# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286144372 -10800 # Node ID 758a864f9613084d4ba15c14c1422a59ec50805d # Parent ef0373b551364fdb8eaff76fa076f14cb01a7560 Revision: 201037 Kit: 201039 diff -r ef0373b55136 -r 758a864f9613 VERSION.SHA1 --- a/VERSION.SHA1 Fri Sep 17 08:34:18 2010 +0300 +++ b/VERSION.SHA1 Mon Oct 04 01:19:32 2010 +0300 @@ -1,1 +1,1 @@ -acc48564b55b8e2fbc80e7b93c790a44f4a7b6e3 +624cafb543fe4bb145ad7e6691e433626cb86b9c diff -r ef0373b55136 -r 758a864f9613 bin/createpackage.pl --- a/bin/createpackage.pl Fri Sep 17 08:34:18 2010 +0300 +++ b/bin/createpackage.pl Mon Oct 04 01:19:32 2010 +0300 @@ -81,11 +81,14 @@ [-o|only-unsigned] = Creates only unsigned package. [-s|stub] = Generates stub sis for ROM. [-n|sisname ] = Specifies the final sis name. + [-g|gcce-is-armv5] = Convert gcce platform to armv5. Where parameters are as follows: templatepkg = Name of .pkg file template target = Either debug or release platform = One of the supported platform winscw | gcce | armv5 | armv6 | armv7 + Note that when packaging binaries built using gcce and symbian-sbsv2 + mkspec, armv5 must be used for platform instead of gcce. certificate = The certificate file used for signing key = The certificate's private key file passphrase = The passphrase of the certificate's private key file @@ -123,6 +126,7 @@ my $stub = ""; my $signed_sis_name = ""; my $onlyUnsigned = ""; +my $convertGcce = ""; unless (GetOptions('i|install' => \$install, 'p|preprocess' => \$preprocessonly, @@ -130,7 +134,8 @@ 'u|unsigned' => \$preserveUnsigned, 'o|only-unsigned' => \$onlyUnsigned, 's|stub' => \$stub, - 'n|sisname=s' => \$signed_sis_name,)) { + 'n|sisname=s' => \$signed_sis_name, + 'g|gcce-is-armv5' => \$convertGcce,)) { Usage(); } @@ -146,6 +151,16 @@ my $platform; $platform = $tmpvalues[1] or $platform = ""; +if ($platform =~ m/^gcce$/i) { + if (($convertGcce ne "")) { + $platform = "armv5"; + } elsif ($ENV{SBS_HOME}) { + # Print a informative note in case suspected misuse is detected. + print "\nNote: You should use armv5 as platform or specify -g parameter to convert platform\n"; + print " when packaging gcce binaries built using symbian-sbsv2 mkspec.\n\n"; + } +} + # Convert visual target to real target (debug->udeb and release->urel) $target =~ s/debug/udeb/i; $target =~ s/release/urel/i; @@ -300,7 +315,8 @@ && $templatepkg !~ m/_installer\.pkg$/i && !$onlyUnsigned) { print("Auto-patching capabilities for self signed package.\n"); - system ("patch_capabilities $pkgoutput"); + my $patch_capabilities = File::Spec->catfile(dirname($0), "patch_capabilities"); + system ("$patch_capabilities $pkgoutput"); } # Create SIS. diff -r ef0373b55136 -r 758a864f9613 bin/patch_capabilities.pl --- a/bin/patch_capabilities.pl Fri Sep 17 08:34:18 2010 +0300 +++ b/bin/patch_capabilities.pl Mon Oct 04 01:19:32 2010 +0300 @@ -54,7 +54,9 @@ print("If no capabilities are given, the binaries will be given the\n"); print("capabilities supported by self-signed certificates.\n\n"); print(" *** NOTE: If *_template.pkg file is given and one is using symbian-abld or\n"); - print(" symbian-sbsv2 platform, 'target-platform' is REQUIRED. ***\n"); + print(" symbian-sbsv2 platform, 'target-platform' is REQUIRED. ***\n\n"); + print(" *** NOTE2: When patching gcce binaries built with symbian-sbsv2 toolchain,\n"); + print(" armv5 must be specified as platform.\n"); print("\nUsage: patch_capabilities.pl pkg_filename [target-platform [capability list]]\n"); print("\nE.g. patch_capabilities.pl myapp_template.pkg release-armv5 \"All -TCB\"\n"); exit(); @@ -104,6 +106,11 @@ # Convert visual target to real target (debug->udeb and release->urel) $target =~ s/debug/udeb/i; $target =~ s/release/urel/i; + + if (($platform =~ m/^gcce$/i) && ($ENV{SBS_HOME})) { + # Print a informative note in case suspected misuse is detected. + print "\nNote: You must use armv5 as platform when packaging gcce binaries built using symbian-sbsv2 mkspec.\n"; + } } # If the specified ".pkg" file exists (and can be read), diff -r ef0373b55136 -r 758a864f9613 bin/syncqt --- a/bin/syncqt Fri Sep 17 08:34:18 2010 +0300 +++ b/bin/syncqt Mon Oct 04 01:19:32 2010 +0300 @@ -42,7 +42,7 @@ "QtScript" => "$basedir/src/script", "QtScriptTools" => "$basedir/src/scripttools", "Qt3Support" => "$basedir/src/qt3support", - "ActiveQt" => "$basedir/src/activeqt/container;$basedir/src/activeqt/control;$basedir/src/activeqt/shared", + "ActiveQt" => "$basedir/src/activeqt", "QtTest" => "$basedir/src/testlib", "QtHelp" => "$basedir/tools/assistant/lib", "QtDesigner" => "$basedir/tools/designer/src/lib", @@ -700,6 +700,7 @@ $isunix = checkUnix; #cache checkUnix # create path +mkpath "$out_basedir/include", !$quiet; mkpath "$out_basedir/$out_subdir/Qt", !$quiet; my @ignore_headers = (); @@ -710,6 +711,10 @@ my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" ); my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" ); my %colliding_headers = (); +my %inject_headers; +# Force generation of forwarding header for qconfig.h if (and only if) we can't +# find the header by normal means. +%inject_headers = ( "$basedir/src/corelib/global" => ( "*qconfig.h" ) ) unless (-e "$basedir/src/corelib/global/qconfig.h"); foreach (@modules_to_sync) { #iteration info @@ -819,8 +824,10 @@ foreach (@subdirs) { my $subdir = "$_"; my @headers = findFiles("$subdir", "^[-a-z0-9_]*\\.h\$" , 0); + push @headers, $inject_headers{$subdir} if (defined $inject_headers{$subdir}); foreach (@headers) { my $header = "$_"; + my $shadow = ($header =~ s/^\*//); $header = 0 if("$header" =~ /^ui_.*.h/); foreach (@ignore_headers) { $header = 0 if("$header" eq "$_"); @@ -838,6 +845,7 @@ } my $iheader = $subdir . "/" . $header; + $iheader =~ s/^\Q$basedir\E/$out_basedir/ if ($shadow); my @classes = $public_header ? classNames($iheader) : (); if($showonly) { print "$header [$lib]\n"; @@ -862,7 +870,7 @@ my $warning_msg = 'Inclusion of header files from include/Qt is deprecated.'; $header_content = "#ifndef QT_NO_QT_INCLUDE_WARN\n" . " #if defined(__GNUC__)\n" . - " #pragma warning \"$warning_msg\"\n" . + " #warning \"$warning_msg\"\n" . " #elif defined(_MSC_VER)\n" . " #pragma message \"WARNING: $warning_msg\"\n" . " #endif\n". @@ -1009,14 +1017,12 @@ for (keys(%modules)) { #iteration info my $lib = $_; - my $dir = "$modules{$lib}"; - foreach (split(/;/, $dir)) { - my $current_dir = "$_"; + { #calc subdirs - my @subdirs = ($current_dir); + my @subdirs = ($modules{$lib}); foreach (@subdirs) { my $subdir = "$_"; - opendir DIR, "$subdir"; + opendir DIR, "$subdir" or die "Huh, directory ".$subdir." cannot be opened."; while(my $t = readdir(DIR)) { push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") && !($t eq "..") && !($t eq ".obj") && @@ -1142,4 +1148,4 @@ } } -exit 0; \ No newline at end of file +exit 0; diff -r ef0373b55136 -r 758a864f9613 config.tests/symbian/audio/audio.pro --- a/config.tests/symbian/audio/audio.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/config.tests/symbian/audio/audio.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,8 +1,6 @@ TARGET = audio SOURCES = audio.cpp -QT= - INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/server INCLUDEPATH += $${EPOCROOT}epoc32/include/mmf/common diff -r ef0373b55136 -r 758a864f9613 config.tests/symbian/compile.test --- a/config.tests/symbian/compile.test Fri Sep 17 08:34:18 2010 +0300 +++ b/config.tests/symbian/compile.test Mon Oct 04 01:19:32 2010 +0300 @@ -26,15 +26,16 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" +"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then $MAKE else $MAKE >/dev/null 2>&1 fi -#by default WINSCW is used in Symbian release -[ -f "$EPOCROOT/epoc32/release/winscw/udeb/$EXE.exe" ] && SUCCESS=yes + +[ -x "$EXE.exe" ] && SUCCESS=yes + # done if [ "$SUCCESS" != "yes" ]; then [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled." diff -r ef0373b55136 -r 758a864f9613 config.tests/unix/icd/icd.cpp --- a/config.tests/unix/icd/icd.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/config.tests/unix/icd/icd.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -40,11 +40,7 @@ ****************************************************************************/ #include -#include -#include -#include #include -#include #include int main(int, char **) diff -r ef0373b55136 -r 758a864f9613 configure --- a/configure Fri Sep 17 08:34:18 2010 +0300 +++ b/configure Mon Oct 04 01:19:32 2010 +0300 @@ -794,6 +794,7 @@ OPT_HELP= CFG_SILENT=no CFG_GRAPHICS_SYSTEM=default +CFG_RUNTIME_SYSTEM= CFG_ALSA=auto CFG_PULSEAUDIO=auto CFG_COREWLAN=auto @@ -824,6 +825,7 @@ QT_CFLAGS_SQLITE= QT_LFLAGS_SQLITE= QT_LFLAGS_ODBC="-lodbc" +QT_LFLAGS_TDS= # flags for libdbus-1 QT_CFLAGS_DBUS= @@ -837,9 +839,9 @@ QT_CFLAGS_GSTREAMER= QT_LIBS_GSTREAMER= -# flags for icd (Maemo Internet Connection Daemon) -QT_CFLAGS_ICD= -QT_LIBS_ICD= +# flags for libconnsettings0 (used for Maemo ICD bearer management plugin) +QT_CFLAGS_CONNSETTINGS= +QT_LIBS_CONNSETTINGS= #------------------------------------------------------------------------------- # check SQL drivers, mouse drivers and decorations available in this package @@ -1037,6 +1039,11 @@ shift VAL=$1 ;; + -runtimegraphicssystem) + VAR="runtimegraphicssystem" + shift + VAL=$1 + ;; -qtlibinfix) VAR="qtlibinfix" shift @@ -1281,11 +1288,18 @@ CFG_GRAPHICS_SYSTEM="openvg" elif [ "$VAL" = "raster" ]; then CFG_GRAPHICS_SYSTEM="raster" + elif [ "$VAL" = "runtime" ]; then + CFG_GRAPHICS_SYSTEM="runtime" else UNKNOWN_OPT=yes fi fi ;; + runtimegraphicssystem) + if [ "$VAL" != "runtime" ]; then + CFG_RUNTIME_SYSTEM="$VAL" + fi + ;; qvfb) # left for commandline compatibility, not documented if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then @@ -2088,7 +2102,7 @@ [ "$VAR" = "decoration" ] && QMakeVar del "${VAR}s" "$VAL" [ "$VAR" = "decoration" ] && CFG_DECORATION_ON=`echo "${CFG_DECORATION_ON} " | sed "s,${VAL} ,,g"` && CFG_DECORATION_PLUGIN="$CFG_DECORATION_PLUGIN ${VAL}" [ "$VAR" = "kbd" ] && QMakeVar del "${VAR}s" "$VAL" - [ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_KBD_PLUGIN="$CFG_KBD_PLUGIN ${VAL}" + [ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_KBD_ON} " | sed "s,${VAL} ,,g"` && CFG_KBD_PLUGIN="$CFG_KBD_PLUGIN ${VAL}" [ "$VAR" = "mouse" ] && QMakeVar del "${VAR}s" "$VAL" [ "$VAR" = "mouse" ] && CFG_MOUSE_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_MOUSE_PLUGIN="$CFG_MOUSE_PLUGIN ${VAL}" [ "$VAR" = "gfx" ] && QMakeVar del "${VAR}s" "$VAL" @@ -2321,7 +2335,7 @@ # detect build style if [ "$CFG_DEBUG" = "auto" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then + if [ "$PLATFORM_MAC" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then CFG_DEBUG_RELEASE=yes CFG_DEBUG=yes elif [ "$CFG_DEV" = "yes" ]; then @@ -2400,10 +2414,31 @@ # symlink the mkspecs directory mkdir -p "$outpath/mkspecs" - rm -f "$outpath"/mkspecs/* + rm -rf "$outpath"/mkspecs/* ln -s "$relpath"/mkspecs/* "$outpath/mkspecs" rm -f "$outpath/mkspecs/default" + ShadowMkspecs() + { + rm -rf "$outpath/mkspecs/$1" + if [ "$UNAME_SYSTEM" = "Linux" ]; then + # This works with GNU coreutils, and is needed for ScratchBox + cp -rs "$relpath/mkspecs/$1" "$outpath/mkspecs/$1" + else + # A simple "cp -rs" doesn't work on Mac. :( + find "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p + find "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%" + fi + } + + # Special case for mkspecs/features directory. + # To be able to place .prf files into a shadow build directory, + # we're creating links for files only. The directory structure is reproduced. + ShadowMkspecs features + + # The modules dir is special, too. + ShadowMkspecs modules + # symlink the doc directory rm -rf "$outpath/doc" ln -s "$relpath/doc" "$outpath/doc" @@ -3675,8 +3710,8 @@ -no-scripttools .... Do not build the QtScriptTools module. + -scripttools ....... Build the QtScriptTools module. - + -no-declarative .....Do not build the declarative module. - -declarative ....... Build the declarative module. + -no-declarative .....Do not build the declarative module. + + -declarative ....... Build the declarative module. -platform target ... The operating system and compiler you are building on ($PLATFORM). @@ -3689,6 +3724,8 @@ -graphicssystem Sets an alternate graphics system. Available options are: raster - Software rasterizer opengl - Rendering via OpenGL, Experimental! + openvg - Rendering via OpenVG, Experimental! + EOF fi cat << EOF @@ -4877,23 +4914,24 @@ exit 1 fi - # the main commands needed to compile; - (cd config.tests/symbian - mkdir -p rcomp - cd rcomp - rm -f rcomp_test.rsg - touch rcomp_test.rpp rcomp_test.rsc rcomp_test.rss - rcomp -u -m045,046,047 -s./rcomp_test.rpp -o./rcomp_test.rsc -h./rcomp_test.rsg -i./rcomp_test.rss 2>&1 > /dev/null - if test ! -f rcomp_test.rsg; then - echo "Finding a working rcomp in your PATH failed." - echo "Fatal error. Make sure you have the epoc tools working and in your PATH"; - exit 1; - fi - ) - - # compile a simple main that uses printf if ! echo $XPLATFORM | grep symbian-sbsv2 > /dev/null; then # Raptor does not support configure tests. + + # the main commands needed to compile; + (cd config.tests/symbian + mkdir -p rcomp + cd rcomp + rm -f rcomp_test.rsg + touch rcomp_test.rpp rcomp_test.rsc rcomp_test.rss + rcomp -u -m045,046,047 -s./rcomp_test.rpp -o./rcomp_test.rsc -h./rcomp_test.rsg -i./rcomp_test.rss 2>&1 > /dev/null + if test ! -f rcomp_test.rsg; then + echo "Finding a working rcomp in your PATH failed." + echo "Fatal error. Make sure you have the epoc tools working and in your PATH"; + exit 1; + fi + ) + + # compile a simple main that uses printf if ! "$symbiantests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/symbian/simple "simple" $L_FLAGS $I_FLAGS $l_FLAGS then echo "Testing your compiler failed. Could not compile a simple application." @@ -5147,7 +5185,9 @@ ;; tds) if [ "$CFG_SQL_tds" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then + [ -z "$SYBASE" ] || QT_LFLAGS_TDS="-L$SYBASE/lib" + [ -z "$SYBASE_LIBS" ] || QT_LFLAGS_TDS="$QT_LFLAGS_TDS $SYBASE_LIBS" + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $QT_LFLAGS_TDS $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then if [ "$CFG_SQL_tds" = "auto" ]; then CFG_SQL_tds=plugin fi @@ -5416,7 +5456,7 @@ fi fi - # Auto-detect GStreamer support (needed for both Phonon & QtMultimedia) + # Auto-detect GStreamer support (needed for Phonon) if [ "$CFG_PHONON" != "no" ]; then if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then @@ -5467,49 +5507,21 @@ # auto-detect icd support if [ "$CFG_GLIB" = "yes" -a "$CFG_ICD" != "no" ]; then - # ICD support has a cyclic dependency on Qt. if [ -n "$PKG_CONFIG" ]; then - QT_CFLAGS_ICD=`$PKG_CONFIG --cflags osso-ic conninet 2>/dev/null` - QT_LIBS_ICD=`$PKG_CONFIG --libs osso-ic conninet 2>/dev/null` - QT_CFLAGS_QTNETWORK=`$PKG_CONFIG --cflags QtNetwork 2>/dev/null` - QT_LIBS_QTNETWORK=`$PKG_CONFIG --libs QtNetwork 2>/dev/null` - else - QT_CFLAGS_QTNETWORK= - QT_LIBS_QTNETWORK= - fi - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/icd "ICD" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_ICD $QT_LIBS_ICD $QT_CFLAGS_QTNETWORK $QT_LIBS_QTNETWORK; then + QT_CFLAGS_CONNSETTINGS=`$PKG_CONFIG --cflags connsettings 2>/dev/null` + QT_LIBS_CONNSETTINGS=`$PKG_CONFIG --libs connsettings 2>/dev/null` + fi + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/icd "ICD" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_CONNSETTINGS $QT_LIBS_CONNSETTINGS; then [ "$CFG_ICD" = "auto" ] && CFG_ICD=yes - # remove system Qt includes and libraries - QT_CFLAGS_ICD_TRIMMED= - for i in $QT_CFLAGS_ICD; do - case $i in - *qt*) - ;; - *) - QT_CFLAGS_ICD_TRIMMED="$QT_CFLAGS_ICD_TRIMMED $i" - ;; - esac - done - QT_LIBS_ICD_TRIMMED= - for i in $QT_LIBS_ICD; do - case $i in - *qt*|-lQt*) - ;; - *) - QT_LIBS_ICD_TRIMMED="$QT_LIBS_ICD_TRIMMED $i" - ;; - esac - done - - QMakeVar set QT_CFLAGS_ICD "$QT_CFLAGS_ICD_TRIMMED" - QMakeVar set QT_LIBS_ICD "$QT_LIBS_ICD_TRIMMED" + QMakeVar set QT_CFLAGS_CONNSETTINGS "$QT_CFLAGS_CONNSETTINGS" + QMakeVar set QT_LIBS_CONNSETTINGS "$QT_LIBS_CONNSETTINGS" else if [ "$CFG_ICD" = "auto" ]; then CFG_ICD=no elif [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then # CFG_ICD is "yes" - echo "The ICD Bearer Management plugin cannot be enabled because osso-ic or conninet was not found." + echo "The ICD Bearer Management plugin cannot be enabled because connsettings was not found." echo " Turn on verbose messaging (-v) to $0 to see the final report." echo " If you believe this message is in error you may use the continue" echo " switch (-continue) to $0 to continue." @@ -6241,9 +6253,13 @@ # find if the platform supports IPv6 if [ "$CFG_IPV6" != "no" ]; then - if [ "$XPLATFORM" = "symbian-sbsv2" ]; then - #IPV6 should always be enabled for Symbian release - CFG_IPV6=yes + # + # We accidently enabled IPv6 for Qt Symbian in 4.6.x. However the underlying OpenC does not fully support IPV6. + # Therefore for 4.7.1 and following we disable it until OpenC either supports it or we have the native Qt + # symbian socket engine. + # + if echo "$XPLATFORM" | grep symbian > /dev/null; then + CFG_IPV6=no elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then CFG_IPV6=yes else @@ -6424,6 +6440,11 @@ CFG_GRAPHICS_SYSTEM=default fi +if [ -n "$CFG_RUNTIME_SYSTEM" -a "$CFG_GRAPHICS_SYSTEM" != "runtime" ] || [ "$CFG_RUNTIME_SYSTEM" = "runtime" ]; then + echo "Argument to -runtimegraphicssystem is invalid so ignoring..." + CFG_RUNTIME_SYSTEM= +fi + if [ "$CFG_PTMALLOC" != "no" ]; then # build ptmalloc, copy .a file to lib/ echo "Building ptmalloc. Please wait..." @@ -6715,7 +6736,11 @@ QT_CONFIG="$QT_CONFIG embedded" rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes fi -QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR" +if [ "$XPLATFORM_MINGW" != "yes" ]; then + # Do not set this here for Windows. Let qmake do it so + # debug and release precompiled headers are kept separate. + QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR" +fi QMakeVar set OBJECTS_DIR ".obj/$QMAKE_OUTDIR" QMakeVar set MOC_DIR ".moc/$QMAKE_OUTDIR" QMakeVar set RCC_DIR ".rcc/$QMAKE_OUTDIR" @@ -6971,6 +6996,8 @@ # turn off exceptions for the compilers that support it if [ "$PLATFORM_QWS" = "yes" ]; then COMPILER=`echo $XPLATFORM | cut -f 3- -d-` +elif [ "$XPLATFORM" != "$PLATFORM" ]; then + COMPILER=`echo $XPLATFORM | cut -f 2- -d-` else COMPILER=`echo $PLATFORM | cut -f 2- -d-` fi @@ -7194,7 +7221,8 @@ fi if [ "$CFG_WEBKIT" = "yes" ]; then - QT_CONFIG="$QT_CONFIG webkit" + # This include takes care of adding "webkit" to QT_CONFIG. + cp -f "$relpath/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri" "$outpath/mkspecs/modules/qt_webkit_version.pri" # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly. CFG_WEBKIT="yes" else @@ -7308,6 +7336,7 @@ # some compilers generate binary incompatible code between different versions, # so we need to generate a build key that is different between these compilers +COMPAT_COMPILER= case "$COMPILER" in g++*) # GNU C++ @@ -7341,6 +7370,22 @@ esac [ '!' -z "$COMPILER_VERSION" ] && COMPILER="g++-${COMPILER_VERSION}" ;; +icc*) + # The Intel CC compiler on Unix systems matches the ABI of the g++ + # that is found on PATH + COMPILER="icc" + COMPAT_COMPILER="g++-4" + case "`g++ -dumpversion` 2>/dev/null" in + 2.95.*) + COMPAT_COMPILER="g++-2.95.*" + ;; + 3.*) + COMPAT_COMPILER="g++-3.*" + ;; + *) + ;; + esac + ;; *) # ;; @@ -7449,9 +7494,17 @@ BUILD_OPTIONS="$BUILD_CONFIG $BUILD_OPTIONS" # extract the operating system from the XPLATFORM TARGET_OPERATING_SYSTEM=`echo $XPLATFORM | cut -f 2- -d/ | cut -f -1 -d-` +case "$XPLATFORM" in +symbian*) + QT_BUILD_KEY_SYSTEM_PART="Symbian" + ;; +*) + QT_BUILD_KEY_SYSTEM_PART="$CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER" + ;; +esac # when cross-compiling, don't include build-host information (build key is target specific) -QT_BUILD_KEY="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS" +QT_BUILD_KEY="$CFG_USER_BUILD_KEY $QT_BUILD_KEY_SYSTEM_PART $BUILD_OPTIONS" if [ -n "$QT_NAMESPACE" ]; then QT_BUILD_KEY="$QT_BUILD_KEY $QT_NAMESPACE" fi @@ -7475,9 +7528,20 @@ QT_BUILD_KEY_COMPAT="$QT_BUILD_KEY_COMPAT $QT_NAMESPACE" fi fi + +# is this compiler compatible with some other "standard" build key +QT_BUILD_KEY_COMPAT_COMPILER= +if [ ! -z "$COMPAT_COMPILER" ]; then + QT_BUILD_KEY_COMPAT_COMPILER="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPAT_COMPILER $BUILD_OPTIONS" + if [ -n "$QT_NAMESPACE" ]; then + QT_BUILD_KEY_COMPAT_COMPILER="$QT_BUILD_KEY_COMPAT_COMPILER $QT_NAMESPACE" + fi +fi + # strip out leading/trailing/extra whitespace QT_BUILD_KEY=`echo $QT_BUILD_KEY | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` QT_BUILD_KEY_COMPAT=`echo $QT_BUILD_KEY_COMPAT | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` +QT_BUILD_KEY_COMPAT_COMPILER=`echo $QT_BUILD_KEY_COMPAT_COMPILER | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` #------------------------------------------------------------------------------- # part of configuration information goes into qconfig.h @@ -7526,6 +7590,10 @@ echo "#define QT_BUILD_KEY_COMPAT \"$QT_BUILD_KEY_COMPAT\"" \ >> "$outpath/src/corelib/global/qconfig.h.new" fi +if [ -n "$QT_BUILD_KEY_COMPAT_COMPILER" ]; then + echo "#define QT_BUILD_KEY_COMPAT2 \"$QT_BUILD_KEY_COMPAT_COMPILER\"" \ + >> "$outpath/src/corelib/global/qconfig.h.new" +fi echo "" >>"$outpath/src/corelib/global/qconfig.h.new" echo "#ifdef QT_BOOTSTRAPPED" >>"$outpath/src/corelib/global/qconfig.h.new" @@ -7717,6 +7785,7 @@ [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENGL" [ "$CFG_GRAPHICS_SYSTEM" = "openvg" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENVG" + [ "$CFG_GRAPHICS_SYSTEM" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RUNTIME" fi # X11/Unix/Mac only configs @@ -7830,6 +7899,13 @@ EOF fi +if [ -n "$CFG_RUNTIME_SYSTEM" ]; then +cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF +#define QT_DEFAULT_RUNTIME_SYSTEM "$CFG_RUNTIME_SYSTEM" + +EOF +fi + # avoid unecessary rebuilds by copying only if qconfig.h has changed if cmp -s "$outpath/src/corelib/global/qconfig.h" "$outpath/src/corelib/global/qconfig.h.new"; then rm -f "$outpath/src/corelib/global/qconfig.h.new" @@ -7906,9 +7982,6 @@ QT_NAMESPACE = $QT_NAMESPACE QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC -#modules -for(mod,\$\$list(\$\$files(\$\$[QMAKE_MKSPECS]/modules/qt_*.pri))):include(\$\$mod) - EOF if [ "$CFG_RPATH" = "yes" ]; then echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp" @@ -7980,6 +8053,9 @@ if [ -n "$QT_LFLAGS_ODBC" ]; then echo "QT_LFLAGS_ODBC = $QT_LFLAGS_ODBC" >> "$CACHEFILE.tmp" fi +if [ -n "$QT_LFLAGS_TDS" ]; then + echo "QT_LFLAGS_TDS = $QT_LFLAGS_TDS" >> "$CACHEFILE.tmp" +fi if [ "$QT_EDITION" != "QT_EDITION_OPENSOURCE" ]; then echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp" diff -r ef0373b55136 -r 758a864f9613 configure.exe Binary file configure.exe has changed diff -r ef0373b55136 -r 758a864f9613 demos/books/bookwindow.cpp --- a/demos/books/bookwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/books/bookwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -64,7 +64,7 @@ model->setEditStrategy(QSqlTableModel::OnManualSubmit); model->setTable("books"); - // Remeber the indexes of the columns + // Remember the indexes of the columns authorIdx = model->fieldIndex("author"); genreIdx = model->fieldIndex("genre"); diff -r ef0373b55136 -r 758a864f9613 demos/browser/browsermainwindow.cpp --- a/demos/browser/browsermainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/browser/browsermainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -670,7 +670,7 @@ " items are automatically removed from the Downloads window," \ " new cookies are not stored, current cookies can't be accessed," \ " site icons wont be stored, session wont be saved, " \ - " and searches are not addded to the pop-up menu in the Google search box." \ + " and searches are not added to the pop-up menu in the Google search box." \ " Until you close the window, you can still click the Back and Forward buttons" \ " to return to the webpages you have opened.").arg(title); diff -r ef0373b55136 -r 758a864f9613 demos/browser/downloadmanager.cpp --- a/demos/browser/downloadmanager.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/browser/downloadmanager.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -282,7 +282,7 @@ remaining = tr("- %4 %5 remaining") .arg(timeRemaining) .arg(timeRemainingString); - info = QString(tr("%1 of %2 (%3/sec) %4")) + info = tr("%1 of %2 (%3/sec) %4") .arg(dataString(m_bytesReceived)) .arg(bytesTotal == 0 ? tr("?") : dataString(bytesTotal)) .arg(dataString((int)speed)) diff -r ef0373b55136 -r 758a864f9613 demos/browser/settings.cpp --- a/demos/browser/settings.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/browser/settings.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -89,7 +89,7 @@ { QSettings settings; settings.beginGroup(QLatin1String("MainWindow")); - QString defaultHome = QLatin1String("http://qt.nokia.com"); + QString defaultHome = QLatin1String("http://doc.qt.nokia.com"); homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString()); settings.endGroup(); diff -r ef0373b55136 -r 758a864f9613 demos/browser/tabwidget.cpp --- a/demos/browser/tabwidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/browser/tabwidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -67,12 +67,12 @@ connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint))); - QString alt = QLatin1String("Alt+%1"); + QString ctrl = QLatin1String("Ctrl+%1"); for (int i = 1; i <= 10; ++i) { int key = i; if (key == 10) key = 0; - QShortcut *shortCut = new QShortcut(alt.arg(key), this); + QShortcut *shortCut = new QShortcut(ctrl.arg(key), this); m_tabShortcuts.append(shortCut); connect(shortCut, SIGNAL(activated()), this, SLOT(selectTabAction())); } diff -r ef0373b55136 -r 758a864f9613 demos/browser/webview.cpp --- a/demos/browser/webview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/browser/webview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -260,7 +260,7 @@ void WebView::loadFinished() { if (100 != m_progress) { - qWarning() << "Recieved finished signal while progress is still:" << progress() + qWarning() << "Received finished signal while progress is still:" << progress() << "Url:" << url(); } m_progress = 0; diff -r ef0373b55136 -r 758a864f9613 demos/declarative/calculator/Core/calculator.js --- a/demos/declarative/calculator/Core/calculator.js Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/calculator/Core/calculator.js Mon Oct 04 01:19:32 2010 +0300 @@ -74,6 +74,11 @@ memory = display.text.valueOf() } else if (op == leftArrow) { display.text = display.text.toString().slice(0, -1) + if (display.text.length == 0) { + display.text = "0" + } + } else if (op == "Off") { + Qt.quit(); } else if (op == "C") { display.text = "0" } else if (op == "AC") { @@ -82,10 +87,5 @@ lastOp = "" display.text ="0" } - - if (op == rotateLeft) - main.state = "orientation " + Orientation.Landscape - if (op == rotateRight) - main.state = '' } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/calculator/calculator.qml --- a/demos/declarative/calculator/calculator.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/calculator/calculator.qml Mon Oct 04 01:19:32 2010 +0300 @@ -58,7 +58,7 @@ property string plusminus : "\u00b1" function doOp(operation) { CalcEngine.doOperation(operation) } - + Item { id: main state: "orientation " + runtime.orientation @@ -70,8 +70,10 @@ anchors { fill: parent; topMargin: 6; bottomMargin: 6; leftMargin: 6; rightMargin: 6 } - Row { - Display { id: display; width: box.width; height: 64 } + Display { + id: display + width: box.width-3 + height: 64 } Column { @@ -82,11 +84,7 @@ Row { spacing: 6 - - Button { - id: rotateButton - width: column.w; height: column.h; color: 'purple'; operation: rotateLeft - } + Button { width: column.w; height: column.h; color: 'purple'; operation: "Off" } Button { width: column.w; height: column.h; color: 'purple'; operation: leftArrow } Button { width: column.w; height: column.h; color: 'purple'; operation: "C" } Button { width: column.w; height: column.h; color: 'purple'; operation: "AC" } @@ -103,7 +101,7 @@ } Grid { - id: grid; rows: 4; columns: 5; spacing: 6 + id: grid; rows: 5; columns: 5; spacing: 6 property real w: (box.width / columns) - ((spacing * (columns - 1)) / columns) @@ -134,18 +132,18 @@ states: [ State { name: "orientation " + Orientation.Landscape - PropertyChanges { target: main; rotation: -90; width: window.height; height: window.width } - PropertyChanges { target: rotateButton; operation: rotateRight } + PropertyChanges { target: main; rotation: 90; width: window.height; height: window.width } + PropertyChanges { target: rotateButton; operation: rotateLeft } }, State { name: "orientation " + Orientation.PortraitInverted - PropertyChanges { target: main; rotation: -180; } - PropertyChanges { target: rotateButton; operation: rotateLeft } + PropertyChanges { target: main; rotation: 180; } + PropertyChanges { target: rotateButton; operation: rotateRight } }, State { name: "orientation " + Orientation.LandscapeInverted - PropertyChanges { target: main; rotation: -270; width: window.height; height: window.width } - PropertyChanges { target: rotateButton; operation: rotateRight } + PropertyChanges { target: main; rotation: 270; width: window.height; height: window.width } + PropertyChanges { target: rotateButton; operation: rotateLeft } } ] diff -r ef0373b55136 -r 758a864f9613 demos/declarative/flickr/common/Slider.qml --- a/demos/declarative/flickr/common/Slider.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/flickr/common/Slider.qml Mon Oct 04 01:19:32 2010 +0300 @@ -45,11 +45,24 @@ id: slider; width: 400; height: 16 // value is read/write. - property real value - onValueChanged: { handle.x = 2 + (value - minimum) * slider.xMax / (maximum - minimum); } + property real value: 1 + onValueChanged: updatePos(); property real maximum: 1 property real minimum: 1 - property int xMax: slider.width - handle.width - 4 + property int xMax: width - handle.width - 4 + onXMaxChanged: updatePos(); + onMinimumChanged: updatePos(); + + function updatePos() { + if (maximum > minimum) { + var pos = 2 + (value - minimum) * slider.xMax / (maximum - minimum); + pos = Math.min(pos, width - handle.width - 2); + pos = Math.max(pos, 2); + handle.x = pos; + } else { + handle.x = 2; + } + } Rectangle { anchors.fill: parent @@ -62,13 +75,14 @@ Rectangle { id: handle; smooth: true - x: slider.width / 2 - handle.width / 2; y: 2; width: 30; height: slider.height-4; radius: 6 + y: 2; width: 30; height: slider.height-4; radius: 6 gradient: Gradient { GradientStop { position: 0.0; color: "lightgray" } GradientStop { position: 1.0; color: "gray" } } MouseArea { + id: mouse anchors.fill: parent; drag.target: parent drag.axis: Drag.XAxis; drag.minimumX: 2; drag.maximumX: slider.xMax+2 onPositionChanged: { value = (maximum - minimum) * (handle.x-2) / slider.xMax + minimum; } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/flickr/flickr.qml --- a/demos/declarative/flickr/flickr.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/flickr/flickr.qml Mon Oct 04 01:19:32 2010 +0300 @@ -57,21 +57,20 @@ Item { id: views - x: 2; width: parent.width - 4 + width: parent.width anchors.top: titleBar.bottom; anchors.bottom: toolBar.top - Mobile.GridDelegate { id: gridDelegate } GridView { - x: (width/4-79)/2; y: x - id: photoGridView; model: rssModel; delegate: gridDelegate; cacheBuffer: 100 - cellWidth: (parent.width-2)/4; cellHeight: cellWidth; width: parent.width; height: parent.height - 1; z: 6 + id: photoGridView; model: rssModel; delegate: Mobile.GridDelegate {} + cacheBuffer: 100 + cellWidth: (parent.width-2)/4; cellHeight: cellWidth; width: parent.width; height: parent.height } - Mobile.ListDelegate { id: listDelegate } ListView { - id: photoListView; model: rssModel; delegate: listDelegate; z: 6 + id: photoListView; model: rssModel; delegate: Mobile.ListDelegate { } width: parent.width; height: parent.height; x: -(parent.width * 1.5); cacheBuffer: 100; } + states: State { name: "ListView"; when: screen.inListView == true PropertyChanges { target: photoListView; x: 0 } @@ -81,13 +80,16 @@ transitions: Transition { NumberAnimation { properties: "x"; duration: 500; easing.type: Easing.InOutQuad } } + + Mobile.ImageDetails { id: imageDetails; width: parent.width; anchors.left: views.right; height: parent.height } + + Item { id: foreground; anchors.fill: parent } } - Mobile.ImageDetails { id: imageDetails; width: parent.width; anchors.left: views.right; height: parent.height; z:1 } - Mobile.TitleBar { id: titleBar; z: 5; width: parent.width; height: 40; opacity: 0.9 } + Mobile.TitleBar { id: titleBar; width: parent.width; height: 40; opacity: 0.9 } Mobile.ToolBar { - id: toolBar; z: 5 + id: toolBar height: 40; anchors.bottom: parent.bottom; width: parent.width; opacity: 0.9 button1Label: "Update"; button2Label: "View mode" onButton1Clicked: rssModel.reload() diff -r ef0373b55136 -r 758a864f9613 demos/declarative/flickr/mobile/GridDelegate.qml --- a/demos/declarative/flickr/mobile/GridDelegate.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/flickr/mobile/GridDelegate.qml Mon Oct 04 01:19:32 2010 +0300 @@ -39,75 +39,73 @@ ** ****************************************************************************/ - import Qt 4.7 +import Qt 4.7 - Component { - id: photoDelegate - Item { - id: wrapper; width: 79; height: 79 +Item { + id: wrapper; width: GridView.view.cellWidth; height: GridView.view.cellHeight - function photoClicked() { - imageDetails.photoTitle = title; - imageDetails.photoTags = tags; - imageDetails.photoWidth = photoWidth; - imageDetails.photoHeight = photoHeight; - imageDetails.photoType = photoType; - imageDetails.photoAuthor = photoAuthor; - imageDetails.photoDate = photoDate; - imageDetails.photoUrl = url; - imageDetails.rating = 0; - scaleMe.state = "Details"; - } + function photoClicked() { + imageDetails.photoTitle = title; + imageDetails.photoTags = tags; + imageDetails.photoWidth = photoWidth; + imageDetails.photoHeight = photoHeight; + imageDetails.photoType = photoType; + imageDetails.photoAuthor = photoAuthor; + imageDetails.photoDate = photoDate; + imageDetails.photoUrl = url; + imageDetails.rating = 0; + scaleMe.state = "Details"; + } - Item { - anchors.centerIn: parent - scale: 0.0 - Behavior on scale { NumberAnimation { easing.type: Easing.InOutQuad} } - id: scaleMe + Item { + anchors.centerIn: parent + scale: 0.0 + Behavior on scale { NumberAnimation { easing.type: Easing.InOutQuad} } + id: scaleMe - Rectangle { height: 79; width: 79; id: blackRect; anchors.centerIn: parent; color: "black"; smooth: true } - Rectangle { - id: whiteRect; width: 77; height: 77; anchors.centerIn: parent; color: "#dddddd"; smooth: true - Image { id: thumb; source: imagePath; x: 1; y: 1; smooth: true} - Image { source: "images/gloss.png" } - } + Item { + width: 77; height: 77; anchors.centerIn: parent + Rectangle { + id: whiteRect; width: 77; height: 77; color: "#dddddd"; smooth: true + Image { id: thumb; source: imagePath; x: 1; y: 1; smooth: true } + Image { source: "images/gloss.png" } + } + } - Connections { - target: toolBar - onButton2Clicked: if (scaleMe.state == 'Details' ) scaleMe.state = 'Show' - } + Connections { + target: toolBar + onButton2Clicked: if (scaleMe.state == 'Details' ) scaleMe.state = 'Show' + } - states: [ - State { - name: "Show"; when: thumb.status == Image.Ready - PropertyChanges { target: scaleMe; scale: 1 } - }, - State { - name: "Details" - PropertyChanges { target: scaleMe; scale: 1 } - ParentChange { target: wrapper; parent: imageDetails.frontContainer } - PropertyChanges { target: wrapper; x: 20; y: 60; z: 1000 } - PropertyChanges { target: background; state: "DetailedView" } - } - ] - transitions: [ - Transition { - from: "Show"; to: "Details" - ParentAnimation { - NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad } - } - }, - Transition { - from: "Details"; to: "Show" - SequentialAnimation { - ParentAnimation { - NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad } - } - PropertyAction { targets: wrapper; properties: "z" } - } - } - ] - } - MouseArea { anchors.fill: wrapper; onClicked: { photoClicked() } } - } - } + states: [ + State { + name: "Show"; when: thumb.status == Image.Ready + PropertyChanges { target: scaleMe; scale: 1 } + }, + State { + name: "Details" + PropertyChanges { target: scaleMe; scale: 1 } + ParentChange { target: whiteRect; x: 10; y: 20; parent: imageDetails.frontContainer } + PropertyChanges { target: background; state: "DetailedView" } + } + ] + transitions: [ + Transition { + from: "Show"; to: "Details" + ParentAnimation { + via: foreground + NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad } + } + }, + Transition { + from: "Details"; to: "Show" + ParentAnimation { + via: foreground + NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad } + } + } + ] + } + MouseArea { anchors.fill: wrapper; onClicked: photoClicked() } +} + diff -r ef0373b55136 -r 758a864f9613 demos/declarative/flickr/mobile/ImageDetails.qml --- a/demos/declarative/flickr/mobile/ImageDetails.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/flickr/mobile/ImageDetails.qml Mon Oct 04 01:19:32 2010 +0300 @@ -45,7 +45,7 @@ Flipable { id: container - property variant frontContainer: containerFront + property alias frontContainer: containerFront property string photoTitle: "" property string photoTags: "" property int photoWidth @@ -76,17 +76,17 @@ Column { spacing: 10 anchors { - left: parent.left; leftMargin: 20 - right: parent.right; rightMargin: 20 - top: parent.top; topMargin: 180 + left: parent.left; leftMargin: 10 + right: parent.right; rightMargin: 10 + top: parent.top; topMargin: 120 } - Text { font.bold: true; color: "white"; elide: Text.ElideRight; text: container.photoTitle } - Text { color: "white"; elide: Text.ElideRight; text: "Size: " + container.photoWidth + 'x' + container.photoHeight } - Text { color: "white"; elide: Text.ElideRight; text: "Type: " + container.photoType } - Text { color: "white"; elide: Text.ElideRight; text: "Author: " + container.photoAuthor } - Text { color: "white"; elide: Text.ElideRight; text: "Published: " + container.photoDate } - Text { color: "white"; elide: Text.ElideRight; text: container.photoTags == "" ? "" : "Tags: " } - Text { color: "white"; elide: Text.ElideRight; text: container.photoTags } + Text { font.bold: true; color: "white"; elide: Text.ElideRight; text: container.photoTitle; width: parent.width } + Text { color: "white"; elide: Text.ElideRight; text: "Size: " + container.photoWidth + 'x' + container.photoHeight; width: parent.width } + Text { color: "white"; elide: Text.ElideRight; text: "Type: " + container.photoType; width: parent.width } + Text { color: "white"; elide: Text.ElideRight; text: "Author: " + container.photoAuthor; width: parent.width } + Text { color: "white"; elide: Text.ElideRight; text: "Published: " + container.photoDate; width: parent.width } + Text { color: "white"; elide: Text.ElideRight; text: container.photoTags == "" ? "" : "Tags: "; width: parent.width } + Text { color: "white"; elide: Text.ElideRight; text: container.photoTags; width: parent.width } } } @@ -104,6 +104,24 @@ id: flickable; anchors.fill: parent; clip: true contentWidth: imageContainer.width; contentHeight: imageContainer.height + function updateMinimumScale() { + if (bigImage.status == Image.Ready && bigImage.width != 0) { + slider.minimum = Math.min(flickable.width / bigImage.width, flickable.height / bigImage.height); + if (bigImage.width * slider.value > flickable.width) { + var xoff = (flickable.width/2 + flickable.contentX) * slider.value / prevScale; + flickable.contentX = xoff - flickable.width/2; + } + if (bigImage.height * slider.value > flickable.height) { + var yoff = (flickable.height/2 + flickable.contentY) * slider.value / prevScale; + flickable.contentY = yoff - flickable.height/2; + } + prevScale = slider.value; + } + } + + onWidthChanged: updateMinimumScale() + onHeightChanged: updateMinimumScale() + Item { id: imageContainer width: Math.max(bigImage.width * bigImage.scale, flickable.width); @@ -114,8 +132,8 @@ anchors.centerIn: parent; smooth: !flickable.movingVertically onStatusChanged : { // Default scale shows the entire image. - if (status == Image.Ready && width != 0) { - slider.minimum = Math.min(flickable.width / width, flickable.height / height); + if (bigImage.status == Image.Ready && bigImage.width != 0) { + slider.minimum = Math.min(flickable.width / bigImage.width, flickable.height / bigImage.height); prevScale = Math.min(slider.minimum, 1); slider.value = prevScale; } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/minehunt/MinehuntCore/pics/No-Ones-Laughing-3.jpg Binary file demos/declarative/minehunt/MinehuntCore/pics/No-Ones-Laughing-3.jpg has changed diff -r ef0373b55136 -r 758a864f9613 demos/declarative/minehunt/MinehuntCore/pics/background.png Binary file demos/declarative/minehunt/MinehuntCore/pics/background.png has changed diff -r ef0373b55136 -r 758a864f9613 demos/declarative/minehunt/MinehuntCore/pics/quit.png Binary file demos/declarative/minehunt/MinehuntCore/pics/quit.png has changed diff -r ef0373b55136 -r 758a864f9613 demos/declarative/minehunt/MinehuntCore/qmldir --- a/demos/declarative/minehunt/MinehuntCore/qmldir Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/minehunt/MinehuntCore/qmldir Mon Oct 04 01:19:32 2010 +0300 @@ -1,3 +1,2 @@ -plugin qmlminehuntplugin Explosion 1.0 Explosion.qml Tile 1.0 Tile.qml diff -r ef0373b55136 -r 758a864f9613 demos/declarative/minehunt/README --- a/demos/declarative/minehunt/README Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/minehunt/README Mon Oct 04 01:19:32 2010 +0300 @@ -1,3 +1,6 @@ -To compile the C++ part, do 'qmake && make'. Minehunt will not run properly if the C++ plugin is not compiled. +Minehunt has to be compiled to run. -To run, simply load the minehunt.qml file with the qml runtime. +To compile the C++ part, do 'qmake && make'. +To run, simply run the executable. +To deploy on a device, do 'make sis'. + diff -r ef0373b55136 -r 758a864f9613 demos/declarative/minehunt/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/demos/declarative/minehunt/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the demonstration applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include +#include + +#include "minehunt.h" + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + QDeclarativeView canvas; + + qmlRegisterType(); + MinehuntGame* game = new MinehuntGame(); + +#ifdef Q_OS_SYMBIAN + canvas.setResizeMode(QDeclarativeView::SizeRootObjectToView); +#endif + canvas.engine()->rootContext()->setContextObject(game); + canvas.setSource(QString("minehunt.qml")); + QObject::connect(canvas.engine(), SIGNAL(quit()), &app, SLOT(quit())); + +#ifdef Q_OS_SYMBIAN + canvas.showFullScreen(); +#else + canvas.setGeometry(QRect(100, 100, 450, 450)); + canvas.show(); +#endif + return app.exec(); +} diff -r ef0373b55136 -r 758a864f9613 demos/declarative/minehunt/minehunt.cpp --- a/demos/declarative/minehunt/minehunt.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/minehunt/minehunt.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -40,99 +40,10 @@ ****************************************************************************/ #include -#include -#include -#include -#include - #include #include -class TileData : public QObject -{ - Q_OBJECT -public: - TileData() : _hasFlag(false), _hasMine(false), _hint(-1), _flipped(false) {} - - Q_PROPERTY(bool hasFlag READ hasFlag WRITE setHasFlag NOTIFY hasFlagChanged) - bool hasFlag() const { return _hasFlag; } - - Q_PROPERTY(bool hasMine READ hasMine NOTIFY hasMineChanged) - bool hasMine() const { return _hasMine; } - - Q_PROPERTY(int hint READ hint NOTIFY hintChanged) - int hint() const { return _hint; } - - Q_PROPERTY(bool flipped READ flipped NOTIFY flippedChanged()) - bool flipped() const { return _flipped; } - - void setHasFlag(bool flag) {if(flag==_hasFlag) return; _hasFlag = flag; emit hasFlagChanged();} - void setHasMine(bool mine) {if(mine==_hasMine) return; _hasMine = mine; emit hasMineChanged();} - void setHint(int hint) { if(hint == _hint) return; _hint = hint; emit hintChanged(); } - void flip() { if (_flipped) return; _flipped = true; emit flippedChanged(); } - void unflip() { if(!_flipped) return; _flipped = false; emit flippedChanged(); } - -signals: - void flippedChanged(); - void hasFlagChanged(); - void hintChanged(); - void hasMineChanged(); - -private: - bool _hasFlag; - bool _hasMine; - int _hint; - bool _flipped; -}; - -class MinehuntGame : public QObject -{ - Q_OBJECT -public: - MinehuntGame(); - - Q_PROPERTY(QDeclarativeListProperty tiles READ tiles CONSTANT) - QDeclarativeListProperty tiles(); - - Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged) - bool isPlaying() {return playing;} - - Q_PROPERTY(bool hasWon READ hasWon NOTIFY hasWonChanged) - bool hasWon() {return won;} - - Q_PROPERTY(int numMines READ numMines NOTIFY numMinesChanged) - int numMines() const{return nMines;} - - Q_PROPERTY(int numFlags READ numFlags NOTIFY numFlagsChanged) - int numFlags() const{return nFlags;} - -public slots: - Q_INVOKABLE bool flip(int row, int col); - Q_INVOKABLE bool flag(int row, int col); - void setBoard(); - void reset(); - -signals: - void isPlayingChanged(); - void hasWonChanged(); - void numMinesChanged(); - void numFlagsChanged(); - -private: - bool onBoard( int r, int c ) const { return r >= 0 && r < numRows && c >= 0 && c < numCols; } - TileData *tile( int row, int col ) { return onBoard(row, col) ? _tiles[col+numRows*row] : 0; } - int getHint(int row, int col); - void setPlaying(bool b){if(b==playing) return; playing=b; emit isPlayingChanged();} - - QList _tiles; - int numCols; - int numRows; - bool playing; - bool won; - int remaining; - int nMines; - int nFlags; -}; +#include "minehunt.h" void tilesPropAppend(QDeclarativeListProperty* prop, TileData* value) { @@ -306,29 +217,3 @@ emit numFlagsChanged(); return true; } - -class MinehuntExtensionPlugin : public QDeclarativeExtensionPlugin -{ - Q_OBJECT - - public: - void registerTypes(const char *uri) { - Q_UNUSED(uri); - qmlRegisterType(); - } - - void initializeEngine(QDeclarativeEngine *engine, const char *uri) { - Q_UNUSED(uri); - - srand(QTime(0,0,0).secsTo(QTime::currentTime())); - - MinehuntGame* game = new MinehuntGame(); - - engine->rootContext()->setContextObject(game); - } -}; - -#include "minehunt.moc" - -Q_EXPORT_PLUGIN(MinehuntExtensionPlugin); - diff -r ef0373b55136 -r 758a864f9613 demos/declarative/minehunt/minehunt.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/demos/declarative/minehunt/minehunt.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,129 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the demonstration applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include + +class TileData : public QObject +{ + Q_OBJECT +public: + TileData() : _hasFlag(false), _hasMine(false), _hint(-1), _flipped(false) {} + + Q_PROPERTY(bool hasFlag READ hasFlag WRITE setHasFlag NOTIFY hasFlagChanged) + bool hasFlag() const { return _hasFlag; } + + Q_PROPERTY(bool hasMine READ hasMine NOTIFY hasMineChanged) + bool hasMine() const { return _hasMine; } + + Q_PROPERTY(int hint READ hint NOTIFY hintChanged) + int hint() const { return _hint; } + + Q_PROPERTY(bool flipped READ flipped NOTIFY flippedChanged()) + bool flipped() const { return _flipped; } + + void setHasFlag(bool flag) {if(flag==_hasFlag) return; _hasFlag = flag; emit hasFlagChanged();} + void setHasMine(bool mine) {if(mine==_hasMine) return; _hasMine = mine; emit hasMineChanged();} + void setHint(int hint) { if(hint == _hint) return; _hint = hint; emit hintChanged(); } + void flip() { if (_flipped) return; _flipped = true; emit flippedChanged(); } + void unflip() { if(!_flipped) return; _flipped = false; emit flippedChanged(); } + +signals: + void flippedChanged(); + void hasFlagChanged(); + void hintChanged(); + void hasMineChanged(); + +private: + bool _hasFlag; + bool _hasMine; + int _hint; + bool _flipped; +}; + +class MinehuntGame : public QObject +{ + Q_OBJECT +public: + MinehuntGame(); + + Q_PROPERTY(QDeclarativeListProperty tiles READ tiles CONSTANT) + QDeclarativeListProperty tiles(); + + Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged) + bool isPlaying() {return playing;} + + Q_PROPERTY(bool hasWon READ hasWon NOTIFY hasWonChanged) + bool hasWon() {return won;} + + Q_PROPERTY(int numMines READ numMines NOTIFY numMinesChanged) + int numMines() const{return nMines;} + + Q_PROPERTY(int numFlags READ numFlags NOTIFY numFlagsChanged) + int numFlags() const{return nFlags;} + +public slots: + Q_INVOKABLE bool flip(int row, int col); + Q_INVOKABLE bool flag(int row, int col); + void setBoard(); + void reset(); + +signals: + void isPlayingChanged(); + void hasWonChanged(); + void numMinesChanged(); + void numFlagsChanged(); + +private: + bool onBoard( int r, int c ) const { return r >= 0 && r < numRows && c >= 0 && c < numCols; } + TileData *tile( int row, int col ) { return onBoard(row, col) ? _tiles[col+numRows*row] : 0; } + int getHint(int row, int col); + void setPlaying(bool b){if(b==playing) return; playing=b; emit isPlayingChanged();} + + QList _tiles; + int numCols; + int numRows; + bool playing; + bool won; + int remaining; + int nMines; + int nFlags; +}; diff -r ef0373b55136 -r 758a864f9613 demos/declarative/minehunt/minehunt.pro --- a/demos/declarative/minehunt/minehunt.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/minehunt/minehunt.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,38 +1,23 @@ -TEMPLATE = lib -TARGET = qmlminehuntplugin +TEMPLATE = app +TARGET = minehunt QT += declarative CONFIG += qt plugin -TARGET = $$qtLibraryTarget($$TARGET) -DESTDIR = MinehuntCore - # Input -SOURCES += minehunt.cpp - -sources.files = minehunt.qml minehunt.pro -sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt +HEADERS += minehunt.h +SOURCES += main.cpp minehunt.cpp -target.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCore +sources.files = minehunt.qml minehunt.pro MinehuntCore +sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt +target.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt -MinehuntCore_sources.files = \ - MinehuntCore/Explosion.qml \ - MinehuntCore/Tile.qml \ - MinehuntCore/pics \ - MinehuntCore/qmldir -MinehuntCore_sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCore - -INSTALLS = sources MinehuntCore_sources target +INSTALLS = sources target symbian:{ TARGET.EPOCALLOWDLLDATA = 1 + TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - TARGET.CAPABILITY = NetworkServices ReadUserData - importFiles.sources = MinehuntCore/qmlminehuntplugin.dll \ - MinehuntCore/Explosion.qml \ - MinehuntCore/pics \ - MinehuntCore/qmldir - importFiles.path = MinehuntCore - DEPLOYMENT = importFiles + qmlminehuntfiles.sources = MinehuntCore minehunt.qml + DEPLOYMENT = qmlminehuntfiles } - -INSTALLS = sources MinehuntCore_sources target + \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 demos/declarative/minehunt/minehunt.qml --- a/demos/declarative/minehunt/minehunt.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/minehunt/minehunt.qml Mon Oct 04 01:19:32 2010 +0300 @@ -49,7 +49,7 @@ width: 450; height: 450 - Image { source: "MinehuntCore/pics/No-Ones-Laughing-3.jpg"; anchors.fill: parent; fillMode: Image.Tile } + Image { source: "MinehuntCore/pics/background.png"; anchors.fill: parent; fillMode: Image.Tile } Grid { anchors.horizontalCenter: parent.horizontalCenter @@ -67,6 +67,18 @@ x: 20; spacing: 20 anchors.bottom: field.bottom; anchors.bottomMargin: 15 + Image { + source: "MinehuntCore/pics/quit.png" + scale: quitMouse.pressed ? 0.8 : 1.0 + smooth: quitMouse.pressed + y: 10 + MouseArea { + id: quitMouse + anchors.fill: parent + anchors.margins: -20 + onClicked: Qt.quit() + } + } Column { spacing: 2 Image { source: "MinehuntCore/pics/bomb-color.png" } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/photoviewer/PhotoViewerCore/Button.qml --- a/demos/declarative/photoviewer/PhotoViewerCore/Button.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/photoviewer/PhotoViewerCore/Button.qml Mon Oct 04 01:19:32 2010 +0300 @@ -45,7 +45,7 @@ id: container property alias label: labelText.text - property string tint: "" + property color tint: "transparent" signal clicked width: labelText.width + 70 ; height: labelText.height + 18 diff -r ef0373b55136 -r 758a864f9613 demos/declarative/photoviewer/photoviewer.qml --- a/demos/declarative/photoviewer/photoviewer.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/photoviewer/photoviewer.qml Mon Oct 04 01:19:32 2010 +0300 @@ -81,6 +81,11 @@ onClicked: mainWindow.editMode = !mainWindow.editMode anchors.horizontalCenter: parent.horizontalCenter } + Button { + id: quitButton; label: qsTr("Quit"); rotation: -2; + onClicked: Qt.quit() + anchors.horizontalCenter: parent.horizontalCenter + } } Rectangle { diff -r ef0373b55136 -r 758a864f9613 demos/declarative/rssnews/rssnews.qml --- a/demos/declarative/rssnews/rssnews.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/rssnews/rssnews.qml Mon Oct 04 01:19:32 2010 +0300 @@ -71,6 +71,7 @@ id: categories anchors.fill: parent model: rssFeeds + footer: quitButtonDelegate delegate: CategoryDelegate {} highlight: Rectangle { color: "steelblue" } highlightMoveSpeed: 9999999 @@ -87,7 +88,24 @@ delegate: NewsDelegate {} } } - + Component { + id: quitButtonDelegate + Item { + width: categories.width; height: 60 + Text { + text: "Quit" + font { family: "Helvetica"; pixelSize: 16; bold: true } + anchors { + left: parent.left; leftMargin: 15 + verticalCenter: parent.verticalCenter + } + } + MouseArea { + anchors.fill: parent + onClicked: Qt.quit() + } + } + } ScrollBar { scrollArea: list; height: list.height; width: 8; anchors.right: window.right } Rectangle { x: 220; height: window.height; width: 1; color: "#cccccc" } } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/samegame/SamegameCore/samegame.js --- a/demos/declarative/samegame/SamegameCore/samegame.js Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/samegame/SamegameCore/samegame.js Mon Oct 04 01:19:32 2010 +0300 @@ -151,7 +151,8 @@ gameDuration = new Date() - gameDuration; nameInputDialog.show("You won! Please enter your name: "); nameInputDialog.initialWidth = nameInputDialog.text.width + 20; - nameInputDialog.width = nameInputDialog.initialWidth; + if(nameInputDialog.name == "") + nameInputDialog.width = nameInputDialog.initialWidth; nameInputDialog.text.opacity = 0;//Just a spacer } } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/samegame/samegame.qml --- a/demos/declarative/samegame/samegame.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/samegame/samegame.qml Mon Oct 04 01:19:32 2010 +0300 @@ -82,6 +82,7 @@ id: nameInputDialog property int initialWidth: 0 + property alias name: nameInputText.text anchors.centerIn: parent z: 22; diff -r ef0373b55136 -r 758a864f9613 demos/declarative/snake/content/Cookie.qml --- a/demos/declarative/snake/content/Cookie.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/snake/content/Cookie.qml Mon Oct 04 01:19:32 2010 +0300 @@ -59,7 +59,6 @@ anchors.fill: parent source: "pics/cookie.png" opacity: 0 - Behavior on opacity { NumberAnimation { duration: 100 } } Text { font.bold: true anchors.verticalCenter: parent.verticalCenter @@ -87,4 +86,9 @@ PropertyChanges { target: img; opacity: 0 } } ] + transitions: [ + Transition { + NumberAnimation { target: img; property: "opacity"; duration: 100 } + } + ] } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/snake/content/Link.qml --- a/demos/declarative/snake/content/Link.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/snake/content/Link.qml Mon Oct 04 01:19:32 2010 +0300 @@ -73,14 +73,12 @@ } } - /* transform: Rotation { id: actualImageRotation origin.x: width/2; origin.y: height/2; angle: rotation * 90 Behavior on angle { NumberAnimation { duration: spawned ? 200 : 0} } } - */ } Image { @@ -88,7 +86,6 @@ } opacity: 0 - Behavior on opacity { NumberAnimation { duration: 200 } } } @@ -116,4 +113,11 @@ PropertyChanges { target: img; opacity: 0 } } ] + + transitions: [ + Transition { + NumberAnimation { target: img; property: "opacity"; duration: 200 } + } + ] + } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/snake/content/snake.js --- a/demos/declarative/snake/content/snake.js Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/snake/content/snake.js Mon Oct 04 01:19:32 2010 +0300 @@ -35,9 +35,12 @@ if (heartbeat.running) { endGame(); startNewGameTimer.running = true; + state = ""; return; } + state = "starting"; + numRows = numRowsAvailable; numColumns = numColumnsAvailable; board = new Array(numRows * numColumns); @@ -80,7 +83,6 @@ waitForCookie = 5; score = 0; startHeartbeatTimer.running = true; - heartbeat.running = true; } function endGame() @@ -94,6 +96,7 @@ } lastScore = score; highScores.saveScore(lastScore); + state = ""; } function move() { diff -r ef0373b55136 -r 758a864f9613 demos/declarative/snake/snake.qml --- a/demos/declarative/snake/snake.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/snake/snake.qml Mon Oct 04 01:19:32 2010 +0300 @@ -94,6 +94,7 @@ Timer { id: startHeartbeatTimer; interval: 1000 ; + onTriggered: { state = "running"; heartbeat.running = true; } } @@ -105,7 +106,6 @@ anchors.fill: parent anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - Behavior on opacity { NumberAnimation { duration: 500 } } Text { color: "white" @@ -193,6 +193,12 @@ anchors.verticalCenter: parent.verticalCenter } + Content.Button { + text: "Quit" + anchors { left: btnA.right; leftMargin: 3; verticalCenter: parent.verticalCenter } + onClicked: Qt.quit(); + } + Text { color: activePalette.text text: "Score: " + score; font.bold: true @@ -211,14 +217,12 @@ states: [ State { name: "starting" - when: startHeartbeatTimer.running PropertyChanges {target: progressIndicator; width: 200} PropertyChanges {target: title; opacity: 0} PropertyChanges {target: progressBar; opacity: 1} }, State { name: "running" - when: (heartbeat.running && !startHeartbeatTimer.running) PropertyChanges {target: progressIndicator; width: 200} PropertyChanges {target: title; opacity: 0} PropertyChanges {target: skull; row: 0; column: 0; } @@ -231,7 +235,10 @@ from: "*" to: "starting" NumberAnimation { target: progressIndicator; property: "width"; duration: 1000 } - + NumberAnimation { target: title; property: "opacity"; duration: 500 } + }, + Transition { + NumberAnimation { target: title; property: "opacity"; duration: 500 } } ] diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/AuthView.qml --- a/demos/declarative/twitter/TwitterCore/AuthView.qml Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,146 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt 4.7 - -Item { - id: wrapper - Column { - anchors.centerIn: parent - spacing: 20 - Column{ - spacing: 4 - Text { - text: "Screen name:" - font.pixelSize: 16; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black" - horizontalAlignment: Qt.AlignRight - } - Item { - width: 220 - height: 28 - BorderImage { source: "images/lineedit.sci"; anchors.fill: parent } - TextInput{ - id: nameIn - width: parent.width - 8 - anchors.centerIn: parent - maximumLength:21 - font.pixelSize: 16; - font.bold: true - color: "#151515"; selectionColor: "green" - KeyNavigation.tab: passIn - KeyNavigation.backtab: guest - focus: true - } - } - } - Column{ - spacing: 4 - Text { - text: "Password:" - font.pixelSize: 16; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black" - horizontalAlignment: Qt.AlignRight - } - Item { - width: 220 - height: 28 - BorderImage { source: "images/lineedit.sci"; anchors.fill: parent } - TextInput{ - id: passIn - width: parent.width - 8 - anchors.centerIn: parent - maximumLength:21 - echoMode: TextInput.Password - font.pixelSize: 16; - font.bold: true - color: "#151515"; selectionColor: "green" - KeyNavigation.tab: login - KeyNavigation.backtab: nameIn - onAccepted: login.doLogin(); - } - } - } - Row{ - spacing: 10 - Button { - width: 100 - height: 32 - id: login - keyUsing: true; - function doLogin(){ - rssModel.authName=nameIn.text; - rssModel.authPass=passIn.text; - rssModel.tags='my timeline'; - screen.focus = true; - } - text: "Log in" - KeyNavigation.right: guest - KeyNavigation.tab: guest - KeyNavigation.backtab: passIn - Keys.onReturnPressed: login.doLogin(); - Keys.onEnterPressed: login.doLogin(); - Keys.onSelectPressed: login.doLogin(); - Keys.onSpacePressed: login.doLogin(); - onClicked: login.doLogin(); - } - Button { - width: 100 - height: 32 - id: guest - keyUsing: true; - function doGuest() - { - rssModel.authName='-'; - screen.focus = true; - screen.setMode(true); - } - text: "Guest" - KeyNavigation.left: login - KeyNavigation.tab: nameIn - KeyNavigation.backtab: login - Keys.onReturnPressed: guest.doGuest(); - Keys.onEnterPressed: guest.doGuest(); - Keys.onSelectPressed: guest.doGuest(); - Keys.onSpacePressed: guest.doGuest(); - onClicked: guest.doGuest(); - } - } - } -} diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/Button.qml --- a/demos/declarative/twitter/TwitterCore/Button.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/twitter/TwitterCore/Button.qml Mon Oct 04 01:19:32 2010 +0300 @@ -67,7 +67,7 @@ } Text { id: btnText - color: if(container.keyUsing){"#DDDDDD";} else {"#FFFFFF";} + color: if(container.keyUsing){"#D0D0D0";} else {"#FFFFFF";} anchors.centerIn: buttonImage; font.bold: true text: container.text; style: Text.Raised; styleColor: "black" font.pixelSize: 12 diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/FatDelegate.qml --- a/demos/declarative/twitter/TwitterCore/FatDelegate.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/twitter/TwitterCore/FatDelegate.qml Mon Oct 04 01:19:32 2010 +0300 @@ -44,11 +44,10 @@ Component { id: listDelegate Item { - id: wrapper; width: wrapper.ListView.view.width; height: if(txt.height > 58){txt.height+8}else{58}//50+4+4 + id: wrapper; width: wrapper.ListView.view.width; height: if(txt.height > 60){txt.height+10}else{60} //50+5+5 function handleLink(link){ if(link.slice(0,3) == 'app'){ screen.setUser(link.slice(7)); - screen.setMode(true); }else if(link.slice(0,4) == 'http'){ Qt.openUrlExternally(link); } @@ -58,26 +57,47 @@ var ret2 = ret.replace(/http:\/\/[^ \n\t]+/g, '$&');//surrounds http links with html link tags return ret2; } + + // Strip away paranthesis + function userName(str) { + var user = str.replace(/\([\S|\s]*\)/gi, ""); + return user.trim(); + } + Item { id: moveMe; height: parent.height Rectangle { id: blackRect color: "black"; opacity: wrapper.ListView.index % 2 ? 0.2 : 0.3; height: wrapper.height-2; width: wrapper.width; y: 1 } - Rectangle { - id: whiteRect; x: 6; width: 50; height: 50; color: "white"; smooth: true + Item { + id: image; x: 6; width: 48; height: 48; smooth: true anchors.verticalCenter: parent.verticalCenter Loading { x: 1; y: 1; width: 48; height: 48; visible: realImage.status != Image.Ready } - Image { id: realImage; source: userImage; x: 1; y: 1; width:48; height:48 } + Image { + id: realImage; + source: userImage; x: 1; y: 1; + width:48; height:48; opacity:0 ; + onStatusChanged: { + if(status==Image.Ready) + image.state="loaded" + } + } + states: State { + name: "loaded"; + PropertyChanges { target: realImage ; opacity:1 } + } + transitions: Transition { NumberAnimation { target: realImage; property: "opacity"; duration: 200 } } + } Text { id:txt; y:4; x: 56 text: '' - + ''+userScreenName + " from " +source - + "
" + wrapper.addTags(statusText) + ""; + + ''+userName(name) + " from " +source + + "
" + statusText + ""; textFormat: Qt.RichText color: "#cccccc"; style: Text.Raised; styleColor: "black"; wrapMode: Text.WordWrap - anchors.left: whiteRect.right; anchors.right: blackRect.right; anchors.leftMargin: 6; anchors.rightMargin: 6 + anchors.left: image.right; anchors.right: blackRect.right; anchors.leftMargin: 6; anchors.rightMargin: 6 onLinkActivated: wrapper.handleLink(link) } } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/HomeTitleBar.qml --- a/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,161 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt 4.7 - -Item { - id: titleBar - - signal update() - onYChanged: state="" //When switching titlebars - - BorderImage { source: "images/titlebar.sci"; width: parent.width; height: parent.height + 14; y: -7 } - Item { - id: container - width: (parent.width * 2) - 55 ; height: parent.height - - function accept() { - if(rssModel.authName == '' || rssModel.authPass == '') - return false;//Can't login like that - - var postData = "status=" + editor.text; - var postman = new XMLHttpRequest(); - postman.open("POST", "http://twitter.com/statuses/update.xml", true, rssModel.authName, rssModel.authPass); - postman.onreadystatechange = function() { - if (postman.readyState == postman.DONE) { - titleBar.update(); - } - } - postman.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); - postman.send(postData); - - editor.text = "" - titleBar.state = "" - } - - Rectangle { - x: 6; width: 50; height: 50; color: "white"; smooth: true - anchors.verticalCenter: parent.verticalCenter - - UserModel { user: rssModel.authName; id: userModel } - Component { id: imgDelegate; - Item { - Loading { width:48; height:48; visible: realImage.status != Image.Ready } - Image { source: image; width:48; height:48; id: realImage } - } - } - ListView { model: userModel.model; x:1; y:1; delegate: imgDelegate } - } - - Text { - id: categoryText - anchors.left: parent.left; anchors.right: tagButton.left - anchors.leftMargin: 58; anchors.rightMargin: 10 - anchors.verticalCenter: parent.verticalCenter - elide: Text.ElideLeft - text: "Timeline for " + rssModel.authName - font.pixelSize: 12; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black" - } - - Button { - id: tagButton; x: titleBar.width - 90; width: 85; height: 32; text: "New Post..." - anchors.verticalCenter: parent.verticalCenter; - onClicked: if (titleBar.state == "Posting") container.accept(); else titleBar.state = "Posting" - } - - Text { - id: charsLeftText; anchors.horizontalCenter: tagButton.horizontalCenter; - anchors.top: tagButton.bottom; anchors.topMargin: 2 - text: {140 - editor.text.length;} visible: titleBar.state == "Posting" - font.pointSize: 10; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black" - } - Item { - id: txtEdit; - anchors.left: tagButton.right; anchors.leftMargin: 5; y: 4 - anchors.right: parent.right; anchors.rightMargin: 40; height: parent.height - 9 - BorderImage { source: "images/lineedit.sci"; anchors.fill: parent } - - Binding {//TODO: Can this be a function, which also resets the cursor? And flashes? - when: editor.text.length > 140 - target: editor - property: "text" - value: editor.text.slice(0,140) - } - TextEdit { - id: editor - anchors.left: parent.left; - anchors.leftMargin: 8; - anchors.bottom: parent.bottom - anchors.bottomMargin: 4; - cursorVisible: true; font.bold: true - width: parent.width - 12 - height: parent.height - 8 - font.pixelSize: 12 - wrapMode: TextEdit.Wrap - color: "#151515"; selectionColor: "green" - } - Keys.forwardTo: [(returnKey), (editor)] - Item { - id: returnKey - Keys.onReturnPressed: container.accept() - Keys.onEnterPressed: container.accept() - Keys.onEscapePressed: titleBar.state = "" - } - } - } - states: [ - State { - name: "Posting" - PropertyChanges { target: container; x: -tagButton.x + 5 } - PropertyChanges { target: titleBar; height: 80 } - PropertyChanges { target: tagButton; text: "OK" } - PropertyChanges { target: tagButton; width: 28 } - PropertyChanges { target: tagButton; height: 24 } - PropertyChanges { target: editor; focus: true } - } - ] - transitions: [ - Transition { - from: "*"; to: "*" - NumberAnimation { properties: "x,y,width,height"; easing.type: Easing.InOutQuad } - } - ] -} diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/Input.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/demos/declarative/twitter/TwitterCore/Input.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +FocusScope { + id:container + width: 220 + height: 28 + BorderImage { source: "images/lineedit.sci"; anchors.fill: parent } + signal accepted + property alias text: input.text + property alias item:input + TextInput{ + id: input + width: parent.width - 12 + anchors.centerIn: parent + maximumLength:21 + font.pixelSize: 16; + font.bold: true + color: "#151515"; selectionColor: "mediumseagreen" + focus: true + onAccepted:{container.accepted()} + text: "" + selectByMouse: true + } +} diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/MultiTitleBar.qml --- a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml Mon Oct 04 01:19:32 2010 +0300 @@ -42,10 +42,6 @@ import Qt 4.7 Item { - height: homeBar.height - HomeTitleBar { id: homeBar; width: parent.width; height: 60; - onUpdate: rssModel.reload() - } TitleBar { id: titleBar; width: parent.width; height: 60; y: -80 untaggedString: "Latest tweets from everyone" @@ -53,9 +49,8 @@ } states: [ State { - name: "search"; when: screen.userView + name: "search"; when: screen.state!="search" PropertyChanges { target: titleBar; y: 0 } - PropertyChanges { target: homeBar; y: -80 } } ] transitions: [ diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/RssModel.qml --- a/demos/declarative/twitter/TwitterCore/RssModel.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/twitter/TwitterCore/RssModel.qml Mon Oct 04 01:19:32 2010 +0300 @@ -43,43 +43,34 @@ Item { id: wrapper property variant model: xmlModel - property string tags : "" - property string authName : "" - property string authPass : "" + property string from : "" + property string to : "" + property string phrase : "" + property string mode : "everyone" property int status: xmlModel.status function reload() { xmlModel.reload(); } -XmlListModel { - id: xmlModel + XmlListModel { + id: xmlModel - source:{ - if (wrapper.authName == ""){ - ""; //Avoid worthless calls to twitter servers - }else if(wrapper.mode == 'user'){ - "https://"+ ((wrapper.authName!="" && wrapper.authPass!="")? (wrapper.authName+":"+wrapper.authPass+"@") : "" )+"twitter.com/statuses/user_timeline.xml?screen_name="+wrapper.tags; - }else if(wrapper.mode == 'self'){ - "https://"+ ((wrapper.authName!="" && wrapper.authPass!="")? (wrapper.authName+":"+wrapper.authPass+"@") : "" )+"twitter.com/statuses/friends_timeline.xml"; - }else{//everyone/public - "http://twitter.com/statuses/public_timeline.xml"; - } - } - query: "/statuses/status" + source: (from=="" && to=="" && phrase=="") ? "" : + 'http://search.twitter.com/search.atom?from='+from+"&to="+to+"&phrase="+phrase + + namespaceDeclarations: "declare default element namespace 'http://www.w3.org/2005/Atom'; " + + "declare namespace twitter=\"http://api.twitter.com/\";"; + + query: "/feed/entry" - XmlRole { name: "statusText"; query: "text/string()" } - XmlRole { name: "timestamp"; query: "created_at/string()" } - XmlRole { name: "source"; query: "source/string()" } - XmlRole { name: "userName"; query: "user/name/string()" } - XmlRole { name: "userScreenName"; query: "user/screen_name/string()" } - XmlRole { name: "userImage"; query: "user/profile_image_url/string()" } - XmlRole { name: "userLocation"; query: "user/location/string()" } - XmlRole { name: "userDescription"; query: "user/description/string()" } - XmlRole { name: "userFollowers"; query: "user/followers_count/string()" } - XmlRole { name: "userStatuses"; query: "user/statuses_count/string()" } - //TODO: Could also get the user's color scheme, timezone and a few other things + XmlRole { name: "statusText"; query: "content/string()" } + XmlRole { name: "timestamp"; query: "published/string()" } + XmlRole { name: "source"; query: "twitter:source/string()" } + XmlRole { name: "name"; query: "author/name/string()" } + XmlRole { name: "userImage"; query: "link[@rel = 'image']/@href/string()" } + + } + Binding { + property: "mode" + target: wrapper + value: {if(wrapper.tags==''){"everyone";}else if(wrapper.tags=='my timeline'){"self";}else{"user";}} + } } -Binding { - property: "mode" - target: wrapper - value: {if(wrapper.tags==''){"everyone";}else if(wrapper.tags=='my timeline'){"self";}else{"user";}} -} -} diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/SearchView.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/demos/declarative/twitter/TwitterCore/SearchView.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,124 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +FocusScope { + id: wrapper + Column { + anchors.centerIn: parent + spacing: 20 + Column{ + spacing: 4 + Text { + text: "Posted by:" + font.pixelSize: 16; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black" + horizontalAlignment: Qt.AlignRight + } + Input{ + id: fromIn + KeyNavigation.backtab: searchbutton + KeyNavigation.tab:toIn + onAccepted:searchbutton.doSearch(); + focus: true + } + Text { + text: "In reply to:" + font.pixelSize: 16; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black" + horizontalAlignment: Qt.AlignRight + } + Input{ + id: toIn + KeyNavigation.backtab: fromIn + KeyNavigation.tab:phraseIn + onAccepted:searchbutton.doSearch(); + } + Text { + text: "Search phrase:" + font.pixelSize: 16; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black" + horizontalAlignment: Qt.AlignRight + } + Input{ + id: phraseIn + KeyNavigation.backtab: toIn + KeyNavigation.tab:searchbutton + onAccepted:searchbutton.doSearch(); + text: "Qt Quick" + } + } + Button { + width: 100 + height: 32 + id: searchbutton + keyUsing: true; + opacity: 1 + text: "Search" + KeyNavigation.tab: fromIn + Keys.onReturnPressed: searchbutton.doSearch(); + Keys.onEnterPressed: searchbutton.doSearch(); + Keys.onSelectPressed: searchbutton.doSearch(); + Keys.onSpacePressed: searchbutton.doSearch(); + onClicked: searchbutton.doSearch(); + + function doSearch() { + // Search ! allowed + if (wrapper.state=="invalidinput") + return; + + rssModel.from=fromIn.text; + rssModel.to= toIn.text; + rssModel.phrase = phraseIn.text; + screen.focus = true; + screen.state = "" + } + } + } + states: + State { + name: "invalidinput" + when: fromIn.text=="" && toIn.text=="" && phraseIn.text=="" + PropertyChanges { target: searchbutton ; opacity: 0.6 ; } + } + transitions: + Transition { + NumberAnimation { target: searchbutton; property: "opacity"; duration: 200 } + } +} diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/TitleBar.qml --- a/demos/declarative/twitter/TwitterCore/TitleBar.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/twitter/TwitterCore/TitleBar.qml Mon Oct 04 01:19:32 2010 +0300 @@ -58,56 +58,58 @@ rssModel.tags = editor.text } + Item { + id:imageBox + x: 6; width: 0; height: 50; smooth: true + anchors.verticalCenter: parent.verticalCenter + + UserModel { user: rssModel.from; id: userModel } + Component { + id: imgDelegate; + Item { + id:imageitem + visible:true + Loading { width:48; height:48; visible: realImage.status != Image.Ready } + Image { id: realImage; source: image; width:48; height:48; opacity:0; } + states: + State { + name: "loaded" + when: (realImage.status == Image.Ready) + PropertyChanges { target: realImage; opacity:1 } + } + transitions: Transition { + NumberAnimation { target: realImage; property: "opacity"; duration: 200 } + } + } + } + ListView { id:view; model: userModel.model; x:1; y:1; delegate: imgDelegate } + states: + State { + when: !userModel.user=="" + PropertyChanges { target: imageBox; width: 50; } + } + transitions: + Transition { + NumberAnimation { target: imageBox; property: "width"; duration: 200 } + } + } + Text { id: categoryText anchors { - left: parent.left; right: tagButton.left; leftMargin: 10; rightMargin: 10 + left: imageBox.right; right: parent.right; leftMargin: 10; rightMargin: 10 verticalCenter: parent.verticalCenter } elide: Text.ElideLeft - text: (rssModel.tags=="" ? untaggedString : taggedString + rssModel.tags) + text: (rssModel.from=="" ? untaggedString : taggedString + rssModel.from) font.bold: true; color: "White"; style: Text.Raised; styleColor: "Black" font.pixelSize: 12 } - - Button { - id: tagButton; x: titleBar.width - 50; width: 45; height: 32; text: "..." - onClicked: if (titleBar.state == "Tags") container.accept(); else titleBar.state = "Tags" - anchors.verticalCenter: parent.verticalCenter - } - - Item { - id: lineEdit - y: 4; height: parent.height - 9 - anchors { left: tagButton.right; leftMargin: 5; right: parent.right; rightMargin: 5 } - - BorderImage { source: "images/lineedit.sci"; anchors.fill: parent } - - TextInput { - id: editor - anchors { - left: parent.left; right: parent.right; leftMargin: 10; rightMargin: 10 - verticalCenter: parent.verticalCenter - } - cursorVisible: true; font.bold: true - color: "#151515"; selectionColor: "Green" - } - - Keys.forwardTo: [ (returnKey), (editor)] - - Item { - id: returnKey - Keys.onReturnPressed: container.accept() - Keys.onEnterPressed: container.accept() - Keys.onEscapePressed: titleBar.state = "" - } - } } states: State { name: "Tags" PropertyChanges { target: container; x: -tagButton.x + 5 } - PropertyChanges { target: tagButton; text: "OK" } PropertyChanges { target: editor; focus: true } } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/ToolBar.qml --- a/demos/declarative/twitter/TwitterCore/ToolBar.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/twitter/TwitterCore/ToolBar.qml Mon Oct 04 01:19:32 2010 +0300 @@ -48,15 +48,14 @@ property alias button2Label: button2.text signal button1Clicked signal button2Clicked - + focus:true BorderImage { source: "images/titlebar.sci"; width: parent.width; height: parent.height + 14; y: -7 } - Button { id: button1 anchors.left: parent.left; anchors.leftMargin: 5; y: 3; width: 140; height: 32 onClicked: toolbar.button1Clicked() + focus:true } - Button { id: button2 anchors.right: parent.right; anchors.rightMargin: 5; y: 3; width: 140; height: 32 diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/UserModel.qml --- a/demos/declarative/twitter/TwitterCore/UserModel.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/twitter/TwitterCore/UserModel.qml Mon Oct 04 01:19:32 2010 +0300 @@ -42,26 +42,24 @@ import Qt 4.7 //This "model" gets the user information about the searched user. Mainly for the icon. -//Copied from RssModel Item { id: wrapper property variant model: xmlModel property string user : "" property int status: xmlModel.status function reload() { xmlModel.reload(); } -XmlListModel { - id: xmlModel + XmlListModel { + id: xmlModel - source: {if(user!="") {"http://twitter.com/users/show.xml?screen_name="+user;}else{"";}} - query: "/user" + source: user!= "" ? "http://twitter.com/users/show.xml?screen_name="+user : "" + query: "/user" - XmlRole { name: "name"; query: "name/string()" } - XmlRole { name: "screenName"; query: "screen_name/string()" } - XmlRole { name: "image"; query: "profile_image_url/string()" } - XmlRole { name: "location"; query: "location/string()" } - XmlRole { name: "description"; query: "description/string()" } - XmlRole { name: "followers"; query: "followers_count/string()" } - //XmlRole { name: "protected"; query: "protected/bool()" } - //TODO: Could also get the user's color scheme, timezone and a few other things + XmlRole { name: "name"; query: "name/string()" } + XmlRole { name: "screenName"; query: "screen_name/string()" } + XmlRole { name: "image"; query: "profile_image_url/string()" } + XmlRole { name: "location"; query: "location/string()" } + XmlRole { name: "description"; query: "description/string()" } + XmlRole { name: "followers"; query: "followers_count/string()" } + //TODO: Could also get the user's color scheme, timezone and a few other things + } } -} diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/images/quit.png Binary file demos/declarative/twitter/TwitterCore/images/quit.png has changed diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/TwitterCore/qmldir --- a/demos/declarative/twitter/TwitterCore/qmldir Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/twitter/TwitterCore/qmldir Mon Oct 04 01:19:32 2010 +0300 @@ -1,7 +1,7 @@ -AuthView 1.0 AuthView.qml +SearchView 1.0 SearchView.qml Button 1.0 Button.qml +Input 1.0 Input.qml FatDelegate 1.0 FatDelegate.qml -HomeTitleBar 1.0 HomeTitleBar.qml Loading 1.0 Loading.qml MultiTitleBar 1.0 MultiTitleBar.qml TitleBar 1.0 TitleBar.qml diff -r ef0373b55136 -r 758a864f9613 demos/declarative/twitter/twitter.qml --- a/demos/declarative/twitter/twitter.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/twitter/twitter.qml Mon Oct 04 01:19:32 2010 +0300 @@ -46,28 +46,18 @@ id: screen; width: 320; height: 480 property bool userView : false property variant tmpStr - function setMode(m){ - screen.userView = m; - if(m == false){ - rssModel.tags='my timeline'; - rssModel.reload(); - toolBar.button2Label = "View others"; - } else { - toolBar.button2Label = "Return home"; - } - } function setUser(str){hack.running = true; tmpStr = str} - function reallySetUser(){rssModel.tags = tmpStr;} - + function reallySetUser(){rssModel.from = tmpStr;rssModel.to = ""; rssModel.phrase = ""} + state:"searchquery" //Workaround for bug 260266 Timer{ interval: 1; running: false; repeat: false; onTriggered: screen.reallySetUser(); id:hack } - - //TODO: better way to return to the auth screen - Keys.onEscapePressed: rssModel.authName='' + Keys.onEscapePressed: screen.state="searchquery" + Keys.onBacktabPressed: screen.state="searchquery" Rectangle { id: background anchors.fill: parent; color: "#343434"; + state:"searchquery" Image { source: "TwitterCore/images/stripes.png"; fillMode: Image.Tile; anchors.fill: parent; opacity: 0.3 } MouseArea { @@ -90,8 +80,16 @@ y:60 //Below the title bars height: 380 - Twitter.AuthView{ - id: authView + Text { + id:title + text: "Search Twitter" + anchors.horizontalCenter: parent.horizontalCenter + font.pixelSize: 20; font.bold: true; color: "#bbb"; style: Text.Raised; styleColor: "black" + opacity:0 + } + + Twitter.SearchView{ + id: searchView anchors.verticalCenter: parent.verticalCenter width: parent.width; height: parent.height-60; x: -(screen.width * 1.5) @@ -110,31 +108,27 @@ //TODO: Use anchor changes instead of hard coding y: screen.height - 40 width: parent.width; opacity: 0.9 - button1Label: "Update" - button2Label: "View others" - onButton1Clicked: rssModel.reload(); - onButton2Clicked: + button1Label: "New Search" + button2Label: "Update" + onButton1Clicked: { - if(screen.userView == true){ - screen.setMode(false); - }else{ - rssModel.tags=''; - screen.setMode(true); - } + screen.state="searchquery" } + onButton2Clicked: rssModel.reload(); } - - states: [ - State { - name: "unauthed"; when: rssModel.authName=="" - PropertyChanges { target: authView; x: 0 } - PropertyChanges { target: mainView; x: -(parent.width * 1.5) } - PropertyChanges { target: titleBar; y: -80 } - PropertyChanges { target: toolBar; y: screen.height } - } - ] - transitions: [ - Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad } } - ] } + states: [ + State { + name: "searchquery"; + PropertyChanges { target: searchView; x: 0; focus:true} + PropertyChanges { target: mainView; x: -(parent.width * 1.5) } + PropertyChanges { target: titleBar; y: -80 } + PropertyChanges { target: toolBar; y: screen.height } + PropertyChanges { target: toolBar } + PropertyChanges { target: title; opacity:1} + } + ] + transitions: [ + Transition { NumberAnimation { properties: "x,y,opacity"; duration: 500; easing.type: Easing.InOutQuad } } + ] } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/webbrowser/content/Header.qml --- a/demos/declarative/webbrowser/content/Header.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/declarative/webbrowser/content/Header.qml Mon Oct 04 01:19:32 2010 +0300 @@ -51,7 +51,6 @@ x: webView.contentX < 0 ? -webView.contentX : webView.contentX > webView.contentWidth-webView.width ? -webView.contentX+webView.contentWidth-webView.width : 0 - y: { if (webView.progress < 1.0) return 0; @@ -59,7 +58,6 @@ webView.contentY < 0 ? -webView.contentY : webView.contentY > height ? -height : -webView.contentY } } - Column { width: parent.width @@ -101,14 +99,38 @@ Button { id: reloadButton - anchors { right: parent.right; rightMargin: 4 } + anchors { right: quitButton.left; rightMargin: 10 } action: webView.reload; image: "pics/view-refresh.png" visible: webView.progress == 1.0 && !header.urlChanged } + Text { + id: quitButton + color: "white" + style: Text.Sunken + anchors.right: parent.right + anchors.top: parent.top + anchors.bottom: parent.bottom + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + font.pixelSize: 18 + width: 60 + text: "Quit" + MouseArea { + anchors.fill: parent + onClicked: Qt.quit() + } + Rectangle { + width: 1 + y: 5 + height: parent.height-10 + anchors.right: parent.left + color: "darkgray" + } + } Button { id: stopButton - anchors { right: parent.right; rightMargin: 4 } + anchors { right: quitButton.left; rightMargin: 10 } action: webView.stop; image: "pics/edit-delete.png" visible: webView.progress < 1.0 && !header.urlChanged } diff -r ef0373b55136 -r 758a864f9613 demos/declarative/webbrowser/content/pics/edit-delete.png Binary file demos/declarative/webbrowser/content/pics/edit-delete.png has changed diff -r ef0373b55136 -r 758a864f9613 demos/declarative/webbrowser/content/pics/go-jump-locationbar.png Binary file demos/declarative/webbrowser/content/pics/go-jump-locationbar.png has changed diff -r ef0373b55136 -r 758a864f9613 demos/declarative/webbrowser/content/pics/go-next-view.png Binary file demos/declarative/webbrowser/content/pics/go-next-view.png has changed diff -r ef0373b55136 -r 758a864f9613 demos/declarative/webbrowser/content/pics/go-previous-view.png Binary file demos/declarative/webbrowser/content/pics/go-previous-view.png has changed diff -r ef0373b55136 -r 758a864f9613 demos/demos.pro --- a/demos/demos.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/demos.pro Mon Oct 04 01:19:32 2010 +0300 @@ -58,7 +58,7 @@ contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative -contains(QT_CONFIG, multimedia):SUBDIRS += demos_spectrum +contains(QT_CONFIG, multimedia):!static:SUBDIRS += demos_spectrum # install sources.files = README *.pro diff -r ef0373b55136 -r 758a864f9613 demos/embedded/anomaly/src/AddressBar.cpp --- a/demos/embedded/anomaly/src/AddressBar.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/anomaly/src/AddressBar.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -44,27 +44,11 @@ #include #include -class LineEdit: public QLineEdit -{ -public: - LineEdit(QWidget *parent = 0): QLineEdit(parent) {} - - void paintEvent(QPaintEvent *event) { - QLineEdit::paintEvent(event); - if (text().isEmpty()) { - QPainter p(this); - int flags = Qt::AlignLeft | Qt::AlignVCenter; - p.setPen(palette().color(QPalette::Disabled, QPalette::Text)); - p.drawText(rect().adjusted(10, 0, 0, 0), flags, "Enter address or search terms"); - p.end(); - } - } -}; - AddressBar::AddressBar(QWidget *parent) : QWidget(parent) { - m_lineEdit = new LineEdit(parent); + m_lineEdit = new QLineEdit(parent); + m_lineEdit->setPlaceholderText("Enter address or search terms"); connect(m_lineEdit, SIGNAL(returnPressed()), SLOT(processAddress())); m_toolButton = new QToolButton(parent); m_toolButton->setText("Go"); diff -r ef0373b55136 -r 758a864f9613 demos/embedded/desktopservices/contenttab.cpp --- a/demos/embedded/desktopservices/contenttab.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/desktopservices/contenttab.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -125,7 +125,7 @@ void ContentTab::handleErrorInOpen(QListWidgetItem *item) { Q_UNUSED(item); - QMessageBox::warning(this, tr("Operation Failed"), tr("Unkown error!"), QMessageBox::Close); + QMessageBox::warning(this, tr("Operation Failed"), tr("Unknown error!"), QMessageBox::Close); } // NEW SLOTS diff -r ef0373b55136 -r 758a864f9613 demos/embedded/desktopservices/desktopwidget.cpp --- a/demos/embedded/desktopservices/desktopwidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/desktopservices/desktopwidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -73,7 +73,7 @@ // Links LinkTab* othersTab = new LinkTab(tabWidget);; - // Given icon file will be overriden by LinkTab + // Given icon file will be overridden by LinkTab othersTab->init(QDesktopServices::PicturesLocation, "", ""); tabWidget->addTab(othersTab, tr("Links")); diff -r ef0373b55136 -r 758a864f9613 demos/embedded/fluidlauncher/fluidlauncher.cpp --- a/demos/embedded/fluidlauncher/fluidlauncher.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/fluidlauncher/fluidlauncher.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -154,7 +154,7 @@ DemoApplication* newDemo = new DemoApplication( filename.toString(), - name.isEmpty() ? "Unamed Demo" : name.toString(), + name.isEmpty() ? "Unnamed Demo" : name.toString(), image.toString(), args.toString().split(" ")); demoList.append(newDemo); diff -r ef0373b55136 -r 758a864f9613 demos/embedded/fluidlauncher/pictureflow.cpp --- a/demos/embedded/fluidlauncher/pictureflow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/fluidlauncher/pictureflow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -603,7 +603,7 @@ Qt::TransformationMode mode = Qt::SmoothTransformation; img = img.scaled(w, h, Qt::IgnoreAspectRatio, mode); - // slightly larger, to accomodate for the reflection + // slightly larger, to accommodate for the reflection int hs = h * 2; int hofs = h / 3; diff -r ef0373b55136 -r 758a864f9613 demos/embedded/qmlcalculator/qmlcalculator.cpp --- a/demos/embedded/qmlcalculator/qmlcalculator.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/qmlcalculator/qmlcalculator.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -42,6 +42,7 @@ #include #include #include +#include #if defined(Q_OS_SYMBIAN) #include @@ -58,7 +59,8 @@ QDeclarativeView view; view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - + QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); + #if defined(QT_KEYPAD_NAVIGATION) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION diff -r ef0373b55136 -r 758a864f9613 demos/embedded/qmlclocks/qmlclocks.cpp --- a/demos/embedded/qmlclocks/qmlclocks.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/qmlclocks/qmlclocks.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -42,6 +42,7 @@ #include #include #include +#include #if defined(Q_OS_SYMBIAN) #include @@ -58,6 +59,7 @@ QDeclarativeView view; view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); + QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); #if defined(QT_KEYPAD_NAVIGATION) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); diff -r ef0373b55136 -r 758a864f9613 demos/embedded/qmldialcontrol/qmldialcontrol.cpp --- a/demos/embedded/qmldialcontrol/qmldialcontrol.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/qmldialcontrol/qmldialcontrol.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -42,6 +42,7 @@ #include #include #include +#include int main(int argc, char *argv[]) { @@ -51,6 +52,7 @@ QDeclarativeView view; view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); + QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); #if defined(QT_KEYPAD_NAVIGATION) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); diff -r ef0373b55136 -r 758a864f9613 demos/embedded/qmleasing/deployment.pri --- a/demos/embedded/qmleasing/deployment.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/qmleasing/deployment.pri Mon Oct 04 01:19:32 2010 +0300 @@ -4,5 +4,5 @@ qmleasing_uid3 = A000E3FE qmleasing_files.path = $$APP_PRIVATE_DIR_BASE/$$qmleasing_uid3 } -qmleasing_files.sources = $$qmleasing_src/easing.qml +qmleasing_files.sources = $$qmleasing_src/easing.qml $$qmleasing_src/content DEPLOYMENT += qmleasing_files diff -r ef0373b55136 -r 758a864f9613 demos/embedded/qmleasing/qmleasing.cpp --- a/demos/embedded/qmleasing/qmleasing.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/qmleasing/qmleasing.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -42,6 +42,7 @@ #include #include #include +#include int main(int argc, char *argv[]) { @@ -51,6 +52,7 @@ QDeclarativeView view; view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); + QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); #if defined(QT_KEYPAD_NAVIGATION) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); diff -r ef0373b55136 -r 758a864f9613 demos/embedded/qmlflickr/qmlflickr.cpp --- a/demos/embedded/qmlflickr/qmlflickr.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/qmlflickr/qmlflickr.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -48,6 +48,7 @@ #include #include #include +#include // Factory to create QNetworkAccessManagers that use the saved network configuration; otherwise // the system default. @@ -95,7 +96,8 @@ view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory); view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - + QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); + #if defined(Q_OS_SYMBIAN) view.showFullScreen(); #else // Q_OS_SYMBIAN diff -r ef0373b55136 -r 758a864f9613 demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp --- a/demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/qmlphotoviewer/qmlphotoviewer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -96,6 +96,8 @@ view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); + QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); + #if defined(Q_OS_SYMBIAN) view.showFullScreen(); #else // Q_OS_SYMBIAN diff -r ef0373b55136 -r 758a864f9613 demos/embedded/qmltwitter/qmltwitter.cpp --- a/demos/embedded/qmltwitter/qmltwitter.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/qmltwitter/qmltwitter.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -95,7 +95,8 @@ view.engine()->setNetworkAccessManagerFactory(&networkAccessManagerFactory); view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); - + QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); + #if defined(Q_OS_SYMBIAN) view.showFullScreen(); #else // Q_OS_SYMBIAN diff -r ef0373b55136 -r 758a864f9613 demos/embedded/raycasting/raycasting.cpp --- a/demos/embedded/raycasting/raycasting.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/embedded/raycasting/raycasting.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -142,7 +142,7 @@ qreal dv = -2 * cosa / bufw; for (int ray = 0; ray < bufw; ++ray, u += du, v += dv) { - // everytime this ray advances 'u' units in x direction, + // every time this ray advances 'u' units in x direction, // it also advanced 'v' units in y direction qreal uu = (u < 0) ? -u : u; qreal vv = (v < 0) ? -v : v; diff -r ef0373b55136 -r 758a864f9613 demos/qtdemo/examplecontent.cpp --- a/demos/qtdemo/examplecontent.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/qtdemo/examplecontent.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -91,8 +91,8 @@ if (paragraphs.length() < 1 && Colors::verbose) qDebug() << "- ExampleContent::loadDescription(): Could not load description:" << MenuManager::instance()->info[this->name]["docfile"]; - QString description = Colors::contentColor + - QLatin1String("Could not load description. Ensure that the documentation for Qt is built."); + QString description = Colors::contentColor + QLatin1String(""); + //QLatin1String("Could not load description. Ensure that the documentation for Qt is built."); // QTBUG-12522: If there is no description why show an error to the user when qDebug above communications the issue (if it is indeed an issue at all) when demos are built? for (int p = 0; p < int(paragraphs.length()); ++p) { description = this->extractTextFromParagraph(paragraphs.item(p)); if (this->isSummary(description)) { diff -r ef0373b55136 -r 758a864f9613 demos/qtdemo/mainwindow.h --- a/demos/qtdemo/mainwindow.h Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/qtdemo/mainwindow.h Mon Oct 04 01:19:32 2010 +0300 @@ -43,7 +43,6 @@ #define MAIN_WINDOW_H #include -#include #include class DemoTextItem; diff -r ef0373b55136 -r 758a864f9613 demos/qtdemo/menumanager.cpp --- a/demos/qtdemo/menumanager.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/qtdemo/menumanager.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -313,7 +313,7 @@ // Send command through remote control even if the process // was started to activate assistant and bring it to front: QTextStream str(&this->assistantProcess); - str << "SetSource " << url << QLatin1Char('\0') << endl; + str << "SetSource " << url << QLatin1Char('\n') << endl; } void MenuManager::launchExample(const QString &name) @@ -356,6 +356,7 @@ void MenuManager::launchQmlExample(const QString &name) { +#ifndef QT_NO_DECLARATIVE if(!qmlRoot){ exampleError(QProcess::UnknownError); return; @@ -382,6 +383,15 @@ qmlRoot->setProperty("qmlFile", QVariant(""));//unload component qmlRoot->setProperty("show", QVariant(true)); qmlRoot->setProperty("qmlFile", QUrl::fromLocalFile(file.fileName())); +#else + exampleError(QProcess::UnknownError); +#endif +} + +void MenuManager::quitQML() +{ + if(qmlRoot) + qmlRoot->setProperty("show", QVariant(false)); } void MenuManager::exampleFinished() @@ -427,21 +437,28 @@ level2MenuNode = level2MenuNode.nextSibling(); } + qmlRoot = 0; +#ifndef QT_NO_DECLARATIVE // Create QML Loader declarativeEngine = new QDeclarativeEngine(this); + connect(declarativeEngine, SIGNAL(quit()), + this, SLOT(quitQML())); QDeclarativeComponent component(declarativeEngine, QUrl("qrc:qml/qmlShell.qml"), this); - qmlRoot = 0; - if(component.isReady()) - qmlRoot = qobject_cast(component.create()); - else + QDeclarativeItem* qmlRootItem = 0; + if(component.isReady()){ + qmlRoot = component.create(); + qmlRootItem = qobject_cast(qmlRoot); + }else{ qDebug() << component.status() << component.errorString(); - if(qmlRoot){ - qmlRoot->setHeight(this->window->scene->sceneRect().height()); - qmlRoot->setWidth(this->window->scene->sceneRect().width()); - qmlRoot->setZValue(101);//Above other items - qmlRoot->setCursor(Qt::ArrowCursor); - window->scene->addItem(qmlRoot); + } + + if(qmlRootItem){ + qmlRootItem->setHeight(this->window->scene->sceneRect().height()); + qmlRootItem->setWidth(this->window->scene->sceneRect().width()); + qmlRootItem->setZValue(101);//Above other items + qmlRootItem->setCursor(Qt::ArrowCursor); + window->scene->addItem(qmlRootItem); //Note that QML adds key handling to the app. window->viewport()->setFocusPolicy(Qt::NoFocus);//Correct keyboard focus handling @@ -449,8 +466,9 @@ window->scene->setStickyFocus(true); window->setFocus(); }else{ - qDebug() << "Error intializing QML subsystem, Declarative examples will not work"; + qDebug() << "Error initializing QML subsystem, Declarative examples will not work"; } +#endif } void MenuManager::readInfoAboutExample(const QDomElement &example) diff -r ef0373b55136 -r 758a864f9613 demos/qtdemo/menumanager.h --- a/demos/qtdemo/menumanager.h Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/qtdemo/menumanager.h Mon Oct 04 01:19:32 2010 +0300 @@ -45,6 +45,9 @@ #include #include #include +#ifndef QT_NO_DECLARATIVE +#include +#endif #include "score.h" #include "textbutton.h" @@ -83,13 +86,17 @@ Score *score; int currentMenuCode; + QObject *qmlRoot; +#ifndef QT_NO_DECLARATIVE QDeclarativeEngine* declarativeEngine; - QDeclarativeItem *qmlRoot; +#endif private slots: void exampleFinished(); void exampleError(QProcess::ProcessError error); + void quitQML(); + private: // singleton pattern: MenuManager(); diff -r ef0373b55136 -r 758a864f9613 demos/qtdemo/qmlShell.qml --- a/demos/qtdemo/qmlShell.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/qtdemo/qmlShell.qml Mon Oct 04 01:19:32 2010 +0300 @@ -68,8 +68,6 @@ loader.item.width = 640; if(loader.item.height > 480) loader.item.height = 480; - if(loader.item.inAnotherDemo != undefined) - loader.item.inAnotherDemo = true; }} } @@ -100,6 +98,30 @@ } } + Rectangle{ id: closeButton + width: 24 + height: 24 + z: 11 + border.color: "#aaaaaaaa" + gradient: Gradient{ + GradientStop{ position: 0.0; color: "#34FFFFFF" } + GradientStop{ position: 1.0; color: "#7AFFFFFF" } + } + anchors.left: frame.right + anchors.bottom: frame.top + anchors.margins: -(2*width/3) + Text{ + text: 'X' + font.bold: true + color: "white" + font.pixelSize: 12 + anchors.centerIn: parent + } + MouseArea{ + anchors.fill: parent + onClicked: main.show = false; + } + } Text{ id: errorTxt @@ -116,32 +138,6 @@ onLinkActivated: Qt.openUrlExternally(link); } } - Rectangle{ - id: helpLabel - property bool timedOut: false - z: 9 - //Positioned in the top left corner - x: 8 - y: 8 - color: "white" - border.color: "black" - border.width: 1 - width: helpText.width + 16 - height: helpText.height + 8 - Text{ - id: helpText - color: "black" - anchors.centerIn: parent - text: "Click outside the example to exit it." - } - opacity: 0 - Behavior on opacity{ NumberAnimation{duration:500} } - Timer{ - id: helpTimer - interval: 5000 - onTriggered: {helpLabel.timedOut=true} - } - } Rectangle{ id: blackout //Maybe use a colorize effect instead? z: 8 anchors.fill: parent @@ -154,7 +150,6 @@ hoverEnabled: main.show //To steal focus from the buttons acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton anchors.fill: parent - onClicked: main.show=false; } states: [ @@ -166,10 +161,6 @@ opacity: 1 } PropertyChanges { - target: helpLabel - opacity: helpLabel.timedOut?0:1 - } - PropertyChanges { target: blackout opacity: 0.5 } @@ -178,8 +169,7 @@ transitions: [//Should not be too long, because the component has already started running Transition { from: ''; to: "show"; reversible: true ParallelAnimation{ - ScriptAction{ script: {helpLabel.timedOut = false; helpTimer.restart();} } - NumberAnimation{ exclude: helpLabel; properties: "opacity"; easing.type: Easing.InQuad; duration: 500} + NumberAnimation{ properties: "opacity"; easing.type: Easing.InQuad; duration: 500} PropertyAction { target: loader; property: "focus"; value: true}//Might be needed to ensure the focus stays with us } } diff -r ef0373b55136 -r 758a864f9613 demos/qtdemo/qtdemo.pro --- a/demos/qtdemo/qtdemo.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/qtdemo/qtdemo.pro Mon Oct 04 01:19:32 2010 +0300 @@ -6,13 +6,17 @@ INSTALLS += target sources -QT += xml network declarative +QT += xml network contains(QT_CONFIG, opengl) { DEFINES += QT_OPENGL_SUPPORT QT += opengl } +contains(QT_CONFIG, declarative) { + QT += declarative +} + build_all:!build_pass { CONFIG -= build_all CONFIG += release diff -r ef0373b55136 -r 758a864f9613 demos/spectrum/3rdparty/fftreal/fftreal.pro --- a/demos/spectrum/3rdparty/fftreal/fftreal.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,5 +1,7 @@ include(../../spectrum.pri) +static: error(This library cannot be built for static linkage) + TEMPLATE = lib TARGET = fftreal diff -r ef0373b55136 -r 758a864f9613 demos/spectrum/app/app.pro --- a/demos/spectrum/app/app.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/demos/spectrum/app/app.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,5 +1,7 @@ include(../spectrum.pri) +static: error(This application cannot be statically linked to the fftreal library) + TEMPLATE = app TARGET = spectrum diff -r ef0373b55136 -r 758a864f9613 dist/changes-4.6.4 --- a/dist/changes-4.6.4 Fri Sep 17 08:34:18 2010 +0300 +++ b/dist/changes-4.6.4 Mon Oct 04 01:19:32 2010 +0300 @@ -63,8 +63,12 @@ QtOpenGL -------- - - foo - * bar + - QGLShaderProgram + * [QTBUG-12478] Don't resolve GLSL extensions if no shaders. + * [QTBUG-12591] setUniformValue(QSize) was setting (w,w) not (w,h). + * [QTBUG-12862] Don't #define highp/mediump/lowp if the desktop OpenGL + implementation has the GL_ARB_ES2_compatibility extension. + * [QTBUG-12554] Wrong OpenGLVersionFlags on OpenGL 4.0 systems. QtScript -------- diff -r ef0373b55136 -r 758a864f9613 dist/changes-4.7.0 --- a/dist/changes-4.7.0 Fri Sep 17 08:34:18 2010 +0300 +++ b/dist/changes-4.7.0 Mon Oct 04 01:19:32 2010 +0300 @@ -88,7 +88,10 @@ - QComboBox * [QTBUG-8796] Made ForegroundRole work for all styles. - + + - QCommandLinkButton + * [QTBUG-5995] Fixed text and icon alignment issues. + - QPrinter * Obsoleted the slightly confusing setNumCopies() and numCopies() functions, and replaced them with setCopyCount(), copyCount() and @@ -133,6 +136,9 @@ * [QTBUG-7982] Added QImage::bitPlaneCount(). * [QTBUG-9072] Fixed alpha check for 1-bit-per-pixel images. + - QLineEdit + * [QTBUG-9823] Placeholder text is now correctly aligned with text. + - QPicture * [QTBUG-4974] Printing QPictures containing text to a high resolution QPrinter would in many cases cause incorrect character spacing. @@ -216,6 +222,7 @@ * [QTBUG-9618] [MR 2372] send secure cookies only over secure connections * [QTBUG-7713] Fix bug related to re-sending request * [QTBUG-7673] Fix issue with some webservers + * [QTBUG-11029] do not accept cookies with non-alpha-numerical domain - Sockets * Better support for derived QTcpServer * [QTBUG-7054] Fix error handling with waitFor*() for socket engine @@ -223,6 +230,10 @@ - SSL * [QTBUG-2515] Do not make OpenSSL prompt for a password * [QTBUG-6504, QTBUG-8924, QTBUG-5645] Fix memleak + * [QTBUG-9973] QSslCertificate: support large serial numbers + * [QTBUG-8833] make QSslSocket::systemCaCertificates() use system certs + * [QT-3567] QSslSocket: improve error handling (fixes Secunia Advisory SA40389) + * [QBTUG-4455, MR 731] Fix handling of SSL certificates with wildcard domain names QtScript -------- @@ -245,6 +256,7 @@ - [QTBUG-8920] fixed crash with anonymous types in XsdSchemaChecker - [QTBUG-8394] include/import/redefine schemas only once - QXmlSchema: fix crash with referencing elements + - [QBTUG-6485] QXmlSchema: allow usage of xsd:all Qt Plugins ---------- @@ -280,8 +292,9 @@ ---------------- - QGtkStyle * Fixed rtl issues with sliders (QTBUG-8986) - * Fixed missing pressed appearance on scroll bar handles. (QTBUG-10396) - + * Fixed missing pressed appearance on scroll bar handles. (QTBUG-10396) + * Fixed crash when creating QGtkStyle before QApplication. (QTBUG-10758) + - QFontDatabase * [QTBUG-4428] Fixed regression when using bitmap fonts on some Linux systems. @@ -297,7 +310,12 @@ Qt for Windows -------------- - Popup windows now implicitly activate when shown. (QTBUG-7386) - + - QComboBox [QTBUG-7552] Fix an issue where only "..." would be shown for + QComboBox with certain DPI settings. + - Fixed a problem where menus exec'ed on system tray icons did not + disappear. (QTBUG-7386) + - Improved look and feel for QWizard on Windows 7 and Vista. (QTBUG-9873), + (QTBUG-11974) and (QTBUG-6120) - QLocalSocket * Pipe handle leak fixed, when closing a QLocalSocket that still has unwritten data. (QTBUG-7815) @@ -309,7 +327,9 @@ --------------- - QMacStyle * Removed frame around statusbar items. (QTBUG-3574) - * More native appearance of item view headers and frames. (QTBUG-10047) + * More native appearance of item view headers and frames. (QTBUG-10047) + * Increased spacing between tree view items. (QTBUG-10190) + * Removed frame around status bar items. (QTBUG-3574) - QFontEngine * Enable fractional metrics for the font engine on Mac in all @@ -345,6 +365,12 @@ * QTabBar scroll button size has been fixed. (QTBUG-8757) * Detection of Windows mobile 6.5 fixed. (QTBUG-8418) +Qt for Symbian +-------------- + + - QSplashScreen + * [QTBUG-11129] Fixed a hanging bug in QSplashScreen on 3.1 devices. + **************************************************************************** @@ -358,8 +384,20 @@ - Build System - - "configure -fast" on Windows now also works for other make tools than - nmake. (QTBUG-8562) + - [QT-3540] Fixed Symbian resources not honoring TARGET with a path. + - "configure -fast" on Windows now also works for other make tools than + nmake. (QTBUG-8562) + - [QTBUG-11351] Fixed memory restrictions not being passed on to elf2e32. + - [QTBUG-11385] Removed the need to specify -arch symbian when compiling + for Symbian on Linux. + - [QTBUG-11396] "configure -qtlibinfix" now works when compiling for + Symbian on Linux. + - [QTBUG-11670] Fixed a bug which caused "make runonphone" to look for + package in the wrong place. + - [QTBUG-11727] Fixed a bug which made builds outside of the Qt tree fail + to compile. + - [QTBUG-11927] "configure -silent" now works with the + symbian/linux-armcc and symbian/linux-gcce mkspecs. - Assistant @@ -450,9 +488,22 @@ ABIs, but it also allowed for unaligned access. Qt never generates or uses unaligned access and the new EABI aligns as expected, so the flag was removed. + - QTextBoundaryFinder is now consistent with ICU when it comes to + line breaking, reporting the index of the boundary at which the line + break should occur rather than the index of the character. + +QtGui: + - QWidget::setLayoutDirection no longer affects the text layout + direction (Qt::LeftToRight or Qt::RightToLeft) of QTextEdit, QLineEdit + and widgets based on them. The default text layout direction + (Qt::LayoutDirectionAuto) is now detected from keyboard layout and + language of the text (conforms to Unicode standards). To + programmatically force the text direction of a QTextEdit, you can + change the defaultTextOption of the QTextDocument associated with that + widget with a new QTextOption of different textDirection property. For + QLineEdit, the only way so far is sending a Qt::Key_Direction_L/R + keyboard event to that widget. QtNetwork: - Qt does no longer provide its own CA bundle, but uses system APIs for - retrieving the default system certificates. On Symbian, - QSslSocket::systemCaCertificates() provides an empty list of - certificates. + retrieving the default system certificates. diff -r ef0373b55136 -r 758a864f9613 dist/changes-4.7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dist/changes-4.7.1 Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,118 @@ +Qt 4.7.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 4.7.0. For more details, +refer to the online documentation included in this distribution. The +documentation is also available online: + + http://qt.nokia.com/doc/4.7 + +The Qt version 4.7 series is binary compatible with the 4.6.x series. +Applications compiled for 4.6 will continue to run with 4.7. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker, the (now obsolete) Task +Tracker, or the Merge Request queue of the public source repository. + +Qt Bug Tracker: http://bugreports.qt.nokia.com +Task Tracker: http://qt.nokia.com/developer/task-tracker +Merge Request: http://qt.gitorious.org + +**************************************************************************** +* General * +**************************************************************************** + +Optimizations +------------- + + - Improved the benchmarking library's timing code + * Uses a faster access to the system clock + + * See list of Important Behavior Changes below + + +**************************************************************************** +* Library * +**************************************************************************** + +QtCore +------ + + +QtGui +----- + + +QtDBus +------ + + +QtMultimedia +------------ + + +QtNetwork +--------- + + +QtOpenGL +-------- + + +QtOpenVG +-------- + + +QtWebKit +-------- + + +QtSql +----- + + +QtSvg +----- + + +Qt Plugins +---------- + + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +Qt for Unix (X11 and Mac OS X) +------------------------------ + + +Qt for Linux/X11 +---------------- + + +Qt for Windows +-------------- + + +Qt for Mac OS X +--------------- + + +Qt for Symbian +-------------- + + + +**************************************************************************** +* Tools * +**************************************************************************** + + - Designer + + - uic + +**************************************************************************** +* Important Behavior Changes * +**************************************************************************** + + diff -r ef0373b55136 -r 758a864f9613 examples/animation/stickman/lifecycle.cpp --- a/examples/animation/stickman/lifecycle.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/animation/stickman/lifecycle.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -103,7 +103,7 @@ m_animationGroup->addAnimation(pa); } - // Set up intial state graph + // Set up initial state graph //! [3] m_machine = new QStateMachine(); m_machine->addDefaultAnimation(m_animationGroup); diff -r ef0373b55136 -r 758a864f9613 examples/declarative/animation/easing/content/QuitButton.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/animation/easing/content/QuitButton.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +Image { + source: "quit.png" + scale: quitMouse.pressed ? 0.8 : 1.0 + smooth: quitMouse.pressed + MouseArea { + id: quitMouse + anchors.fill: parent + anchors.margins: -10 + onClicked: Qt.quit() + } +} \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/declarative/animation/easing/content/quit.png Binary file examples/declarative/animation/easing/content/quit.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/animation/easing/easing.qml --- a/examples/declarative/animation/easing/easing.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/animation/easing/easing.qml Mon Oct 04 01:19:32 2010 +0300 @@ -39,6 +39,7 @@ ****************************************************************************/ import Qt 4.7 +import "content" Rectangle { id: window @@ -134,11 +135,23 @@ } Flickable { - anchors.fill: parent; contentHeight: layout.height - + anchors.fill: parent + contentHeight: layout.height + Rectangle { + id: titlePane + color: "#444444" + height: 35 + anchors { top: parent.top; left: parent.left; right: parent.right } + QuitButton { + id: quitButton + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: 10 + } + } Column { id: layout - anchors.left: parent.left; anchors.right: parent.right + anchors { top: titlePane.bottom; topMargin: 10; left: parent.left; right: parent.right } Repeater { model: easingTypes; delegate: delegate } } } diff -r ef0373b55136 -r 758a864f9613 examples/declarative/animation/states/qt-logo.png Binary file examples/declarative/animation/states/qt-logo.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/animation/states/states.qml --- a/examples/declarative/animation/states/states.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/animation/states/states.qml Mon Oct 04 01:19:32 2010 +0300 @@ -48,14 +48,14 @@ Image { id: userIcon x: topLeftRect.x; y: topLeftRect.y - source: "user.png" + source: "qt-logo.png" } Rectangle { id: topLeftRect anchors { left: parent.left; top: parent.top; leftMargin: 10; topMargin: 20 } - width: 64; height: 64 + width: 46; height: 54 color: "Transparent"; border.color: "Gray"; radius: 6 // Clicking in here sets the state to the default state, returning the image to @@ -67,7 +67,7 @@ id: middleRightRect anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 20 } - width: 64; height: 64 + width: 46; height: 54 color: "Transparent"; border.color: "Gray"; radius: 6 // Clicking in here sets the state to 'middleRight' @@ -78,7 +78,7 @@ id: bottomLeftRect anchors { left: parent.left; bottom: parent.bottom; leftMargin: 10; bottomMargin: 20 } - width: 64; height: 64 + width: 46; height: 54 color: "Transparent"; border.color: "Gray"; radius: 6 // Clicking in here sets the state to 'bottomLeft' diff -r ef0373b55136 -r 758a864f9613 examples/declarative/animation/states/transitions.qml --- a/examples/declarative/animation/states/transitions.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/animation/states/transitions.qml Mon Oct 04 01:19:32 2010 +0300 @@ -54,14 +54,14 @@ Image { id: userIcon x: topLeftRect.x; y: topLeftRect.y - source: "user.png" + source: "qt-logo.png" } Rectangle { id: topLeftRect anchors { left: parent.left; top: parent.top; leftMargin: 10; topMargin: 20 } - width: 64; height: 64 + width: 46; height: 54 color: "Transparent"; border.color: "Gray"; radius: 6 // Clicking in here sets the state to the default state, returning the image to @@ -73,7 +73,7 @@ id: middleRightRect anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 20 } - width: 64; height: 64 + width: 46; height: 54 color: "Transparent"; border.color: "Gray"; radius: 6 // Clicking in here sets the state to 'middleRight' @@ -84,7 +84,7 @@ id: bottomLeftRect anchors { left: parent.left; bottom: parent.bottom; leftMargin: 10; bottomMargin: 20 } - width: 64; height: 64 + width: 46; height: 54 color: "Transparent"; border.color: "Gray"; radius: 6 // Clicking in here sets the state to 'bottomLeft' diff -r ef0373b55136 -r 758a864f9613 examples/declarative/animation/states/user.png Binary file examples/declarative/animation/states/user.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/adding/main.cpp --- a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/cppextensions/referenceexamples/adding/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -51,13 +51,13 @@ //![0] QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); Person *person = qobject_cast(component.create()); if (person) { qWarning() << "The person's name is" << person->name(); qWarning() << "They wear a" << person->shoeSize() << "sized shoe"; } else { - qWarning() << "An error occured"; + qWarning() << component.errors(); } return 0; diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/attached/main.cpp --- a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/cppextensions/referenceexamples/attached/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -56,7 +56,7 @@ qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -83,7 +83,7 @@ } } else { - qWarning() << "An error occured"; + qWarning() << component.errors(); } return 0; diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/binding/main.cpp --- a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -57,7 +57,7 @@ qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -85,7 +85,7 @@ party->startParty(); } else { - qWarning() << "An error occured"; + qWarning() << component.errors(); } return app.exec(); diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/coercion/main.cpp --- a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -56,7 +56,7 @@ qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -70,7 +70,7 @@ for (int ii = 0; ii < party->guestCount(); ++ii) qWarning() << " " << party->guest(ii)->name(); } else { - qWarning() << "An error occured"; + qWarning() << component.errors(); } return 0; diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/default/main.cpp --- a/examples/declarative/cppextensions/referenceexamples/default/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/cppextensions/referenceexamples/default/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -54,7 +54,7 @@ qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -68,7 +68,7 @@ for (int ii = 0; ii < party->guestCount(); ++ii) qWarning() << " " << party->guest(ii)->name(); } else { - qWarning() << "An error occured"; + qWarning() << component.errors(); } return 0; diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/extended/main.cpp --- a/examples/declarative/cppextensions/referenceexamples/extended/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/cppextensions/referenceexamples/extended/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -51,14 +51,14 @@ qmlRegisterExtendedType("People", 1,0, "QLineEdit"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); QLineEdit *edit = qobject_cast(component.create()); if (edit) { edit->show(); return app.exec(); } else { - qWarning() << "An error occured"; + qWarning() << component.errors(); return 0; } } diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/grouped/main.cpp --- a/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -55,7 +55,7 @@ qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -78,7 +78,7 @@ qWarning() << bestShoe->name() << "is wearing the best shoes!"; } else { - qWarning() << "An error occured"; + qWarning() << component.errors(); } return 0; diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "birthdayparty.h" + +BirthdayParty::BirthdayParty(QObject *parent) +: QObject(parent), m_host(0) +{ +} + +// ![0] +Person *BirthdayParty::host() const +{ + return m_host; +} + +void BirthdayParty::setHost(Person *c) +{ + m_host = c; +} + +QDeclarativeListProperty BirthdayParty::guests() +{ + return QDeclarativeListProperty(this, m_guests); +} + +int BirthdayParty::guestCount() const +{ + return m_guests.count(); +} + +Person *BirthdayParty::guest(int index) const +{ + return m_guests.at(index); +} + +void BirthdayParty::invite(const QString &name) +{ + Person *person = new Person(this); + person->setName(name); + m_guests.append(person); +} +// ![0] + diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef BIRTHDAYPARTY_H +#define BIRTHDAYPARTY_H + +#include +#include +#include "person.h" + +class BirthdayParty : public QObject +{ + Q_OBJECT + Q_PROPERTY(Person *host READ host WRITE setHost) + Q_PROPERTY(QDeclarativeListProperty guests READ guests) +public: + BirthdayParty(QObject *parent = 0); + + Person *host() const; + void setHost(Person *); + + QDeclarativeListProperty guests(); + int guestCount() const; + Person *guest(int) const; + +// ![0] + Q_INVOKABLE void invite(const QString &name); +// ![0] + +private: + Person *m_host; + QList m_guests; +}; + +#endif // BIRTHDAYPARTY_H diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/methods/example.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/cppextensions/referenceexamples/methods/example.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +import People 1.0 + +// ![0] +BirthdayParty { + host: Person { + name: "Bob Jones" + shoeSize: 12 + } + guests: [ + Person { name: "Leo Hodges" }, + Person { name: "Jack Smith" }, + Person { name: "Anne Brown" } + ] + + Component.onCompleted: invite("William Green") +} +// ![0] diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/methods/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/cppextensions/referenceexamples/methods/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include +#include +#include +#include +#include "birthdayparty.h" +#include "person.h" + +int main(int argc, char ** argv) +{ + QCoreApplication app(argc, argv); + + qmlRegisterType("People", 1,0, "BirthdayParty"); + qmlRegisterType("People", 1,0, "Person"); + + QDeclarativeEngine engine; + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); + BirthdayParty *party = qobject_cast(component.create()); + + if (party && party->host()) { + qWarning() << party->host()->name() << "is having a birthday!"; + qWarning() << "They are inviting:"; + for (int ii = 0; ii < party->guestCount(); ++ii) + qWarning() << " " << party->guest(ii)->name(); + } else { + qWarning() << component.errors(); + } + + return 0; +} diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/methods/methods.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,18 @@ +TEMPLATE = app +TARGET = methods +DEPENDPATH += . +INCLUDEPATH += . +QT += declarative + +# Input +SOURCES += main.cpp \ + person.cpp \ + birthdayparty.cpp +HEADERS += person.h \ + birthdayparty.h +RESOURCES += methods.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/methods +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/methods +INSTALLS += target sources diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/methods/methods.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/cppextensions/referenceexamples/methods/methods.qrc Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,5 @@ + + + example.qml + + diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/methods/person.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/cppextensions/referenceexamples/methods/person.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "person.h" + +Person::Person(QObject *parent) +: QObject(parent), m_shoeSize(0) +{ +} + +QString Person::name() const +{ + return m_name; +} + +void Person::setName(const QString &n) +{ + m_name = n; +} + +int Person::shoeSize() const +{ + return m_shoeSize; +} + +void Person::setShoeSize(int s) +{ + m_shoeSize = s; +} + diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/methods/person.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/cppextensions/referenceexamples/methods/person.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef PERSON_H +#define PERSON_H + +#include + +class Person : public QObject +{ + Q_OBJECT + Q_PROPERTY(QString name READ name WRITE setName) + Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize) +public: + Person(QObject *parent = 0); + + QString name() const; + void setName(const QString &); + + int shoeSize() const; + void setShoeSize(int); +private: + QString m_name; + int m_shoeSize; +}; + +#endif // PERSON_H diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/properties/main.cpp --- a/examples/declarative/cppextensions/referenceexamples/properties/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/cppextensions/referenceexamples/properties/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -52,7 +52,7 @@ qmlRegisterType("People", 1,0, "Person"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -61,7 +61,7 @@ for (int ii = 0; ii < party->guestCount(); ++ii) qWarning() << " " << party->guest(ii)->name(); } else { - qWarning() << "An error occured"; + qWarning() << component.errors(); } return 0; diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/referenceexamples.pro --- a/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro Mon Oct 04 01:19:32 2010 +0300 @@ -10,4 +10,5 @@ grouped \ properties \ signal \ - valuesource + valuesource \ + methods diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/signal/main.cpp --- a/examples/declarative/cppextensions/referenceexamples/signal/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/cppextensions/referenceexamples/signal/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -56,7 +56,7 @@ qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -84,7 +84,7 @@ party->startParty(); } else { - qWarning() << "An error occured"; + qWarning() << component.errors(); } return 0; diff -r ef0373b55136 -r 758a864f9613 examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp --- a/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -58,7 +58,7 @@ qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -86,7 +86,7 @@ party->startParty(); } else { - qWarning() << "An error occured"; + qWarning() << component.errors(); } return app.exec(); diff -r ef0373b55136 -r 758a864f9613 examples/declarative/imageelements/image/ImageCell.qml --- a/examples/declarative/imageelements/image/ImageCell.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/imageelements/image/ImageCell.qml Mon Oct 04 01:19:32 2010 +0300 @@ -48,7 +48,7 @@ Image { id: image width: parent.width; height: parent.height - captionItem.height - source: "face-smile.png" + source: "qt-logo.png" clip: true // only makes a difference if mode is PreserveAspectCrop smooth: true } diff -r ef0373b55136 -r 758a864f9613 examples/declarative/imageelements/image/face-smile.png Binary file examples/declarative/imageelements/image/face-smile.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/imageelements/image/qt-logo.png Binary file examples/declarative/imageelements/image/qt-logo.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/keyinteraction/focus/Core/ContextMenu.qml --- a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml Mon Oct 04 01:19:32 2010 +0300 @@ -53,6 +53,13 @@ color: "#D1DBBD" focus: true Keys.onRightPressed: mainView.focus = true + + Text { + anchors { top: parent.top; horizontalCenter: parent.horizontalCenter; margins: 30 } + color: "black" + font.pixelSize: 14 + text: "Context Menu" + } } } } diff -r ef0373b55136 -r 758a864f9613 examples/declarative/keyinteraction/focus/Core/GridMenu.qml --- a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml Mon Oct 04 01:19:32 2010 +0300 @@ -43,7 +43,10 @@ FocusScope { property alias interactive: gridView.interactive - onActiveFocusChanged: if (activeFocus) mainView.state = "" + onActiveFocusChanged: { + if (activeFocus) + mainView.state = "" + } Rectangle { anchors.fill: parent @@ -60,7 +63,7 @@ focus: true model: 12 - KeyNavigation.down: listViews + KeyNavigation.down: listMenu KeyNavigation.left: contextMenu delegate: Item { diff -r ef0373b55136 -r 758a864f9613 examples/declarative/keyinteraction/focus/Core/ListMenu.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/keyinteraction/focus/Core/ListMenu.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +FocusScope { + clip: true + + onActiveFocusChanged: { + if (activeFocus) + mainView.state = "showListViews" + } + + ListView { + id: list1 + y: activeFocus ? 10 : 40; width: parent.width / 3; height: parent.height - 20 + focus: true + KeyNavigation.up: gridMenu; KeyNavigation.left: contextMenu; KeyNavigation.right: list2 + model: 10; cacheBuffer: 200 + delegate: ListViewDelegate {} + + Behavior on y { + NumberAnimation { duration: 600; easing.type: Easing.OutQuint } + } + } + + ListView { + id: list2 + y: activeFocus ? 10 : 40; x: parseInt(parent.width / 3); width: parent.width / 3; height: parent.height - 20 + KeyNavigation.up: gridMenu; KeyNavigation.left: list1; KeyNavigation.right: list3 + model: 10; cacheBuffer: 200 + delegate: ListViewDelegate {} + + Behavior on y { + NumberAnimation { duration: 600; easing.type: Easing.OutQuint } + } + } + + ListView { + id: list3 + y: activeFocus ? 10 : 40; x: parseInt(2 * parent.width / 3); width: parent.width / 3; height: parent.height - 20 + KeyNavigation.up: gridMenu; KeyNavigation.left: list2 + model: 10; cacheBuffer: 200 + delegate: ListViewDelegate {} + + Behavior on y { + NumberAnimation { duration: 600; easing.type: Easing.OutQuint } + } + } + + Rectangle { width: parent.width; height: 1; color: "#D1DBBD" } + + Rectangle { + y: 1; width: parent.width; height: 10 + gradient: Gradient { + GradientStop { position: 0.0; color: "#3E606F" } + GradientStop { position: 1.0; color: "transparent" } + } + } + + Rectangle { + y: parent.height - 10; width: parent.width; height: 10 + gradient: Gradient { + GradientStop { position: 1.0; color: "#3E606F" } + GradientStop { position: 0.0; color: "transparent" } + } + } +} diff -r ef0373b55136 -r 758a864f9613 examples/declarative/keyinteraction/focus/Core/ListViews.qml --- a/examples/declarative/keyinteraction/focus/Core/ListViews.qml Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt 4.7 - -FocusScope { - clip: true - - onActiveFocusChanged: if (activeFocus) mainView.state = "showListViews" - - ListView { - id: list1 - y: activeFocus ? 10 : 40; width: parent.width / 3; height: parent.height - 20 - focus: true - KeyNavigation.up: gridMenu; KeyNavigation.left: contextMenu; KeyNavigation.right: list2 - model: 10; cacheBuffer: 200 - delegate: ListViewDelegate {} - - Behavior on y { - NumberAnimation { duration: 600; easing.type: Easing.OutQuint } - } - } - - ListView { - id: list2 - y: activeFocus ? 10 : 40; x: parseInt(parent.width / 3); width: parent.width / 3; height: parent.height - 20 - KeyNavigation.up: gridMenu; KeyNavigation.left: list1; KeyNavigation.right: list3 - model: 10; cacheBuffer: 200 - delegate: ListViewDelegate {} - - Behavior on y { - NumberAnimation { duration: 600; easing.type: Easing.OutQuint } - } - } - - ListView { - id: list3 - y: activeFocus ? 10 : 40; x: parseInt(2 * parent.width / 3); width: parent.width / 3; height: parent.height - 20 - KeyNavigation.up: gridMenu; KeyNavigation.left: list2 - model: 10; cacheBuffer: 200 - delegate: ListViewDelegate {} - - Behavior on y { - NumberAnimation { duration: 600; easing.type: Easing.OutQuint } - } - } - - Rectangle { width: parent.width; height: 1; color: "#D1DBBD" } - - Rectangle { - y: 1; width: parent.width; height: 10 - gradient: Gradient { - GradientStop { position: 0.0; color: "#3E606F" } - GradientStop { position: 1.0; color: "transparent" } - } - } - - Rectangle { - y: parent.height - 10; width: parent.width; height: 10 - gradient: Gradient { - GradientStop { position: 1.0; color: "#3E606F" } - GradientStop { position: 0.0; color: "transparent" } - } - } -} diff -r ef0373b55136 -r 758a864f9613 examples/declarative/keyinteraction/focus/focus.qml --- a/examples/declarative/keyinteraction/focus/focus.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/keyinteraction/focus/focus.qml Mon Oct 04 01:19:32 2010 +0300 @@ -55,27 +55,28 @@ GridMenu { id: gridMenu + width: parent.width; height: 320 - width: parent.width; height: 320 focus: true interactive: parent.activeFocus } - ListViews { - id: listViews + ListMenu { + id: listMenu y: 320; width: parent.width; height: 320 } Rectangle { id: shade anchors.fill: parent - color: "black"; opacity: 0 + color: "black" + opacity: 0 } states: State { name: "showListViews" PropertyChanges { target: gridMenu; y: -160 } - PropertyChanges { target: listViews; y: 160 } + PropertyChanges { target: listMenu; y: 160 } } transitions: Transition { diff -r ef0373b55136 -r 758a864f9613 examples/declarative/modelviews/listview/content/pics/arrow-down.png Binary file examples/declarative/modelviews/listview/content/pics/arrow-down.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/modelviews/listview/content/pics/arrow-up.png Binary file examples/declarative/modelviews/listview/content/pics/arrow-up.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/modelviews/listview/content/pics/list-delete.png Binary file examples/declarative/modelviews/listview/content/pics/list-delete.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/modelviews/package/view.qml --- a/examples/declarative/modelviews/package/view.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/modelviews/package/view.qml Mon Oct 04 01:19:32 2010 +0300 @@ -40,7 +40,8 @@ import Qt 4.7 -Item { +Rectangle { + color: "white" width: 400 height: 200 diff -r ef0373b55136 -r 758a864f9613 examples/declarative/positioners/add.png Binary file examples/declarative/positioners/add.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/positioners/del.png Binary file examples/declarative/positioners/del.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/screenorientation/Core/Bubble.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/screenorientation/Core/Bubble.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,91 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + property bool rising: false + property bool verticalRise: true + property real xAttractor: 0 + property real yAttractor: 0 + + width: 5 + 10*Math.random() + height: width + radius: Math.floor(width/2)-1 + property real amountOfGray: Math.random() + color: Qt.rgba(amountOfGray,amountOfGray,amountOfGray,1) + + y: (rising && verticalRise) ? yAttractor : Math.random()*(main.inPortrait ? main.baseHeight : main.baseWidth) + x: (rising && !verticalRise) ? xAttractor : Math.random()*(main.inPortrait ? main.baseWidth : main.baseHeight) + Behavior on x { + id: xBehavior + SmoothedAnimation { + velocity: 100+Math.random()*100 + } + } + Behavior on y { + id: yBehavior + SmoothedAnimation { + velocity: 100+Math.random()*100 + } + } + Timer { + interval: 80+Math.random()*40 + repeat: true + running: true + onTriggered: { + if (rising) { + if (x > main.width || x < 0) { + xBehavior.enabled = false; + rising = false; + xBehavior.enabled = true; + rising = true; + } + if (y > main.height || y < 0) { + yBehavior.enabled = false; + rising = false; + yBehavior.enabled = true; + rising = true; + } + } + } + } +} \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/declarative/screenorientation/Core/Button.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/screenorientation/Core/Button.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,72 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +Item { + id: button + signal clicked + property string text + property bool toggled: false + width: 100 + height: 60 + Rectangle { + anchors.fill: button + anchors.margins: mouseArea.pressed ? 3 : 2 + color: toggled ? (mouseArea.pressed ? "#442222" : "darkred") : (mouseArea.pressed ? "#333333": "black") + radius: mouseArea.pressed ? 8 : 6 + Text { + id: text + anchors.centerIn: parent + text: button.text + font.pixelSize: mouseArea.pressed ? 12 : 14 + color: "white" + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + MouseArea { + id: mouseArea + anchors.fill: parent + onClicked: { + button.clicked() + } + } + } +} diff -r ef0373b55136 -r 758a864f9613 examples/declarative/screenorientation/Core/screenorientation.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/screenorientation/Core/screenorientation.js Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,95 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +function printOrientation(orientation) { + var orientationString; + if (orientation == Orientation.Portrait) { + orientationString = "Portrait"; + } else if (orientation == Orientation.Landscape) { + orientationString = "Landscape"; + } else if (orientation == Orientation.PortraitInverted) { + orientationString = "Portrait inverted"; + } else if (orientation == Orientation.LandscapeInverted) { + orientationString = "Landscape inverted"; + } else { + orientationString = "UnknownOrientation"; + } + return orientationString; +} + +function getAngle(orientation) { + var angle; + if (orientation == Orientation.Portrait) { + angle = 0; + } else if (orientation == Orientation.Landscape) { + angle = 90; + } else if (orientation == Orientation.PortraitInverted) { + angle = 180; + } else if (orientation == Orientation.LandscapeInverted) { + angle = 270; + } else { + angle = 0; + } + return angle; +} + +function parallel(firstOrientation, secondOrientation) { + var difference = getAngle(firstOrientation) - getAngle(secondOrientation) + return difference % 180 == 0; +} + +function calculateGravityPoint(firstOrientation, secondOrientation) { + var position = Qt.point(0, 0); + var difference = getAngle(firstOrientation) - getAngle(secondOrientation) + if (difference < 0) { + difference = 360 + difference; + } + if (difference == 0) { + position = Qt.point(0, -10); + } else if (difference == 90) { + position = Qt.point(-10, 0); + } else if (difference == 180) { + position = Qt.point(0, 1000); + } else if (difference == 270) { + position = Qt.point(1000, 0); + } + return position; +} diff -r ef0373b55136 -r 758a864f9613 examples/declarative/screenorientation/screenorientation.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/screenorientation/screenorientation.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,202 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +import "Core" +import "Core/screenorientation.js" as ScreenOrientation + +Rectangle { + id: window + width: 360 + height: 640 + color: "white" + + Rectangle { + id: main + clip: true + property variant selectedOrientation: Orientation.UnknownOrientation + property variant activeOrientation: selectedOrientation == Orientation.UnknownOrientation ? runtime.orientation : selectedOrientation + state: "orientation " + activeOrientation + property bool inPortrait: (activeOrientation == Orientation.Portrait || activeOrientation == Orientation.PortraitInverted); + + // rotation correction for landscape devices like N900 + property bool landscapeWindow: window.width > window.height + property variant rotationDelta: landscapeWindow ? -90 : 0 + rotation: rotationDelta + + // initial state is portrait + property real baseWidth: landscapeWindow ? window.height-10 : window.width-10 + property real baseHeight: landscapeWindow ? window.width-10 : window.height-10 + + width: baseWidth + height: baseHeight + anchors.centerIn: parent + + color: "black" + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.rgba(0.5,0.5,0.5,0.5) } + GradientStop { position: 0.8; color: "black" } + GradientStop { position: 1.0; color: "black" } + } + Item { + id: bubbles + property bool rising: false + anchors.fill: parent + property variant gravityPoint: ScreenOrientation.calculateGravityPoint(main.activeOrientation, runtime.orientation) + Repeater { + model: 24 + Bubble { + rising: bubbles.rising + verticalRise: ScreenOrientation.parallel(main.activeOrientation, runtime.orientation) + xAttractor: parent.gravityPoint.x + yAttractor: parent.gravityPoint.y + } + } + Component.onCompleted: bubbles.rising = true; + } + + Column { + width: centeredText.width + anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenterOffset: 30 + Text { + text: "Orientation" + color: "white" + font.pixelSize: 22 + anchors.horizontalCenter: parent.horizontalCenter + } + Text { + id: centeredText + text: ScreenOrientation.printOrientation(main.activeOrientation) + color: "white" + font.pixelSize: 40 + anchors.horizontalCenter: parent.horizontalCenter + } + Text { + text: "sensor: " + ScreenOrientation.printOrientation(runtime.orientation) + color: "white" + font.pixelSize: 14 + anchors.horizontalCenter: parent.horizontalCenter + } + } + Flow { + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: 10 + spacing: 4 + Button { + width: main.inPortrait ? (parent.width-4)/2 : (parent.width-8)/3 + text: "Portrait" + onClicked: main.selectedOrientation = Orientation.Portrait + toggled: main.selectedOrientation == Orientation.Portrait + } + Button { + width: main.inPortrait ? (parent.width-4)/2 : (parent.width-8)/3 + text: "Portrait inverted" + onClicked: main.selectedOrientation = Orientation.PortraitInverted + toggled: main.selectedOrientation == Orientation.PortraitInverted + } + Button { + width: main.inPortrait ? (parent.width-4)/2 : (parent.width-8)/3 + text: "Landscape" + onClicked: main.selectedOrientation = Orientation.Landscape + toggled: main.selectedOrientation == Orientation.Landscape + } + Button { + width: main.inPortrait ? (parent.width-4)/2 : (parent.width-8)/3 + text: "Landscape inverted" + onClicked: main.selectedOrientation = Orientation.LandscapeInverted + toggled: main.selectedOrientation == Orientation.LandscapeInverted + } + Button { + width: main.inPortrait ? parent.width : 2*(parent.width-2)/3 + text: "From runtime.orientation" + onClicked: main.selectedOrientation = Orientation.UnknownOrientation + toggled: main.selectedOrientation == Orientation.UnknownOrientation + } + } + states: [ + State { + name: "orientation " + Orientation.Landscape + PropertyChanges { + target: main + rotation: ScreenOrientation.getAngle(Orientation.Landscape)+rotationDelta + width: baseHeight + height: baseWidth + } + }, + State { + name: "orientation " + Orientation.PortraitInverted + PropertyChanges { + target: main + rotation: ScreenOrientation.getAngle(Orientation.PortraitInverted)+rotationDelta + width: baseWidth + height: baseHeight + } + }, + State { + name: "orientation " + Orientation.LandscapeInverted + PropertyChanges { + target: main + rotation: ScreenOrientation.getAngle(Orientation.LandscapeInverted)+rotationDelta + width: baseHeight + height: baseWidth + } + } + ] + transitions: Transition { + ParallelAnimation { + RotationAnimation { + direction: RotationAnimation.Shortest + duration: 300 + easing.type: Easing.InOutQuint + } + NumberAnimation { + properties: "x,y,width,height" + duration: 300 + easing.type: Easing.InOutQuint + } + } + } + } +} diff -r ef0373b55136 -r 758a864f9613 examples/declarative/screenorientation/screenorientation.qmlproject --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/screenorientation/screenorientation.qmlproject Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,16 @@ +import QmlProject 1.0 + +Project { + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } + /* List of plugin directories passed to QML runtime */ + // importPaths: [ " ../exampleplugin " ] +} diff -r ef0373b55136 -r 758a864f9613 examples/declarative/sqllocalstorage/hello.qml --- a/examples/declarative/sqllocalstorage/hello.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/sqllocalstorage/hello.qml Mon Oct 04 01:19:32 2010 +0300 @@ -40,32 +40,38 @@ //![0] import Qt 4.7 -Text { - text: "?" - - function findGreetings() { - var db = openDatabaseSync("QDeclarativeExampleDB", "1.0", "The Example QML SQL!", 1000000); +Rectangle { + color: "white" + width: 200 + height: 100 + + Text { + text: "?" + anchors.horizontalCenter: parent.horizontalCenter + function findGreetings() { + var db = openDatabaseSync("QDeclarativeExampleDB", "1.0", "The Example QML SQL!", 1000000); - db.transaction( - function(tx) { - // Create the database if it doesn't already exist - tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)'); - - // Add (another) greeting row - tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]); + db.transaction( + function(tx) { + // Create the database if it doesn't already exist + tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)'); - // Show all added greetings - var rs = tx.executeSql('SELECT * FROM Greeting'); + // Add (another) greeting row + tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]); + + // Show all added greetings + var rs = tx.executeSql('SELECT * FROM Greeting'); - var r = "" - for(var i = 0; i < rs.rows.length; i++) { - r += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + "\n" + var r = "" + for(var i = 0; i < rs.rows.length; i++) { + r += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + "\n" + } + text = r } - text = r - } - ) + ) + } + + Component.onCompleted: findGreetings() } - - Component.onCompleted: findGreetings() } //![0] diff -r ef0373b55136 -r 758a864f9613 examples/declarative/threading/threadedlistmodel/timedisplay.qml --- a/examples/declarative/threading/threadedlistmodel/timedisplay.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/threading/threadedlistmodel/timedisplay.qml Mon Oct 04 01:19:32 2010 +0300 @@ -41,31 +41,35 @@ // ![0] import Qt 4.7 -ListView { +Rectangle { + color: "white" width: 200 height: 300 - model: listModel - delegate: Component { - Text { text: time } - } + ListView { + anchors.fill: parent + model: listModel + delegate: Component { + Text { text: time } + } - ListModel { id: listModel } + ListModel { id: listModel } - WorkerScript { - id: worker - source: "dataloader.js" - } + WorkerScript { + id: worker + source: "dataloader.js" + } - Timer { - id: timer - interval: 2000; repeat: true - running: true - triggeredOnStart: true + Timer { + id: timer + interval: 2000; repeat: true + running: true + triggeredOnStart: true - onTriggered: { - var msg = {'action': 'appendCurrentTime', 'model': listModel}; - worker.sendMessage(msg); + onTriggered: { + var msg = {'action': 'appendCurrentTime', 'model': listModel}; + worker.sendMessage(msg); + } } } } diff -r ef0373b55136 -r 758a864f9613 examples/declarative/toys/clocks/clocks.qml --- a/examples/declarative/toys/clocks/clocks.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/toys/clocks/clocks.qml Mon Oct 04 01:19:32 2010 +0300 @@ -51,4 +51,9 @@ Clock { city: "Mumbai"; shift: 5.5 } Clock { city: "Tokyo"; shift: 9 } } + QuitButton { + anchors.right: parent.right + anchors.top: parent.top + anchors.margins: 10 + } } diff -r ef0373b55136 -r 758a864f9613 examples/declarative/toys/clocks/content/Clock.qml --- a/examples/declarative/toys/clocks/content/Clock.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/toys/clocks/content/Clock.qml Mon Oct 04 01:19:32 2010 +0300 @@ -77,7 +77,7 @@ origin.x: 7.5; origin.y: 73; angle: (clock.hours * 30) + (clock.minutes * 0.5) Behavior on angle { - RotationAnimation{ direction: RotationAnimation.Clockwise } + SpringAnimation { spring: 2; damping: 0.2; modulus: 360 } } } } @@ -91,7 +91,7 @@ origin.x: 6.5; origin.y: 83; angle: clock.minutes * 6 Behavior on angle { - RotationAnimation{ direction: RotationAnimation.Clockwise } + SpringAnimation { spring: 2; damping: 0.2; modulus: 360 } } } } @@ -105,7 +105,7 @@ origin.x: 2.5; origin.y: 80; angle: clock.seconds * 6 Behavior on angle { - RotationAnimation{ direction: RotationAnimation.Clockwise } + SpringAnimation { spring: 2; damping: 0.2; modulus: 360 } } } } diff -r ef0373b55136 -r 758a864f9613 examples/declarative/toys/clocks/content/QuitButton.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/toys/clocks/content/QuitButton.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +Image { + source: "quit.png" + scale: quitMouse.pressed ? 0.8 : 1.0 + smooth: quitMouse.pressed + MouseArea { + id: quitMouse + anchors.fill: parent + anchors.margins: -10 + onClicked: Qt.quit() + } +} \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/declarative/toys/clocks/content/quit.png Binary file examples/declarative/toys/clocks/content/quit.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/toys/dynamicscene/dynamicscene.qml --- a/examples/declarative/toys/dynamicscene/dynamicscene.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/toys/dynamicscene/dynamicscene.qml Mon Oct 04 01:19:32 2010 +0300 @@ -136,10 +136,11 @@ Text { text: "Drag an item into the scene." } Rectangle { - width: childrenRect.width + 10; height: childrenRect.height + 10 + width: palette.width + 10; height: palette.height + 10 border.color: "black" Row { + id: palette anchors.centerIn: parent spacing: 8 diff -r ef0373b55136 -r 758a864f9613 examples/declarative/toys/tvtennis/tvtennis.qml --- a/examples/declarative/toys/tvtennis/tvtennis.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/toys/tvtennis/tvtennis.qml Mon Oct 04 01:19:32 2010 +0300 @@ -87,14 +87,14 @@ color: "Lime" x: 2; width: 20; height: 90 y: ball.direction == 'left' ? ball.y - 45 : page.height/2 -45; - Behavior on y { SpringAnimation{ spring: 1; damping: .1; } } + Behavior on y { SpringAnimation{ velocity: 300 } } } Rectangle { id: rightBat color: "Lime" x: page.width - 22; width: 20; height: 90 y: ball.direction == 'right' ? ball.y - 45 : page.height/2 -45; - Behavior on y { SpringAnimation{ spring: 1; damping: .1; } } + Behavior on y { SpringAnimation{ velocity: 300 } } } // The rest, to make it look realistic, if neither ever scores... diff -r ef0373b55136 -r 758a864f9613 examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp --- a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -41,7 +41,7 @@ //![0] #include "piechart.h" #include "pieslice.h" -#include +#include void ChartsPlugin::registerTypes(const char *uri) { diff -r ef0373b55136 -r 758a864f9613 examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h --- a/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chartsplugin.h Mon Oct 04 01:19:32 2010 +0300 @@ -41,7 +41,7 @@ #define CHARTSPLUGIN_H //![0] -#include +#include class ChartsPlugin : public QDeclarativeExtensionPlugin { diff -r ef0373b55136 -r 758a864f9613 examples/declarative/tutorials/samegame/samegame1/samegame.qml --- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/tutorials/samegame/samegame1/samegame.qml Mon Oct 04 01:19:32 2010 +0300 @@ -55,7 +55,7 @@ Image { id: background anchors.fill: parent - source: "../shared/pics/background.png" + source: "../shared/pics/background.jpg" fillMode: Image.PreserveAspectCrop } } diff -r ef0373b55136 -r 758a864f9613 examples/declarative/tutorials/samegame/samegame4/content/samegame.js --- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js Mon Oct 04 01:19:32 2010 +0300 @@ -127,7 +127,7 @@ } else { if (fallDist > 0) { var obj = board[index(column, row)]; - obj.y += fallDist * gameCanvas.blockSize; + obj.y = (row + fallDist) * gameCanvas.blockSize; board[index(column, row + fallDist)] = obj; board[index(column, row)] = null; } @@ -145,7 +145,7 @@ obj = board[index(column, row)]; if (obj == null) continue; - obj.x -= fallDist * gameCanvas.blockSize; + obj.x = (fallDist - column) * gameCanvas.blockSize; board[index(column - fallDist, row)] = obj; board[index(column, row)] = null; } diff -r ef0373b55136 -r 758a864f9613 examples/declarative/ui-components/dialcontrol/content/Dial.qml --- a/examples/declarative/ui-components/dialcontrol/content/Dial.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/ui-components/dialcontrol/content/Dial.qml Mon Oct 04 01:19:32 2010 +0300 @@ -68,6 +68,7 @@ transform: Rotation { id: needleRotation origin.x: 5; origin.y: 65 + //! [needle angle] angle: Math.min(Math.max(-130, root.value*2.6 - 130), 133) Behavior on angle { SpringAnimation { @@ -75,6 +76,7 @@ damping: .15 } } + //! [needle angle] } } //! [needle] diff -r ef0373b55136 -r 758a864f9613 examples/declarative/ui-components/dialcontrol/content/QuitButton.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/declarative/ui-components/dialcontrol/content/QuitButton.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +Image { + source: "quit.png" + scale: quitMouse.pressed ? 0.8 : 1.0 + smooth: quitMouse.pressed + MouseArea { + id: quitMouse + anchors.fill: parent + anchors.margins: -10 + onClicked: Qt.quit() + } +} \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/declarative/ui-components/dialcontrol/content/quit.png Binary file examples/declarative/ui-components/dialcontrol/content/quit.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/declarative/ui-components/dialcontrol/dialcontrol.qml --- a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml Mon Oct 04 01:19:32 2010 +0300 @@ -38,8 +38,10 @@ ** ****************************************************************************/ +//! [imports] import Qt 4.7 import "content" +//! [imports] //! [0] Rectangle { @@ -86,5 +88,10 @@ } } } + QuitButton { + anchors.right: parent.right + anchors.top: parent.top + anchors.margins: 10 + } } -//! [0] \ No newline at end of file +//! [0] diff -r ef0373b55136 -r 758a864f9613 examples/declarative/ui-components/searchbox/SearchBox.qml --- a/examples/declarative/ui-components/searchbox/SearchBox.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/declarative/ui-components/searchbox/SearchBox.qml Mon Oct 04 01:19:32 2010 +0300 @@ -75,6 +75,7 @@ id: textInput anchors { left: parent.left; leftMargin: 8; right: clear.left; rightMargin: 8; verticalCenter: parent.verticalCenter } focus: true + selectByMouse: true } Image { diff -r ef0373b55136 -r 758a864f9613 examples/examples.pro --- a/examples/examples.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/examples.pro Mon Oct 04 01:19:32 2010 +0300 @@ -26,7 +26,7 @@ tutorials \ widgets \ uitools \ - multitouch \ + touch \ gestures } diff -r ef0373b55136 -r 758a864f9613 examples/graphicsview/diagramscene/mainwindow.cpp --- a/examples/graphicsview/diagramscene/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/graphicsview/diagramscene/mainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -45,6 +45,7 @@ #include "diagramitem.h" #include "diagramscene.h" #include "diagramtextitem.h" +#include "arrow.h" const int InsertTextButton = 10; @@ -55,7 +56,7 @@ createToolBox(); createMenus(); - scene = new DiagramScene(itemMenu); + scene = new DiagramScene(itemMenu, this); scene->setSceneRect(QRectF(0, 0, 5000, 5000)); connect(scene, SIGNAL(itemInserted(DiagramItem*)), this, SLOT(itemInserted(DiagramItem*))); @@ -123,11 +124,22 @@ void MainWindow::deleteItem() { foreach (QGraphicsItem *item, scene->selectedItems()) { - if (item->type() == DiagramItem::Type) { - qgraphicsitem_cast(item)->removeArrows(); + if (item->type() == Arrow::Type) { + scene->removeItem(item); + Arrow *arrow = qgraphicsitem_cast(item); + arrow->startItem()->removeArrow(arrow); + arrow->endItem()->removeArrow(arrow); + delete item; } - scene->removeItem(item); } + + foreach (QGraphicsItem *item, scene->selectedItems()) { + if (item->type() == DiagramItem::Type) { + qgraphicsitem_cast(item)->removeArrows(); + } + scene->removeItem(item); + delete item; + } } //! [3] @@ -313,7 +325,7 @@ //! [21] void MainWindow::createToolBox() { - buttonGroup = new QButtonGroup; + buttonGroup = new QButtonGroup(this); buttonGroup->setExclusive(false); connect(buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(buttonGroupClicked(int))); @@ -345,7 +357,7 @@ QWidget *itemWidget = new QWidget; itemWidget->setLayout(layout); - backgroundButtonGroup = new QButtonGroup; + backgroundButtonGroup = new QButtonGroup(this); connect(backgroundButtonGroup, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(backgroundButtonGroupClicked(QAbstractButton*))); @@ -460,7 +472,6 @@ editToolBar->addAction(sendBackAction); fontCombo = new QFontComboBox(); - fontSizeCombo = new QComboBox(); connect(fontCombo, SIGNAL(currentFontChanged(QFont)), this, SLOT(currentFontChanged(QFont))); @@ -526,7 +537,7 @@ linePointerButton->setCheckable(true); linePointerButton->setIcon(QIcon(":/images/linepointer.png")); - pointerTypeGroup = new QButtonGroup; + pointerTypeGroup = new QButtonGroup(this); pointerTypeGroup->addButton(pointerButton, int(DiagramScene::MoveItem)); pointerTypeGroup->addButton(linePointerButton, int(DiagramScene::InsertLine)); @@ -605,7 +616,7 @@ names << tr("black") << tr("white") << tr("red") << tr("blue") << tr("yellow"); - QMenu *colorMenu = new QMenu; + QMenu *colorMenu = new QMenu(this); for (int i = 0; i < colors.count(); ++i) { QAction *action = new QAction(names.at(i), this); action->setData(colors.at(i)); diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/dials/dials.pro --- a/examples/multitouch/dials/dials.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -SOURCES += main.cpp -FORMS += dials.ui diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/dials/dials.ui --- a/examples/multitouch/dials/dials.ui Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ - - - Dials - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - true - - - - - - - true - - - - - - - true - - - - - - - true - - - - - - - true - - - - - - - true - - - - - - - true - - - - - - - true - - - - - - - - diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/dials/main.cpp --- a/examples/multitouch/dials/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include - -#include "ui_dials.h" - -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - QWidget window; - Ui::Dials dialsUi; - dialsUi.setupUi(&window); - QList sliders = window.findChildren(); - foreach (QAbstractSlider *slider, sliders) - slider->setAttribute(Qt::WA_AcceptTouchEvents); - window.showMaximized(); - return app.exec(); -} diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/fingerpaint/fingerpaint.pro --- a/examples/multitouch/fingerpaint/fingerpaint.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -HEADERS = mainwindow.h \ - scribblearea.h -SOURCES = main.cpp \ - mainwindow.cpp \ - scribblearea.cpp - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/multitouch/fingerpaint -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fingerpaint.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/multitouch/fingerpaint -INSTALLS += target sources diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/fingerpaint/main.cpp --- a/examples/multitouch/fingerpaint/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include "mainwindow.h" - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - MainWindow window; - window.showMaximized(); - return app.exec(); -} diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/fingerpaint/mainwindow.cpp --- a/examples/multitouch/fingerpaint/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,217 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include "mainwindow.h" -#include "scribblearea.h" - -//! [0] -MainWindow::MainWindow() -{ - scribbleArea = new ScribbleArea; - setCentralWidget(scribbleArea); - - createActions(); - createMenus(); - - setWindowTitle(tr("Finger Paint")); - resize(500, 500); -} -//! [0] - -//! [1] -void MainWindow::closeEvent(QCloseEvent *event) -//! [1] //! [2] -{ - if (maybeSave()) { - event->accept(); - } else { - event->ignore(); - } -} -//! [2] - -//! [3] -void MainWindow::open() -//! [3] //! [4] -{ - if (maybeSave()) { - QString fileName = QFileDialog::getOpenFileName(this, - tr("Open File"), QDir::currentPath()); - if (!fileName.isEmpty()) - scribbleArea->openImage(fileName); - } -} -//! [4] - -//! [5] -void MainWindow::save() -//! [5] //! [6] -{ - QAction *action = qobject_cast(sender()); - QByteArray fileFormat = action->data().toByteArray(); - saveFile(fileFormat); -} -//! [6] - -//! [11] -void MainWindow::about() -//! [11] //! [12] -{ - QMessageBox::about(this, tr("About Scribble"), - tr("

The Scribble example shows how to use QMainWindow as the " - "base widget for an application, and how to reimplement some of " - "QWidget's event handlers to receive the events generated for " - "the application's widgets:

We reimplement the mouse event " - "handlers to facilitate drawing, the paint event handler to " - "update the application and the resize event handler to optimize " - "the application's appearance. In addition we reimplement the " - "close event handler to intercept the close events before " - "terminating the application.

The example also demonstrates " - "how to use QPainter to draw an image in real time, as well as " - "to repaint widgets.

")); -} -//! [12] - -//! [13] -void MainWindow::createActions() -//! [13] //! [14] -{ - openAct = new QAction(tr("&Open..."), this); - openAct->setShortcut(tr("Ctrl+O")); - connect(openAct, SIGNAL(triggered()), this, SLOT(open())); - - foreach (QByteArray format, QImageWriter::supportedImageFormats()) { - QString text = tr("%1...").arg(QString(format).toUpper()); - - QAction *action = new QAction(text, this); - action->setData(format); - connect(action, SIGNAL(triggered()), this, SLOT(save())); - saveAsActs.append(action); - } - - printAct = new QAction(tr("&Print..."), this); - connect(printAct, SIGNAL(triggered()), scribbleArea, SLOT(print())); - - exitAct = new QAction(tr("E&xit"), this); - exitAct->setShortcut(tr("Ctrl+Q")); - connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); - - clearScreenAct = new QAction(tr("&Clear Screen"), this); - clearScreenAct->setShortcut(tr("Ctrl+L")); - connect(clearScreenAct, SIGNAL(triggered()), - scribbleArea, SLOT(clearImage())); - - aboutAct = new QAction(tr("&About"), this); - connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); - - aboutQtAct = new QAction(tr("About &Qt"), this); - connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt())); -} -//! [14] - -//! [15] -void MainWindow::createMenus() -//! [15] //! [16] -{ - saveAsMenu = new QMenu(tr("&Save As"), this); - foreach (QAction *action, saveAsActs) - saveAsMenu->addAction(action); - - fileMenu = new QMenu(tr("&File"), this); - fileMenu->addAction(openAct); - fileMenu->addMenu(saveAsMenu); - fileMenu->addAction(printAct); - fileMenu->addSeparator(); - fileMenu->addAction(exitAct); - - optionMenu = new QMenu(tr("&Options"), this); - optionMenu->addAction(clearScreenAct); - - helpMenu = new QMenu(tr("&Help"), this); - helpMenu->addAction(aboutAct); - helpMenu->addAction(aboutQtAct); - - menuBar()->addMenu(fileMenu); - menuBar()->addMenu(optionMenu); - menuBar()->addMenu(helpMenu); -} -//! [16] - -//! [17] -bool MainWindow::maybeSave() -//! [17] //! [18] -{ - if (scribbleArea->isModified()) { - QMessageBox::StandardButton ret; - ret = QMessageBox::warning(this, tr("Scribble"), - tr("The image has been modified.\n" - "Do you want to save your changes?"), - QMessageBox::Save | QMessageBox::Discard - | QMessageBox::Cancel); - if (ret == QMessageBox::Save) { - return saveFile("png"); - } else if (ret == QMessageBox::Cancel) { - return false; - } - } - return true; -} -//! [18] - -//! [19] -bool MainWindow::saveFile(const QByteArray &fileFormat) -//! [19] //! [20] -{ - QString initialPath = QDir::currentPath() + "/untitled." + fileFormat; - - QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), - initialPath, - tr("%1 Files (*.%2);;All Files (*)") - .arg(QString(fileFormat.toUpper())) - .arg(QString(fileFormat))); - if (fileName.isEmpty()) { - return false; - } else { - return scribbleArea->saveImage(fileName, fileFormat); - } -} -//! [20] diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/fingerpaint/mainwindow.h --- a/examples/multitouch/fingerpaint/mainwindow.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include - -class ScribbleArea; - -//! [0] -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - MainWindow(); - -protected: - void closeEvent(QCloseEvent *event); - -private slots: - void open(); - void save(); - void about(); - -private: - void createActions(); - void createMenus(); - bool maybeSave(); - bool saveFile(const QByteArray &fileFormat); - - ScribbleArea *scribbleArea; - - QMenu *saveAsMenu; - QMenu *fileMenu; - QMenu *optionMenu; - QMenu *helpMenu; - - QAction *openAct; - QList saveAsActs; - QAction *exitAct; - QAction *printAct; - QAction *clearScreenAct; - QAction *aboutAct; - QAction *aboutQtAct; -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/fingerpaint/scribblearea.cpp --- a/examples/multitouch/fingerpaint/scribblearea.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,211 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include "scribblearea.h" - -//! [0] -ScribbleArea::ScribbleArea(QWidget *parent) - : QWidget(parent) -{ - setAttribute(Qt::WA_AcceptTouchEvents); - setAttribute(Qt::WA_StaticContents); - modified = false; - - myPenColors - << QColor("green") - << QColor("purple") - << QColor("red") - << QColor("blue") - << QColor("yellow") - - << QColor("pink") - << QColor("orange") - << QColor("brown") - << QColor("grey") - << QColor("black"); -} -//! [0] - -//! [1] -bool ScribbleArea::openImage(const QString &fileName) -//! [1] //! [2] -{ - QImage loadedImage; - if (!loadedImage.load(fileName)) - return false; - - QSize newSize = loadedImage.size().expandedTo(size()); - resizeImage(&loadedImage, newSize); - image = loadedImage; - modified = false; - update(); - return true; -} -//! [2] - -//! [3] -bool ScribbleArea::saveImage(const QString &fileName, const char *fileFormat) -//! [3] //! [4] -{ - QImage visibleImage = image; - resizeImage(&visibleImage, size()); - - if (visibleImage.save(fileName, fileFormat)) { - modified = false; - return true; - } else { - return false; - } -} -//! [4] - -//! [9] -void ScribbleArea::clearImage() -//! [9] //! [10] -{ - image.fill(qRgb(255, 255, 255)); - modified = true; - update(); -} -//! [10] - -//! [12] //! [13] -void ScribbleArea::paintEvent(QPaintEvent *event) -//! [13] //! [14] -{ - QPainter painter(this); - const QRect rect = event->rect(); - painter.drawImage(rect.topLeft(), image, rect); -} -//! [14] - -//! [15] -void ScribbleArea::resizeEvent(QResizeEvent *event) -//! [15] //! [16] -{ - if (width() > image.width() || height() > image.height()) { - int newWidth = qMax(width() + 128, image.width()); - int newHeight = qMax(height() + 128, image.height()); - resizeImage(&image, QSize(newWidth, newHeight)); - update(); - } - QWidget::resizeEvent(event); -} -//! [16] - -//! [19] -void ScribbleArea::resizeImage(QImage *image, const QSize &newSize) -//! [19] //! [20] -{ - if (image->size() == newSize) - return; - - QImage newImage(newSize, QImage::Format_RGB32); - newImage.fill(qRgb(255, 255, 255)); - QPainter painter(&newImage); - painter.drawImage(QPoint(0, 0), *image); - *image = newImage; -} -//! [20] - -//! [21] -void ScribbleArea::print() -{ -#ifndef QT_NO_PRINTER - QPrinter printer(QPrinter::HighResolution); - - QPrintDialog *printDialog = new QPrintDialog(&printer, this); -//! [21] //! [22] - if (printDialog->exec() == QDialog::Accepted) { - QPainter painter(&printer); - QRect rect = painter.viewport(); - QSize size = image.size(); - size.scale(rect.size(), Qt::KeepAspectRatio); - painter.setViewport(rect.x(), rect.y(), size.width(), size.height()); - painter.setWindow(image.rect()); - painter.drawImage(0, 0, image); - } -#endif // QT_NO_PRINTER -} -//! [22] - -bool ScribbleArea::event(QEvent *event) -{ - switch (event->type()) { - case QEvent::TouchBegin: - case QEvent::TouchUpdate: - case QEvent::TouchEnd: - { - QList touchPoints = static_cast(event)->touchPoints(); - foreach (const QTouchEvent::TouchPoint &touchPoint, touchPoints) { - switch (touchPoint.state()) { - case Qt::TouchPointStationary: - // don't do anything if this touch point hasn't moved - continue; - default: - { - QRectF rect = touchPoint.rect(); - if (rect.isEmpty()) { - qreal diameter = qreal(50) * touchPoint.pressure(); - rect.setSize(QSizeF(diameter, diameter)); - } - - QPainter painter(&image); - painter.setPen(Qt::NoPen); - painter.setBrush(myPenColors.at(touchPoint.id() % myPenColors.count())); - painter.drawEllipse(rect); - painter.end(); - - modified = true; - int rad = 2; - update(rect.toRect().adjusted(-rad,-rad, +rad, +rad)); - } - break; - } - } - break; - } - default: - return QWidget::event(event); - } - return true; -} diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/fingerpaint/scribblearea.h --- a/examples/multitouch/fingerpaint/scribblearea.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef SCRIBBLEAREA_H -#define SCRIBBLEAREA_H - -#include -#include -#include -#include - -//! [0] -class ScribbleArea : public QWidget -{ - Q_OBJECT - -public: - ScribbleArea(QWidget *parent = 0); - - bool openImage(const QString &fileName); - bool saveImage(const QString &fileName, const char *fileFormat); - - bool isModified() const { return modified; } - -public slots: - void clearImage(); - void print(); - -protected: - void paintEvent(QPaintEvent *event); - void resizeEvent(QResizeEvent *event); - bool event(QEvent *event); - -private: - void resizeImage(QImage *image, const QSize &newSize); - - bool modified; - QList myPenColors; - QImage image; -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/knobs/knob.cpp --- a/examples/multitouch/knobs/knob.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "knob.h" - -#include -#include - -Knob::Knob() - : QGraphicsEllipseItem(-50, -50, 100, 100) -{ - setAcceptTouchEvents(true); - setBrush(Qt::lightGray); - - QGraphicsEllipseItem *leftItem = new QGraphicsEllipseItem(0, 0, 20, 20, this); - leftItem->setPos(-40, -10); - leftItem->setBrush(Qt::darkGreen); - - QGraphicsEllipseItem *rightItem = new QGraphicsEllipseItem(0, 0, 20, 20, this); - rightItem->setPos(20, -10); - rightItem->setBrush(Qt::darkRed); -} - -bool Knob::sceneEvent(QEvent *event) -{ - switch (event->type()) { - case QEvent::TouchBegin: - case QEvent::TouchUpdate: - case QEvent::TouchEnd: - { - QTouchEvent *touchEvent = static_cast(event); - - if (touchEvent->touchPoints().count() == 2) { - const QTouchEvent::TouchPoint &touchPoint1 = touchEvent->touchPoints().first(); - const QTouchEvent::TouchPoint &touchPoint2 = touchEvent->touchPoints().last(); - - QLineF line1(touchPoint1.lastScenePos(), touchPoint2.lastScenePos()); - QLineF line2(touchPoint1.scenePos(), touchPoint2.scenePos()); - - rotate(line2.angleTo(line1)); - } - - break; - } - - default: - return QGraphicsItem::sceneEvent(event); - } - - return true; -} diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/knobs/knob.h --- a/examples/multitouch/knobs/knob.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef KNOB_H -#define KNOB_H - -#include - -class Knob : public QGraphicsEllipseItem -{ -public: - Knob(); - - bool sceneEvent(QEvent *event); -}; - -#endif // KNOB_H diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/knobs/knobs.pro --- a/examples/multitouch/knobs/knobs.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -HEADERS = knob.h -SOURCES = main.cpp knob.cpp diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/knobs/main.cpp --- a/examples/multitouch/knobs/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#include "knob.h" - -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - - QGraphicsScene scene; - QGraphicsView view(&scene); - - Knob *knob1 = new Knob; - knob1->setPos(-110, 0); - Knob *knob2 = new Knob; - - scene.addItem(knob1); - scene.addItem(knob2); - - view.showMaximized(); - view.fitInView(scene.sceneRect().adjusted(-20, -20, 20, 20), Qt::KeepAspectRatio); - - return app.exec(); -} diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/multitouch.pro --- a/examples/multitouch/multitouch.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = pinchzoom fingerpaint knobs dials diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/pinchzoom/graphicsview.cpp --- a/examples/multitouch/pinchzoom/graphicsview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "graphicsview.h" - -#include -#include - -GraphicsView::GraphicsView(QGraphicsScene *scene, QWidget *parent) - : QGraphicsView(scene, parent), totalScaleFactor(1) -{ - viewport()->setAttribute(Qt::WA_AcceptTouchEvents); - setDragMode(ScrollHandDrag); -} - -bool GraphicsView::viewportEvent(QEvent *event) -{ - switch (event->type()) { - case QEvent::TouchBegin: - case QEvent::TouchUpdate: - case QEvent::TouchEnd: - { - QTouchEvent *touchEvent = static_cast(event); - QList touchPoints = touchEvent->touchPoints(); - if (touchPoints.count() == 2) { - // determine scale factor - const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first(); - const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last(); - qreal currentScaleFactor = - QLineF(touchPoint0.pos(), touchPoint1.pos()).length() - / QLineF(touchPoint0.startPos(), touchPoint1.startPos()).length(); - if (touchEvent->touchPointStates() & Qt::TouchPointReleased) { - // if one of the fingers is released, remember the current scale - // factor so that adding another finger later will continue zooming - // by adding new scale factor to the existing remembered value. - totalScaleFactor *= currentScaleFactor; - currentScaleFactor = 1; - } - setTransform(QTransform().scale(totalScaleFactor * currentScaleFactor, - totalScaleFactor * currentScaleFactor)); - } - return true; - } - default: - break; - } - return QGraphicsView::viewportEvent(event); -} diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/pinchzoom/graphicsview.h --- a/examples/multitouch/pinchzoom/graphicsview.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#pragma once -#include - -class GraphicsView : public QGraphicsView -{ - Q_OBJECT - -public: - GraphicsView(QGraphicsScene *scene = 0, QWidget *parent = 0); - - bool viewportEvent(QEvent *event); - -private: - qreal totalScaleFactor; -}; diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/pinchzoom/images/cheese.jpg Binary file examples/multitouch/pinchzoom/images/cheese.jpg has changed diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/pinchzoom/main.cpp --- a/examples/multitouch/pinchzoom/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "graphicsview.h" -#include "mouse.h" - -#include - -#include - -static const int MouseCount = 7; - -//! [0] -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); -//! [0] - -//! [1] - QGraphicsScene scene; - scene.setSceneRect(-300, -300, 600, 600); -//! [1] //! [2] - scene.setItemIndexMethod(QGraphicsScene::NoIndex); -//! [2] - -//! [3] - for (int i = 0; i < MouseCount; ++i) { - Mouse *mouse = new Mouse; - mouse->setPos(::sin((i * 6.28) / MouseCount) * 200, - ::cos((i * 6.28) / MouseCount) * 200); - scene.addItem(mouse); - } -//! [3] - -//! [4] - GraphicsView view(&scene); - view.setRenderHint(QPainter::Antialiasing); - view.setBackgroundBrush(QPixmap(":/images/cheese.jpg")); -//! [4] //! [5] - view.setCacheMode(QGraphicsView::CacheBackground); - view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate); -//! [5] //! [6] - view.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Colliding Mice")); - view.showMaximized(); - - return app.exec(); -} -//! [6] diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/pinchzoom/mice.qrc --- a/examples/multitouch/pinchzoom/mice.qrc Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - images/cheese.jpg - - diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/pinchzoom/mouse.cpp --- a/examples/multitouch/pinchzoom/mouse.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,199 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "mouse.h" - -#include -#include -#include - -#include - -static const double Pi = 3.14159265358979323846264338327950288419717; -static double TwoPi = 2.0 * Pi; - -static qreal normalizeAngle(qreal angle) -{ - while (angle < 0) - angle += TwoPi; - while (angle > TwoPi) - angle -= TwoPi; - return angle; -} - -//! [0] -Mouse::Mouse() - : angle(0), speed(0), mouseEyeDirection(0), - color(qrand() % 256, qrand() % 256, qrand() % 256) -{ - rotate(qrand() % (360 * 16)); - startTimer(1000 / 33); -} -//! [0] - -//! [1] -QRectF Mouse::boundingRect() const -{ - qreal adjust = 0.5; - return QRectF(-18 - adjust, -22 - adjust, - 36 + adjust, 60 + adjust); -} -//! [1] - -//! [2] -QPainterPath Mouse::shape() const -{ - QPainterPath path; - path.addRect(-10, -20, 20, 40); - return path; -} -//! [2] - -//! [3] -void Mouse::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) -{ - // Body - painter->setBrush(color); - painter->drawEllipse(-10, -20, 20, 40); - - // Eyes - painter->setBrush(Qt::white); - painter->drawEllipse(-10, -17, 8, 8); - painter->drawEllipse(2, -17, 8, 8); - - // Nose - painter->setBrush(Qt::black); - painter->drawEllipse(QRectF(-2, -22, 4, 4)); - - // Pupils - painter->drawEllipse(QRectF(-8.0 + mouseEyeDirection, -17, 4, 4)); - painter->drawEllipse(QRectF(4.0 + mouseEyeDirection, -17, 4, 4)); - - // Ears - painter->setBrush(scene()->collidingItems(this).isEmpty() ? Qt::darkYellow : Qt::red); - painter->drawEllipse(-17, -12, 16, 16); - painter->drawEllipse(1, -12, 16, 16); - - // Tail - QPainterPath path(QPointF(0, 20)); - path.cubicTo(-5, 22, -5, 22, 0, 25); - path.cubicTo(5, 27, 5, 32, 0, 30); - path.cubicTo(-5, 32, -5, 42, 0, 35); - painter->setBrush(Qt::NoBrush); - painter->drawPath(path); -} -//! [3] - -//! [4] -void Mouse::timerEvent(QTimerEvent *) -{ -//! [4] - // Don't move too far away -//! [5] - QLineF lineToCenter(QPointF(0, 0), mapFromScene(0, 0)); - if (lineToCenter.length() > 150) { - qreal angleToCenter = ::acos(lineToCenter.dx() / lineToCenter.length()); - if (lineToCenter.dy() < 0) - angleToCenter = TwoPi - angleToCenter; - angleToCenter = normalizeAngle((Pi - angleToCenter) + Pi / 2); - - if (angleToCenter < Pi && angleToCenter > Pi / 4) { - // Rotate left - angle += (angle < -Pi / 2) ? 0.25 : -0.25; - } else if (angleToCenter >= Pi && angleToCenter < (Pi + Pi / 2 + Pi / 4)) { - // Rotate right - angle += (angle < Pi / 2) ? 0.25 : -0.25; - } - } else if (::sin(angle) < 0) { - angle += 0.25; - } else if (::sin(angle) > 0) { - angle -= 0.25; -//! [5] //! [6] - } -//! [6] - - // Try not to crash with any other mice -//! [7] - QList dangerMice = scene()->items(QPolygonF() - << mapToScene(0, 0) - << mapToScene(-30, -50) - << mapToScene(30, -50)); - foreach (QGraphicsItem *item, dangerMice) { - if (item == this) - continue; - - QLineF lineToMouse(QPointF(0, 0), mapFromItem(item, 0, 0)); - qreal angleToMouse = ::acos(lineToMouse.dx() / lineToMouse.length()); - if (lineToMouse.dy() < 0) - angleToMouse = TwoPi - angleToMouse; - angleToMouse = normalizeAngle((Pi - angleToMouse) + Pi / 2); - - if (angleToMouse >= 0 && angleToMouse < Pi / 2) { - // Rotate right - angle += 0.5; - } else if (angleToMouse <= TwoPi && angleToMouse > (TwoPi - Pi / 2)) { - // Rotate left - angle -= 0.5; -//! [7] //! [8] - } -//! [8] //! [9] - } -//! [9] - - // Add some random movement -//! [10] - if (dangerMice.size() > 1 && (qrand() % 10) == 0) { - if (qrand() % 1) - angle += (qrand() % 100) / 500.0; - else - angle -= (qrand() % 100) / 500.0; - } -//! [10] - -//! [11] - speed += (-50 + qrand() % 100) / 100.0; - - qreal dx = ::sin(angle) * 10; - mouseEyeDirection = (qAbs(dx / 5) < 1) ? 0 : dx / 5; - - rotate(dx); - setPos(mapToParent(0, -(3 + sin(speed) * 3))); -} -//! [11] diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/pinchzoom/mouse.h --- a/examples/multitouch/pinchzoom/mouse.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MOUSE_H -#define MOUSE_H - -#include - -//! [0] -class Mouse : public QGraphicsObject -{ - Q_OBJECT - -public: - Mouse(); - - QRectF boundingRect() const; - QPainterPath shape() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget); - -protected: - void timerEvent(QTimerEvent *event); - -private: - qreal angle; - qreal speed; - qreal mouseEyeDirection; - QColor color; -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 examples/multitouch/pinchzoom/pinchzoom.pro --- a/examples/multitouch/pinchzoom/pinchzoom.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -HEADERS += \ - mouse.h \ - graphicsview.h -SOURCES += \ - main.cpp \ - mouse.cpp \ - graphicsview.cpp - -RESOURCES += \ - mice.qrc - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/multitouch/pinchzoom -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pinchzoom.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/multitouch/pinchzoom -INSTALLS += target sources diff -r ef0373b55136 -r 758a864f9613 examples/network/bearercloud/bluetooth.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/network/bearercloud/bluetooth.svg Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,24 @@ + + + + +]> + + + + + + + + + + + + + + diff -r ef0373b55136 -r 758a864f9613 examples/network/bearercloud/cell.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/network/bearercloud/cell.svg Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,25 @@ + + + + +]> + + + + + + + + + + + + + + + + + + diff -r ef0373b55136 -r 758a864f9613 examples/network/bearercloud/cloud.cpp --- a/examples/network/bearercloud/cloud.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/network/bearercloud/cloud.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -53,7 +53,7 @@ #include -static QMap svgCache; +static QMap svgCache; //! [0] Cloud::Cloud(const QNetworkConfiguration &config, QGraphicsItem *parent) @@ -245,6 +245,8 @@ else finalOpacity = 1.0; +#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6) && \ + !defined(Q_OS_SYMBIAN) && !defined(Q_OS_WINCE) QString tooltip; if (configuration.name().isEmpty()) @@ -259,9 +261,9 @@ tooltip += tr("
Id: %1").arg(configuration.identifier()); #endif - const QString bearerName = configuration.bearerName(); - if (!bearerName.isEmpty()) - tooltip += tr("
Bearer: %1").arg(bearerName); + const QString bearerTypeName = configuration.bearerTypeName(); + if (!bearerTypeName.isEmpty()) + tooltip += tr("
Bearer: %1").arg(bearerTypeName); QString s = tr("
State: %1 (%2)"); switch (state) { @@ -302,23 +304,45 @@ tooltip += tr("
Sent data: %1 bytes").arg(session->bytesWritten()); setToolTip(tooltip); +#else + Q_UNUSED(state); +#endif } //! [2] //! [1] void Cloud::newConfigurationActivated() { - const QString bearerName = configuration.bearerName(); - if (!svgCache.contains(bearerName)) { - if (bearerName == QLatin1String("WLAN")) - svgCache.insert(bearerName, new QSvgRenderer(QLatin1String(":wlan.svg"))); - else if (bearerName == QLatin1String("Ethernet")) - svgCache.insert(bearerName, new QSvgRenderer(QLatin1String(":lan.svg"))); - else - svgCache.insert(bearerName, new QSvgRenderer(QLatin1String(":unknown.svg"))); + QNetworkConfiguration::BearerType bearerType = configuration.bearerType(); + if (!svgCache.contains(bearerType)) { + QSvgRenderer *renderer = 0; + switch (bearerType) { + case QNetworkConfiguration::BearerWLAN: + renderer = new QSvgRenderer(QLatin1String(":wlan.svg")); + break; + case QNetworkConfiguration::BearerEthernet: + renderer = new QSvgRenderer(QLatin1String(":lan.svg")); + break; + case QNetworkConfiguration::Bearer2G: + renderer = new QSvgRenderer(QLatin1String(":cell.svg")); + break; + case QNetworkConfiguration::BearerBluetooth: + renderer = new QSvgRenderer(QLatin1String(":bluetooth.svg")); + break; + case QNetworkConfiguration::BearerCDMA2000: + case QNetworkConfiguration::BearerWCDMA: + case QNetworkConfiguration::BearerHSPA: + renderer = new QSvgRenderer(QLatin1String(":umts.svg")); + break; + default: + renderer = new QSvgRenderer(QLatin1String(":unknown.svg")); + } + + if (renderer) + svgCache.insert(bearerType, renderer); } - icon->setSharedRenderer(svgCache[bearerName]); + icon->setSharedRenderer(svgCache[bearerType]); if (configuration.name().isEmpty()) { text->setPlainText(tr("HIDDEN NETWORK")); diff -r ef0373b55136 -r 758a864f9613 examples/network/bearercloud/gprs.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/network/bearercloud/gprs.svg Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,199 @@ + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ef0373b55136 -r 758a864f9613 examples/network/bearercloud/icons.qrc --- a/examples/network/bearercloud/icons.qrc Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/network/bearercloud/icons.qrc Mon Oct 04 01:19:32 2010 +0300 @@ -3,5 +3,9 @@ wlan.svg lan.svg unknown.svg + bluetooth.svg + cell.svg + gprs.svg + umts.svg diff -r ef0373b55136 -r 758a864f9613 examples/network/bearercloud/lan.svg --- a/examples/network/bearercloud/lan.svg Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/network/bearercloud/lan.svg Mon Oct 04 01:19:32 2010 +0300 @@ -1,76 +1,33 @@ - - - - - - - - - - - image/svg+xml - - - - - - LAN - + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + diff -r ef0373b55136 -r 758a864f9613 examples/network/bearercloud/umts.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/network/bearercloud/umts.svg Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,200 @@ + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/network/bearermonitor/sessionwidget.cpp --- a/examples/network/bearermonitor/sessionwidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/network/bearermonitor/sessionwidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -111,11 +111,11 @@ killTimer(statsTimer); if (session->configuration().type() == QNetworkConfiguration::InternetAccessPoint) - bearer->setText(session->configuration().bearerName()); + bearer->setText(session->configuration().bearerTypeName()); else { QNetworkConfigurationManager mgr; QNetworkConfiguration c = mgr.configurationFromIdentifier(session->sessionProperty("ActiveConfiguration").toString()); - bearer->setText(c.bearerName()); + bearer->setText(c.bearerTypeName()); } #ifndef QT_NO_NETWORKINTERFACE diff -r ef0373b55136 -r 758a864f9613 examples/network/download/main.cpp --- a/examples/network/download/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/network/download/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -150,7 +150,7 @@ } else { QString filename = saveFileName(url); if (saveToDisk(filename, reply)) - printf("Download of %s succeded (saved to %s)\n", + printf("Download of %s succeeded (saved to %s)\n", url.toEncoded().constData(), qPrintable(filename)); } diff -r ef0373b55136 -r 758a864f9613 examples/network/fortuneserver/fortuneserver.pro --- a/examples/network/fortuneserver/fortuneserver.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/network/fortuneserver/fortuneserver.pro Mon Oct 04 01:19:32 2010 +0300 @@ -10,7 +10,7 @@ INSTALLS += target sources symbian { - TARGET.UID3 = 0xA000CF71 + TARGET.UID3 = 0xA000E406 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.CAPABILITY = "NetworkServices ReadUserData" TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 diff -r ef0373b55136 -r 758a864f9613 examples/network/fortuneserver/server.cpp --- a/examples/network/fortuneserver/server.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/network/fortuneserver/server.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -107,17 +107,19 @@ void Server::sessionOpened() { // Save the used configuration - QNetworkConfiguration config = networkSession->configuration(); - QString id; - if (config.type() == QNetworkConfiguration::UserChoice) - id = networkSession->sessionProperty(QLatin1String("UserChoiceConfiguration")).toString(); - else - id = config.identifier(); + if (networkSession) { + QNetworkConfiguration config = networkSession->configuration(); + QString id; + if (config.type() == QNetworkConfiguration::UserChoice) + id = networkSession->sessionProperty(QLatin1String("UserChoiceConfiguration")).toString(); + else + id = config.identifier(); - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); - settings.beginGroup(QLatin1String("QtNetwork")); - settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); - settings.endGroup(); + QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + settings.beginGroup(QLatin1String("QtNetwork")); + settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); + settings.endGroup(); + } //! [0] //! [1] tcpServer = new QTcpServer(this); diff -r ef0373b55136 -r 758a864f9613 examples/network/http/httpwindow.cpp --- a/examples/network/http/httpwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/network/http/httpwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -206,7 +206,7 @@ void HttpWindow::httpReadyRead() { - // this slot gets called everytime the QNetworkReply has new data. + // this slot gets called every time the QNetworkReply has new data. // We read all of its new data and write it into the file. // That way we use less RAM than when reading it at the finished() // signal of the QNetworkReply diff -r ef0373b55136 -r 758a864f9613 examples/network/network.pro --- a/examples/network/network.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/network/network.pro Mon Oct 04 01:19:32 2010 +0300 @@ -16,9 +16,12 @@ threadedfortuneserver \ googlesuggest \ torrent \ - bearercloud \ bearermonitor + contains(QT_CONFIG, svg) { + SUBDIRS += bearercloud + } + # no QProcess !vxworks:!qnx:SUBDIRS += network-chat diff -r ef0373b55136 -r 758a864f9613 examples/network/torrent/torrent.pro --- a/examples/network/torrent/torrent.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/network/torrent/torrent.pro Mon Oct 04 01:19:32 2010 +0300 @@ -5,7 +5,7 @@ metainfo.h \ peerwireclient.h \ ratecontroller.h \ - filemanager.h \ + filemanager.h \ torrentclient.h \ torrentserver.h \ trackerclient.h diff -r ef0373b55136 -r 758a864f9613 examples/network/torrent/torrentclient.cpp --- a/examples/network/torrent/torrentclient.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/network/torrent/torrentclient.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1243,8 +1243,8 @@ // depending on the state we're in. int pieceIndex = 0; if (d->state == WarmingUp || (qrand() & 4) == 0) { - int *occurrances = new int[d->pieceCount]; - memset(occurrances, 0, d->pieceCount * sizeof(int)); + int *occurrences = new int[d->pieceCount]; + memset(occurrences, 0, d->pieceCount * sizeof(int)); // Count how many of each piece are available. foreach (PeerWireClient *peer, d->connections) { @@ -1252,38 +1252,38 @@ int peerPiecesSize = peerPieces.size(); for (int i = 0; i < peerPiecesSize; ++i) { if (peerPieces.testBit(i)) - ++occurrances[i]; + ++occurrences[i]; } } // Find the rarest or most common pieces. - int numOccurrances = d->state == WarmingUp ? 0 : 99999; + int numOccurrences = d->state == WarmingUp ? 0 : 99999; QList piecesReadyForDownload; for (int i = 0; i < d->pieceCount; ++i) { if (d->state == WarmingUp) { // Add common pieces - if (occurrances[i] >= numOccurrances + if (occurrences[i] >= numOccurrences && incompletePiecesAvailableToClient.testBit(i)) { - if (occurrances[i] > numOccurrances) + if (occurrences[i] > numOccurrences) piecesReadyForDownload.clear(); piecesReadyForDownload.append(i); - numOccurrances = occurrances[i]; + numOccurrences = occurrences[i]; } } else { // Add rare pieces - if (occurrances[i] <= numOccurrances + if (occurrences[i] <= numOccurrences && incompletePiecesAvailableToClient.testBit(i)) { - if (occurrances[i] < numOccurrances) + if (occurrences[i] < numOccurrences) piecesReadyForDownload.clear(); piecesReadyForDownload.append(i); - numOccurrances = occurrances[i]; + numOccurrences = occurrences[i]; } } } // Select one piece randomly pieceIndex = piecesReadyForDownload.at(qrand() % piecesReadyForDownload.size()); - delete [] occurrances; + delete [] occurrences; } else { // Make up a list of available piece indices, and pick // a random one. diff -r ef0373b55136 -r 758a864f9613 examples/opengl/shared/qtlogo.cpp --- a/examples/opengl/shared/qtlogo.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/opengl/shared/qtlogo.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -327,7 +327,7 @@ QVector in_back = extrude(inside, depth); QVector out_back = extrude(outside, depth); - // Create front, back and sides as seperate patches so that smooth normals + // Create front, back and sides as separate patches so that smooth normals // are generated for the curving sides, but a faceted edge is created between // sides and front/back Patch *front = new Patch(g); diff -r ef0373b55136 -r 758a864f9613 examples/phonon/qmusicplayer/mainwindow.cpp --- a/examples/phonon/qmusicplayer/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/phonon/qmusicplayer/mainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -248,7 +248,7 @@ void MainWindow::setupActions() { playAction = new QAction(style()->standardIcon(QStyle::SP_MediaPlay), tr("Play"), this); - playAction->setShortcut(tr("Crl+P")); + playAction->setShortcut(tr("Ctrl+P")); playAction->setDisabled(true); pauseAction = new QAction(style()->standardIcon(QStyle::SP_MediaPause), tr("Pause"), this); pauseAction->setShortcut(tr("Ctrl+A")); diff -r ef0373b55136 -r 758a864f9613 examples/sql/masterdetail/mainwindow.cpp --- a/examples/sql/masterdetail/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/sql/masterdetail/mainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -189,9 +189,9 @@ QMessageBox::StandardButton button; button = QMessageBox::question(this, tr("Delete Album"), - QString(tr("Are you sure you want to " \ - "delete '%1' by '%2'?")) - .arg(title).arg(artist), + tr("Are you sure you want to " + "delete '%1' by '%2'?") + .arg(title, artist), QMessageBox::Yes | QMessageBox::No); if (button == QMessageBox::Yes) { diff -r ef0373b55136 -r 758a864f9613 examples/tools/customcompleter/textedit.cpp --- a/examples/tools/customcompleter/textedit.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tools/customcompleter/textedit.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -141,7 +141,7 @@ } bool isShortcut = ((e->modifiers() & Qt::ControlModifier) && e->key() == Qt::Key_E); // CTRL+E - if (!c || !isShortcut) // dont process the shortcut when we have a completer + if (!c || !isShortcut) // do not process the shortcut when we have a completer QTextEdit::keyPressEvent(e); //! [7] diff -r ef0373b55136 -r 758a864f9613 examples/tools/treemodelcompleter/mainwindow.cpp --- a/examples/tools/treemodelcompleter/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tools/treemodelcompleter/mainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -241,6 +241,6 @@ void MainWindow::updateContentsLabel(const QString& sep) { - contentsLabel->setText(QString(tr("Type path from model above with items at each level separated by a '%1'")).arg(sep)); + contentsLabel->setText(tr("Type path from model above with items at each level separated by a '%1'").arg(sep)); } diff -r ef0373b55136 -r 758a864f9613 examples/touch/dials/dials.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/dials/dials.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,8 @@ +SOURCES += main.cpp +FORMS += dials.ui + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/touch/dials +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dials.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/touch/dials +INSTALLS += target sources diff -r ef0373b55136 -r 758a864f9613 examples/touch/dials/dials.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/dials/dials.ui Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,77 @@ + + + Dials + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + true + + + + + + + true + + + + + + + true + + + + + + + true + + + + + + + true + + + + + + + true + + + + + + + true + + + + + + + true + + + + + + + + diff -r ef0373b55136 -r 758a864f9613 examples/touch/dials/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/dials/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +#include "ui_dials.h" + +int main(int argc, char **argv) +{ + QApplication app(argc, argv); + QWidget window; + Ui::Dials dialsUi; + dialsUi.setupUi(&window); + QList sliders = window.findChildren(); + foreach (QAbstractSlider *slider, sliders) + slider->setAttribute(Qt::WA_AcceptTouchEvents); + window.showMaximized(); + return app.exec(); +} diff -r ef0373b55136 -r 758a864f9613 examples/touch/fingerpaint/fingerpaint.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/fingerpaint/fingerpaint.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,11 @@ +HEADERS = mainwindow.h \ + scribblearea.h +SOURCES = main.cpp \ + mainwindow.cpp \ + scribblearea.cpp + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fingerpaint.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint +INSTALLS += target sources diff -r ef0373b55136 -r 758a864f9613 examples/touch/fingerpaint/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/fingerpaint/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include "mainwindow.h" + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + MainWindow window; + window.showMaximized(); + return app.exec(); +} diff -r ef0373b55136 -r 758a864f9613 examples/touch/fingerpaint/mainwindow.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/fingerpaint/mainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,217 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include "mainwindow.h" +#include "scribblearea.h" + +//! [0] +MainWindow::MainWindow() +{ + scribbleArea = new ScribbleArea; + setCentralWidget(scribbleArea); + + createActions(); + createMenus(); + + setWindowTitle(tr("Finger Paint")); + resize(500, 500); +} +//! [0] + +//! [1] +void MainWindow::closeEvent(QCloseEvent *event) +//! [1] //! [2] +{ + if (maybeSave()) { + event->accept(); + } else { + event->ignore(); + } +} +//! [2] + +//! [3] +void MainWindow::open() +//! [3] //! [4] +{ + if (maybeSave()) { + QString fileName = QFileDialog::getOpenFileName(this, + tr("Open File"), QDir::currentPath()); + if (!fileName.isEmpty()) + scribbleArea->openImage(fileName); + } +} +//! [4] + +//! [5] +void MainWindow::save() +//! [5] //! [6] +{ + QAction *action = qobject_cast(sender()); + QByteArray fileFormat = action->data().toByteArray(); + saveFile(fileFormat); +} +//! [6] + +//! [11] +void MainWindow::about() +//! [11] //! [12] +{ + QMessageBox::about(this, tr("About Scribble"), + tr("

The Scribble example shows how to use QMainWindow as the " + "base widget for an application, and how to reimplement some of " + "QWidget's event handlers to receive the events generated for " + "the application's widgets:

We reimplement the mouse event " + "handlers to facilitate drawing, the paint event handler to " + "update the application and the resize event handler to optimize " + "the application's appearance. In addition we reimplement the " + "close event handler to intercept the close events before " + "terminating the application.

The example also demonstrates " + "how to use QPainter to draw an image in real time, as well as " + "to repaint widgets.

")); +} +//! [12] + +//! [13] +void MainWindow::createActions() +//! [13] //! [14] +{ + openAct = new QAction(tr("&Open..."), this); + openAct->setShortcut(tr("Ctrl+O")); + connect(openAct, SIGNAL(triggered()), this, SLOT(open())); + + foreach (QByteArray format, QImageWriter::supportedImageFormats()) { + QString text = tr("%1...").arg(QString(format).toUpper()); + + QAction *action = new QAction(text, this); + action->setData(format); + connect(action, SIGNAL(triggered()), this, SLOT(save())); + saveAsActs.append(action); + } + + printAct = new QAction(tr("&Print..."), this); + connect(printAct, SIGNAL(triggered()), scribbleArea, SLOT(print())); + + exitAct = new QAction(tr("E&xit"), this); + exitAct->setShortcut(tr("Ctrl+Q")); + connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); + + clearScreenAct = new QAction(tr("&Clear Screen"), this); + clearScreenAct->setShortcut(tr("Ctrl+L")); + connect(clearScreenAct, SIGNAL(triggered()), + scribbleArea, SLOT(clearImage())); + + aboutAct = new QAction(tr("&About"), this); + connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); + + aboutQtAct = new QAction(tr("About &Qt"), this); + connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt())); +} +//! [14] + +//! [15] +void MainWindow::createMenus() +//! [15] //! [16] +{ + saveAsMenu = new QMenu(tr("&Save As"), this); + foreach (QAction *action, saveAsActs) + saveAsMenu->addAction(action); + + fileMenu = new QMenu(tr("&File"), this); + fileMenu->addAction(openAct); + fileMenu->addMenu(saveAsMenu); + fileMenu->addAction(printAct); + fileMenu->addSeparator(); + fileMenu->addAction(exitAct); + + optionMenu = new QMenu(tr("&Options"), this); + optionMenu->addAction(clearScreenAct); + + helpMenu = new QMenu(tr("&Help"), this); + helpMenu->addAction(aboutAct); + helpMenu->addAction(aboutQtAct); + + menuBar()->addMenu(fileMenu); + menuBar()->addMenu(optionMenu); + menuBar()->addMenu(helpMenu); +} +//! [16] + +//! [17] +bool MainWindow::maybeSave() +//! [17] //! [18] +{ + if (scribbleArea->isModified()) { + QMessageBox::StandardButton ret; + ret = QMessageBox::warning(this, tr("Scribble"), + tr("The image has been modified.\n" + "Do you want to save your changes?"), + QMessageBox::Save | QMessageBox::Discard + | QMessageBox::Cancel); + if (ret == QMessageBox::Save) { + return saveFile("png"); + } else if (ret == QMessageBox::Cancel) { + return false; + } + } + return true; +} +//! [18] + +//! [19] +bool MainWindow::saveFile(const QByteArray &fileFormat) +//! [19] //! [20] +{ + QString initialPath = QDir::currentPath() + "/untitled." + fileFormat; + + QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), + initialPath, + tr("%1 Files (*.%2);;All Files (*)") + .arg(QString(fileFormat.toUpper())) + .arg(QString(fileFormat))); + if (fileName.isEmpty()) { + return false; + } else { + return scribbleArea->saveImage(fileName, fileFormat); + } +} +//! [20] diff -r ef0373b55136 -r 758a864f9613 examples/touch/fingerpaint/mainwindow.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/fingerpaint/mainwindow.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include +#include + +class ScribbleArea; + +//! [0] +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + MainWindow(); + +protected: + void closeEvent(QCloseEvent *event); + +private slots: + void open(); + void save(); + void about(); + +private: + void createActions(); + void createMenus(); + bool maybeSave(); + bool saveFile(const QByteArray &fileFormat); + + ScribbleArea *scribbleArea; + + QMenu *saveAsMenu; + QMenu *fileMenu; + QMenu *optionMenu; + QMenu *helpMenu; + + QAction *openAct; + QList saveAsActs; + QAction *exitAct; + QAction *printAct; + QAction *clearScreenAct; + QAction *aboutAct; + QAction *aboutQtAct; +}; +//! [0] + +#endif diff -r ef0373b55136 -r 758a864f9613 examples/touch/fingerpaint/scribblearea.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/fingerpaint/scribblearea.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,211 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include "scribblearea.h" + +//! [0] +ScribbleArea::ScribbleArea(QWidget *parent) + : QWidget(parent) +{ + setAttribute(Qt::WA_AcceptTouchEvents); + setAttribute(Qt::WA_StaticContents); + modified = false; + + myPenColors + << QColor("green") + << QColor("purple") + << QColor("red") + << QColor("blue") + << QColor("yellow") + + << QColor("pink") + << QColor("orange") + << QColor("brown") + << QColor("grey") + << QColor("black"); +} +//! [0] + +//! [1] +bool ScribbleArea::openImage(const QString &fileName) +//! [1] //! [2] +{ + QImage loadedImage; + if (!loadedImage.load(fileName)) + return false; + + QSize newSize = loadedImage.size().expandedTo(size()); + resizeImage(&loadedImage, newSize); + image = loadedImage; + modified = false; + update(); + return true; +} +//! [2] + +//! [3] +bool ScribbleArea::saveImage(const QString &fileName, const char *fileFormat) +//! [3] //! [4] +{ + QImage visibleImage = image; + resizeImage(&visibleImage, size()); + + if (visibleImage.save(fileName, fileFormat)) { + modified = false; + return true; + } else { + return false; + } +} +//! [4] + +//! [9] +void ScribbleArea::clearImage() +//! [9] //! [10] +{ + image.fill(qRgb(255, 255, 255)); + modified = true; + update(); +} +//! [10] + +//! [12] //! [13] +void ScribbleArea::paintEvent(QPaintEvent *event) +//! [13] //! [14] +{ + QPainter painter(this); + const QRect rect = event->rect(); + painter.drawImage(rect.topLeft(), image, rect); +} +//! [14] + +//! [15] +void ScribbleArea::resizeEvent(QResizeEvent *event) +//! [15] //! [16] +{ + if (width() > image.width() || height() > image.height()) { + int newWidth = qMax(width() + 128, image.width()); + int newHeight = qMax(height() + 128, image.height()); + resizeImage(&image, QSize(newWidth, newHeight)); + update(); + } + QWidget::resizeEvent(event); +} +//! [16] + +//! [19] +void ScribbleArea::resizeImage(QImage *image, const QSize &newSize) +//! [19] //! [20] +{ + if (image->size() == newSize) + return; + + QImage newImage(newSize, QImage::Format_RGB32); + newImage.fill(qRgb(255, 255, 255)); + QPainter painter(&newImage); + painter.drawImage(QPoint(0, 0), *image); + *image = newImage; +} +//! [20] + +//! [21] +void ScribbleArea::print() +{ +#ifndef QT_NO_PRINTER + QPrinter printer(QPrinter::HighResolution); + + QPrintDialog *printDialog = new QPrintDialog(&printer, this); +//! [21] //! [22] + if (printDialog->exec() == QDialog::Accepted) { + QPainter painter(&printer); + QRect rect = painter.viewport(); + QSize size = image.size(); + size.scale(rect.size(), Qt::KeepAspectRatio); + painter.setViewport(rect.x(), rect.y(), size.width(), size.height()); + painter.setWindow(image.rect()); + painter.drawImage(0, 0, image); + } +#endif // QT_NO_PRINTER +} +//! [22] + +bool ScribbleArea::event(QEvent *event) +{ + switch (event->type()) { + case QEvent::TouchBegin: + case QEvent::TouchUpdate: + case QEvent::TouchEnd: + { + QList touchPoints = static_cast(event)->touchPoints(); + foreach (const QTouchEvent::TouchPoint &touchPoint, touchPoints) { + switch (touchPoint.state()) { + case Qt::TouchPointStationary: + // don't do anything if this touch point hasn't moved + continue; + default: + { + QRectF rect = touchPoint.rect(); + if (rect.isEmpty()) { + qreal diameter = qreal(50) * touchPoint.pressure(); + rect.setSize(QSizeF(diameter, diameter)); + } + + QPainter painter(&image); + painter.setPen(Qt::NoPen); + painter.setBrush(myPenColors.at(touchPoint.id() % myPenColors.count())); + painter.drawEllipse(rect); + painter.end(); + + modified = true; + int rad = 2; + update(rect.toRect().adjusted(-rad,-rad, +rad, +rad)); + } + break; + } + } + break; + } + default: + return QWidget::event(event); + } + return true; +} diff -r ef0373b55136 -r 758a864f9613 examples/touch/fingerpaint/scribblearea.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/fingerpaint/scribblearea.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef SCRIBBLEAREA_H +#define SCRIBBLEAREA_H + +#include +#include +#include +#include + +//! [0] +class ScribbleArea : public QWidget +{ + Q_OBJECT + +public: + ScribbleArea(QWidget *parent = 0); + + bool openImage(const QString &fileName); + bool saveImage(const QString &fileName, const char *fileFormat); + + bool isModified() const { return modified; } + +public slots: + void clearImage(); + void print(); + +protected: + void paintEvent(QPaintEvent *event); + void resizeEvent(QResizeEvent *event); + bool event(QEvent *event); + +private: + void resizeImage(QImage *image, const QSize &newSize); + + bool modified; + QList myPenColors; + QImage image; +}; +//! [0] + +#endif diff -r ef0373b55136 -r 758a864f9613 examples/touch/knobs/knob.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/knobs/knob.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "knob.h" + +#include +#include + +Knob::Knob() + : QGraphicsEllipseItem(-50, -50, 100, 100) +{ + setAcceptTouchEvents(true); + setBrush(Qt::lightGray); + + QGraphicsEllipseItem *leftItem = new QGraphicsEllipseItem(0, 0, 20, 20, this); + leftItem->setPos(-40, -10); + leftItem->setBrush(Qt::darkGreen); + + QGraphicsEllipseItem *rightItem = new QGraphicsEllipseItem(0, 0, 20, 20, this); + rightItem->setPos(20, -10); + rightItem->setBrush(Qt::darkRed); +} + +bool Knob::sceneEvent(QEvent *event) +{ + switch (event->type()) { + case QEvent::TouchBegin: + case QEvent::TouchUpdate: + case QEvent::TouchEnd: + { + QTouchEvent *touchEvent = static_cast(event); + + if (touchEvent->touchPoints().count() == 2) { + const QTouchEvent::TouchPoint &touchPoint1 = touchEvent->touchPoints().first(); + const QTouchEvent::TouchPoint &touchPoint2 = touchEvent->touchPoints().last(); + + QLineF line1(touchPoint1.lastScenePos(), touchPoint2.lastScenePos()); + QLineF line2(touchPoint1.scenePos(), touchPoint2.scenePos()); + + rotate(line2.angleTo(line1)); + } + + break; + } + + default: + return QGraphicsItem::sceneEvent(event); + } + + return true; +} diff -r ef0373b55136 -r 758a864f9613 examples/touch/knobs/knob.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/knobs/knob.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef KNOB_H +#define KNOB_H + +#include + +class Knob : public QGraphicsEllipseItem +{ +public: + Knob(); + + bool sceneEvent(QEvent *event); +}; + +#endif // KNOB_H diff -r ef0373b55136 -r 758a864f9613 examples/touch/knobs/knobs.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/knobs/knobs.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,8 @@ +HEADERS = knob.h +SOURCES = main.cpp knob.cpp + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS knobs.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs +INSTALLS += target sources diff -r ef0373b55136 -r 758a864f9613 examples/touch/knobs/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/knobs/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +#include "knob.h" + +int main(int argc, char **argv) +{ + QApplication app(argc, argv); + + QGraphicsScene scene; + QGraphicsView view(&scene); + + Knob *knob1 = new Knob; + knob1->setPos(-110, 0); + Knob *knob2 = new Knob; + + scene.addItem(knob1); + scene.addItem(knob2); + + view.showMaximized(); + view.fitInView(scene.sceneRect().adjusted(-20, -20, 20, 20), Qt::KeepAspectRatio); + + return app.exec(); +} diff -r ef0373b55136 -r 758a864f9613 examples/touch/pinchzoom/graphicsview.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/pinchzoom/graphicsview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "graphicsview.h" + +#include +#include + +GraphicsView::GraphicsView(QGraphicsScene *scene, QWidget *parent) + : QGraphicsView(scene, parent), totalScaleFactor(1) +{ + viewport()->setAttribute(Qt::WA_AcceptTouchEvents); + setDragMode(ScrollHandDrag); +} + +bool GraphicsView::viewportEvent(QEvent *event) +{ + switch (event->type()) { + case QEvent::TouchBegin: + case QEvent::TouchUpdate: + case QEvent::TouchEnd: + { + QTouchEvent *touchEvent = static_cast(event); + QList touchPoints = touchEvent->touchPoints(); + if (touchPoints.count() == 2) { + // determine scale factor + const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first(); + const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last(); + qreal currentScaleFactor = + QLineF(touchPoint0.pos(), touchPoint1.pos()).length() + / QLineF(touchPoint0.startPos(), touchPoint1.startPos()).length(); + if (touchEvent->touchPointStates() & Qt::TouchPointReleased) { + // if one of the fingers is released, remember the current scale + // factor so that adding another finger later will continue zooming + // by adding new scale factor to the existing remembered value. + totalScaleFactor *= currentScaleFactor; + currentScaleFactor = 1; + } + setTransform(QTransform().scale(totalScaleFactor * currentScaleFactor, + totalScaleFactor * currentScaleFactor)); + } + return true; + } + default: + break; + } + return QGraphicsView::viewportEvent(event); +} diff -r ef0373b55136 -r 758a864f9613 examples/touch/pinchzoom/graphicsview.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/pinchzoom/graphicsview.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#pragma once +#include + +class GraphicsView : public QGraphicsView +{ + Q_OBJECT + +public: + GraphicsView(QGraphicsScene *scene = 0, QWidget *parent = 0); + + bool viewportEvent(QEvent *event); + +private: + qreal totalScaleFactor; +}; diff -r ef0373b55136 -r 758a864f9613 examples/touch/pinchzoom/images/cheese.jpg Binary file examples/touch/pinchzoom/images/cheese.jpg has changed diff -r ef0373b55136 -r 758a864f9613 examples/touch/pinchzoom/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/pinchzoom/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "graphicsview.h" +#include "mouse.h" + +#include + +#include + +static const int MouseCount = 7; + +//! [0] +int main(int argc, char **argv) +{ + QApplication app(argc, argv); + qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); +//! [0] + +//! [1] + QGraphicsScene scene; + scene.setSceneRect(-300, -300, 600, 600); +//! [1] //! [2] + scene.setItemIndexMethod(QGraphicsScene::NoIndex); +//! [2] + +//! [3] + for (int i = 0; i < MouseCount; ++i) { + Mouse *mouse = new Mouse; + mouse->setPos(::sin((i * 6.28) / MouseCount) * 200, + ::cos((i * 6.28) / MouseCount) * 200); + scene.addItem(mouse); + } +//! [3] + +//! [4] + GraphicsView view(&scene); + view.setRenderHint(QPainter::Antialiasing); + view.setBackgroundBrush(QPixmap(":/images/cheese.jpg")); +//! [4] //! [5] + view.setCacheMode(QGraphicsView::CacheBackground); + view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate); +//! [5] //! [6] + view.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Colliding Mice")); + view.showMaximized(); + + return app.exec(); +} +//! [6] diff -r ef0373b55136 -r 758a864f9613 examples/touch/pinchzoom/mice.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/pinchzoom/mice.qrc Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,5 @@ + + + images/cheese.jpg + + diff -r ef0373b55136 -r 758a864f9613 examples/touch/pinchzoom/mouse.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/pinchzoom/mouse.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,199 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "mouse.h" + +#include +#include +#include + +#include + +static const double Pi = 3.14159265358979323846264338327950288419717; +static double TwoPi = 2.0 * Pi; + +static qreal normalizeAngle(qreal angle) +{ + while (angle < 0) + angle += TwoPi; + while (angle > TwoPi) + angle -= TwoPi; + return angle; +} + +//! [0] +Mouse::Mouse() + : angle(0), speed(0), mouseEyeDirection(0), + color(qrand() % 256, qrand() % 256, qrand() % 256) +{ + rotate(qrand() % (360 * 16)); + startTimer(1000 / 33); +} +//! [0] + +//! [1] +QRectF Mouse::boundingRect() const +{ + qreal adjust = 0.5; + return QRectF(-18 - adjust, -22 - adjust, + 36 + adjust, 60 + adjust); +} +//! [1] + +//! [2] +QPainterPath Mouse::shape() const +{ + QPainterPath path; + path.addRect(-10, -20, 20, 40); + return path; +} +//! [2] + +//! [3] +void Mouse::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) +{ + // Body + painter->setBrush(color); + painter->drawEllipse(-10, -20, 20, 40); + + // Eyes + painter->setBrush(Qt::white); + painter->drawEllipse(-10, -17, 8, 8); + painter->drawEllipse(2, -17, 8, 8); + + // Nose + painter->setBrush(Qt::black); + painter->drawEllipse(QRectF(-2, -22, 4, 4)); + + // Pupils + painter->drawEllipse(QRectF(-8.0 + mouseEyeDirection, -17, 4, 4)); + painter->drawEllipse(QRectF(4.0 + mouseEyeDirection, -17, 4, 4)); + + // Ears + painter->setBrush(scene()->collidingItems(this).isEmpty() ? Qt::darkYellow : Qt::red); + painter->drawEllipse(-17, -12, 16, 16); + painter->drawEllipse(1, -12, 16, 16); + + // Tail + QPainterPath path(QPointF(0, 20)); + path.cubicTo(-5, 22, -5, 22, 0, 25); + path.cubicTo(5, 27, 5, 32, 0, 30); + path.cubicTo(-5, 32, -5, 42, 0, 35); + painter->setBrush(Qt::NoBrush); + painter->drawPath(path); +} +//! [3] + +//! [4] +void Mouse::timerEvent(QTimerEvent *) +{ +//! [4] + // Don't move too far away +//! [5] + QLineF lineToCenter(QPointF(0, 0), mapFromScene(0, 0)); + if (lineToCenter.length() > 150) { + qreal angleToCenter = ::acos(lineToCenter.dx() / lineToCenter.length()); + if (lineToCenter.dy() < 0) + angleToCenter = TwoPi - angleToCenter; + angleToCenter = normalizeAngle((Pi - angleToCenter) + Pi / 2); + + if (angleToCenter < Pi && angleToCenter > Pi / 4) { + // Rotate left + angle += (angle < -Pi / 2) ? 0.25 : -0.25; + } else if (angleToCenter >= Pi && angleToCenter < (Pi + Pi / 2 + Pi / 4)) { + // Rotate right + angle += (angle < Pi / 2) ? 0.25 : -0.25; + } + } else if (::sin(angle) < 0) { + angle += 0.25; + } else if (::sin(angle) > 0) { + angle -= 0.25; +//! [5] //! [6] + } +//! [6] + + // Try not to crash with any other mice +//! [7] + QList dangerMice = scene()->items(QPolygonF() + << mapToScene(0, 0) + << mapToScene(-30, -50) + << mapToScene(30, -50)); + foreach (QGraphicsItem *item, dangerMice) { + if (item == this) + continue; + + QLineF lineToMouse(QPointF(0, 0), mapFromItem(item, 0, 0)); + qreal angleToMouse = ::acos(lineToMouse.dx() / lineToMouse.length()); + if (lineToMouse.dy() < 0) + angleToMouse = TwoPi - angleToMouse; + angleToMouse = normalizeAngle((Pi - angleToMouse) + Pi / 2); + + if (angleToMouse >= 0 && angleToMouse < Pi / 2) { + // Rotate right + angle += 0.5; + } else if (angleToMouse <= TwoPi && angleToMouse > (TwoPi - Pi / 2)) { + // Rotate left + angle -= 0.5; +//! [7] //! [8] + } +//! [8] //! [9] + } +//! [9] + + // Add some random movement +//! [10] + if (dangerMice.size() > 1 && (qrand() % 10) == 0) { + if (qrand() % 1) + angle += (qrand() % 100) / 500.0; + else + angle -= (qrand() % 100) / 500.0; + } +//! [10] + +//! [11] + speed += (-50 + qrand() % 100) / 100.0; + + qreal dx = ::sin(angle) * 10; + mouseEyeDirection = (qAbs(dx / 5) < 1) ? 0 : dx / 5; + + rotate(dx); + setPos(mapToParent(0, -(3 + sin(speed) * 3))); +} +//! [11] diff -r ef0373b55136 -r 758a864f9613 examples/touch/pinchzoom/mouse.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/pinchzoom/mouse.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MOUSE_H +#define MOUSE_H + +#include + +//! [0] +class Mouse : public QGraphicsObject +{ + Q_OBJECT + +public: + Mouse(); + + QRectF boundingRect() const; + QPainterPath shape() const; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget); + +protected: + void timerEvent(QTimerEvent *event); + +private: + qreal angle; + qreal speed; + qreal mouseEyeDirection; + QColor color; +}; +//! [0] + +#endif diff -r ef0373b55136 -r 758a864f9613 examples/touch/pinchzoom/pinchzoom.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/pinchzoom/pinchzoom.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,16 @@ +HEADERS += \ + mouse.h \ + graphicsview.h +SOURCES += \ + main.cpp \ + mouse.cpp \ + graphicsview.cpp + +RESOURCES += \ + mice.qrc + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pinchzoom.pro images +sources.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom +INSTALLS += target sources diff -r ef0373b55136 -r 758a864f9613 examples/touch/touch.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/touch/touch.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = pinchzoom fingerpaint knobs dials diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook-fr/part2/addressbook.cpp --- a/examples/tutorials/addressbook-fr/part2/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook-fr/part2/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -111,7 +111,7 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if ( name.isEmpty()|| address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); return; diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook-fr/part3/addressbook.cpp --- a/examples/tutorials/addressbook-fr/part3/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook-fr/part3/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -122,9 +122,10 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if (name.isEmpty() || address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); + return; } if (!contacts.contains(name)) { diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook-fr/part4/addressbook.cpp --- a/examples/tutorials/addressbook-fr/part4/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook-fr/part4/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -131,9 +131,10 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if (name.isEmpty() || address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); + return; } //! [submitContact() function part1] if (currentMode == AddingMode) { diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook-fr/part5/addressbook.cpp --- a/examples/tutorials/addressbook-fr/part5/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook-fr/part5/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -138,10 +138,11 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if (name.isEmpty() || address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); - } + return; + } if (currentMode == AddingMode) { diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook-fr/part6/addressbook.cpp --- a/examples/tutorials/addressbook-fr/part6/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook-fr/part6/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -144,9 +144,10 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if (name.isEmpty() || address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); + return; } if (currentMode == AddingMode) { diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook-fr/part7/addressbook.cpp --- a/examples/tutorials/addressbook-fr/part7/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook-fr/part7/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -146,9 +146,10 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if (name.isEmpty() || address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); + return; } if (currentMode == AddingMode) { diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook/part2/addressbook.cpp --- a/examples/tutorials/addressbook/part2/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook/part2/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -111,7 +111,7 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if (name.isEmpty() || address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); return; diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook/part3/addressbook.cpp --- a/examples/tutorials/addressbook/part3/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook/part3/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -122,7 +122,7 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if (name.isEmpty() || address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); return; diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook/part4/addressbook.cpp --- a/examples/tutorials/addressbook/part4/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook/part4/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -131,7 +131,7 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if (name.isEmpty() || address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); return; diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook/part5/addressbook.cpp --- a/examples/tutorials/addressbook/part5/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook/part5/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -138,7 +138,7 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if (name.isEmpty() || address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); return; diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook/part6/addressbook.cpp --- a/examples/tutorials/addressbook/part6/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook/part6/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -144,7 +144,7 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if (name.isEmpty() || address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); return; diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/addressbook/part7/addressbook.cpp --- a/examples/tutorials/addressbook/part7/addressbook.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/addressbook/part7/addressbook.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -146,7 +146,7 @@ QString name = nameLine->text(); QString address = addressText->toPlainText(); - if (name == "" || address == "") { + if (name.isEmpty() || address.isEmpty()) { QMessageBox::information(this, tr("Empty Field"), tr("Please enter a name and address.")); return; diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/core/button.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/core/button.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +import Qt 4.7 + +Rectangle { + //identifier of the item + id: button + + //these properties act as constants, useable outside this QML file + property int buttonHeight: 75 + property int buttonWidth: 150 + + //attaches to the Text element's text content + property string label + property color textColor: buttonLabel.color + + //the color highlight when the mouse hovers on the rectangle + property color onHoverColor: "lightsteelblue" + property color borderColor: "transparent" + + //buttonColor is set to the button's main color + property color buttonColor: "lightblue" + + property real labelSize: 14 + + //set appearance properties + radius: 6 + smooth: true + border { width: 2; color: borderColor } + width: buttonWidth; height: buttonHeight + + Text { + id: buttonLabel + anchors.centerIn: parent + text: label //bind the text to the parent's text + color: "#DCDCCC" + font.pointSize: labelSize + } + + //buttonClick() is callable and a signal handler, onButtonClick is automatically created + signal buttonClick() + + //define the clickable area to be the whole rectangle + MouseArea { + id: buttonMouseArea + anchors.fill: parent //stretch the area to the parent's dimension + onClicked: buttonClick() + + //if true, then onEntered and onExited called if mouse hovers in the mouse area + //if false, a button must be clicked to detect the mouse hover + hoverEnabled: true + + //display a border if the mouse hovers on the button mouse area + onEntered: parent.border.color = onHoverColor + //remove the border if the mouse exits the button mouse area + onExited: parent.border.color = borderColor + } + + //change the color of the button when pressed + color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor + //animate the color whenever the color property changes + Behavior on color { ColorAnimation{ duration: 55 } } + + //scale the button when pressed + scale: buttonMouseArea.pressed ? 1.1 : 1.00 + //Animate the scale property change + Behavior on scale { NumberAnimation{ duration: 55 } } + +} \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/core/editMenu.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +import Qt 4.7 + +Rectangle { + id: editMenu + height: 480; width:1000 + color: "powderblue" + property color buttonBorderColor: "#7A8182" + property color buttonFillColor: "#61BDCACD" + property string menuName:"Edit" + gradient: Gradient { + GradientStop { position: 0.0; color: "#6A7570" } + GradientStop { position: 1.0; color: Qt.darker("#6A7570") } + } + + Rectangle { + id:actionContainer + color:"transparent" + anchors.centerIn: parent + width: parent.width; height: parent.height / 5 + Row { + anchors.centerIn: parent + spacing: parent.width/9 + Button { + id: loadButton + buttonColor: buttonFillColor + label: "Copy" + labelSize: 16 + borderColor: buttonBorderColor + height: actionContainer.height; width: actionContainer.width/6 + onButtonClick: textArea.copy() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: saveButton + height: actionContainer.height; width: actionContainer.width/6 + buttonColor: buttonFillColor + label: "Paste" + borderColor: buttonBorderColor + labelSize: 16 + onButtonClick: textArea.paste() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: exitButton + label: "Select All" + height: actionContainer.height; width: actionContainer.width/6 + labelSize: 16 + buttonColor: buttonFillColor + borderColor:buttonBorderColor + onButtonClick: textArea.selectAll() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + } + } +} \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,163 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id:dialog + height: 200 * partition; width: 200 + color: "transparent" + + signal selectChanged() + signal notifyRefresh() + onNotifyRefresh:dirView.model = directory.files + + property string selectedFile + property int selectedIndex: 0 + + Rectangle { + id: dirBox + radius: 10 + anchors.centerIn:parent + height: parent.height -15; width: parent.width -30 + + Rectangle { + id:header + height: parent.height*0.1; width: parent.width + radius:3 + z:1 + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.98;color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#0e1B20" } + } + Text { + height: header.height; anchors.centerIn: header + text: "files:" + color: "lightblue" + font.weight: Font.Light + font.italic: true + } + } + GridView { + id:dirView + width:parent.width; height:parent.height*.9 + anchors.top: header.bottom + cellWidth: 100; cellHeight: 75 + model: directory.files + delegate: dirDelegate + clip: true + highlightMoveDuration: 40 + } + Component { + id: dirDelegate + Rectangle { + id:file + color: "transparent" + width: GridView.view.cellWidth; height: GridView.view.cellHeight + + Text { + id:fileName + width: parent.width + anchors.centerIn: parent + text: name + color: "#BDCACD" + font.weight: GridView.view.currentIndex == index ? Font.DemiBold : Font.Normal + font.pointSize: GridView.view.currentIndex == index ? 12 : 10 + elide: Text.ElideMiddle + horizontalAlignment: Text.AlignHCenter + } + Rectangle { + id: selection + width: parent.width; height: parent.height + anchors.centerIn: parent + radius: 10 + smooth: true + scale: GridView.view.currentIndex == index ? 1 : 0.5 + opacity: GridView.view.currentIndex == index ? 1 : 0 + Text { + id: overlay + width: parent.width + anchors.centerIn: parent + text: name + color: "#696167" + font.weight: Font.DemiBold + font.pointSize: 12 + smooth: true + elide: Text.ElideMiddle + horizontalAlignment: Text.AlignHCenter + } + Behavior on opacity { NumberAnimation{ duration: 45 } } + Behavior on scale { NumberAnimation{ duration: 45 } } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter("lightsteelblue",1.25) } + GradientStop { position: 0.67; color: Qt.darker("lightsteelblue",1.3) } + } + border.color: "lightsteelblue" + border.width: 1 + } + MouseArea { + id:fileMouseArea + anchors.fill:parent + hoverEnabled: true + + onClicked: { + GridView.view.currentIndex = index + selectedFile = directory.files[index].name + selectChanged() + } + onEntered: { + fileName.color = "lightsteelblue" + fileName.font.weight = Font.DemiBold + } + onExited: { + fileName.font.weight = Font.Normal + fileName.color = "#BDCACD" + } + } + } + } + gradient: Gradient { + GradientStop { position: 0.0; color: "#A5333333" } + GradientStop { position: 1.0; color: "#03333333" } + } + } +} \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,232 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id: fileMenu + height: 480; width:1000 + property color buttonBorderColor: "#7F8487" + property color buttonFillColor: "#8FBDCACD" + property string fileContent:directory.fileContent + + //the menuName is accessible from outside this QML file + property string menuName: "File" + + //used to divide the screen into parts. + property real partition: 1/3 + + color: "#6C646A" + gradient: Gradient { + GradientStop { position: 0.0; color: "#6C646A" } + GradientStop { position: 1.0; color: Qt.darker("#6A6D6A") } + } + + Directory { + id:directory + filename: textInput.text + onDirectoryChanged:fileDialog.notifyRefresh() + } + + Rectangle { + id:actionContainer + + //make this rectangle invisible + color:"transparent" + anchors.left: parent.left + + //the height is a good proportion that creates more space at the top of + //the column of buttons + width: fileMenu.width * partition; height: fileMenu.height + + Column { + anchors.centerIn: parent + spacing: parent.height/32 + Button { + id: saveButton + label: "Save" + borderColor: buttonBorderColor + buttonColor: buttonFillColor + width: actionContainer.width/ 1.3 + height:actionContainer.height / 8 + labelSize:24 + onButtonClick: { + directory.fileContent = textArea.textContent + directory.filename = textInput.text + directory.saveFile() + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: loadButton + width: actionContainer.width/ 1.3 + height:actionContainer.height/ 8 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + label: "Load" + labelSize:24 + onButtonClick:{ + directory.filename = textInput.text + directory.loadFile() + textArea.textContent = directory.fileContent + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + Button { + id: newButton + width: actionContainer.width/ 1.3 + height: actionContainer.height/ 8 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + label: "New" + labelSize: 24 + onButtonClick:{ + textArea.textContent = "" + textInput.text = "" + } + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + + } + Rectangle { + id: space + width: actionContainer.width/ 1.3 + height: actionContainer.height / 16 + color: "transparent" + } + Button { + id: exitButton + width: actionContainer.width/ 1.3 + height: actionContainer.height/ 8 + label: "Exit" + labelSize: 24 + buttonColor: buttonFillColor + borderColor: buttonBorderColor + onButtonClick: Qt.quit() + gradient: Gradient { + GradientStop { position: 0.0; color: Qt.lighter(buttonFillColor,1.25) } + GradientStop { position: 0.67; color: Qt.darker(buttonFillColor,1.3) } + } + } + } + } + Rectangle { + id:dialogContainer + + width: 2*fileMenu.width * partition; height: fileMenu.height + anchors.right:parent.right + color: "transparent" + + Column { + anchors.centerIn: parent + spacing: parent.height /640 + FileDialog { + id:fileDialog + height: 2*dialogContainer.height * partition + width: dialogContainer.width + onSelectChanged: textInput.text = selectedFile + } + + Rectangle { + id:lowerPartition + height: dialogContainer.height * partition; width: dialogContainer.width + color: "transparent" + + Rectangle { + id: nameField + gradient: Gradient { + GradientStop { position: 0.0; color: "#806F6F6F" } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + radius: 10 + anchors { centerIn:parent; leftMargin: 15; rightMargin: 15; topMargin: 15 } + height: parent.height-15 + width: parent.width -20 + border { color: "#4A4A4A"; width:1 } + + TextInput { + id: textInput + z:2 + anchors { bottom: parent.bottom; topMargin: 10; horizontalCenter: parent.horizontalCenter } + width: parent.width - 10 + height: parent.height -10 + font.pointSize: 40 + color: "lightsteelblue" + focus: true + } + Text { + id: textInstruction + anchors.centerIn: parent + text: "Select file name and press save or load" + font {pointSize: 11; weight: Font.Light; italic: true} + color: "lightblue" + z: 2 + opacity: (textInput.text == "") ? 1 : 0 + } + Text { + id:fieldLabel + anchors { top: parent.top; left: parent.left } + text: " file name: " + font { pointSize: 11; weight: Font.Light; italic: true } + color: "lightblue" + z:2 + } + MouseArea { + anchors.centerIn:parent + width: nameField.width; height: nameField.height + onClicked: { + textInput.text = "" + textInput.focus = true + textInput.forceFocus() + } + } + } + } + } + } +} diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/core/menuBar.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,147 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id: menuBar + width: 1000; height:300 + color:"transparent" + property color fileColor: "plum" + property color editColor: "powderblue" + + property real partition: 1/10 + + Column { + anchors.fill: parent + //container for the header and the buttons + z: 1 + Rectangle { + id: labelList + height:menuBar.height*partition + width: menuBar.width + color: "beige" + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.98;color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#0e1B20" } + } + Text { + height: parent.height + anchors { right: labelRow.left ; verticalCenter: parent.bottom } + text: "menu: " + color: "lightblue" + font { weight: Font.Light; italic: true } + smooth: true + } + //row displays its children in a vertical row + Row { + id: labelRow + anchors.centerIn: parent + spacing:40 + Button { + id: fileButton + height: 20; width: 50 + label: "File" + buttonColor : menuListView.currentIndex == 0? fileColor : Qt.darker(fileColor, 1.5) + scale: menuListView.currentIndex == 0? 1.25: 1 + labelSize: menuListView.currentIndex == 0? 16:12 + radius: 1 + smooth:true + //on a button click, change the list's currently selected item to FileMenu + onButtonClick: menuListView.currentIndex = 0 + gradient: Gradient { + GradientStop { position: 0.0; color: fileColor } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + } + Button { + id: editButton + height: 20; width: 50 + buttonColor : menuListView.currentIndex == 1? Qt.darker(editColor, 1.5) : Qt.darker(editColor, 1.9) + scale: menuListView.currentIndex == 1? 1.25: 1 + label: "Edit" + radius: 1 + labelSize: menuListView.currentIndex == 1? 16:12 + smooth:true + //on a button click, change the list's currently selected item to EditMenu + onButtonClick: menuListView.currentIndex = 1 + gradient: Gradient { + GradientStop { position: 0.0; color: editColor } + GradientStop { position: 1.0; color: "#136F6F6F" } + } + } + } + } + + //list view will display a model according to a delegate + ListView { + id: menuListView + width:menuBar.width; height: 9*menuBar.height*partition + + //the model contains the data + model: menuListModel + + //control the movement of the menu switching + snapMode: ListView.SnapOneItem + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + flickDeceleration: 5000 + highlightFollowsCurrentItem: true + highlightMoveDuration:240 + highlightRangeMode: ListView.StrictlyEnforceRange + } + } + //a list of visual items already have delegates handling their display + VisualItemModel { + id: menuListModel + + FileMenu { + id:fileMenu + width: menuListView.width; height: menuListView.height + color: fileColor + } + EditMenu { + color: editColor + width: menuListView.width; height: menuListView.height + } + } +} diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/core/qmldir --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/core/qmldir Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +Button ./button.qml +FileDialog ./fileDialog.qml +TextArea ./textArea.qml +TextEditor ./textEditor.qml +EditMenu ./editMenu.qml +MenuBar ./menuBar.qml +FileMenu ./fileMenu.qml + +plugin FileDialog ../plugins diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/core/textArea.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/core/textArea.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id:textArea + + function paste() { textEdit.paste() } + function copy() { textEdit.copy() } + function selectAll() { textEdit.selectAll() } + + width :400; height:400 + + property color fontColor: "white" + property alias textContent: textEdit.text + Flickable { + id: flickArea + width: parent.width; height: parent.height + anchors.fill:parent + + boundsBehavior: Flickable.StopAtBounds + flickableDirection: Flickable.HorizontalFlick + interactive: true + //Will move the text Edit area to make the area visible when + //scrolled with keyboard strokes + function ensureVisible(r) { + if (contentX >= r.x) + contentX = r.x; + else if (contentX+width <= r.x+r.width) + contentX = r.x+r.width-width; + if (contentY >= r.y) + contentY = r.y; + else if (contentY+height <= r.y+r.height) + contentY = r.y+r.height-height; + } + + TextEdit { + id: textEdit + anchors.fill:parent + width:parent.width; height:parent.height + color:fontColor + focus: true + wrapMode: TextEdit.Wrap + font.pointSize:10 + onCursorRectangleChanged: flickArea.ensureVisible(cursorRectangle) + selectByMouse: true + } + } +} \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,17 @@ +TEMPLATE = lib +CONFIG += qt plugin +QT += declarative + +DESTDIR += ../plugins +OBJECTS_DIR = tmp +MOC_DIR = tmp + +TARGET = FileDialog + +HEADERS += directory.h \ + file.h \ + dialogPlugin.h + +SOURCES += directory.cpp \ + file.cpp \ + dialogPlugin.cpp diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "dialogPlugin.h" +#include "directory.h" +#include "file.h" +#include + +void DialogPlugin::registerTypes(const char *uri) +{ + //register the class Directory into QML as a "Directory" element version 1.0 + qmlRegisterType(uri, 1, 0, "Directory"); + qmlRegisterType(uri,1,0,"File"); +} + +//FileDialog is the plugin name (same as the TARGET in the project file) and DialogPlugin is the plugin classs +Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin); \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIALOGPLUGIN_H +#define DIALOGPLUGIN_H + +#include + +class DialogPlugin : public QDeclarativeExtensionPlugin +{ + Q_OBJECT + + public: + //registerTypes is inherited from QDeclarativeExtensionPlugin + void registerTypes(const char *uri); + +}; + +#endif + diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,224 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "directory.h" +#include + +/* +Directory constructor + +Initialize the saves directory and creates the file list +*/ +Directory::Directory(QObject *parent) : QObject(parent) +{ + m_dir.cd( QDir::currentPath() ); + + //go to the saved directory. if not found, create save directory + m_saveDir = "saves"; + if ( m_dir.cd(m_saveDir) == 0 ) { + m_dir.mkdir(m_saveDir); + m_dir.cd(m_saveDir); + } + m_filterList << "*.txt"; + refresh(); +} + +/* +Directory::filesNumber +Return the number of Files +*/ +int Directory::filesCount() const +{ + return m_fileList.size(); +} + +/* +Function called to append data onto list property +*/ +void appendFiles(QDeclarativeListProperty * property, File * file) +{ + Q_UNUSED(property); + Q_UNUSED(file); + //Do nothing. can't add to a directory using this method +} + +/* +Function called to retrieve file in the list using an index +*/ +File* fileAt(QDeclarativeListProperty * property, int index) +{ + return static_cast< QList *>(property->data)->at(index); +} + +/* +Returns the number of files in the list +*/ +int filesSize(QDeclarativeListProperty * property) +{ + return static_cast< QList *>(property->data)->size(); +} + +/* +Function called to empty the list property contents +*/ +void clearFilesPtr(QDeclarativeListProperty *property) +{ + return static_cast< QList *>(property->data)->clear(); +} + +/* +Returns the list of files as a QDeclarativeListProperty. +*/ +QDeclarativeListProperty Directory::files() +{ + refresh(); + return QDeclarativeListProperty( this, &m_fileList, &appendFiles, &filesSize, &fileAt, &clearFilesPtr ); +} + +/* +Return the name of the currently selected file +*/ +QString Directory::filename() const +{ + return currentFile.name(); +} + +/* +Return the file's content as a string. +*/ +QString Directory::fileContent() const +{ + return m_fileContent; +} + +/* +Set the file name of the current file +*/ +void Directory::setFilename(const QString &str) +{ + if( str != currentFile.name() ) { + currentFile.setName(str); + emit filenameChanged(); + } +} + +/* +Set the content of the file as a string +*/ +void Directory::setFileContent(const QString &str) +{ + if(str != m_fileContent){ + m_fileContent = str; + emit fileContentChanged(); + } +} + +/* +Called from QML to save the file using the filename and file content. +Saving makes sure that the file has a .txt extension. +*/ +void Directory::saveFile() +{ + if(currentFile.name().size() == 0){ + qWarning()<< "Empty filename. no save"; + return; + } + QString extendedName = currentFile.name(); + if(!currentFile.name().endsWith(".txt")){ + extendedName.append(".txt"); + } + QFile file( m_dir.filePath(extendedName) ); + if ( file.open(QFile::WriteOnly | QFile::Truncate) ) { + QTextStream outStream(&file); + outStream << m_fileContent; + } + file.close(); + refresh(); + emit directoryChanged(); +} + +/* +Load the contents of a file. +Only loads files with a .txt extension +*/ +void Directory::loadFile() +{ + m_fileContent.clear(); + QString extendedName = currentFile.name(); + if( !currentFile.name().endsWith(".txt") ) { + extendedName.append(".txt"); + } + + QFile file( m_dir.filePath(extendedName) ); + if ( file.open(QFile::ReadOnly ) ) { + QTextStream inStream(&file); + + QString line; + do { + line = inStream.read(75); + m_fileContent.append(line); + } while ( !line.isNull() ) ; + } + file.close(); +} + +/* +Reloads the content of the files list. This is to ensure that the newly +created files are added onto the list. +*/ +void Directory::refresh() +{ + m_dirFiles = m_dir.entryList(m_filterList,QDir::Files,QDir::Name); + m_fileList.clear(); + + File * file; + for(int i = 0; i < m_dirFiles.size() ; i ++) { + file = new File(); + + if( m_dirFiles.at(i).endsWith(".txt") ) { + QString name = m_dirFiles.at(i); + file->setName( name.remove(".txt",Qt::CaseSensitive) ); + } + else { + file->setName(m_dirFiles.at(i)); + } + m_fileList.append(file); + } +} \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/filedialog/directory.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,107 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIRECTORY_H +#define DIRECTORY_H + +#include "file.h" + +#include +#include +#include +#include +#include + +class Directory : public QObject { + + Q_OBJECT + + //number of files in the directory + Q_PROPERTY(int filesCount READ filesCount) + + //list property containing file names as QString + Q_PROPERTY(QDeclarativeListProperty files READ files CONSTANT ) + + //file name of the text file to read/write + Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged) + + //text content of the file + Q_PROPERTY(QString fileContent READ fileContent WRITE setFileContent NOTIFY fileContentChanged) + + public: + Directory(QObject *parent = 0); + + //properties' read functions + int filesCount() const; + QString filename() const; + QString fileContent() const; + QDeclarativeListProperty files(); + + //properties' write functions + void setFilename(const QString &str); + void setFileContent(const QString &str); + + //accessible from QML + Q_INVOKABLE void saveFile(); + Q_INVOKABLE void loadFile(); + + signals: + void directoryChanged(); + void filenameChanged(); + void fileContentChanged(); + + private: + QDir m_dir; + QStringList m_dirFiles; + File currentFile; + QString m_saveDir; + QStringList m_filterList; + + //contains the file data in QString format + QString m_fileContent; + + //Registered to QML in a plugin. Accessible from QML as a property of Directory + QList m_fileList; + + //refresh content of the directory + void refresh(); +}; + +#endif diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include "file.h" + +File::File(QObject *parent) : QObject(parent) +{ + m_name = ""; +} + +QString File::name() const{ + return m_name; +} +void File::setName(const QString &str){ + if(str != m_name){ + m_name = str; + emit nameChanged(); + } +} \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/filedialog/file.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/file.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef FILE_H +#define FILE_H + + +#include +#include + +class File : public QObject{ + + Q_OBJECT + + Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) + + public: + File(QObject *parent = 0); + + QString name() const; + void setName(const QString &str); + + signals: + void nameChanged(); + + private: + QString m_name; +}; + +#endif \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/filedialog/qmldir --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +plugin FileDialog plugins diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/images/arrow.png Binary file examples/tutorials/gettingStarted/gsQml/images/arrow.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png Binary file examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png Binary file examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png Binary file examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png has changed diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/gettingStarted/gsQml/texteditor.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/gettingStarted/gsQml/texteditor.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,128 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +import "core" + +Rectangle { + id: screen + width: 1000; height: 1000 + property int partition: height/3 + border { width: 1; color: "#DCDCCC"} + state: "DRAWER_CLOSED" + + //Item 1: MenuBar on the top portion of the screen + MenuBar { + id:menuBar + height: screen.partition; width: screen.width + z: 1 + } + + //Item 2: The editable text area + TextArea { + id: textArea + y: drawer.height + color: "#3F3F3F" + fontColor: "#DCDCCC" + height: partition*2; width:parent.width + } + + //Item 3: The drawer handle + Rectangle { + id: drawer + height: 15; width: parent.width + border { color : "#6A6D6A"; width: 1 } + z: 1 + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.77; color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#6A6D6A" } + } + Image { + id: arrowIcon + source: "images/arrow.png" + anchors.horizontalCenter: parent.horizontalCenter + Behavior{ NumberAnimation { property: "rotation"; easing.type: Easing.OutExpo } } + } + + MouseArea { + id: drawerMouseArea + anchors.fill: parent + hoverEnabled: true + onEntered: parent.border.color = Qt.lighter("#6A6D6A") + onExited: parent.border.color = "#6A6D6A" + onClicked: { + if (screen.state == "DRAWER_CLOSED") { + screen.state = "DRAWER_OPEN" + } + else if (screen.state == "DRAWER_OPEN"){ + screen.state = "DRAWER_CLOSED" + } + } + } + } + + states:[ + State { + name: "DRAWER_OPEN" + PropertyChanges { target: menuBar; y: 0} + PropertyChanges { target: textArea; y: partition + drawer.height} + PropertyChanges { target: drawer; y: partition} + PropertyChanges { target: arrowIcon; rotation: 180} + }, + State { + name: "DRAWER_CLOSED" + PropertyChanges { target: menuBar; y:-height; } + PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height } + PropertyChanges { target: drawer; y: 0 } + PropertyChanges { target: arrowIcon; rotation: 0 } + } + ] + + transitions: [ + Transition { + to: "*" + NumberAnimation { target: textArea; properties: "y, height"; duration: 100; easing.type:Easing.OutExpo } + NumberAnimation { target: menuBar; properties: "y"; duration: 100; easing.type: Easing.OutExpo } + NumberAnimation { target: drawer; properties: "y"; duration: 100; easing.type: Easing.OutExpo } + } + ] +} diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/1_readonly/1_readonly.pro --- a/examples/tutorials/modelview/1_readonly/1_readonly.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/1_readonly/1_readonly.pro Mon Oct 04 01:19:32 2010 +0300 @@ -3,8 +3,15 @@ TEMPLATE = app SOURCES += main.cpp \ - modelview.cpp \ mymodel.cpp -HEADERS += modelview.h \ - mymodel.h +HEADERS += mymodel.h + + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/1_readonly +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 1_readonly.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/1_readonly +INSTALLS += target sources + +symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/1_readonly/main.cpp --- a/examples/tutorials/modelview/1_readonly/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/1_readonly/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -41,13 +41,16 @@ //! [Quoting ModelView Tutorial] // main.cpp #include -#include "modelview.h" +#include +#include "mymodel.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); - ModelView w; - w.show(); + QTableView tableView; + MyModel myModel(0); + tableView.setModel( &myModel ); + tableView.show(); return a.exec(); } //! [Quoting ModelView Tutorial] diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/1_readonly/modelview.cpp --- a/examples/tutorials/modelview/1_readonly/modelview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//! [Quoting ModelView Tutorial] -// modelview.cpp -#include -#include "modelview.h" -#include "mymodel.h" - -ModelView::ModelView(QWidget *parent) - : QMainWindow(parent) -{ - tableView = new QTableView(this); - setCentralWidget(tableView); - tableView->setModel(new MyModel(this)); -} -//! [Quoting ModelView Tutorial] diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/1_readonly/modelview.h --- a/examples/tutorials/modelview/1_readonly/modelview.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MODELVIEW_H -#define MODELVIEW_H - -//! [Quoting ModelView Tutorial] -// modelview.h -#include - -QT_FORWARD_DECLARE_CLASS(QTableView) - -class ModelView : public QMainWindow -{ - Q_OBJECT -private: - QTableView *tableView; -public: - ModelView(QWidget *parent = 0); - -}; -//! [Quoting ModelView Tutorial] - -#endif // MODELVIEW_H diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/2_formatting/2_formatting.pro --- a/examples/tutorials/modelview/2_formatting/2_formatting.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/2_formatting/2_formatting.pro Mon Oct 04 01:19:32 2010 +0300 @@ -3,8 +3,14 @@ TEMPLATE = app SOURCES += main.cpp \ - modelview.cpp \ mymodel.cpp -HEADERS += modelview.h \ - mymodel.h +HEADERS += mymodel.h + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/2_formatting +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2_formatting.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/2_formatting +INSTALLS += target sources + +symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/2_formatting/main.cpp --- a/examples/tutorials/modelview/2_formatting/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/2_formatting/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -38,13 +38,19 @@ ** ****************************************************************************/ +//! [Quoting ModelView Tutorial] +// main.cpp #include -#include "modelview.h" +#include +#include "mymodel.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); - ModelView w; - w.show(); + QTableView tableView; + MyModel myModel(0); + tableView.setModel( &myModel ); + tableView.show(); return a.exec(); } +//! [Quoting ModelView Tutorial] diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/2_formatting/modelview.cpp --- a/examples/tutorials/modelview/2_formatting/modelview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "modelview.h" -#include "mymodel.h" - -ModelView::ModelView(QWidget *parent) - : QMainWindow(parent) -{ - tableView = new QTableView(this); - setCentralWidget(tableView); - tableView->setModel(new MyModel(this)); -} - diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/2_formatting/modelview.h --- a/examples/tutorials/modelview/2_formatting/modelview.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MODELVIEW_H -#define MODELVIEW_H - -#include - -QT_FORWARD_DECLARE_CLASS(QTableView) - -class ModelView : public QMainWindow -{ - Q_OBJECT -private: - QTableView *tableView; -public: - ModelView(QWidget *parent = 0); -}; - -#endif // MODELVIEW_H diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/2_formatting/mymodel.cpp --- a/examples/tutorials/modelview/2_formatting/mymodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/2_formatting/mymodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -43,8 +43,6 @@ #include "mymodel.h" #include -//! [Quoting ModelView Tutorial] -// mymodel.cpp MyModel::MyModel(QObject *parent) :QAbstractTableModel(parent) { @@ -60,6 +58,8 @@ return 3; } +//! [Quoting ModelView Tutorial] +// mymodel.cpp QVariant MyModel::data(const QModelIndex &index, int role) const { int row = index.row(); @@ -89,7 +89,7 @@ if (row == 1 && col == 2) //change background only for cell(1,2) { - QBrush redBackground = QBrush(Qt::red); + QBrush redBackground(Qt::red); return redBackground; } break; diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro --- a/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro Mon Oct 04 01:19:32 2010 +0300 @@ -3,8 +3,14 @@ TEMPLATE = app SOURCES += main.cpp \ - modelview.cpp \ mymodel.cpp -HEADERS += modelview.h \ - mymodel.h +HEADERS += mymodel.h + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/3_changingmodel +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 3_changingmodel.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/3_changingmodel +INSTALLS += target sources + +symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/3_changingmodel/main.cpp --- a/examples/tutorials/modelview/3_changingmodel/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/3_changingmodel/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -39,12 +39,15 @@ ****************************************************************************/ #include -#include "modelview.h" +#include +#include "mymodel.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); - ModelView w; - w.show(); + QTableView tableView; + MyModel myModel(0); + tableView.setModel( &myModel ); + tableView.show(); return a.exec(); } diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/3_changingmodel/modelview.cpp --- a/examples/tutorials/modelview/3_changingmodel/modelview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "modelview.h" -#include "mymodel.h" - -ModelView::ModelView(QWidget *parent) - : QMainWindow(parent) -{ - tableView = new QTableView(this); - setCentralWidget(tableView); - tableView->setModel(new MyModel(this)); -} - diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/3_changingmodel/modelview.h --- a/examples/tutorials/modelview/3_changingmodel/modelview.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MODELVIEW_H -#define MODELVIEW_H - -#include - -QT_FORWARD_DECLARE_CLASS(QTableView) - -class ModelView : public QMainWindow -{ - Q_OBJECT -private: - QTableView *tableView; -public: - ModelView(QWidget *parent = 0); -}; - -#endif // MODELVIEW_H diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/3_changingmodel/mymodel.h --- a/examples/tutorials/modelview/3_changingmodel/mymodel.h Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/3_changingmodel/mymodel.h Mon Oct 04 01:19:32 2010 +0300 @@ -42,8 +42,7 @@ #define MYMODEL_H #include - -QT_FORWARD_DECLARE_CLASS(QTimer) +#include class MyModel : public QAbstractTableModel { diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/4_headers/4_headers.pro --- a/examples/tutorials/modelview/4_headers/4_headers.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/4_headers/4_headers.pro Mon Oct 04 01:19:32 2010 +0300 @@ -2,9 +2,15 @@ TEMPLATE = app -SOURCES += main.cpp \ - modelview.cpp \ +SOURCES += main.cpp \ mymodel.cpp -HEADERS += modelview.h \ - mymodel.h +HEADERS += mymodel.h + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/4_headers +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 4_headers.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/4_headers +INSTALLS += target sources + +symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/4_headers/main.cpp --- a/examples/tutorials/modelview/4_headers/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/4_headers/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -39,12 +39,15 @@ ****************************************************************************/ #include -#include "modelview.h" +#include +#include "mymodel.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); - ModelView w; - w.show(); + QTableView tableView; + MyModel myModel(0); + tableView.setModel( &myModel ); + tableView.show(); return a.exec(); -} +} \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/4_headers/modelview.cpp --- a/examples/tutorials/modelview/4_headers/modelview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include "modelview.h" -#include "mymodel.h" - -ModelView::ModelView(QWidget *parent) - : QMainWindow(parent) -{ - tableView = new QTableView(this); - setCentralWidget(tableView); - tableView->setModel(new MyModel(this)); - tableView->verticalHeader()->hide(); -} - diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/4_headers/modelview.h --- a/examples/tutorials/modelview/4_headers/modelview.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MODELVIEW_H -#define MODELVIEW_H - -#include - -QT_FORWARD_DECLARE_CLASS(QTableView) - -class ModelView : public QMainWindow -{ - Q_OBJECT -private: - QTableView *tableView; -public: - ModelView(QWidget *parent = 0); - -}; - -#endif // MODELVIEW_H diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/5_edit/5_edit.pro --- a/examples/tutorials/modelview/5_edit/5_edit.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/5_edit/5_edit.pro Mon Oct 04 01:19:32 2010 +0300 @@ -3,8 +3,16 @@ TEMPLATE = app SOURCES += main.cpp \ - modelview.cpp \ + mainwindow.cpp \ mymodel.cpp -HEADERS += modelview.h \ +HEADERS += mainwindow.h \ mymodel.h + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/5_edit +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 5_edit.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/5_edit +INSTALLS += target sources + +symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/5_edit/main.cpp --- a/examples/tutorials/modelview/5_edit/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/5_edit/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -39,12 +39,12 @@ ****************************************************************************/ #include -#include "modelview.h" +#include "mainwindow.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); - ModelView w; + MainWindow w; w.show(); return a.exec(); } diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/5_edit/mainwindow.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/modelview/5_edit/mainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include "mainwindow.h" +#include "mymodel.h" + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) +{ + tableView = new QTableView(this); + setCentralWidget(tableView); + QAbstractTableModel *myModel = new MyModel(this); + tableView->setModel(myModel); + + //transfer changes to the model to the window title + connect(myModel, SIGNAL(editCompleted(const QString &)), this, SLOT(setWindowTitle(const QString &))); +} + +void MainWindow::showWindowTitle(const QString & title) +{ +setWindowTitle(title); +} diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/5_edit/mainwindow.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/modelview/5_edit/mainwindow.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include +#include + +class MainWindow : public QMainWindow +{ + Q_OBJECT +private: + QTableView *tableView; +public: + MainWindow(QWidget *parent = 0); +public slots: + void showWindowTitle(const QString & title); +}; + +#endif // MAINWINDOW_H diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/5_edit/modelview.cpp --- a/examples/tutorials/modelview/5_edit/modelview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "modelview.h" -#include "mymodel.h" - -ModelView::ModelView(QWidget *parent) - : QMainWindow(parent) -{ - tableView = new QTableView(this); - setCentralWidget(tableView); - QAbstractTableModel *myModel = new MyModel(this); - tableView->setModel(myModel); - - //transfer changes to the model to the window title - connect(myModel, SIGNAL(editCompleted(const QString &)), this, SLOT(setWindowTitle(const QString &))); -} - -void ModelView::showWindowTitle(const QString & title) -{ -setWindowTitle(title); -} diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/5_edit/modelview.h --- a/examples/tutorials/modelview/5_edit/modelview.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MODELVIEW_H -#define MODELVIEW_H - -#include - -QT_FORWARD_DECLARE_CLASS(QTableView) - -class ModelView : public QMainWindow -{ - Q_OBJECT -private: - QTableView *tableView; -public: - ModelView(QWidget *parent = 0); -public slots: - void showWindowTitle(const QString & title); -}; - -#endif // MODELVIEW_H diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/5_edit/mymodel.cpp --- a/examples/tutorials/modelview/5_edit/mymodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/5_edit/mymodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -38,62 +38,64 @@ ** ****************************************************************************/ -//! [quoting mymodel_d] + #include "mymodel.h" -const int COLS= 3; -const int ROWS= 2; MyModel::MyModel(QObject *parent) :QAbstractTableModel(parent) { - //gridData needs to have 6 element, one for each table cell - m_gridData << "1/1" << "1/2" << "1/3" << "2/1" << "2/2" << "2/3" ; } -//! [quoting mymodel_d] -//! [quoting mymodel_e] +//----------------------------------------------------------------- int MyModel::rowCount(const QModelIndex & /*parent*/) const { return ROWS; } +//----------------------------------------------------------------- int MyModel::columnCount(const QModelIndex & /*parent*/) const { return COLS; } +//----------------------------------------------------------------- QVariant MyModel::data(const QModelIndex &index, int role) const { if (role == Qt::DisplayRole) { - return m_gridData[modelIndexToOffset(index)]; + return m_gridData[index.row()][index.column()]; } return QVariant(); } -//! [quoting mymodel_e] //----------------------------------------------------------------- - -//! [quoting mymodel_f] +//! [quoting mymodel_e] bool MyModel::setData(const QModelIndex & index, const QVariant & value, int role) { if (role == Qt::EditRole) { - m_gridData[modelIndexToOffset(index)] = value.toString(); - emit editCompleted(m_gridData.join(" | ")); + //save value from editor to member m_gridData + m_gridData[index.row()][index.column()] = value.toString(); + //for presentation purposes only: build and emit a joined string + QString result; + for(int row= 0; row < ROWS; row++) + { + for(int col= 0; col < COLS; col++) + { + result += m_gridData[row][col] + " "; + } + } + emit editCompleted( result ); } return true; } +//! [quoting mymodel_e] +//----------------------------------------------------------------- +//! [quoting mymodel_f] Qt::ItemFlags MyModel::flags(const QModelIndex & /*index*/) const { return Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled ; } - -//convert row and column information to array offset -int MyModel::modelIndexToOffset(const QModelIndex & index) const -{ - return index.row()*COLS + index.column(); -} //! [quoting mymodel_f] diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/5_edit/mymodel.h --- a/examples/tutorials/modelview/5_edit/mymodel.h Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/5_edit/mymodel.h Mon Oct 04 01:19:32 2010 +0300 @@ -44,7 +44,11 @@ //! [Quoting ModelView Tutorial] // mymodel.h #include -#include +#include + +const int COLS= 3; +const int ROWS= 2; + class MyModel : public QAbstractTableModel { @@ -57,8 +61,7 @@ bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole); Qt::ItemFlags flags(const QModelIndex & index) const ; private: - QStringList m_gridData; //holds text entered into QTableView - int modelIndexToOffset(const QModelIndex & index) const; + QString m_gridData[ROWS][COLS]; //holds text entered into QTableView signals: void editCompleted(const QString &); }; diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/6_treeview/6_treeview.pro --- a/examples/tutorials/modelview/6_treeview/6_treeview.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/6_treeview/6_treeview.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,5 +1,13 @@ TARGET = mv_tree TEMPLATE = app SOURCES += main.cpp \ - modelview.cpp -HEADERS += modelview.h + mainwindow.cpp +HEADERS += mainwindow.h + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/6_treeview +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 6_treeview.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/6_treeview +INSTALLS += target sources + +symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/6_treeview/main.cpp --- a/examples/tutorials/modelview/6_treeview/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/6_treeview/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -39,12 +39,12 @@ ****************************************************************************/ #include -#include "modelview.h" +#include "mainwindow.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); - ModelView w; + MainWindow w; w.show(); return a.exec(); } diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/6_treeview/mainwindow.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/modelview/6_treeview/mainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//! [Quoting ModelView Tutorial] +// modelview.cpp +#include +#include +#include +#include "mainwindow.h" + + +const int ROWS = 2; +const int COLUMNS = 3; + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) +{ + treeView = new QTreeView(this); + setCentralWidget(treeView); + standardModel = new QStandardItemModel ; + + QList preparedRow =prepareRow("first", "second", "third"); + QStandardItem *item = standardModel->invisibleRootItem(); + // adding a row to the invisible root item produces a root element + item->appendRow(preparedRow); + + QList secondRow =prepareRow("111", "222", "333"); + // adding a row to an item starts a subtree + preparedRow.first()->appendRow(secondRow); + + treeView->setModel(standardModel); + treeView->expandAll(); +} + +QList MainWindow::prepareRow(const QString &first, + const QString &second, + const QString &third) +{ + QList rowItems; + rowItems << new QStandardItem(first); + rowItems << new QStandardItem(second); + rowItems << new QStandardItem(third); + return rowItems; +} +//! [Quoting ModelView Tutorial] diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/6_treeview/mainwindow.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/modelview/6_treeview/mainwindow.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include +#include +#include + + +class MainWindow : public QMainWindow +{ + Q_OBJECT +private: + QTreeView *treeView; + QStandardItemModel *standardModel; + QList prepareRow( const QString &first, + const QString &second, + const QString &third ); +public: + MainWindow(QWidget *parent = 0); +}; + +#endif // MAINWINDOW_H diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/6_treeview/modelview.cpp --- a/examples/tutorials/modelview/6_treeview/modelview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//! [Quoting ModelView Tutorial] -// modelview.cpp -#include -#include -#include -#include "modelview.h" - - -const int ROWS = 2; -const int COLUMNS = 3; - -ModelView::ModelView(QWidget *parent) - : QMainWindow(parent) -{ - treeView = new QTreeView(this); - setCentralWidget(treeView); - standardModel = new QStandardItemModel ; - - QList preparedColumn =prepareColumn("first", "second", "third"); - QStandardItem *item = standardModel->invisibleRootItem(); - // adding a row to the invisible root item produces a root element - item->appendRow(preparedColumn); - - QList secondRow =prepareColumn("111", "222", "333"); - // adding a row to an item starts a subtree - preparedColumn.first()->appendRow(secondRow); - - treeView->setModel(standardModel); - treeView->expandAll(); -} - -QList ModelView::prepareColumn(const QString &first, - const QString &second, - const QString &third) -{ - QList colItems; - colItems << new QStandardItem(first); - colItems << new QStandardItem(second); - colItems << new QStandardItem(third); - return colItems; -} -//! [Quoting ModelView Tutorial] diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/6_treeview/modelview.h --- a/examples/tutorials/modelview/6_treeview/modelview.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MODELVIEW_H -#define MODELVIEW_H - -#include - -QT_BEGIN_NAMESPACE -class QTreeView; //forward declaration -class QStandardItemModel; -class QStandardItem; -QT_END_NAMESPACE - -class ModelView : public QMainWindow -{ - Q_OBJECT -private: - QTreeView *treeView; - QStandardItemModel *standardModel; - QList prepareColumn(const QString &first, - const QString &second, - const QString &third); -public: - ModelView(QWidget *parent = 0); -}; - -#endif // MODELVIEW_H diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/7_selections/7_selections.pro --- a/examples/tutorials/modelview/7_selections/7_selections.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/7_selections/7_selections.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,5 +1,13 @@ TARGET = mv_selections TEMPLATE = app SOURCES += main.cpp \ - modelview.cpp -HEADERS += modelview.h + mainwindow.cpp +HEADERS += mainwindow.h + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/7_selections +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 7_selections.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview/7_selections +INSTALLS += target sources + +symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/7_selections/main.cpp --- a/examples/tutorials/modelview/7_selections/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/7_selections/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -39,12 +39,12 @@ ****************************************************************************/ #include -#include "modelview.h" +#include "mainwindow.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); - ModelView w; + MainWindow w; w.show(); return a.exec(); } diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/7_selections/mainwindow.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/modelview/7_selections/mainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,109 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//! [quoting modelview_a] +#include +#include +#include +#include "mainwindow.h" + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) +{ + treeView = new QTreeView(this); + setCentralWidget(treeView); + standardModel = new QStandardItemModel ; + QStandardItem *rootNode = standardModel->invisibleRootItem(); + + + //defining a couple of items + QStandardItem *americaItem = new QStandardItem("America"); + QStandardItem *mexicoItem = new QStandardItem("Canada"); + QStandardItem *usaItem = new QStandardItem("USA"); + QStandardItem *bostonItem = new QStandardItem("Boston"); + QStandardItem *europeItem = new QStandardItem("Europe"); + QStandardItem *italyItem = new QStandardItem("Italy"); + QStandardItem *romeItem = new QStandardItem("Rome"); + QStandardItem *veronaItem = new QStandardItem("Verona"); + + //building up the hierarchy + rootNode-> appendRow(americaItem); + rootNode-> appendRow(europeItem); + americaItem-> appendRow(mexicoItem); + americaItem-> appendRow(usaItem); + usaItem-> appendRow(bostonItem); + europeItem-> appendRow(italyItem); + italyItem-> appendRow(romeItem); + italyItem-> appendRow(veronaItem); + + //register the model + treeView->setModel(standardModel); + treeView->expandAll(); + + //selection changes shall trigger a slot + QItemSelectionModel *selectionModel= treeView->selectionModel(); + connect(selectionModel, SIGNAL(selectionChanged (const QItemSelection &, const QItemSelection &)), + this, SLOT(selectionChangedSlot(const QItemSelection &, const QItemSelection &))); +} +//! [quoting modelview_a] + +//------------------------------------------------------------------------------------ + +//! [quoting modelview_b] +void MainWindow::selectionChangedSlot(const QItemSelection & /*newSelection*/, const QItemSelection & /*oldSelection*/) +{ + //get the text of the selected item + const QModelIndex index = treeView->selectionModel()->currentIndex(); + QString selectedText = index.data(Qt::DisplayRole).toString(); + //find out the hierarchy level of the selected item + int hierarchyLevel=1; + QModelIndex seekRoot = index; + while(seekRoot.parent() != QModelIndex()) + { + seekRoot = seekRoot.parent(); + hierarchyLevel++; + } + QString showString = QString("%1, Level %2").arg(selectedText) + .arg(hierarchyLevel); + setWindowTitle(showString); +} +//! [quoting modelview_b] + + diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/7_selections/mainwindow.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/tutorials/modelview/7_selections/mainwindow.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include +#include +#include + + +class MainWindow : public QMainWindow +{ + Q_OBJECT +private: + QTreeView *treeView; + QStandardItemModel *standardModel; +private slots: + void selectionChangedSlot(const QItemSelection & newSelection, const QItemSelection & oldSelection); +public: + MainWindow(QWidget *parent = 0); +}; + +#endif // MAINWINDOW_H diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/7_selections/modelview.cpp --- a/examples/tutorials/modelview/7_selections/modelview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//! [quoting modelview_a] -#include -#include -#include -#include "modelview.h" - -ModelView::ModelView(QWidget *parent) - : QMainWindow(parent) -{ - treeView = new QTreeView(this); - setCentralWidget(treeView); - standardModel = new QStandardItemModel ; - QStandardItem *rootNode = standardModel->invisibleRootItem(); - - - //defining a couple of items - QStandardItem *americaItem = new QStandardItem("America"); - QStandardItem *mexicoItem = new QStandardItem("Canada"); - QStandardItem *usaItem = new QStandardItem("USA"); - QStandardItem *bostonItem = new QStandardItem("Boston"); - QStandardItem *europeItem = new QStandardItem("Europe"); - QStandardItem *italyItem = new QStandardItem("Italy"); - QStandardItem *romeItem = new QStandardItem("Rome"); - QStandardItem *veronaItem = new QStandardItem("Verona"); - - //building up the hierarchy - rootNode-> appendRow(americaItem); - rootNode-> appendRow(europeItem); - americaItem-> appendRow(mexicoItem); - americaItem-> appendRow(usaItem); - usaItem-> appendRow(bostonItem); - europeItem-> appendRow(italyItem); - italyItem-> appendRow(romeItem); - italyItem-> appendRow(veronaItem); - - //register the model - treeView->setModel(standardModel); - treeView->expandAll(); - - //selection changes shall trigger a slot - QItemSelectionModel *selectionModel= treeView->selectionModel(); - connect(selectionModel, SIGNAL(selectionChanged (const QItemSelection &, const QItemSelection &)), - this, SLOT(selectionChangedSlot(const QItemSelection &, const QItemSelection &))); -} -//! [quoting modelview_a] - -//------------------------------------------------------------------------------------ - -//! [quoting modelview_b] -void ModelView::selectionChangedSlot(const QItemSelection & /*newSelection*/, const QItemSelection & /*oldSelection*/) -{ - const QModelIndex index = treeView->selectionModel()->currentIndex(); - QString selectedText = index.data(Qt::DisplayRole).toString(); - int hierarchyLevel=1; - QModelIndex seekRoot = index; - while(seekRoot.parent() != QModelIndex()) - { - seekRoot = seekRoot.parent(); - hierarchyLevel++; - } - QString showString = QString("%1, Level %2").arg(selectedText) - .arg(hierarchyLevel); - setWindowTitle(showString); -} -//! [quoting modelview_b] - - diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/7_selections/modelview.h --- a/examples/tutorials/modelview/7_selections/modelview.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MODELVIEW_H -#define MODELVIEW_H - -#include - -QT_BEGIN_NAMESPACE -class QTreeView; //forward declaration -class QStandardItemModel; -class QItemSelection; -QT_END_NAMESPACE - -class ModelView : public QMainWindow -{ - Q_OBJECT -private: - QTreeView *treeView; - QStandardItemModel *standardModel; -private slots: - void selectionChangedSlot(const QItemSelection & newSelection, const QItemSelection & oldSelection); -public: - ModelView(QWidget *parent = 0); -}; - -#endif // MODELVIEW_H diff -r ef0373b55136 -r 758a864f9613 examples/tutorials/modelview/modelview.pro --- a/examples/tutorials/modelview/modelview.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/tutorials/modelview/modelview.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,5 +1,4 @@ -TEMPLATE = subdirs - +TEMPLATE = subdirs SUBDIRS = 1_readonly \ 2_formatting \ 3_changingmodel \ @@ -8,3 +7,10 @@ 6_treeview \ 7_selections +# install +target.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS modelview.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials/modelview +INSTALLS += target sources + +symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) diff -r ef0373b55136 -r 758a864f9613 examples/xml/htmlinfo/main.cpp --- a/examples/xml/htmlinfo/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/xml/htmlinfo/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -94,7 +94,7 @@ int main(int argc, char **argv) { - // intialize QtCore application + // initialize QtCore application QCoreApplication app(argc, argv); // get a list of all html files in the current directory diff -r ef0373b55136 -r 758a864f9613 examples/xmlpatterns/filetree/mainwindow.cpp --- a/examples/xmlpatterns/filetree/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/examples/xmlpatterns/filetree/mainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -140,7 +140,7 @@ QXmlFormatter formatter(query, &buffer); query.evaluateTo(&formatter); - treeInfo->setText((QString(tr("Model of %1 output as XML.")).arg(directory))); + treeInfo->setText(tr("Model of %1 output as XML.").arg(directory)); fileTree->setText(QString::fromLatin1(output.constData())); evaluateResult(); //! [6] diff -r ef0373b55136 -r 758a864f9613 mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +#include diff -r ef0373b55136 -r 758a864f9613 mkspecs/common/symbian/header-wrappers/AknFontAccess.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mkspecs/common/symbian/header-wrappers/AknFontAccess.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +#include diff -r ef0373b55136 -r 758a864f9613 mkspecs/common/symbian/header-wrappers/AknInputLanguageInfo.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mkspecs/common/symbian/header-wrappers/AknInputLanguageInfo.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +#include diff -r ef0373b55136 -r 758a864f9613 mkspecs/common/symbian/header-wrappers/ApAccessPointItem.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mkspecs/common/symbian/header-wrappers/ApAccessPointItem.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +#include diff -r ef0373b55136 -r 758a864f9613 mkspecs/common/symbian/header-wrappers/ApDataHandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mkspecs/common/symbian/header-wrappers/ApDataHandler.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +#include diff -r ef0373b55136 -r 758a864f9613 mkspecs/common/symbian/header-wrappers/ApUtils.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mkspecs/common/symbian/header-wrappers/ApUtils.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +#include diff -r ef0373b55136 -r 758a864f9613 mkspecs/common/symbian/symbian-makefile.conf --- a/mkspecs/common/symbian/symbian-makefile.conf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/common/symbian/symbian-makefile.conf Mon Oct 04 01:19:32 2010 +0300 @@ -29,7 +29,12 @@ QMAKE_EXTENSION_STATICLIB = lib QMAKE_SYMBIAN_SHLIB = 1 -DEFINES *= __PRODUCT_INCLUDE__=\\<$${EPOCROOT}epoc32/include/variant/symbian_os.hrh\\> \ +is_using_gnupoc { + DEFINES *= __PRODUCT_INCLUDE__=\\<$${EPOCROOT}epoc32/include/variant/symbian_os.hrh\\> +} else { + DEFINES *= __PRODUCT_INCLUDE__=\\<$${EPOCROOT}epoc32/include/variant/Symbian_OS.hrh\\> +} +DEFINES *= \ __SYMBIAN32__ \ __MARM_INTERWORK__ \ _UNICODE \ diff -r ef0373b55136 -r 758a864f9613 mkspecs/common/symbian/symbian-mmp.conf --- a/mkspecs/common/symbian/symbian-mmp.conf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/common/symbian/symbian-mmp.conf Mon Oct 04 01:19:32 2010 +0300 @@ -39,24 +39,7 @@ # RVCT seems to do this automatically, but WINSCW compiler does not, so add it here. MMP_RULES += "USERINCLUDE ." -exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis) { - S60_VERSION = 5.2 symbian3 -} else { - exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) { - S60_VERSION = 5.1 symbian2 - } else { - exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) { - S60_VERSION = 5.0 - } else { - exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) { - S60_VERSION = 3.2 - } else { - S60_VERSION = 3.1 - MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET - } - } - } -} +contains(S60_VERSION, 3.1):MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET QMAKE_CXXFLAGS_FAST_VFP.ARMCC = --fpmode fast # [TODO] QMAKE_CXXFLAGS_FAST_VFP.GCCE = @@ -73,3 +56,15 @@ } } } + +# Variables for replacing equivalent QMAKE_* variables in bld.inf for FLM execution of commands +symbian-sbsv2 { + QMAKE_SBSV2_COPY = $(GNUCP) + QMAKE_SBSV2_COPY_DIR = $(GNUCP) -r + QMAKE_SBSV2_MOVE = $(GNUMV) + QMAKE_SBSV2_DEL_FILE = $(GNURM) -f + QMAKE_SBSV2_MKDIR = $(GNUMKDIR) + QMAKE_SBSV2_DEL_DIR = $(GNURMDIR) + QMAKE_SBSV2_DEL_TREE = $(GNURM) -rf +} + diff -r ef0373b55136 -r 758a864f9613 mkspecs/common/symbian/symbian.conf --- a/mkspecs/common/symbian/symbian.conf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/common/symbian/symbian.conf Mon Oct 04 01:19:32 2010 +0300 @@ -70,7 +70,12 @@ QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -lapparc -lcentralrepository QMAKE_LIBS_NETWORK = QMAKE_LIBS_EGL = -llibEGL -QMAKE_LIBS_OPENGL = +QMAKE_LIBS_OPENGL = -llibglesv2 +QMAKE_LIBS_OPENGL_ES1 = -llibGLESv1_CM +QMAKE_LIBS_OPENGL_ES2 = -llibglesv2 +QMAKE_LIBS_OPENGL_QT = -llibglesv2 -lcone -lws32 +QMAKE_LIBS_OPENGL_ES1_QT = -llibGLESv1_CM -lcone -lws32 +QMAKE_LIBS_OPENGL_ES2_QT = -llibglesv2 -lcone -lws32 QMAKE_LIBS_OPENVG = -llibOpenVG -lfbscli -lbitgdi -lgdi QMAKE_LIBS_THREAD = -llibpthread QMAKE_LIBS_COMPAT = @@ -112,13 +117,46 @@ QT_ARCH = symbian +load(qt_config) + # These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins QT_IMPORTS_BASE_DIR = /resource/qt/imports -load(qt_config) load(symbian/platform_paths) +# The Symbian^3 PDK does not necessarily contain the required sis files. +# However, libstdcppv5 first appeared in Symbian^3 (S60 5.2), so check for that too. +exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) { + S60_VERSION = 5.2 +} else { + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) { + S60_VERSION = 5.1 + } else { + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) { + S60_VERSION = 5.0 + } else { + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) { + S60_VERSION = 3.2 + } else { + S60_VERSION = 3.1 + } + } + } +} + +contains(S60_VERSION, "3\\.1") { + SYMBIAN_VERSION = 9.2 +} else:contains(S60_VERSION, "3\\.2") { + SYMBIAN_VERSION = 9.3 +} else:contains(S60_VERSION, "5\\.0") { + SYMBIAN_VERSION = 9.4 +} else:contains(S60_VERSION, "5\\.1") { + SYMBIAN_VERSION = Symbian2 +} else:contains(S60_VERSION, "5\\.2") { + SYMBIAN_VERSION = Symbian3 +} + # pkg_depends_webkit, pkg_depends_core, and pkg_platform_dependencies can be removed by developer # if multiple languages need to be supported by pkg file. In that case the developer should declare # multiple language compatible dependency statements him/herself. @@ -137,3 +175,21 @@ DEPLOYMENT += default_deployment +defineReplace(symbianRemoveSpecialCharacters) { + # Produce identical string to what SymbianCommonGenerator::removeSpecialCharacters and + # SymbianCommonGenerator::removeEpocSpecialCharacters produce + + fixedStr = $$1 + + fixedStr = $$replace(fixedStr, /,_) + fixedStr = $$replace(fixedStr, \\\\,_) + fixedStr = $$replace(fixedStr, " ",_) + symbian-abld|symbian-sbsv2 { + fixedStr = $$replace(fixedStr, -,_) + fixedStr = $$replace(fixedStr, \\.,_) + fixedStr = $$replace(fixedStr, :,_) + } + + return ($$fixedStr) +} + diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/qt.prf --- a/mkspecs/features/qt.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/qt.prf Mon Oct 04 01:19:32 2010 +0300 @@ -31,9 +31,6 @@ } } -#handle modules -for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod) - #handle includes INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt @@ -209,3 +206,15 @@ mac { !isEmpty(QT_NAMESPACE_MAC_CRC):DEFINES *= QT_NAMESPACE_MAC_CRC=$$QT_NAMESPACE_MAC_CRC } + +#SIMD defines: +mmx:DEFINES += QT_HAVE_MMX +3dnow:DEFINES += QT_HAVE_3DNOW +sse:DEFINES += QT_HAVE_SSE QT_HAVE_MMXEXT +sse2:DEFINES += QT_HAVE_SSE2 +sse3:DEFINES += QT_HAVE_SSE3 +ssse3:DEFINES += QT_HAVE_SSSE3 +sse4_1:DEFINES += QT_HAVE_SSE4_1 +sse4_2:DEFINES += QT_HAVE_SSE4_2 +avx:DEFINES += QT_HAVE_AVX +iwmmxt:DEFINES += QT_HAVE_IWMMXT diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/qt_config.prf --- a/mkspecs/features/qt_config.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/qt_config.prf Mon Oct 04 01:19:32 2010 +0300 @@ -1,3 +1,6 @@ +# This file is loaded by the mkspecs, before .qmake.cache has been loaded. +# Consequently, we have to do some stunts to get values out of the cache. + exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG) isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { !isEmpty(QT_BUILD_TREE):QMAKE_QT_CONFIG = $$QT_BUILD_TREE/mkspecs/qconfig.pri @@ -8,6 +11,7 @@ debug(1, "Cannot load qconfig.pri!") } else { debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)") + for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod) } load(qt_functions) diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/sis_targets.prf --- a/mkspecs/features/sis_targets.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/sis_targets.prf Mon Oct 04 01:19:32 2010 +0300 @@ -4,17 +4,25 @@ contains(TEMPLATE, app): GENERATE_SIS_TARGETS = true else:!equals(DEPLOYMENT, default_deployment) { for(dep_item, $$list($$DEPLOYMENT)) { - eval(dep_item_sources = $${dep_item}.sources) + dep_item_sources = $$eval($${dep_item}.sources) !isEmpty(dep_item_sources): GENERATE_SIS_TARGETS = true } } equals(GENERATE_SIS_TARGETS, true) { + + baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET)) + symbian-abld|symbian-sbsv2 { - sis_destdir = + symbian-sbsv2 { + CONVERT_GCCE_PARAM = -g + } else { + CONVERT_GCCE_PARAM = + } + make_cache_name = .make.cache sis_target.target = sis - sis_target.commands = $(if $(wildcard $$basename(TARGET)_template.pkg), \ + sis_target.commands = $(if $(wildcard $${baseTarget}_template.pkg), \ $(if $(wildcard $$make_cache_name), \ $(MAKE) -f $(MAKEFILE) ok_sis MAKEFILES=$$make_cache_name \ , \ @@ -29,11 +37,11 @@ ) ok_sis_target.target = ok_sis - ok_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $$basename(TARGET)_template.pkg \ + ok_sis_target.commands = createpackage.bat $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \ $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) unsigned_sis_target.target = unsigned_sis - unsigned_sis_target.commands = $(if $(wildcard $$basename(TARGET)_template.pkg), \ + unsigned_sis_target.commands = $(if $(wildcard $${baseTarget}_template.pkg), \ $(if $(wildcard $$make_cache_name), \ $(MAKE) -f $(MAKEFILE) ok_unsigned_sis MAKEFILES=$$make_cache_name \ , \ @@ -48,21 +56,21 @@ ) ok_unsigned_sis_target.target = ok_unsigned_sis - ok_unsigned_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) -o $$basename(TARGET)_template.pkg $(QT_SIS_TARGET) + ok_unsigned_sis_target.commands = createpackage.bat $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg $(QT_SIS_TARGET) - target_sis_target.target = $${sis_destdir}$${TARGET}.sis + target_sis_target.target = $${baseTarget}.sis target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis installer_sis_target.target = installer_sis - installer_sis_target.commands = $(if $(wildcard $$basename(TARGET)_installer.pkg), \ + installer_sis_target.commands = $(if $(wildcard $${baseTarget}_installer.pkg), \ $(MAKE) -f $(MAKEFILE) ok_installer_sis \ , \ $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \ ) - installer_sis_target.depends = $${sis_destdir}$${TARGET}.sis + installer_sis_target.depends = $${baseTarget}.sis ok_installer_sis_target.target = ok_installer_sis - ok_installer_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $$basename(TARGET)_installer.pkg - \ + ok_installer_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \ $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) fail_sis_nopkg_target.target = fail_sis_nopkg @@ -72,7 +80,7 @@ fail_sis_nocache_target.commands = "$(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target)" stub_sis_target.target = stub_sis - stub_sis_target.commands = $(if $(wildcard $$basename(TARGET)_template.pkg), \ + stub_sis_target.commands = $(if $(wildcard $${baseTarget}_template.pkg), \ $(if $(wildcard $$make_cache_name), \ $(MAKE) -f $(MAKEFILE) ok_stub_sis MAKEFILES=$$make_cache_name \ , \ @@ -87,7 +95,7 @@ ) ok_stub_sis_target.target = ok_stub_sis - ok_stub_sis_target.commands = createpackage.bat -s $(QT_SIS_OPTIONS) $$basename(TARGET)_stub.pkg \ + ok_stub_sis_target.commands = createpackage.bat -s $(QT_SIS_OPTIONS) $${baseTarget}_stub.pkg \ $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) QMAKE_EXTRA_TARGETS += sis_target \ @@ -125,25 +133,26 @@ QMAKE_EXTRA_TARGETS += store_build_target } } else { + qtPrepareTool(QMAKE_CREATEPACKAGE, createpackage) + sis_destdir = $$DESTDIR isEmpty(sis_destdir):sis_destdir = . - baseTarget = $$basename(TARGET) !equals(TARGET, "$$baseTarget"):sis_destdir = $$sis_destdir/$$dirname(TARGET) sis_target.target = sis - sis_target.commands = createpackage $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \ + sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \ - $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) sis_target.depends = first unsigned_sis_target.target = unsigned_sis - unsigned_sis_target.commands = createpackage $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg + unsigned_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg unsigned_sis_target.depends = first target_sis_target.target = $${sis_destdir}/$${baseTarget}.sis target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis installer_sis_target.target = installer_sis - installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \ + installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \ $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) installer_sis_target.depends = $${sis_destdir}/$${baseTarget}.sis diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/symbian/application_icon.prf --- a/mkspecs/features/symbian/application_icon.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/symbian/application_icon.prf Mon Oct 04 01:19:32 2010 +0300 @@ -14,20 +14,7 @@ warning("Only first icon specified in ICON variable is used: $$ICON") } - # Try to produce indentical string to fixedTarget in SymbianMakefileGenerator, replaced chars taken - # from SymbianCommonGenerator::removeSpecialCharacters. - # - # Note: it is not a major problem even baseTarget is not 100% identical to fixedTarget since qmake - # only uses filename from RSS_RULES.icon_file when referring to icon file name. - baseTarget = $$basename(TARGET) - baseTarget = $$replace(baseTarget, /,_) - baseTarget = $$replace(baseTarget, \\\\,_) - baseTarget = $$replace(baseTarget, " ",_) - symbian-abld|symbian-sbsv2 { - baseTarget = $$replace(baseTarget, -,_) - baseTarget = $$replace(baseTarget, \\.,_) - baseTarget = $$replace(baseTarget, :,_) - } + baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET)) # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code !symbian-sbsv2 { diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/symbian/opengl.prf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mkspecs/features/symbian/opengl.prf Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,21 @@ +contains(QT_CONFIG, opengles1) { + INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES1 + !isEmpty(QMAKE_LIBDIR_OPENGL_ES1):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES1 + target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1_QT + else:LIBS += $$QMAKE_LIBS_OPENGL_ES1 +} else:contains(QT_CONFIG, opengles2) { + INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 + !isEmpty(QMAKE_LIBDIR_OPENGL_ES2):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2 + target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES2_QT + else:LIBS += $$QMAKE_LIBS_OPENGL_ES2 +} else { + INCLUDEPATH += $$QMAKE_INCDIR_OPENGL + !isEmpty(QMAKE_LIBDIR_OPENGL):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL + target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_QT + else:LIBS += $$QMAKE_LIBS_OPENGL +} + +contains(QT_CONFIG, egl) { + !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL +} + diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/symbian/platform_paths.prf --- a/mkspecs/features/symbian/platform_paths.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/symbian/platform_paths.prf Mon Oct 04 01:19:32 2010 +0300 @@ -65,8 +65,11 @@ epocroot_prefix = $${EPOCROOT} } -exists($${EPOCROOT}epoc32/include/platform_paths.prf) { - +symbian-abld|symbian-sbsv2:exists($${EPOCROOT}epoc32/include/platform_paths.prf) { + + # Symbian does not provide correct profiles for non-mmp based systems, so + # we only should get in here with abld and sbsv2. + # Load platform specific paths load($${EPOCROOT}epoc32/include/platform_paths.prf) diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/symbian/run_on_phone.prf --- a/mkspecs/features/symbian/run_on_phone.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/symbian/run_on_phone.prf Mon Oct 04 01:19:32 2010 +0300 @@ -5,31 +5,35 @@ contains(TEMPLATE, app): GENERATE_RUN_TARGETS = true else:!equals(DEPLOYMENT, default_deployment) { for(dep_item, $$list($$DEPLOYMENT)) { - eval(dep_item_sources = $${dep_item}.sources) + dep_item_sources = $$eval($${dep_item}.sources) !isEmpty(dep_item_sources): GENERATE_RUN_TARGETS = true } } equals(GENERATE_RUN_TARGETS, true) { + baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET)) + sis_file = $${baseTarget}.sis symbian-abld|symbian-sbsv2 { sis_destdir = } else { sis_destdir = $$DESTDIR + isEmpty(sis_destdir):sis_destdir = . + !equals(TARGET, "$$baseTarget"):sis_destdir = $$sis_destdir/$$dirname(TARGET) !isEmpty(sis_destdir):!contains(sis_destdir, "[/\\\\]$"):sis_destdir = $${sis_destdir}/ contains(QMAKE_HOST.os, "Windows"):sis_destdir = $$replace(sis_destdir, "/", "\\") } contains(SYMBIAN_PLATFORMS, "WINSCW"):contains(TEMPLATE, "app") { run_target.target = run - run_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$${TARGET}.exe" $(QT_RUN_OPTIONS) + run_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$${baseTarget}.exe" $(QT_RUN_OPTIONS) QMAKE_EXTRA_TARGETS += run_target } runonphone_target.target = runonphone runonphone_target.depends = sis - runonphone_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${TARGET}.sis" - contains(TEMPLATE, "app"):runonphone_target.commands += "$${TARGET}.exe" $(QT_RUN_OPTIONS) + runonphone_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${sis_file}" + contains(TEMPLATE, "app"):runonphone_target.commands += "$${baseTarget}.exe" $(QT_RUN_OPTIONS) QMAKE_EXTRA_TARGETS += runonphone_target } diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/symbian/stl.prf --- a/mkspecs/features/symbian/stl.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/symbian/stl.prf Mon Oct 04 01:19:32 2010 +0300 @@ -15,18 +15,24 @@ INCLUDEPATH -= $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off # libstdcppv5 is preferred over libstdcpp as it has/uses the throwing version of operator new -STL_LIB = -llibstdcppv5.dll - # STDCPP turns on standard C++ new behaviour (ie. throwing new) -STL_MMP_RULE = "STDCPP" +use_libstdcppv5 = true # Fall back to old implementation if that is the only one that is found exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcpp.dso)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcpp.dll) { !exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso):!exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) { - STL_LIB = -llibstdcpp.dll - STL_MMP_RULE = + use_libstdcppv5 = false } } -LIBS *= $$STL_LIB -MMP_RULES *= $$STL_MMP_RULE +equals(use_libstdcppv5, true) { + LIBS *= -llibstdcppv5.dll + symbian-abld|symbian-sbsv2 { + MMP_RULES *= "STDCPP" + } else { + DEFINES *= __SYMBIAN_STDCPP_SUPPORT__ + LIBS *= -lstdnew.dll + } +} else { + LIBS *= -llibstdcpp.dll +} diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/symbian/symbian_building.prf --- a/mkspecs/features/symbian/symbian_building.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/symbian/symbian_building.prf Mon Oct 04 01:19:32 2010 +0300 @@ -35,36 +35,38 @@ isEmpty(symbianDestdir) { symbianDestdir = . } -baseTarget = $$basename(TARGET) +baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET)) !equals(TARGET, "$$baseTarget"):symbianDestdir = $$symbianDestdir/$$dirname(TARGET) contains(QMAKE_CFLAGS, "--thumb")|contains(QMAKE_CXXFLAGS, "--thumb")|contains(QMAKE_CFLAGS, "-mthumb")|contains(QMAKE_CXXFLAGS, "-mthumb") { DEFINES += __MARM_THUMB__ } -defineReplace(processSymbianLibraries) { - library = $$replace(1, "\\.dll$", ".dso") - library = $$replace(library, "^-l", "") - isFullName = $$find(library, \\.) - isEmpty(isFullName):library="$${library}.dso" - linux-gcce { - newLIB = "-l:$${library}" - } else { - newLIB = "$${library}" - } - contains(library, "\\.dso$")|contains(library, "\\.lib$"):PRE_TARGETDEPS += $$library - return($$newLIB) +defineReplace(processSymbianLibrary) { + qt_library = $$replace(1, "\\.dll$", ".dso") + qt_library = $$replace(qt_library, "^-l", "") + isFullName = $$find(qt_library, \\.) + isEmpty(isFullName):qt_library="$${qt_library}.dso" + return($$qt_library) } -for(libraries, LIBS) { - newLIBS += $$processSymbianLibraries($$libraries) +qt_libraries = $$split(LIBS, " ") +LIBS = +for(qt_library, qt_libraries) { + qt_newLib = $$processSymbianLibrary($$qt_library) + contains(qt_newLib, ".*\\.dso$")|contains(qt_newLib, ".*\\.lib$"):PRE_TARGETDEPS += $$qt_newLib + linux-gcce:qt_newLib = "-l:$$qt_newLib" + LIBS += $$qt_newLib } -LIBS = $$newLIBS -newLIBS = -for(libraries, QMAKE_LIBS) { - newLIBS += $$processSymbianLibraries($$libraries) + +qt_libraries = $$split(QMAKE_LIBS, " ") +QMAKE_LIBS = +for(qt_library, qt_libraries) { + qt_newLib = $$processSymbianLibrary($$qt_library) + contains(qt_newLib, ".*\\.dso$")|contains(qt_newLib, ".*\\.lib$"):PRE_TARGETDEPS += $$qt_newLib + linux-gcce:qt_newLib = "-l:$$qt_newLib" + QMAKE_LIBS += $$qt_newLib } -QMAKE_LIBS = $$newLIBS elf2e32_LIBPATH = for(libPath, QMAKE_LIBDIR) { @@ -112,14 +114,9 @@ capability = "--capability=$$capability" contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { - !isEmpty(QMAKE_POST_LINK) { - # No way to honor the '@' :-( - QMAKE_POST_LINK = $$replace(QMAKE_POST_LINK, "^@", "") - QMAKE_POST_LINK = && $$QMAKE_POST_LINK - } - contains(CONFIG, plugin):QMAKE_ELF2E32_FLAGS += --definput=plugin_commonu.def + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${baseTarget}.dll $$symbianDestdir/$${baseTarget}.sym \ && $$QMAKE_ELF2E32_WRAPPER --version=$$decVersion \ --sid=$$TARGET.SID \ @@ -164,11 +161,7 @@ } contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") { - !isEmpty(QMAKE_POST_LINK) { - # No way to honor the '@' :-( - QMAKE_POST_LINK = $$replace(QMAKE_POST_LINK, "^@", "") - QMAKE_POST_LINK = && $$QMAKE_POST_LINK - } + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK QMAKE_POST_LINK = $$QMAKE_MOVE $$symbianDestdir/$${baseTarget} $$symbianDestdir/$${baseTarget}.sym \ && $$QMAKE_ELF2E32_WRAPPER --version $$decVersion \ --sid=$$TARGET.SID \ @@ -184,7 +177,7 @@ $$elf2e32_LIBPATH \ $$capability \ $$QMAKE_ELF2E32_FLAGS \ - && ln "$${symbianDestdir}/$${baseTarget}.exe" "$${symbianDestdir}/$${baseTarget}" \ + && $$QMAKE_COPY "$${symbianDestdir}/$${baseTarget}.exe" "$${symbianDestdir}/$${baseTarget}" \ $$QMAKE_POST_LINK silent:QMAKE_POST_LINK = @echo postlinking $@ && $$QMAKE_POST_LINK QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.sym @@ -260,49 +253,45 @@ QMAKE_EXTRA_COMPILERS += symbianresources contains(TEMPLATE, "app"):!contains(CONFIG, "no_icon") { - baseResourceTarget = $$basename(TARGET) - # If you change this, also see application_icon.prf - baseResourceTarget = $$replace(baseResourceTarget, " ",_) - # Make our own extra target in order to get dependencies for generated # files right. This also avoids the warning about files not found. - symbianGenResource.target = $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg + symbianGenResource.target = $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg symbianGenResource.commands = cpp -nostdinc -undef \ $$symbian_resources_INCLUDES \ $$symbian_resources_DEFINES \ - $${baseResourceTarget}.rss \ - -o $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rpp \ + $${baseTarget}.rss \ + -o $${symbian_resources_RCC_DIR}/$${baseTarget}.rpp \ && rcomp -u -m045,046,047 \ - -s$${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rpp \ - -o$${symbianDestdir}/$${baseResourceTarget}.rsc \ - -h$${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg \ - -i$${baseResourceTarget}.rss - silent:symbianGenResource.commands = @echo rcomp $${baseResourceTarget}.rss && $$symbianGenResource.commands - symbianGenResource.depends = $${baseResourceTarget}.rss - PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg - QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg - QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rpp - QMAKE_DISTCLEAN += $${baseResourceTarget}.rss - QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseResourceTarget}.rsc + -s$${symbian_resources_RCC_DIR}/$${baseTarget}.rpp \ + -o$${symbianDestdir}/$${baseTarget}.rsc \ + -h$${symbian_resources_RCC_DIR}/$${baseTarget}.rsg \ + -i$${baseTarget}.rss + silent:symbianGenResource.commands = @echo rcomp $${baseTarget}.rss && $$symbianGenResource.commands + symbianGenResource.depends = $${baseTarget}.rss + PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg + QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg + QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}.rpp + QMAKE_DISTCLEAN += $${baseTarget}.rss + QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.rsc - symbianGenRegResource.target = $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg + symbianGenRegResource.target = $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg symbianGenRegResource.commands = cpp -nostdinc -undef \ $$symbian_resources_INCLUDES \ $$symbian_resources_DEFINES \ - $${baseResourceTarget}_reg.rss \ - -o $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rpp \ + $${baseTarget}_reg.rss \ + -o $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rpp \ && rcomp -u -m045,046,047 \ - -s$${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rpp \ - -o$${symbianDestdir}/$${baseResourceTarget}_reg.rsc \ - -h$${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg \ - -i$${baseResourceTarget}_reg.rss - silent:symbianGenRegResource.commands = @echo rcomp $${baseResourceTarget}_reg.rss && $$symbianGenRegResource.commands - symbianGenRegResource.depends = $${baseResourceTarget}_reg.rss $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg - PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg - QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg - QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rpp - QMAKE_DISTCLEAN += $${baseResourceTarget}_reg.rss - QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseResourceTarget}_reg.rsc + -s$${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rpp \ + -o$${symbianDestdir}/$${baseTarget}_reg.rsc \ + -h$${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg \ + -i$${baseTarget}_reg.rss + silent:symbianGenRegResource.commands = @echo rcomp $${baseTarget}_reg.rss && $$symbianGenRegResource.commands + symbianGenRegResource.depends = $${baseTarget}_reg.rss $${symbian_resources_RCC_DIR}/$${baseTarget}.rsg + PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg + QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rsg + QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseTarget}_reg.rpp + QMAKE_DISTCLEAN += $${baseTarget}_reg.rss + QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}_reg.rsc # Trick to get qmake to create the RCC_DIR for us. symbianRccDirCreation.input = SOURCES @@ -319,3 +308,5 @@ # Generated pkg files QMAKE_DISTCLEAN += $${baseTarget}_template.pkg +QMAKE_DISTCLEAN += $${baseTarget}_installer.pkg +QMAKE_DISTCLEAN += $${baseTarget}_stub.pkg diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/unix/separate_debug_info.prf --- a/mkspecs/features/unix/separate_debug_info.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/unix/separate_debug_info.prf Mon Oct 04 01:19:32 2010 +0300 @@ -1,8 +1,9 @@ !separate_debug_info_nocopy:!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) { - QMAKE_SEPARATE_DEBUG_INFO = (test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" ) ; + QMAKE_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/ + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK QMAKE_POST_LINK = $$QMAKE_SEPARATE_DEBUG_INFO $$QMAKE_POST_LINK silent:QMAKE_POST_LINK = @echo creating $@.debug && $$QMAKE_POST_LINK diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/vxworks.prf --- a/mkspecs/features/vxworks.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/vxworks.prf Mon Oct 04 01:19:32 2010 +0300 @@ -22,20 +22,20 @@ shared|!staticlib:!lib { *-dcc { - VXWORKS_MUNCH_CMD = (targ=`basename $(TARGET)`; \ + VXWORKS_MUNCH_CMD = targ=`basename $(TARGET)`; \ ddump -Ng \"$(TARGET)\" | tclsh $$VXWORKS_MUNCH_TOOL -c $$VXWORKS_ARCH_MUNCH >\"$(OBJECTS_DIR)/\$\${targ}_ctdt.c\" && \ $$QMAKE_CC -c $$QMAKE_CFLAGS \"$(OBJECTS_DIR)/\$\${targ}_ctdt.c\" -o \"$(OBJECTS_DIR)/\$\${targ}_ctdt.o\" && \ $$QMAKE_LINK $$QMAKE_LFLAGS -X -r5 -r4 \"$(OBJECTS_DIR)/\$\${targ}_ctdt.o\" \"$(TARGET)\" -o \"$(TARGET).munched\" && \ mv \"$(TARGET).munched\" \"$(TARGET)\" && \ - chmod +x \"$(TARGET)\") + chmod +x \"$(TARGET)\" } *-g++ { - VXWORKS_MUNCH_CMD = (targ=`basename $(TARGET)`; \ + VXWORKS_MUNCH_CMD = targ=`basename $(TARGET)`; \ nm \"$(DESTDIR)$(TARGET)\" | tclsh $$VXWORKS_MUNCH_TOOL -c $$VXWORKS_ARCH_MUNCH >\"$(OBJECTS_DIR)/\$\${targ}_ctdt.c\" && \ $$QMAKE_CC -c $$QMAKE_CFLAGS -fdollars-in-identifiers \"$(OBJECTS_DIR)/\$\${targ}_ctdt.c\" -o \"$(OBJECTS_DIR)/\$\${targ}_ctdt.o\" && \ $$QMAKE_LINK $$QMAKE_LFLAGS -nostdlib -Wl,-X -T $(WIND_BASE)/target/h/tool/gnu/ldscripts/link.OUT \"$(OBJECTS_DIR)/\$\${targ}_ctdt.o\" \"$(DESTDIR)$(TARGET)\" -o \"$(DESTDIR)$(TARGET).munched\" && \ mv \"$(DESTDIR)$(TARGET).munched\" \"$(DESTDIR)$(TARGET)\" && \ - chmod +x \"$(DESTDIR)$(TARGET)\") + chmod +x \"$(DESTDIR)$(TARGET)\" } # We need to create a dummy lib.a in case someone links against this lib. @@ -48,7 +48,8 @@ VXWORKS_MUNCH_CMD += (atarg=`basename $(TARGET) .so.$${VERSION}`.a ; touch \"$(DESTDIR)\$\${atarg}\") } - QMAKE_POST_LINK = $$VXWORKS_MUNCH_CMD $$QMAKE_POST_LINK + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK + QMAKE_POST_LINK = $$VXWORKS_MUNCH_CMD$$QMAKE_POST_LINK silent:QMAKE_POST_LINK = @echo creating $@.$$VXWORKS_MUNCH_EXT && $$QMAKE_POST_LINK isEmpty(DESTDIR) { diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/win32/embed_manifest_dll.prf --- a/mkspecs/features/win32/embed_manifest_dll.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/win32/embed_manifest_dll.prf Mon Oct 04 01:19:32 2010 +0300 @@ -6,8 +6,7 @@ NOPATH_TARGET ~= s,\\\\,/,g # Change to single type separators NOPATH_TARGET ~= s,^(.*/)+,, # Remove all paths QMAKE_LFLAGS += /MANIFEST $$quote(/MANIFESTFILE:\"$${MANIFEST_DIR}\\$${NOPATH_TARGET}.intermediate.manifest\") - QMAKE_PREV_POST_LINK = $$QMAKE_POST_LINK - QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);2$$escape_expand(\\n\\t)) - QMAKE_POST_LINK += $$QMAKE_PREV_POST_LINK + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK + QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);2$$escape_expand(\\n\\t))$$QMAKE_POST_LINK QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" } diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/win32/embed_manifest_exe.prf --- a/mkspecs/features/win32/embed_manifest_exe.prf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/features/win32/embed_manifest_exe.prf Mon Oct 04 01:19:32 2010 +0300 @@ -6,8 +6,7 @@ NOPATH_TARGET ~= s,\\\\,/,g # Change to single type separators NOPATH_TARGET ~= s,^(.*/)+,, # Remove all paths QMAKE_LFLAGS += /MANIFEST $$quote(/MANIFESTFILE:\"$${MANIFEST_DIR}\\$${NOPATH_TARGET}.intermediate.manifest\") - QMAKE_PREV_POST_LINK = $$QMAKE_POST_LINK - QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\\n\\t)) - QMAKE_POST_LINK += $$QMAKE_PREV_POST_LINK + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK + QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\\n\\t))$$QMAKE_POST_LINK QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" } diff -r ef0373b55136 -r 758a864f9613 mkspecs/features/win32/msvc_mp.prf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mkspecs/features/win32/msvc_mp.prf Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,2 @@ +QMAKE_CFLAGS += $$QMAKE_CFLAGS_MP +QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_MP diff -r ef0373b55136 -r 758a864f9613 mkspecs/modules/README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mkspecs/modules/README Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,3 @@ +Externally provided Qt modules may drop a qmake file here to become part of +the current Qt configuration. The file name must follow the pattern +"qt_.pri". It must contain a "QT_CONFIG += " statement. diff -r ef0373b55136 -r 758a864f9613 mkspecs/modules/qt_webkit_version.pri --- a/mkspecs/modules/qt_webkit_version.pri Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -QT_WEBKIT_VERSION = 4.7.0 -QT_WEBKIT_MAJOR_VERSION = 4 -QT_WEBKIT_MINOR_VERSION = 7 -QT_WEBKIT_PATCH_VERSION = 0 -QT_CONFIG *= webkit diff -r ef0373b55136 -r 758a864f9613 mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm Mon Oct 04 01:19:32 2010 +0300 @@ -38,7 +38,7 @@ echo "# make sis target." >> $(CACHE_FILENAME) && \ echo "# Version : " >> $(CACHE_FILENAME) && \ echo "# ==============================================================================" >> $(CACHE_FILENAME) && \ - echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME) \ + echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME) $(call endrule,qmake_store_build) endef diff -r ef0373b55136 -r 758a864f9613 mkspecs/symbian/linux-armcc/qmake.conf --- a/mkspecs/symbian/linux-armcc/qmake.conf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/symbian/linux-armcc/qmake.conf Mon Oct 04 01:19:32 2010 +0300 @@ -31,7 +31,7 @@ # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. QMAKE_QtWebKit_LFLAGS = --rw-base 0xE00000 -QMAKE_CFLAGS += --dllimport_runtime --preinclude rvct2_2.h --diag_suppress 186,611,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter +QMAKE_CFLAGS += --dllimport_runtime --diag_suppress 186,611,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter QMAKE_CXXFLAGS += $$QMAKE_CFLAGS QMAKE_LFLAGS += --symver_soname --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --dll --no_scanlib QMAKE_LFLAGS_APP += --entry _E32Startup @@ -47,7 +47,16 @@ QMAKE_LIBDIR *= $$(RVCT22LIB) INCLUDEPATH = $${EPOCROOT}epoc32/include \ - $${EPOCROOT}epoc32/include/rvct2_2 \ $${EPOCROOT}epoc32/include/variant \ $${EPOCROOT}epoc32/include/stdapis \ $$INCLUDEPATH + +exists($${EPOCROOT}epoc32/include/rvct2_2) { + INCLUDEPATH += $${EPOCROOT}epoc32/include/rvct2_2 + QMAKE_CFLAGS += --preinclude rvct2_2.h + QMAKE_CXXFLAGS += --preinclude rvct2_2.h +} else { + INCLUDEPATH += $${EPOCROOT}epoc32/include/rvct + QMAKE_CFLAGS += --preinclude rvct.h + QMAKE_CXXFLAGS += --preinclude rvct.h +} diff -r ef0373b55136 -r 758a864f9613 mkspecs/win32-g++-symbian/qmake.conf --- a/mkspecs/win32-g++-symbian/qmake.conf Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ -# -# qmake configuration for win32-g++ -# -# Written for MinGW -# - -MAKEFILE_GENERATOR = MINGW -TEMPLATE = app -CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header -QT += core gui -DEFINES += UNICODE QT_LARGEFILE_SUPPORT -QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 - -QMAKE_EXT_OBJ = .o -QMAKE_EXT_RES = _res.o - -QMAKE_CC = $${EPOCROOT}epoc32/gcc_mingw/bin/gcc -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = byacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -Wall -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O2 -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -QMAKE_CXX = $${EPOCROOT}epoc32/gcc_mingw/bin/g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -QMAKE_CXXFLAGS_RTTI_ON = -frtti -QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti -QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads -QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions - -QMAKE_INCDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] - -QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src -QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src -QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -QMAKE_LINK = $${EPOCROOT}epoc32/gcc_mingw/bin/g++ -QMAKE_LINK_C = $${EPOCROOT}epoc32/gcc_mingw/bin/gcc -QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl -QMAKE_LFLAGS_EXCEPTIONS_OFF = -QMAKE_LFLAGS_RELEASE = -Wl,-s -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console -QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows -QMAKE_LFLAGS_DLL = -shared -QMAKE_LINK_OBJECT_MAX = 10 -QMAKE_LINK_OBJECT_SCRIPT= object_script - - -QMAKE_LIBS = -QMAKE_LIBS_CORE = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32 -QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -QMAKE_LIBS_NETWORK = -lws2_32 -QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32 -QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 -QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain - -!isEmpty(QMAKE_SH) { - MINGW_IN_SHELL = 1 - QMAKE_DIR_SEP = / - QMAKE_COPY = cp - QMAKE_COPY_DIR = xcopy /s /q /y /i - QMAKE_MOVE = mv - QMAKE_DEL_FILE = rm - QMAKE_MKDIR = mkdir - QMAKE_DEL_DIR = rmdir - QMAKE_CHK_DIR_EXISTS = test -d -} else { - QMAKE_COPY = copy /y - QMAKE_COPY_DIR = xcopy /s /q /y /i - QMAKE_MOVE = move - QMAKE_DEL_FILE = del - QMAKE_MKDIR = mkdir - QMAKE_DEL_DIR = rmdir - QMAKE_CHK_DIR_EXISTS = if not exist -} - -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe - -QMAKE_IDL = midl -QMAKE_LIB = $${EPOCROOT}epoc32/gcc_mingw/bin/ar -ru -QMAKE_AR = $${EPOCROOT}epoc32/gcc_mingw/bin/ar -QMAKE_RC = $${EPOCROOT}epoc32/gcc_mingw/bin/windres -QMAKE_ZIP = zip -r -9 - -QMAKE_STRIP = $${EPOCROOT}epoc32/gcc_mingw/bin/strip -QMAKE_STRIPFLAGS_LIB += --strip-unneeded -load(qt_config) - diff -r ef0373b55136 -r 758a864f9613 mkspecs/win32-g++-symbian/qplatformdefs.h --- a/mkspecs/win32-g++-symbian/qplatformdefs.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,164 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QPLATFORMDEFS_H -#define QPLATFORMDEFS_H - -#ifdef UNICODE -#ifndef _UNICODE -#define _UNICODE -#endif -#endif - -// Get Qt defines/settings - -#include "qglobal.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500) -typedef enum { - NameUnknown = 0, - NameFullyQualifiedDN = 1, - NameSamCompatible = 2, - NameDisplay = 3, - NameUniqueId = 6, - NameCanonical = 7, - NameUserPrincipal = 8, - NameCanonicalEx = 9, - NameServicePrincipal = 10, - NameDnsDomain = 12 -} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT; -#endif - -#define Q_FS_FAT -#ifdef QT_LARGEFILE_SUPPORT -#define QT_STATBUF struct _stati64 // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs -#define QT_STAT ::_stati64 -#define QT_FSTAT ::_fstati64 -#else -#define QT_STATBUF struct _stat // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs -#define QT_STAT ::_stat -#define QT_FSTAT ::_fstat -#endif -#define QT_STAT_REG _S_IFREG -#define QT_STAT_DIR _S_IFDIR -#define QT_STAT_MASK _S_IFMT -#if defined(_S_IFLNK) -# define QT_STAT_LNK _S_IFLNK -#endif -#define QT_FILENO _fileno -#define QT_OPEN ::_open -#define QT_CLOSE ::_close -#ifdef QT_LARGEFILE_SUPPORT -#define QT_LSEEK ::_lseeki64 -#ifndef UNICODE -#define QT_TSTAT ::_stati64 -#else -#define QT_TSTAT ::_wstati64 -#endif -#else -#define QT_LSEEK ::_lseek -#ifndef UNICODE -#define QT_TSTAT ::_stat -#else -#define QT_TSTAT ::_wstat -#endif -#endif -#define QT_READ ::_read -#define QT_WRITE ::_write -#define QT_ACCESS ::_access -#define QT_GETCWD ::_getcwd -#define QT_CHDIR ::_chdir -#define QT_MKDIR ::_mkdir -#define QT_RMDIR ::_rmdir -#define QT_OPEN_LARGEFILE 0 -#define QT_OPEN_RDONLY _O_RDONLY -#define QT_OPEN_WRONLY _O_WRONLY -#define QT_OPEN_RDWR _O_RDWR -#define QT_OPEN_CREAT _O_CREAT -#define QT_OPEN_TRUNC _O_TRUNC -#define QT_OPEN_APPEND _O_APPEND -#if defined(O_TEXT) -# define QT_OPEN_TEXT _O_TEXT -# define QT_OPEN_BINARY _O_BINARY -#endif - -#define QT_FOPEN ::fopen -#ifdef QT_LARGEFILE_SUPPORT -#define QT_FSEEK ::fseeko64 -#define QT_FTELL ::ftello64 -#else -#define QT_FSEEK ::fseek -#define QT_FTELL ::ftell -#endif -#define QT_FGETPOS ::fgetpos -#define QT_FSETPOS ::fsetpos -#define QT_FPOS_T fpos_t -#ifdef QT_LARGEFILE_SUPPORT -#define QT_OFF_T off64_t -#else -#define QT_OFF_T long -#endif - -#define QT_SIGNAL_ARGS int - -#define QT_VSNPRINTF ::_vsnprintf -#define QT_SNPRINTF ::_snprintf - -# define F_OK 0 -# define X_OK 1 -# define W_OK 2 -# define R_OK 4 - - -#endif // QPLATFORMDEFS_H diff -r ef0373b55136 -r 758a864f9613 mkspecs/win32-icc/qmake.conf --- a/mkspecs/win32-icc/qmake.conf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/win32-icc/qmake.conf Mon Oct 04 01:19:32 2010 +0300 @@ -50,7 +50,7 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< -QMAKE_LINK = link +QMAKE_LINK = xilink QMAKE_LFLAGS = /NOLOGO QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = /DEBUG @@ -72,7 +72,7 @@ QMAKE_IDC = $$[QT_INSTALL_BINS]\\idc.exe QMAKE_IDL = midl -QMAKE_LIB = lib /NOLOGO +QMAKE_LIB = xilib /NOLOGO QMAKE_RC = rc QMAKE_ZIP = zip -r -9 diff -r ef0373b55136 -r 758a864f9613 mkspecs/win32-msvc2008/qmake.conf --- a/mkspecs/win32-msvc2008/qmake.conf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/win32-msvc2008/qmake.conf Mon Oct 04 01:19:32 2010 +0300 @@ -23,6 +23,7 @@ QMAKE_CFLAGS_DEBUG = -Zi -MDd QMAKE_CFLAGS_YACC = QMAKE_CFLAGS_LTCG = -GL +QMAKE_CFLAGS_MP = -MP QMAKE_CXX = $$QMAKE_CC QMAKE_CXXFLAGS = $$QMAKE_CFLAGS @@ -32,6 +33,7 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG +QMAKE_CXXFLAGS_MP = $$QMAKE_CFLAGS_MP QMAKE_CXXFLAGS_STL_ON = -EHsc QMAKE_CXXFLAGS_STL_OFF = QMAKE_CXXFLAGS_RTTI_ON = -GR diff -r ef0373b55136 -r 758a864f9613 mkspecs/win32-msvc2010/qmake.conf --- a/mkspecs/win32-msvc2010/qmake.conf Fri Sep 17 08:34:18 2010 +0300 +++ b/mkspecs/win32-msvc2010/qmake.conf Mon Oct 04 01:19:32 2010 +0300 @@ -23,6 +23,7 @@ QMAKE_CFLAGS_DEBUG = -Zi -MDd QMAKE_CFLAGS_YACC = QMAKE_CFLAGS_LTCG = -GL +QMAKE_CFLAGS_MP = -MP QMAKE_CXX = $$QMAKE_CC QMAKE_CXXFLAGS = $$QMAKE_CFLAGS @@ -32,6 +33,7 @@ QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG +QMAKE_CXXFLAGS_MP = $$QMAKE_CFLAGS_MP QMAKE_CXXFLAGS_STL_ON = -EHsc QMAKE_CXXFLAGS_STL_OFF = QMAKE_CXXFLAGS_RTTI_ON = -GR diff -r ef0373b55136 -r 758a864f9613 projects.pro --- a/projects.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/projects.pro Mon Oct 04 01:19:32 2010 +0300 @@ -40,8 +40,6 @@ SUBDIRS += examples } else:isEqual(PROJECT, demos) { SUBDIRS += demos - } else:isEqual(PROJECT, tests) { - SUBDIRS += tests } else:isEqual(PROJECT, libs) { include(src/src.pro) } else:isEqual(PROJECT, docs) { @@ -161,11 +159,13 @@ #mkspecs mkspecs.path=$$[QT_INSTALL_DATA]/mkspecs -mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$QT_SOURCE_TREE/mkspecs/* +mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$files($$QT_SOURCE_TREE/mkspecs/*) +mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules unix { DEFAULT_QMAKESPEC = $$QMAKESPEC DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default + mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/default } win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) { # When shadow building on Windows, the default mkspec only exists in the build tree. diff -r ef0373b55136 -r 758a864f9613 qmake/Makefile.win32 --- a/qmake/Makefile.win32 Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/Makefile.win32 Mon Oct 04 01:19:32 2010 +0300 @@ -23,11 +23,14 @@ # specific stuff for VS2005 # !if "$(QMAKESPEC)" == "win32-msvc2005" -CFLAGS = /Zc:wchar_t- +CFLAGS_EXTRA = /Zc:wchar_t- +!elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" +CFLAGS_EXTRA = /MP !endif -CFLAGS = -c -Fo$@ \ +CFLAGS_BARE = -c -Fo./ \ -W3 -nologo -O2 \ + $(CFLAGS_EXTRA) \ -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \ -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \ -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \ @@ -37,38 +40,19 @@ -I$(SOURCE_PATH)\tools\shared \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \ -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \ - -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQT_NO_PCRE -DQT_BOOTSTRAPPED \ - $(CFLAGS) -CXXFLAGS = $(CFLAGS) + -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQT_NO_PCRE -DQT_BOOTSTRAPPED +CFLAGS = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch $(CFLAGS_BARE) $(CFLAGS) + +CXXFLAGS_BARE = $(CFLAGS_BARE) +CXXFLAGS = $(CFLAGS) + LFLAGS = LIBS = ole32.lib advapi32.lib LINKQMAKE = $(LINK) $(LFLAGS) -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS) ADDCLEAN = vc60.pdb vc70.pdb qmake.pdb qmake.ilk + !ELSE - -# -# specific stuff for Borland make -# -!if !$d(BCB) -BCB = $(MAKEDIR)\.. -!endif -CXX = bcc32 -CFLAGS = -c -o$@ \ - -tWR -w -w-hid -w-use -O1 \ - -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \ - -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \ - -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \ - -I$(BUILD_PATH)\src\corelib\global \ - -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC) \ - -I$(SOURCE_PATH)\tools\shared \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \ - -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \ - -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -CXXFLAGS = $(CFLAGS) -LFLAGS = -L$(BCB)\lib -c -x -Gn -ap -Tpe c0x32.obj -LIBS = import32.lib cw32i.lib -LINKQMAKE = ilink32 $(LFLAGS) $(OBJS) $(QTOBJS), qmake.exe,,$(LIBS) -ADDCLEAN = qmake.tds +!ERROR Unsupported compiler for this Makefile !ENDIF #qmake code @@ -133,81 +117,14 @@ first all: qmake.exe qmake.exe: $(OBJS) $(QTOBJS) - $(LINKQMAKE) + $(LINKQMAKE) qmake_pch.obj -copy qmake.exe $(BUILD_PATH)\bin\qmake.exe clean:: - -del qbitarray.obj - -del qbuffer.obj - -del qcryptographichash.obj - -del qlinkedlist.obj - -del qfsfileengine.obj - -del qfsfileengine_iterator.obj - -del qbytearray.obj - -del qvsnprintf.obj - -del qbytearraymatcher.obj - -del qdatetime.obj - -del qdir.obj - -del qdiriterator.obj - -del qfile.obj - -del qtemporaryfile.obj - -del qabstractfileengine.obj - -del qfsfileengine_win.obj - -del qfsfileengine_iterator_win.obj - -del qfileinfo.obj - -del qglobal.obj - -del qhash.obj - -del qiodevice.obj - -del qlist.obj - -del qlocale.obj - -del qmalloc.obj - -del qmap.obj - -del qregexp.obj - -del qtextcodec.obj - -del qutfcodec.obj - -del qstring.obj - -del qstringlist.obj - -del qtextstream.obj - -del qdatastream.obj - -del quuid.obj - -del qvector.obj - -del qsettings.obj - -del qlibraryinfo.obj - -del qvariant.obj - -del qurl.obj - -del qsettings_win.obj - -del qmetatype.obj - -del project.obj - -del main.obj - -del makefile.obj - -del unixmake.obj - -del unixmake2.obj - -del mingw_make.obj - -del option.obj - -del winmakefile.obj - -del projectgenerator.obj - -del property.obj - -del meta.obj - -del makefiledeps.obj - -del metamakefile.obj - -del xmloutput.obj - -del borland_bmake.obj - -del msvc_nmake.obj - -del msvc_vcproj.obj - -del msvc_vcxproj.obj - -del msvc_objectmodel.obj - -del msbuild_objectmodel.obj - -del symmake.obj - -del symmake_abld.obj - -del symmake_sbsv2.obj - -del symbiancommon.obj - -del initprojectdeploy_symbian.obj - -del registry.obj - -del epocroot.obj - -del pbuilder_pbx.obj - -del qxmlstream.obj - -del qxmlutils.obj - -del qnumeric.obj + -del $(QTOBJS) + -del $(OBJS) + -del qmake_pch.obj + -del qmake_pch.pch -del vc60.pdb -del vc70.pdb -del qmake.pdb @@ -229,227 +146,57 @@ .cxx.obj: $(CXX) $(CXXFLAGS) $< -qsettings_win.obj: $(SOURCE_PATH)\src\corelib\io\qsettings_win.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qsettings_win.cpp - -qsettings.obj: $(SOURCE_PATH)\src\corelib\io\qsettings.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qsettings.cpp - -qlibraryinfo.obj: $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qlibraryinfo.cpp - -qnumeric.obj: $(SOURCE_PATH)\src\corelib\global\qnumeric.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qnumeric.cpp +$(OBJS): qmake_pch.obj -qvariant.obj: $(SOURCE_PATH)\src\corelib\kernel\qvariant.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\kernel\qvariant.cpp - -qurl.obj: $(SOURCE_PATH)\src\corelib\io\qurl.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qurl.cpp - -qtextstream.obj: $(SOURCE_PATH)\src\corelib\io\qtextstream.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qtextstream.cpp - -qdatastream.obj: $(SOURCE_PATH)\src\corelib\io\qdatastream.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qdatastream.cpp - -qiodevice.obj: $(SOURCE_PATH)\src\corelib\io\qiodevice.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qiodevice.cpp +$(QTOBJS): qmake_pch.obj -qmalloc.obj: $(SOURCE_PATH)\src\corelib\global\qmalloc.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qmalloc.cpp - -qglobal.obj: $(SOURCE_PATH)\src\corelib\global\qglobal.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\global\qglobal.cpp - -qhash.obj: $(SOURCE_PATH)\src\corelib\tools\qhash.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qhash.cpp - -qbytearray.obj: $(SOURCE_PATH)\src\corelib\tools\qbytearray.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qbytearray.cpp +qmake_pch.obj: + $(CXX) $(CXXFLAGS_BARE) -c -Yc -Fpqmake_pch.pch -TP qmake_pch.h -qcryptographichash.obj: $(SOURCE_PATH)\src\corelib\tools\qcryptographichash.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qcryptographichash.cpp - -qvsnprintf.obj: $(SOURCE_PATH)\src\corelib\tools\qvsnprintf.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qvsnprintf.cpp - -qbytearraymatcher.obj: $(SOURCE_PATH)\src\corelib\tools\qbytearraymatcher.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qbytearraymatcher.cpp - -qchar.obj: $(SOURCE_PATH)\src\corelib\tools\qchar.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qchar.cpp - -qutfcodec.obj: $(SOURCE_PATH)\src\corelib\codecs\qutfcodec.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\codecs\qutfcodec.cpp +{$(SOURCE_PATH)\qmake\generators\mac}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -qstring.obj: $(SOURCE_PATH)\src\corelib\tools\qstring.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qstring.cpp - -qstringmatcher.obj: $(SOURCE_PATH)\src\corelib\tools\qstringmatcher.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qstringmatcher.cpp - -qlocale.obj: $(SOURCE_PATH)\src\corelib\tools\qlocale.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlocale.cpp - -quuid.obj: $(SOURCE_PATH)\src\corelib\plugin\quuid.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\plugin\quuid.cpp +{$(SOURCE_PATH)\qmake\generators\symbian}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -qbuffer.obj: $(SOURCE_PATH)\src\corelib\io\qbuffer.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qbuffer.cpp - -qlist.obj: $(SOURCE_PATH)\src\corelib\tools\qlist.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlist.cpp - -qlinkedlist.obj: $(SOURCE_PATH)\src\corelib\tools\qlinkedlist.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qlinkedlist.cpp - -qfile.obj: $(SOURCE_PATH)\src\corelib\io\qfile.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfile.cpp - -qtemporaryfile.obj: $(SOURCE_PATH)\src\corelib\io\qtemporaryfile.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qtemporaryfile.cpp +{$(SOURCE_PATH)\qmake\generators\unix}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -qfsfileengine_win.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine_win.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine_win.cpp - -qfsfileengine_iterator_win.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator_win.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator_win.cpp - -qfsfileengine.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine.cpp - -qfsfileengine_iterator.obj: $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfsfileengine_iterator.cpp - -qabstractfileengine.obj: $(SOURCE_PATH)\src\corelib\io\qabstractfileengine.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qabstractfileengine.cpp +{$(SOURCE_PATH)\qmake\generators\win32}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -qtextcodec.obj: $(SOURCE_PATH)\src\corelib\codecs\qtextcodec.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\codecs\qtextcodec.cpp - -qregexp.obj: $(SOURCE_PATH)\src\corelib\tools\qregexp.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qregexp.cpp +{$(SOURCE_PATH)\qmake\generators}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -qvector.obj: $(SOURCE_PATH)\src\corelib\tools\qvector.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qvector.cpp - -qbitarray.obj: $(SOURCE_PATH)\src\corelib\tools\qbitarray.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qbitarray.cpp - -qdir.obj: $(SOURCE_PATH)\src\corelib\io\qdir.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qdir.cpp +{$(SOURCE_PATH)\qmake}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -qdiriterator.obj: $(SOURCE_PATH)\src\corelib\io\qdiriterator.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qdiriterator.cpp - -qmetatype.obj: $(SOURCE_PATH)\src\corelib\kernel\qmetatype.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\kernel\qmetatype.cpp - -qfileinfo.obj: $(SOURCE_PATH)\src\corelib\io\qfileinfo.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\io\qfileinfo.cpp - -qdatetime.obj: $(SOURCE_PATH)\src\corelib\tools\qdatetime.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qdatetime.cpp +{$(SOURCE_PATH)\src\3rdparty\md5}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -qstringlist.obj: $(SOURCE_PATH)\src\corelib\tools\qstringlist.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qstringlist.cpp - -qmap.obj: $(SOURCE_PATH)\src\corelib\tools\qmap.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qmap.cpp - -qunicodetables.obj: $(SOURCE_PATH)\src\corelib\tools\qunicodetables.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qunicodetables.cpp - -makefile.obj: $(SOURCE_PATH)/qmake/generators\makefile.cpp - $(CXX) $(CXXFLAGS) generators\makefile.cpp - -unixmake.obj: $(SOURCE_PATH)/qmake/generators\unix\unixmake.cpp - $(CXX) $(CXXFLAGS) generators\unix\unixmake.cpp +{$(SOURCE_PATH)\src\corelib\codecs}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -unixmake2.obj: $(SOURCE_PATH)/qmake/generators\unix\unixmake2.cpp - $(CXX) $(CXXFLAGS) generators\unix\unixmake2.cpp - -winmakefile.obj: $(SOURCE_PATH)/qmake/generators/win32/winmakefile.cpp - $(CXX) $(CXXFLAGS) generators/win32/winmakefile.cpp - -borland_bmake.obj: $(SOURCE_PATH)/qmake/generators/win32/borland_bmake.cpp - $(CXX) $(CXXFLAGS) generators/win32/borland_bmake.cpp - -mingw_make.obj: $(SOURCE_PATH)/qmake/generators/win32/mingw_make.cpp - $(CXX) $(CXXFLAGS) generators/win32/mingw_make.cpp - -msvc_nmake.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_nmake.cpp - $(CXX) $(CXXFLAGS) generators/win32/msvc_nmake.cpp +{$(SOURCE_PATH)\src\corelib\global}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -msvc_vcproj.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp - $(CXX) $(CXXFLAGS) generators/win32/msvc_vcproj.cpp - -msvc_vcxproj.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcxproj.cpp - $(CXX) $(CXXFLAGS) generators/win32/msvc_vcxproj.cpp +{$(SOURCE_PATH)\src\corelib\io}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -msvc_objectmodel.obj: $(SOURCE_PATH)/qmake/generators/win32/msvc_objectmodel.cpp - $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp - -msbuild_objectmodel.obj: $(SOURCE_PATH)/qmake/generators/win32/msbuild_objectmodel.cpp - $(CXX) $(CXXFLAGS) generators/win32/msbuild_objectmodel.cpp - -symmake.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp - $(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp +{$(SOURCE_PATH)\src\corelib\kernel}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -symmake_abld.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp - $(CXX) $(CXXFLAGS) generators/symbian/symmake_abld.cpp - -symmake_sbsv2.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp - $(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp - -symbiancommon.obj: $(SOURCE_PATH)/qmake/generators/symbian/symbiancommon.cpp - $(CXX) $(CXXFLAGS) generators/symbian/symbiancommon.cpp - -initprojectdeploy_symbian.obj: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp - $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp +{$(SOURCE_PATH)\src\corelib\plugin}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -registry.obj: $(SOURCE_PATH)/tools/shared/windows/registry.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp - -epocroot.obj: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp - -md5.obj: $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp - -project.obj: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h - $(CXX) $(CXXFLAGS) project.cpp - -meta.obj: $(SOURCE_PATH)/qmake/meta.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h - $(CXX) $(CXXFLAGS) meta.cpp +{$(SOURCE_PATH)\src\corelib\tools}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -main.obj: $(SOURCE_PATH)/qmake/main.cpp $(SOURCE_PATH)/qmake/project.h - $(CXX) $(CXXFLAGS) main.cpp - -option.obj: $(SOURCE_PATH)/qmake/option.cpp $(SOURCE_PATH)/qmake/option.h - $(CXX) $(CXXFLAGS) option.cpp - -property.obj: $(SOURCE_PATH)/qmake/property.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h - $(CXX) $(CXXFLAGS) property.cpp - -projectgenerator.obj: $(SOURCE_PATH)/qmake/generators/projectgenerator.cpp - $(CXX) $(CXXFLAGS) generators/projectgenerator.cpp - -pbuilder_pbx.obj: $(SOURCE_PATH)/qmake/generators/mac/pbuilder_pbx.cpp - $(CXX) $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp +{$(SOURCE_PATH)\src\corelib\xml}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -makefiledeps.obj: $(SOURCE_PATH)/qmake/generators/makefiledeps.cpp - $(CXX) $(CXXFLAGS) generators/makefiledeps.cpp - -metamakefile.obj: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp - $(CXX) $(CXXFLAGS) generators/metamakefile.cpp +{$(SOURCE_PATH)\tools\shared\symbian}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< -xmloutput.obj: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp - $(CXX) $(CXXFLAGS) generators/xmloutput.cpp - -qxmlstream.obj: $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp - -qxmlutils.obj: $(SOURCE_PATH)\src\corelib\xml\qxmlutils.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\xml\qxmlutils.cpp +{$(SOURCE_PATH)\tools\shared\windows}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< diff -r ef0373b55136 -r 758a864f9613 qmake/Makefile.win32-g++-symbian --- a/qmake/Makefile.win32-g++-symbian Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,327 +0,0 @@ -ifeq "$(SOURCE_PATH)" "" -SOURCE_PATH = .. -endif - -#cmd version - -ifeq "$(BUILD_PATH)" "" -BUILD_PATH = .. -endif - -LOCAL_EPOC_ROOT:=$(subst //,/,$(subst \,/,$(EPOCROOT))/) - -# -# specific stuff for mingw g++ make -# -LD = $(LOCAL_EPOC_ROOT)epoc32/gcc_mingw/bin/g++ -CXX = $(LOCAL_EPOC_ROOT)epoc32/gcc_mingw/bin/g++ -CFLAGS = -c -o$@ -O2 \ - -I. -Igenerators -Igenerators/unix \ - -Igenerators/win32 -Igenerators/mac \ - -Igenerators/symbian \ - -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ - -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \ - -I$(BUILD_PATH)/src/corelib/global \ - -I$(BUILD_PATH)/src/corelib/xml \ - -I$(SOURCE_PATH)/mkspecs/win32-g++ \ - -I$(SOURCE_PATH)/tools/shared \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \ - -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \ - -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ - -DQT_BOOTSTRAPPED -CXXFLAGS = $(CFLAGS) -LFLAGS = -LIBS = -lole32 -luuid -LINKQMAKE = $(LD) $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS) -ADDCLEAN = - - -#qmake code -OBJS = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \ - option.o winmakefile.o projectgenerator.o property.o meta.o \ - makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \ - borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \ - msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \ - registry.o \ - epocroot.o \ - symmake_abld.o symmake_sbsv2.o - -ifdef QMAKE_OPENSOURCE_EDITION -CFLAGS += -DQMAKE_OPENSOURCE_EDITION -endif - -#qt code -QTOBJS= \ - qbitarray.o \ - qbuffer.o \ - qbytearray.o \ - qcryptographichash.o \ - qvsnprintf.o \ - qbytearraymatcher.o \ - qconfig.o \ - qdatetime.o \ - qdir.o \ - qdiriterator.o \ - qfile.o \ - qtemporaryfile.o \ - qfileinfo.o \ - qabstractfileengine.o \ - qfsfileengine.o \ - qfsfileengine_iterator.o \ - qfsfileengine_win.o \ - qfsfileengine_iterator_win.o \ - qglobal.o \ - qhash.o \ - qiodevice.o \ - qlibraryinfo.o \ - qlist.o \ - qlinkedlist.o \ - qlocale.o \ - qmalloc.o \ - qmap.o \ - qregexp.o \ - qtextcodec.o \ - qutfcodec.o \ - qstring.o \ - qstringlist.o \ - qtextstream.o \ - quuid.o \ - qvector.o \ - qurl.o \ - qsettings.o \ - qsettings_win.o \ - qvariant.o \ - qmetatype.o \ - qxmlstream.o \ - qxmlutils.o \ - qnumeric.o - - -qmake.exe: $(OBJS) $(QTOBJS) - $(LINKQMAKE) - -cmd.exe /c copy qmake.exe $(BUILD_PATH)\bin\qmake.exe - -Makefile: Makefile.win32-g++ - @echo "Out of date, please rerun configure" - -clean:: - -del $(OBJS) $(QTOBJS) $(ADDCLEAN) - -distclean:: clean - -del qmake - -.c.o: - $(CXX) $(CFLAGS) $< - -.cpp.o: - $(CXX) $(CXXFLAGS) $< - -qconfig.o: $(BUILD_PATH)/src/corelib/global/qconfig.cpp - $(CXX) $(CXXFLAGS) $(BUILD_PATH)/src/corelib/global/qconfig.cpp - -qsettings_win.o: $(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp - -qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings.cpp - -qvariant.o: $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp - -qurl.o: $(SOURCE_PATH)/src/corelib/io/qurl.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qurl.cpp - -qtextstream.o: $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp - -qdatastream.o: $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp - -qiodevice.o: $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp - -qlibraryinfo.o: $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp - -qnumeric.o: $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp - -qmalloc.o: $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp - -qglobal.o: $(SOURCE_PATH)/src/corelib/global/qglobal.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qglobal.cpp - -qhash.o: $(SOURCE_PATH)/src/corelib/tools/qhash.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qhash.cpp - -qbytearray.o: $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp - -qcryptographichash.o: $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp - -qvsnprintf.o: $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp - -qbytearraymatcher.o: $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp - -qutfcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp - -qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring.cpp - -qlocale.o: $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp - -quuid.o: $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp - -qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp - -qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlist.cpp - -qlinkedlist.o: $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp - -qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfile.cpp - -qtemporaryfile.o: $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp - -qabstractfileengine.o: $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp - -qfsfileengine_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp - -qfsfileengine_iterator_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_win.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_win.cpp - -qfsfileengine.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp - -qfsfileengine_iterator.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp - -qtextcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp - -qregexp.o: $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp - -qvector.o: $(SOURCE_PATH)/src/corelib/tools/qvector.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qvector.cpp - -qbitarray.o: $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp - -qdir.o: $(SOURCE_PATH)/src/corelib/io/qdir.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qdir.cpp - -qdiriterator.o: $(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp - -qmetatype.o: $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp - -qfileinfo.o: $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp - -qdatetime.o: $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp - -qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp - -qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qmap.cpp - -makefile.o: $(SOURCE_PATH)/qmake/generators/makefile.cpp - $(CXX) $(CXXFLAGS) generators/makefile.cpp - -unixmake.o: $(SOURCE_PATH)/qmake/generators/unix/unixmake.cpp - $(CXX) $(CXXFLAGS) generators/unix/unixmake.cpp - -unixmake2.o: $(SOURCE_PATH)/qmake/generators/unix/unixmake2.cpp - $(CXX) $(CXXFLAGS) generators/unix/unixmake2.cpp - -winmakefile.o: $(SOURCE_PATH)/qmake/generators/win32/winmakefile.cpp - $(CXX) $(CXXFLAGS) generators/win32/winmakefile.cpp - -borland_bmake.o: $(SOURCE_PATH)/qmake/generators/win32/borland_bmake.cpp - $(CXX) $(CXXFLAGS) generators/win32/borland_bmake.cpp - -mingw_make.o: $(SOURCE_PATH)/qmake/generators/win32/mingw_make.cpp - $(CXX) $(CXXFLAGS) generators/win32/mingw_make.cpp - -msvc_nmake.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_nmake.cpp - $(CXX) $(CXXFLAGS) generators/win32/msvc_nmake.cpp - -msvc_dsp.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_dsp.cpp - $(CXX) $(CXXFLAGS) generators/win32/msvc_dsp.cpp - -msvc_vcproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp - $(CXX) $(CXXFLAGS) generators/win32/msvc_vcproj.cpp - -msvc_objectmodel.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_objectmodel.cpp - $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp - -symmake.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp - $(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp - -symmake_abld.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp - $(CXX) $(CXXFLAGS) generators/symbian/symmake_abld.cpp - -symmake_sbsv2.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp - $(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp - -initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp - $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp - -registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp - -epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp - -project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h - $(CXX) $(CXXFLAGS) project.cpp - -meta.o: $(SOURCE_PATH)/qmake/meta.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h - $(CXX) $(CXXFLAGS) meta.cpp - -main.o: $(SOURCE_PATH)/qmake/main.cpp $(SOURCE_PATH)/qmake/project.h - $(CXX) $(CXXFLAGS) main.cpp - -option.o: $(SOURCE_PATH)/qmake/option.cpp $(SOURCE_PATH)/qmake/option.h - $(CXX) $(CXXFLAGS) option.cpp - -property.o: $(SOURCE_PATH)/qmake/property.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h - $(CXX) $(CXXFLAGS) property.cpp - -projectgenerator.o: $(SOURCE_PATH)/qmake/generators/projectgenerator.cpp - $(CXX) $(CXXFLAGS) generators/projectgenerator.cpp - -pbuilder_pbx.o: $(SOURCE_PATH)/qmake/generators/mac/pbuilder_pbx.cpp - $(CXX) $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp - -makefiledeps.o: $(SOURCE_PATH)/qmake/generators/makefiledeps.cpp - $(CXX) $(CXXFLAGS) generators/makefiledeps.cpp - -metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp - $(CXX) $(CXXFLAGS) generators/metamakefile.cpp - -xmloutput.o: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp - $(CXX) $(CXXFLAGS) generators/xmloutput.cpp - -qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp - -qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp diff -r ef0373b55136 -r 758a864f9613 qmake/generators/makefile.cpp --- a/qmake/generators/makefile.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/makefile.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -466,14 +466,37 @@ if(!project->isEmpty("QMAKE_SUBSTITUTES")) { const QStringList &subs = v["QMAKE_SUBSTITUTES"]; for(int i = 0; i < subs.size(); ++i) { - if(!subs.at(i).endsWith(".in")) { - warn_msg(WarnLogic, "Substitute '%s' does not end with '.in'", - subs.at(i).toLatin1().constData()); - continue; + QString inn = subs.at(i) + ".input", outn = subs.at(i) + ".output"; + if (v.contains(inn) || v.contains(outn)) { + if (!v.contains(inn) || !v.contains(outn)) { + warn_msg(WarnLogic, "Substitute '%s' has only one of .input and .output", + subs.at(i).toLatin1().constData()); + continue; + } + const QStringList &tinn = v[inn], &toutn = v[outn]; + if (tinn.length() != 1) { + warn_msg(WarnLogic, "Substitute '%s.input' does not have exactly one value", + subs.at(i).toLatin1().constData()); + continue; + } + if (toutn.length() != 1) { + warn_msg(WarnLogic, "Substitute '%s.output' does not have exactly one value", + subs.at(i).toLatin1().constData()); + continue; + } + inn = tinn.first(); + outn = toutn.first(); + } else { + inn = subs.at(i); + if(!inn.endsWith(".in")) { + warn_msg(WarnLogic, "Substitute '%s' does not end with '.in'", + inn.toLatin1().constData()); + continue; + } + outn = inn.left(inn.length()-3); } - QFile in(fileFixify(subs.at(i))), out(fileInfo(subs.at(i)).fileName()); - if(out.fileName().endsWith(".in")) - out.setFileName(out.fileName().left(out.fileName().length()-3)); + QFile in(fileFixify(inn)); + QFile out(fileFixify(outn, qmake_getpwd(), Option::output_dir)); if(in.open(QFile::ReadOnly)) { QString contents; QStack state; @@ -528,7 +551,7 @@ if(out.exists() && out.open(QFile::ReadOnly)) { QString old = QString::fromUtf8(out.readAll()); if(contents == old) { - v["QMAKE_INTERNAL_INCLUDED_FILES"].append(subs.at(i)); + v["QMAKE_INTERNAL_INCLUDED_FILES"].append(in.fileName()); continue; } out.close(); @@ -538,8 +561,9 @@ continue; } } + mkdir(QFileInfo(out).absolutePath()); if(out.open(QFile::WriteOnly)) { - v["QMAKE_INTERNAL_INCLUDED_FILES"].append(subs.at(i)); + v["QMAKE_INTERNAL_INCLUDED_FILES"].append(in.fileName()); out.write(contents.toUtf8()); } else { warn_msg(WarnLogic, "Cannot open substitute for output '%s'", diff -r ef0373b55136 -r 758a864f9613 qmake/generators/symbian/initprojectdeploy_symbian.cpp --- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -353,7 +353,11 @@ CopyItem &item = i.next(); QFileInfo fromItem(item.from); QFileInfo toItem(item.to); - if (fromItem == toItem) +#if defined(Q_OS_WIN) + if (0 == fromItem.absoluteFilePath().compare(toItem.absoluteFilePath(), Qt::CaseInsensitive)) +#else + if (0 == fromItem.absoluteFilePath().compare(toItem.absoluteFilePath())) +#endif i.remove(); } } diff -r ef0373b55136 -r 758a864f9613 qmake/generators/symbian/symbiancommon.cpp --- a/qmake/generators/symbian/symbiancommon.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/symbian/symbiancommon.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -146,7 +146,7 @@ void SymbianCommonGenerator::removeSpecialCharacters(QString& str) { - // When modifying this method check also application_icon.prf + // When modifying this method check also symbianRemoveSpecialCharacters in symbian.conf str.replace(QString("/"), QString("_")); str.replace(QString("\\"), QString("_")); str.replace(QString(" "), QString("_")); @@ -154,7 +154,7 @@ void SymbianCommonGenerator::removeEpocSpecialCharacters(QString& str) { - // When modifying this method check also application_icon.prf + // When modifying this method check also symbianRemoveSpecialCharacters in symbian.conf str.replace(QString("-"), QString("_")); str.replace(QString(":"), QString("_")); str.replace(QString("."), QString("_")); @@ -171,13 +171,8 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocBuild) { QMakeProject *project = generator->project; - QString pkgTarget = project->first("QMAKE_ORIG_TARGET"); - if (pkgTarget.isEmpty()) - pkgTarget = project->first("TARGET"); - pkgTarget = generator->unescapeFilePath(pkgTarget); - pkgTarget = removePathSeparators(pkgTarget); QString pkgFilename = Option::output_dir + QLatin1Char('/') + - QString("%1_template.pkg").arg(pkgTarget); + QString("%1_template.pkg").arg(fixedTarget); QFile pkgFile(pkgFilename); if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) { @@ -186,7 +181,7 @@ } QString stubPkgFileName = Option::output_dir + QLatin1Char('/') + - QString("%1_stub.pkg").arg(pkgTarget); + QString("%1_stub.pkg").arg(fixedTarget); QFile stubPkgFile(stubPkgFileName); if (!stubPkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) { @@ -210,7 +205,7 @@ // Header info QString wrapperPkgFilename = Option::output_dir + QLatin1Char('/') + QString("%1_installer.%2") - .arg(pkgTarget).arg("pkg"); + .arg(fixedTarget).arg("pkg"); QString headerComment = "; %1 generated by qmake at %2\n" "; This file is generated by qmake and should not be modified by the user\n" @@ -269,8 +264,44 @@ tw << languageRules.join("\n") << endl; ts << languageRules.join("\n") << endl; - // name of application, UID and version - QString applicationVersion = project->first("VERSION").isEmpty() ? "1,0,0" : project->first("VERSION").replace('.', ','); + // Determine application version. If version has missing component values, + // those will default to zero. + // If VERSION is missing altogether or is invalid, use "1,0,0" + QStringList verNumList = project->first("VERSION").split('.'); + uint major = 0; + uint minor = 0; + uint patch = 0; + bool success = false; + + if (verNumList.size() > 0) { + major = verNumList[0].toUInt(&success); + if (success && verNumList.size() > 1) { + minor = verNumList[1].toUInt(&success); + if (success && verNumList.size() > 2) { + patch = verNumList[2].toUInt(&success); + } + } + } + + QString applicationVersion("1,0,0"); + if (success) + applicationVersion = QString("%1,%2,%3").arg(major).arg(minor).arg(patch); + + // Append package build version number if it is set + QString pkgBuildVersion = project->first("DEPLOYMENT.pkg_build_version"); + if (!pkgBuildVersion.isEmpty()) { + success = false; + uint build = pkgBuildVersion.toUInt(&success); + if (success && build < 100) { + if (pkgBuildVersion.size() == 1) + pkgBuildVersion.prepend(QLatin1Char('0')); + applicationVersion.append(pkgBuildVersion); + } else { + fprintf(stderr, "Warning: Invalid DEPLOYMENT.pkg_build_version (%s), must be a number between 0 - 99\n", qPrintable(pkgBuildVersion)); + } + } + + // Package header QString sisHeader = "; SIS header: name, uid, version\n#{\"%1\"},(%2),%3\n\n"; QString visualTarget = generator->escapeFilePath(project->first("TARGET")); @@ -519,7 +550,7 @@ // Wrapped files deployment QString currentPath = qmake_getpwd(); - QString sisName = QString("%1.sis").arg(pkgTarget); + QString sisName = QString("%1.sis").arg(fixedTarget); twf << "\"" << currentPath << "/" << sisName << "\" - \"c:\\private\\2002CCCE\\import\\" << sisName << "\"" << endl; QString bootStrapPath = QLibraryInfo::location(QLibraryInfo::PrefixPath); @@ -536,7 +567,7 @@ if (QDir::separator().unicode() != '/') ret.replace(QDir::separator(), QLatin1Char('/')); - if (ret.indexOf(QLatin1Char('/')) > 0) + if (ret.indexOf(QLatin1Char('/')) >= 0) ret.remove(0, ret.lastIndexOf(QLatin1Char('/')) + 1); return ret; @@ -559,7 +590,7 @@ t << "// * user." << endl; t << "// ============================================================================" << endl; t << endl; - t << "#include <" << fixedTarget << ".rsg>" << endl; + t << "#include <" << fixedTarget.toLower() << ".rsg>" << endl; t << "#include " << endl; foreach(QString item, userItems[RSS_TAG_HEADER]) t << item << endl; @@ -639,7 +670,7 @@ //QTP: //QTP: loc change start - t << "#include <" << translationFileName << ".loc>" << endl; + t << "#include <" << translationFileName.toLower() << ".loc>" << endl; //QTP: loc change end t << endl; t << "RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info" << endl; @@ -774,107 +805,120 @@ void SymbianCommonGenerator::writeSymbianLocFile(QStringList &symbianLangCodes) { - QMakeProject *project = generator->project; - QString filename(translationFileName); + QMakeProject *project = generator->project; + // Loop through all the languages and generate language specific loc files. foreach(QString lang, symbianLangCodes) { - - QString tsFilename(filename); - QString language = qt2S60LangMapTable.key(lang, QString("en")); - tsFilename.append("_"+language+".ts"); - - tsFilename.insert(0, project->first("SYMBIANTRANSLATIONSRCDIR")); - - QString locFilename(filename); - locFilename.append("_"+lang+".loc"); - if (!project->first("SYMBIANLOCFILESDIR").isEmpty()) { - locFilename.insert(0, lang+"/"); - locFilename.insert(0, project->first("SYMBIANLOCFILESDIR")); - } else { - locFilename.insert(0, "/epoc32/include/platform/mw/loc/"+lang+"/"); + QString locFilename(translationFileName); //Use first entry from pro files TRANSLATIONS field as the name of the loc file. + locFilename.append("_"+lang+".loc"); + if (!project->first("SYMBIANLOCFILESDIR").isEmpty()) { + locFilename.insert(0, lang+"/"); + locFilename.insert(0, project->first("SYMBIANLOCFILESDIR")); + } else { + locFilename.insert(0, "/epoc32/include/platform/mw/loc/"+lang+"/"); + } + QString shortCaption; + QString longCaption; + + QStringList translationFilenames = project->values("TRANSLATIONS"); + // Read captions from all the ts files that exist on pro file. Use the caption that is found first. Print warning notes from duplicates. + foreach (QString tsFilename, translationFilenames) { + // add the path and current language identification to ts name and search if txt_short_caption_ or txt_long_caption_ is present + //QString tsFilename(tempfilename); + if (!tsFilename.isEmpty()) { + tsFilename = generator->fileInfo(tsFilename).completeBaseName(); + tsFilename = generator->unescapeFilePath(tsFilename); + tsFilename = removePathSeparators(tsFilename); + } + QString language = qt2S60LangMapTable.key(lang, QString("en")); + tsFilename.append("_"+language+".ts"); + tsFilename.insert(0, project->first("SYMBIANTRANSLATIONSRCDIR")); + QFile tsFile(tsFilename); + if (tsFile.exists()) { + if (tsFile.open(QIODevice::ReadOnly)) { + QString shortCaptionId = QLatin1String("txt_short_caption_"); + QString longCaptionId = QLatin1String("txt_long_caption_"); + QXmlStreamReader xml(&tsFile); + while (!xml.atEnd()) { + xml.readNext(); + if (xml.isStartElement() && xml.name() == "context") { + while (!(xml.isEndElement() && xml.name() == "context") && !xml.atEnd()) { + xml.readNext(); + if (xml.isStartElement() && xml.name() == "message" + && xml.attributes().value("numerus") == "no" + && xml.attributes().value("id").toString().left(shortCaptionId.length()) == shortCaptionId) { + while (!(xml.isEndElement() && xml.name() == "message") && !xml.atEnd()) { + xml.readNext(); + if (xml.isStartElement() && xml.name() == "translation") { + if (shortCaption.isEmpty()){ + shortCaption = xml.readElementText(); + } else { + fprintf(stderr, "Duplicate short caption field found from: '%s'.\n", qPrintable(tsFilename)); + } + } + } + } + if (xml.isStartElement() && xml.name() == "message" + && xml.attributes().value("numerus") == "no" + && xml.attributes().value("id").toString().left(longCaptionId.length()) == longCaptionId) { + while (!(xml.isEndElement() && xml.name() == "message") && !xml.atEnd()) { + xml.readNext(); + if (xml.isStartElement() && xml.name() == "translation" ) { + if (longCaption.isEmpty()){ + longCaption = xml.readElementText(); + } else { + fprintf(stderr, "Duplicate long caption field found from: '%s'.\n", qPrintable(tsFilename)); + } + } + } + } + } + } + } + if (shortCaption.isEmpty()) { + fprintf(stderr, "Short caption generated from target name '#%s'.\n", qPrintable(fixedTarget)); + } + if (longCaption.isEmpty()) { + fprintf(stderr, "Warning: STRING_r_caption not generated from file '%s'.\n", qPrintable(tsFilename)); + fprintf(stderr, " : caption generated from target name '#%s'.\n", qPrintable(fixedTarget)); + } + if (xml.hasError()) + fprintf(stderr, "ERROR: \"%s\" when parsing ts file\n", qPrintable(xml.errorString())); + } else { + fprintf(stderr, "Could not open ts file (%s)\n", qPrintable(tsFilename)); + } + } else { + fprintf(stderr, "Warning: ts file does not exist: (%s)\n", qPrintable(tsFilename)); + fprintf(stderr, " : short and long caption generated from target name '#%s'.\n", qPrintable(fixedTarget)); + } + } + // generate language specific caption loc file + QFile ft(locFilename); + if (ft.open(QIODevice::WriteOnly)) { + generatedFiles << ft.fileName(); + QTextStream t(&ft); + t << "// ============================================================================" << endl; + t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: "; + t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl; + t << "// * This file is generated by qmake and should not be modified by the" << endl; + t << "// * user." << endl; + t << "// ============================================================================" << endl; + t << endl; + t <<"CHARACTER_SET UTF8"<project; - QString systemLanguagesIniFile = project->first("SYMBIANTRANSLATIONDIR"). - append(QLatin1String("system_languages.ini")); + + QString systemLanguagesIniFile("/epoc32/include/system_languages.ini"); + QFileInfo systemLangFileInfo(systemLanguagesIniFile); if (systemLangFileInfo.exists()) { QSettings systemLanguages(systemLanguagesIniFile, QSettings::IniFormat); diff -r ef0373b55136 -r 758a864f9613 qmake/generators/symbian/symmake.cpp --- a/qmake/generators/symbian/symmake.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/symbian/symmake.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -246,13 +246,8 @@ writeMkFile(wrapperFileName, false); - QString shortProFilename = project->projectFile(); - shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString("")); - shortProFilename.replace(Option::pro_ext, QString("")); - - QString mmpFilename = Option::output_dir + QLatin1Char('/') + shortProFilename + QLatin1Char('_') - + uid3 + Option::mmp_ext; - writeMmpFile(mmpFilename, symbianLangCodes); + QString absoluteMmpFileName = Option::output_dir + QLatin1Char('/') + mmpFileName; + writeMmpFile(absoluteMmpFileName, symbianLangCodes); if (targetType == TypeExe) { if (!project->isActiveConfig("no_icon")) { @@ -289,6 +284,15 @@ project->values("MAKEFILE") += BLD_INF_FILENAME; // .mmp + mmpFileName = fixedTarget; + if (targetType == TypeExe) + mmpFileName.append("_exe"); + else if (targetType == TypeDll || targetType == TypePlugin) + mmpFileName.append("_dll"); + else if (targetType == TypeLib) + mmpFileName.append("_lib"); + mmpFileName.append(Option::mmp_ext); + initMmpVariables(); uid2 = project->first("TARGET.UID2"); @@ -488,7 +492,7 @@ t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl; t << "// This file is generated by qmake and should not be modified by the" << endl; t << "// user." << endl; - t << "// Name : " << escapeFilePath(fileFixify(project->projectFile().remove(project->projectFile().length() - 4, 4))) << Option::mmp_ext << endl; + t << "// Name : " << mmpFileName << endl; t << "// ==============================================================================" << endl << endl; } @@ -697,7 +701,7 @@ t << "SOURCEPATH\t\t\t." << endl; t << MMP_START_RESOURCE "\t\t" << regTarget << endl; if (isForSymbianSbsv2()) - t << "DEPENDS " << fixedTarget << ".rsg" << endl; + t << "DEPENDS " << fixedTarget.toLower() << ".rsg" << endl; t << "TARGETPATH\t\t" REGISTRATION_RESOURCE_DIRECTORY_HW << endl; t << MMP_END_RESOURCE << endl << endl; } @@ -924,8 +928,6 @@ // Add includes of subdirs bld.inf files - QString mmpfilename = escapeFilePath(fileFixify(project->projectFile())); - mmpfilename = mmpfilename.replace(mmpfilename.lastIndexOf("."), 4, Option::mmp_ext); QString currentPath = qmake_getpwd(); QDir directory(currentPath); @@ -1007,15 +1009,8 @@ t << endl << mmpTag << endl << endl; writeBldInfMkFilePart(t, addDeploymentExtension); - if (targetType != TypeSubdirs) { - QString shortProFilename = project->projectFile(); - shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString("")); - shortProFilename.replace(Option::pro_ext, QString("")); - - QString mmpFilename = shortProFilename + QString("_") + uid3 + Option::mmp_ext; - - t << mmpFilename << endl; - } + if (targetType != TypeSubdirs) + t << mmpFileName << endl; userItems = userBldInfRules.value(mmpTag); foreach(QString item, userItems) diff -r ef0373b55136 -r 758a864f9613 qmake/generators/symbian/symmake.h --- a/qmake/generators/symbian/symmake.h Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/symbian/symmake.h Mon Oct 04 01:19:32 2010 +0300 @@ -59,6 +59,7 @@ protected: QString platform; QString uid2; + QString mmpFileName; QMap sources; QMap systeminclude; QMap library; @@ -78,6 +79,7 @@ QString generateUID3(); void initMmpVariables(); + void generateMmpFileName(); void handleMmpRulesOverrides(QString &checkString, bool &inResourceBlock, QStringList &restrictedMmpKeywords, diff -r ef0373b55136 -r 758a864f9613 qmake/generators/symbian/symmake_abld.cpp --- a/qmake/generators/symbian/symmake_abld.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/symbian/symmake_abld.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -70,10 +70,6 @@ void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, bool deploymentOnly) { - QString gnuMakefileName = QLatin1String("Makefile_") + uid3; - removeEpocSpecialCharacters(gnuMakefileName); - gnuMakefileName.append(".mk"); - QFile ft(gnuMakefileName); if (ft.open(QIODevice::WriteOnly)) { generatedFiles << ft.fileName(); @@ -339,13 +335,17 @@ } else { t << "all: debug release" << endl; t << endl; + + QString qmakeCmd = "\t$(QMAKE) \"" + project->projectFile() + "\" " + buildArgs(); + t << "qmake:" << endl; - t << "\t$(QMAKE) -spec symbian-abld -o \"" << fileInfo(Option::output.fileName()).fileName() - << "\" \"" << project->projectFile() << "\"" << endl; + t << qmakeCmd << endl; t << endl; - t << BLD_INF_FILENAME ":" << endl; - t << "\t$(QMAKE)" << endl; + + t << BLD_INF_FILENAME ": " << project->projectFile() << endl; + t << qmakeCmd << endl; t << endl; + t << "$(ABLD): " BLD_INF_FILENAME << endl; t << "\tbldmake bldfiles" << endl; t << endl; @@ -557,9 +557,8 @@ // Normally emulator deployment gets done via regular makefile, but since subdirs // do not get that, special deployment only makefile is generated for them if needed. if (targetType != TypeSubdirs || addDeploymentExtension) { - QString gnuMakefileName = QLatin1String("Makefile_") + uid3; - removeEpocSpecialCharacters(gnuMakefileName); - gnuMakefileName.append(".mk"); + gnuMakefileName = QLatin1String("Makefile_") + fileInfo(mmpFileName).completeBaseName() + + QLatin1String(".mk"); t << "gnumakefile " << gnuMakefileName << endl; } } diff -r ef0373b55136 -r 758a864f9613 qmake/generators/symbian/symmake_abld.h --- a/qmake/generators/symbian/symmake_abld.h Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/symbian/symmake_abld.h Mon Oct 04 01:19:32 2010 +0300 @@ -58,7 +58,7 @@ virtual void appendAbldTempDirs(QStringList& sysincspaths, QString includepath); bool writeDeploymentTargets(QTextStream &t, bool isRom); - + QString gnuMakefileName; public: SymbianAbldMakefileGenerator(); diff -r ef0373b55136 -r 758a864f9613 qmake/generators/symbian/symmake_sbsv2.cpp --- a/qmake/generators/symbian/symmake_sbsv2.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/symbian/symmake_sbsv2.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -56,6 +56,12 @@ #define FLM_DEST_DIR "epoc32/tools/makefile_templates/qt" #define FLM_SOURCE_DIR "/mkspecs/symbian-sbsv2/flm/qt" +#define UNDETECTED_GCCE_VERSION "0" +#define PLATFORM_GCCE "gcce" +#define PLATFORM_WINSCW "winscw" +#define PLATFORM_ARMV5 "armv5" +#define BUILD_DEBUG "udeb" +#define BUILD_RELEASE "urel" // Copies Qt FLMs to correct location under epocroot. // This is not done by configure as it is possible to change epocroot after configure. @@ -94,6 +100,67 @@ } } +QString SymbianSbsv2MakefileGenerator::gcceVersion() +{ + static QString gcceVersionStr; + + if (gcceVersionStr.isEmpty()) { + // First check if QT_GCCE_VERSION has been set, and use that if it is + QByteArray qtGcceVersion = qgetenv("QT_GCCE_VERSION"); + if (!qtGcceVersion.isEmpty()) { + // Check that QT_GCCE_VERSION is in proper format + QString check(qtGcceVersion); + check.replace(QRegExp("^\\d+\\.\\d+\\.\\d+$"),QString()); + if (check.isEmpty()) { + gcceVersionStr = PLATFORM_GCCE + QString(qtGcceVersion).replace(".","_"); + return gcceVersionStr; + } else { + fprintf(stderr, "Warning: Environment variable QT_GCCE_VERSION ('%s') is in incorrect " + "format, expected format is: '1.2.3'. Attempting to autodetect GCCE version.", + qtGcceVersion.constData()); + } + } + // Sbsv2 has separate env variable defined for each gcce version, so try to determine + // which user is likely to want to use by checking version 4.0.0 to 9.9.9 and taking + // the highest found version that actually points to a valid path. + // This is kind of a kludge, but since qmake doesn't bootstrap QProcess, there + // is no Qt API available to get all environment variables. + for (int i = 9; i >= 4; i--) { + for (int j = 9; j >= 0; j--) { + for (int k = 9; k >= 0; k--) { + QByteArray gcceVar = qgetenv(qPrintable(QString("SBS_GCCE%1%2%3BIN").arg(i).arg(j).arg(k))); + if (!gcceVar.isEmpty() && fileInfo(QString::fromLocal8Bit(gcceVar.constData())).exists()) { + gcceVersionStr = QString(PLATFORM_GCCE "%1_%2_%3").arg(i).arg(j).arg(k); + return gcceVersionStr; + } + } + } + } + } + + // Indicate undetected version to avoid rechecking multiple times + if (gcceVersionStr.isEmpty()) + gcceVersionStr = UNDETECTED_GCCE_VERSION; + + return gcceVersionStr; +} + +QString SymbianSbsv2MakefileGenerator::configClause(QString &platform, + QString &build, + QString &winscwClauseTemplate, + QString &gcceClauseTemplate, + QString &genericClauseTemplate) +{ + QString retval; + if (QString::compare(platform, PLATFORM_WINSCW) == 0) + retval = winscwClauseTemplate.arg(build); + else if (QString::compare(platform, PLATFORM_GCCE) == 0) + retval = gcceClauseTemplate.arg(build); + else + retval = genericClauseTemplate.arg(platform).arg(build); + return retval; +} + void SymbianSbsv2MakefileGenerator::writeSbsDeploymentList(const DeploymentList& depList, QTextStream& t) { for (int i = 0; i < depList.size(); ++i) { @@ -123,21 +190,54 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile) { + static QString debugBuild(BUILD_DEBUG); + static QString releaseBuild(BUILD_RELEASE); + QStringList allPlatforms; foreach(QString platform, project->values("SYMBIAN_PLATFORMS")) { allPlatforms << platform.toLower(); } - QStringList debugPlatforms = allPlatforms; - QStringList releasePlatforms = allPlatforms; - releasePlatforms.removeAll("winscw"); // No release for emulator - QString testClause; if (project->isActiveConfig(SYMBIAN_TEST_CONFIG)) testClause = QLatin1String(".test"); else testClause = QLatin1String(""); + QString genericClause = " -c %1_%2" + testClause; + QString winscwClause = " -c winscw_%1.mwccinc" + testClause; + QString gcceClause; + bool stripArmv5 = false; + + if (allPlatforms.contains(PLATFORM_GCCE)) { + if (QString::compare(gcceVersion(), UNDETECTED_GCCE_VERSION) == 0) { + allPlatforms.removeAll(PLATFORM_GCCE); + } else { + gcceClause = " -c arm.v5.%1." + gcceVersion() + testClause; + // Since gcce building is enabled, do not add armv5 for any sbs command + // that also contains gcce, because those will build same targets. + stripArmv5 = true; + } + } + + QStringList allClauses; + QStringList debugClauses; + QStringList releaseClauses; + + QStringList debugPlatforms = allPlatforms; + QStringList releasePlatforms = allPlatforms; + releasePlatforms.removeAll(PLATFORM_WINSCW); // No release for emulator + + foreach(QString item, debugPlatforms) { + if (item != PLATFORM_ARMV5 || !stripArmv5) + debugClauses << configClause(item, debugBuild, winscwClause, gcceClause, genericClause); + } + foreach(QString item, releasePlatforms) { + if (item != PLATFORM_ARMV5 || !stripArmv5) + releaseClauses << configClause(item, releaseBuild, winscwClause, gcceClause, genericClause); + } + allClauses << debugClauses << releaseClauses; + QTextStream t(&wrapperFile); t << "# ==============================================================================" << endl; @@ -177,9 +277,9 @@ } t << endl; t << "first: default" << endl; - if (debugPlatforms.contains("winscw")) + if (debugPlatforms.contains(PLATFORM_WINSCW)) t << "default: debug-winscw"; - else if (debugPlatforms.contains("armv5")) + else if (debugPlatforms.contains(PLATFORM_ARMV5)) t << "default: debug-armv5"; else if (debugPlatforms.size()) t << "default: debug-" << debugPlatforms.first(); @@ -192,60 +292,61 @@ } else { t << "all: debug release" << endl; t << endl; + + QString qmakeCmd = "\t$(QMAKE) \"" + project->projectFile() + "\" " + buildArgs(); + t << "qmake:" << endl; - t << "\t$(QMAKE) -spec symbian-sbsv2 -o \"" << fileInfo(Option::output.fileName()).fileName() - << "\" \"" << project->projectFile() << "\"" << endl; - t << endl; - t << BLD_INF_FILENAME ":" << endl; - t << "\t$(QMAKE)" << endl; + t << qmakeCmd << endl; t << endl; - QString winscw("winscw"); + t << BLD_INF_FILENAME ": " << project->projectFile() << endl; + t << qmakeCmd << endl; + t << endl; + + QString currentClause; + t << "debug: " << BLD_INF_FILENAME << endl; t << "\t$(SBS)"; - foreach(QString item, debugPlatforms) { - if(QString::compare(item, winscw) == 0) - t << " -c " << item << "_udeb.mwccinc" << testClause; - else - t << " -c " << item << "_udeb" << testClause; + foreach(QString item, debugClauses) { + t << item; } t << endl; t << "release: " << BLD_INF_FILENAME << endl; t << "\t$(SBS)"; - foreach(QString item, releasePlatforms) { - if(QString::compare(item, winscw) == 0) - t << " -c " << item << "_urel.mwccinc" << testClause; - else - t << " -c " << item << "_urel" << testClause; + foreach(QString item, releaseClauses) { + t << item; } t << endl; // For more specific builds, targets are in this form: build-platform, e.g. release-armv5 foreach(QString item, debugPlatforms) { t << "debug-" << item << ": " << BLD_INF_FILENAME << endl; - if(QString::compare(item, winscw) == 0) - t << "\t$(SBS) -c " << item << "_udeb.mwccinc" << testClause << endl; - else - t << "\t$(SBS) -c " << item << "_udeb" << testClause << endl; + t << "\t$(SBS)"; + t << configClause(item, debugBuild, winscwClause, gcceClause, genericClause); + t << endl; } foreach(QString item, releasePlatforms) { t << "release-" << item << ": " << BLD_INF_FILENAME << endl; - if(QString::compare(item, winscw) == 0) - t << "\t$(SBS) -c " << item << "_urel.mwccinc" << testClause << endl; - else - t << "\t$(SBS) -c " << item << "_urel" << testClause << endl; + t << "\t$(SBS)"; + t << configClause(item, releaseBuild, winscwClause, gcceClause, genericClause); + t << endl; } t << endl; t << "export: " << BLD_INF_FILENAME << endl; - t << "\t$(SBS) export" << endl; - t << endl; + t << "\t$(SBS) export"; + foreach(QString clause, allClauses) { + t << clause; + } + t << endl << endl; t << "cleanexport: " << BLD_INF_FILENAME << endl; - t << "\t$(SBS) cleanexport" << endl; - t << endl; - + t << "\t$(SBS) cleanexport"; + foreach(QString clause, allClauses) { + t << clause; + } + t << endl << endl; } // Add all extra targets including extra compiler targest also to wrapper makefile, @@ -263,30 +364,37 @@ generateDistcleanTargets(t); t << "clean: " << BLD_INF_FILENAME << endl; - t << "\t-$(SBS) reallyclean" << endl; - t << endl; + t << "\t-$(SBS) reallyclean"; + foreach(QString clause, allClauses) { + t << clause; + } + t << endl << endl; t << "clean-debug: " << BLD_INF_FILENAME << endl; t << "\t$(SBS) reallyclean"; - foreach(QString item, debugPlatforms) { - t << " -c " << item << "_udeb" << testClause; + foreach(QString clause, debugClauses) { + t << clause; } - t << endl; + t << endl << endl; t << "clean-release: " << BLD_INF_FILENAME << endl; t << "\t$(SBS) reallyclean"; - foreach(QString item, releasePlatforms) { - t << " -c " << item << "_urel" << testClause; + foreach(QString clause, releaseClauses) { + t << clause; } - t << endl; + t << endl << endl; // For more specific builds, targets are in this form: clean-build-platform, e.g. clean-release-armv5 foreach(QString item, debugPlatforms) { t << "clean-debug-" << item << ": " << BLD_INF_FILENAME << endl; - t << "\t$(SBS) reallyclean -c " << item << "_udeb" << testClause << endl; + t << "\t$(SBS) reallyclean"; + t << configClause(item, debugBuild, winscwClause, gcceClause, genericClause); + t << endl; } foreach(QString item, releasePlatforms) { t << "clean-release-" << item << ": " << BLD_INF_FILENAME << endl; - t << "\t$(SBS) reallyclean -c " << item << "_urel" << testClause << endl; + t << "\t$(SBS) reallyclean"; + t << configClause(item, releaseBuild, winscwClause, gcceClause, genericClause); + t << endl; } t << endl; } @@ -310,6 +418,28 @@ } } + QMap commandsToReplace; + commandsToReplace.insert(project->values("QMAKE_COPY").join(" "), + project->values("QMAKE_SBSV2_COPY").join(" ")); + commandsToReplace.insert(project->values("QMAKE_COPY_DIR").join(" "), + project->values("QMAKE_SBSV2_COPY_DIR").join(" ")); + commandsToReplace.insert(project->values("QMAKE_MOVE").join(" "), + project->values("QMAKE_SBSV2_MOVE").join(" ")); + commandsToReplace.insert(project->values("QMAKE_DEL_FILE").join(" "), + project->values("QMAKE_SBSV2_DEL_FILE").join(" ")); + commandsToReplace.insert(project->values("QMAKE_MKDIR").join(" "), + project->values("QMAKE_SBSV2_MKDIR").join(" ")); + commandsToReplace.insert(project->values("QMAKE_DEL_DIR").join(" "), + project->values("QMAKE_SBSV2_DEL_DIR").join(" ")); + commandsToReplace.insert(project->values("QMAKE_DEL_TREE").join(" "), + project->values("QMAKE_SBSV2_DEL_TREE").join(" ")); + + // If commandItem starts with any $$QMAKE_* commands, do a replace for SBS equivalent + // Command replacement is done only for the start of the command or right after + // concatenation operators (&& and ||), as otherwise unwanted replacements might occur. + static QString cmdFind("(^|&&\\s*|\\|\\|\\s*)%1"); + static QString cmdReplace("\\1%1"); + // Write extra compilers and targets to initialize QMAKE_ET_* variables // Cache results to avoid duplicate calls when creating wrapper makefile QTextStream extraCompilerStream(&extraCompilersCache); @@ -321,13 +451,7 @@ // are not necessary. QStringList allPreDeps; foreach(QString item, project->values("PRE_TARGETDEPS")) { - // Predeps get mangled in windows, so fix them to more sbsv2 friendly format -#if defined(Q_OS_WIN) - if (item.mid(1, 1) == ":") - item = item.mid(0, 1).toUpper().append(item.mid(1)); // Fix drive to uppercase -#endif - item.replace("\\", "/"); - allPreDeps << escapeDependencyPath(item); + allPreDeps.append(fileInfo(item).absoluteFilePath()); } foreach (QString item, project->values("GENERATED_SOURCES")) { @@ -357,7 +481,6 @@ QStringList deps = project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_DEPS.") + item + targetItem); QString commandItem = project->values(QLatin1String("QMAKE_INTERNAL_ET_PARSED_CMD.") + item + targetItem).join(" "); - // Make sure all deps paths are absolute QString absoluteDeps; foreach (QString depItem, deps) { @@ -371,6 +494,18 @@ t << "OPTION PREDEP_TARGET " << absoluteTarget << endl; t << "OPTION DEPS " << absoluteDeps << endl; + // Iterate command replacements in reverse alphabetical order of keys so + // that keys which are starts of other longer keys are iterated after longer keys. + QMapIterator cmdIter(commandsToReplace); + cmdIter.toBack(); + while (cmdIter.hasPrevious()) { + cmdIter.previous(); + if (commandItem.contains(cmdIter.key())) { + commandItem.replace(QRegExp(cmdFind.arg(cmdIter.key())), + cmdReplace.arg(cmdIter.value())); + } + } + if (commandItem.indexOf("$(INCPATH)") != -1) commandItem.replace("$(INCPATH)", incPath.join(" ")); if (commandItem.indexOf("$(DEFINES)") != -1) @@ -388,8 +523,10 @@ t << endl; //loc change starts - QString translationFilename = project->first("TRANSLATIONS"); - if (!project->values("SYMBIANTRANSLATIONS").isEmpty() && !translationFilename.isEmpty()) { + //QString translationFilename = project->first("TRANSLATIONS"); + if (!project->values("SYMBIANTRANSLATIONS").isEmpty() && !project->first("TRANSLATIONS").isEmpty()) { + QStringList translationFilenames = project->values("TRANSLATIONS"); + foreach (const QString &translationFilename, translationFilenames) { QStringList symbianTranslations = project->values("SYMBIANTRANSLATIONS"); QString symbianTrPath = project->first("SYMBIANTRANSLATIONDIR"); QString symbianTrSrcPath = project->first("SYMBIANTRANSLATIONSRCDIR"); @@ -451,6 +588,7 @@ t << endl; } } + } //QTP: loc change end // Write deployment rules diff -r ef0373b55136 -r 758a864f9613 qmake/generators/symbian/symmake_sbsv2.h --- a/qmake/generators/symbian/symmake_sbsv2.h Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/symbian/symmake_sbsv2.h Mon Oct 04 01:19:32 2010 +0300 @@ -65,6 +65,13 @@ private: void exportFlm(); + QString gcceVersion(); + QString configClause(QString &platform, + QString &build, + QString &winscwClauseTemplate, + QString &gcceClauseTemplate, + QString &genericClauseTemplate); + void writeSbsDeploymentList(const DeploymentList& depList, QTextStream& t); QString extraTargetsCache; diff -r ef0373b55136 -r 758a864f9613 qmake/generators/win32/mingw_make.cpp --- a/qmake/generators/win32/mingw_make.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/win32/mingw_make.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -197,10 +197,7 @@ QTextStream t(&file); t << "CREATE " << target << endl; for (QStringList::ConstIterator it = objList.constBegin(); it != objList.constEnd(); ++it) { - if (QDir::isRelativePath(*it)) - t << "ADDMOD " << *it << endl; - else - t << *it << endl; + t << "ADDMOD " << *it << endl; } t << "SAVE" << endl; t.flush(); diff -r ef0373b55136 -r 758a864f9613 qmake/generators/win32/msbuild_objectmodel.cpp --- a/qmake/generators/win32/msbuild_objectmodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/win32/msbuild_objectmodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -569,7 +569,8 @@ UseFullPaths = _True; break; case 'd': - ProgramDataBaseFileName += option+3; + ProgramDataBaseFileName = option+3; + break; case 'I': ForcedIncludeFiles += option+3; break; @@ -1572,7 +1573,8 @@ break; case 0x0034160: // /MAP[:filename] GenerateMapFile = _True; - MapFileName = option+5; + if (option[4] == ':') + MapFileName = option+5; break; case 0x164e1ef: // /MAPINFO:{EXPORTS} if(*(option+9) == 'E') diff -r ef0373b55136 -r 758a864f9613 qmake/generators/win32/msvc_objectmodel.cpp --- a/qmake/generators/win32/msvc_objectmodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/win32/msvc_objectmodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1430,7 +1430,8 @@ break; case 0x0034160: // /MAP[:filename] GenerateMapFile = _True; - MapFileName = option+5; + if (option[4] == ':') + MapFileName = option+5; break; case 0x164e1ef: // /MAPINFO:{EXPORTS|LINES} if(*(option+9) == 'E') diff -r ef0373b55136 -r 758a864f9613 qmake/generators/win32/msvc_vcxproj.cpp --- a/qmake/generators/win32/msvc_vcxproj.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/win32/msvc_vcxproj.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -202,7 +202,6 @@ conf.CharacterSet = "NotSet"; break; } - conf.CharacterSet = charSet(temp.isEmpty() ? (short)charSetNotSet : temp.toShort()); } conf.DeleteExtensionsOnClean = project->first("DeleteExtensionsOnClean"); conf.ImportLibrary = conf.linker.ImportLibrary; diff -r ef0373b55136 -r 758a864f9613 qmake/generators/win32/winmakefile.cpp --- a/qmake/generators/win32/winmakefile.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/qmake/generators/win32/winmakefile.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -475,10 +475,13 @@ resFile.replace(".rc", Option::res_ext); project->values("RES_FILE").prepend(fileInfo(resFile).fileName()); if (!project->values("OBJECTS_DIR").isEmpty()) { - if(project->isActiveConfig("staticlib")) - project->values("RES_FILE").first().prepend(fileInfo(project->values("DESTDIR").first()).absoluteFilePath() + Option::dir_sep); + QString resDestDir; + if (project->isActiveConfig("staticlib")) + resDestDir = fileInfo(project->first("DESTDIR")).absoluteFilePath(); else - project->values("RES_FILE").first().prepend(project->values("OBJECTS_DIR").first() + Option::dir_sep); + resDestDir = project->first("OBJECTS_DIR"); + resDestDir.append(Option::dir_sep); + project->values("RES_FILE").first().prepend(resDestDir); } project->values("RES_FILE").first() = Option::fixPathToTargetOS(project->values("RES_FILE").first(), false, false); project->values("POST_TARGETDEPS") += project->values("RES_FILE"); diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog --- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog Mon Oct 04 01:19:32 2010 +0300 @@ -1,3 +1,39 @@ +2010-06-18 Tucker Jay + + Reviewed by NOBODY (OOPS!). + + [Symbian] Lazy commit of memory required in JSC register file + https://bugs.webkit.org/show_bug.cgi?id=34349 + + * JavaScriptCore.pro: Added 1 new Symbian source file + * interpreter/RegisterFile.cpp: + (JSC::RegisterFile::~RegisterFile): + * interpreter/RegisterFile.h: + (JSC::RegisterFile::): + (JSC::RegisterFile::start): + (JSC::RegisterFile::end): + (JSC::RegisterFile::size): + (JSC::RegisterFile::setNumGlobals): + (JSC::RegisterFile::numGlobals): + (JSC::RegisterFile::maxGlobals): + (JSC::RegisterFile::lastGlobal): + (JSC::RegisterFile::markGlobals): + (JSC::RegisterFile::markCallFrames): + (JSC::isPageAligned): + (JSC::RegisterFile::RegisterFile): + (JSC::RegisterFile::shrink): + (JSC::RegisterFile::grow): + * wtf/symbian/RegisterFileAllocatorSymbian.cpp: Added. + (WTF::RegisterFileAllocator::RegisterFileAllocator): + Helper class to allocate memory required by RegisterFile + more efficiently. + (WTF::RegisterFileAllocator::~RegisterFileAllocator): + (WTF::RegisterFileAllocator::buffer): + (WTF::RegisterFileAllocator::grow): + (WTF::RegisterFileAllocator::shrink): + * wtf/symbian/RegisterFileAllocatorSymbian.h: Added. + * wtf/symbian/SymbianDefines.h: Added. + 2010-06-19 Thiago Macieira Reviewed by Kenneth Rohde Christiansen. diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri Mon Oct 04 01:19:32 2010 +0300 @@ -211,6 +211,7 @@ wtf/qt/ThreadingQt.cpp \ wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ + wtf/symbian/RegisterFileAllocatorSymbian.cpp \ wtf/ThreadingNone.cpp \ wtf/Threading.cpp \ wtf/TypeTraits.cpp \ diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.cpp --- a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -40,6 +40,8 @@ VirtualFree(m_buffer, DWORD(m_commitEnd) - DWORD(m_buffer), MEM_DECOMMIT); #endif VirtualFree(m_buffer, 0, MEM_RELEASE); +#elif OS(SYMBIAN) + delete m_registerFileAllocator; #else fastFree(m_buffer); #endif diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.h --- a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/RegisterFile.h Mon Oct 04 01:19:32 2010 +0300 @@ -41,6 +41,10 @@ #include #endif +#if OS(SYMBIAN) +#include +#endif + namespace JSC { /* @@ -152,12 +156,21 @@ #if HAVE(VIRTUALALLOC) Register* m_commitEnd; #endif +#if OS(SYMBIAN) + // Commits and frees a continguous chunk of memory as required + WTF::RegisterFileAllocator* m_registerFileAllocator; +#endif JSGlobalObject* m_globalObject; // The global object whose vars are currently stored in the register file. }; // FIXME: Add a generic getpagesize() to WTF, then move this function to WTF as well. - inline bool isPageAligned(size_t size) { return size != 0 && size % (8 * 1024) == 0; } + // This is still a hack that should be fixed later. We know that a Symbian page size is 4K. + #if OS(SYMBIAN) + inline bool isPageAligned(size_t size) { return size && !(size % (4 * 1024)); } + #else + inline bool isPageAligned(size_t size) { return size && !(size % (8 * 1024)); } + #endif inline RegisterFile::RegisterFile(size_t capacity, size_t maxGlobals) : m_numGlobals(0) @@ -204,7 +217,13 @@ CRASH(); } m_commitEnd = reinterpret_cast(reinterpret_cast(m_buffer) + committedSize); - #else + #elif OS(SYMBIAN) + m_registerFileAllocator = new WTF::RegisterFileAllocator(bufferLength); + m_buffer = (Register*)(m_registerFileAllocator->buffer()); + // start by committing enough space to hold maxGlobals + void* newEnd = (void*)((int)m_buffer + (maxGlobals * sizeof(Register))); + m_registerFileAllocator->grow(newEnd); + #else /* * If neither MMAP nor VIRTUALALLOC are available - use fastMalloc instead. * @@ -226,8 +245,13 @@ if (newEnd >= m_end) return; m_end = newEnd; - if (m_end == m_start && (m_maxUsed - m_start) > maxExcessCapacity) + if (m_end == m_start && (m_maxUsed - m_start) > maxExcessCapacity) { +#if OS(SYMBIAN) + m_registerFileAllocator->shrink(newEnd); +#endif + releaseExcessCapacity(); + } } inline bool RegisterFile::grow(Register* newEnd) @@ -252,6 +276,9 @@ m_commitEnd = reinterpret_cast(reinterpret_cast(m_commitEnd) + size); } #endif +#if OS(SYMBIAN) + m_registerFileAllocator->grow((void*)newEnd); +#endif if (newEnd > m_maxUsed) m_maxUsed = newEnd; diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/javascriptcore/JavaScriptCore/runtime/CollectorHeapIterator.h --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/CollectorHeapIterator.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/CollectorHeapIterator.h Mon Oct 04 01:19:32 2010 +0300 @@ -97,14 +97,12 @@ inline LiveObjectIterator& LiveObjectIterator::operator++() { - if (m_block < m_heap.nextBlock || m_cell < m_heap.nextCell) { - advance(HeapConstants::cellsPerBlock); + advance(HeapConstants::cellsPerBlock - 1); + if (m_block < m_heap.nextBlock || (m_block == m_heap.nextBlock && m_cell < m_heap.nextCell)) return *this; - } - do { - advance(HeapConstants::cellsPerBlock); - } while (m_block < m_heap.usedBlocks && !m_heap.blocks[m_block]->marked.get(m_cell)); + while (m_block < m_heap.usedBlocks && !m_heap.blocks[m_block]->marked.get(m_cell)) + advance(HeapConstants::cellsPerBlock - 1); return *this; } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" + +#if OS(SYMBIAN) + +#include "RegisterFileAllocatorSymbian.h" + +namespace WTF { + +/** Efficiently allocates memory pools of size poolSize. + * Primarily designed for JSC RegisterFile's needs. + * Not thread-safe. + */ +RegisterFileAllocator::RegisterFileAllocator(TUint32 reservationSize, TUint32 poolSize) : + m_reserved(reservationSize), m_poolSize(poolSize) +{ + // Get system's page size value. + SYMBIAN_PAGESIZE(m_pageSize); + + // We only accept multiples of system page size for both initial reservation + // and the alignment/pool size + m_reserved = SYMBIAN_ROUNDUPTOMULTIPLE(m_reserved, m_pageSize); + __ASSERT_ALWAYS(SYMBIAN_ROUNDUPTOMULTIPLE(m_poolSize, m_pageSize), + User::Panic(_L("RegisterFileAllocator1"), KErrArgument)); + + // Open a Symbian RChunk, and reserve requested virtual address range + // Any thread in this process can operate this RChunk due to EOwnerProcess access rights. + TInt ret = m_chunk.CreateDisconnectedLocal(0 , 0, (TInt)m_reserved , EOwnerProcess); + if (ret != KErrNone) + User::Panic(_L("RegisterFileAllocator2"), ret); + + m_buffer = (void*)m_chunk.Base(); + m_resEnd = (void*)(m_chunk.Base() + m_chunk.MaxSize()); + m_comEnd = m_buffer; +} + +RegisterFileAllocator::~RegisterFileAllocator() +{ + // release everything! + m_chunk.Decommit(0, m_chunk.MaxSize()); + m_chunk.Close(); +} + +void* RegisterFileAllocator::buffer() const +{ + return m_buffer; +} + +void RegisterFileAllocator::grow(void* newEnd) +{ + // trying to commit more memory than reserved! + if (newEnd > m_resEnd) + return; + + if (newEnd > m_comEnd) { + TInt nBytes = (TInt)(newEnd) - (TInt)(m_comEnd); + nBytes = SYMBIAN_ROUNDUPTOMULTIPLE(nBytes, m_poolSize); + TInt offset = (TInt)m_comEnd - (TInt)m_buffer; + + TInt ret = m_chunk.Commit(offset, nBytes); + if (ret == KErrNone) + m_comEnd = (void*)(m_chunk.Base() + m_chunk.Size()); + } +} + +void RegisterFileAllocator::shrink(void* newEnd) +{ + if (newEnd < m_comEnd) { + TInt nBytes = (TInt)newEnd - (TInt)m_comEnd; + if (nBytes >= m_poolSize) { + TInt offset = SYMBIAN_ROUNDUPTOMULTIPLE((TUint)newEnd, m_poolSize) - (TInt)m_buffer; + nBytes = (TInt)m_comEnd - offset - (TInt)m_buffer; + if (nBytes > 0) { + TInt ret = m_chunk.Decommit(offset, nBytes); + if (ret == KErrNone) + m_comEnd = (void*)(m_chunk.Base() + m_chunk.Size()); + } + } + } +} + +} // end of namespace + +#endif // SYMBIAN diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef RegisterFileAllocatorSymbian_h +#define RegisterFileAllocatorSymbian_h + +#include "SymbianDefines.h" + +namespace WTF { + +/** + * Allocates contiguous regions of size poolSize. + * poolSize must be a multiple of system page size (typically 4K on Symbian/ARM) + * + * @param reservationSize Virtual address range to be reserved upon creation of chunk (bytes). + * @param poolSize Size of a single allocation. + */ +class RegisterFileAllocator { + +public: + RegisterFileAllocator( + TUint32 reservationSize, TUint32 poolSize = SYMBIAN_REGFILEALLOC_DEFAULTPOOLSIZE); + ~RegisterFileAllocator(); + void* buffer() const; + void grow(void* newEnd); + void shrink(void* newEnd); + +private: + RChunk m_chunk; // Symbian chunk that lets us reserve/commit/decommit + + // all following values are in numbers of bytes + TInt m_pageSize; // cached value of system page size, typically 4K on Symbian + TUint32 m_reserved; // total number of reserved bytes in virtual memory + TUint32 m_poolSize; // size of one memory pool, set by default to 64K in wtf/symbian/SymbianDefines.h + + void* m_buffer; // pointer to base of the chunk + void* m_comEnd; // pointer to end of currently committed memory + void* m_resEnd; // pointer to end of reserved memory + +}; + +} // end of namespace + +#endif // RegisterFileAllocatorSymbian_h diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef SymbianDefines_h +#define SymbianDefines_h + +#include +#include +#include + +#define SYMBIAN_PAGESIZE(x) (HAL::Get(HALData::EMemoryPageSize, x)); +#define SYMBIAN_FREERAM(x) (HAL::Get(HALData::EMemoryRAMFree, x)); +#define SYMBIAN_ROUNDUPTOMULTIPLE(x, multipleof) ( (x + multipleof - 1) & ~(multipleof - 1) ) + +#define SYMBIAN_REGFILEALLOC_DEFAULTPOOLSIZE 65536 // 64K + +#endif // SymbianDefines_h diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet.pri --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet.pri Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,18 @@ +INCLUDEPATH += $$PWD/libconninet/src + +QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB + +HEADERS += \ + $$PWD/libconninet/src/dbusdispatcher.h \ + $$PWD/libconninet/src/iapconf.h \ + $$PWD/libconninet/src/iapmonitor.h \ + $$PWD/libconninet/src/maemo_icd.h \ + $$PWD/libconninet/src/proxyconf.h + +SOURCES += \ + $$PWD/libconninet/src/dbusdispatcher.cpp \ + $$PWD/libconninet/src/iapconf.cpp \ + $$PWD/libconninet/src/iapmonitor.cpp \ + $$PWD/libconninet/src/maemo_icd.cpp \ + $$PWD/libconninet/src/proxyconf.cpp + diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/AUTHORS diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/COPYING --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/COPYING Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,510 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control +compilation and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply, and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License +may add an explicit geographical distribution limitation excluding those +countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License). + + To apply these terms, attach the following notices to the library. +It is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where the full +notice is found. + + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the library, +if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James + Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/ChangeLog diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/INSTALL --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/INSTALL Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,229 @@ +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. + +Installation Names +================== + + By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PATH'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the `--target=TYPE' option to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/NEWS diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/README diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/autogen.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/autogen.sh Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,3 @@ +#!/bin/sh + +autoreconf --verbose --install --force diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/config.guess --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/config.guess Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1533 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. + +timestamp='2009-06-10' + +# This file 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 program 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 program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd | genuineintel) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/config.sub --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/config.sub Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1693 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. + +timestamp='2009-06-11' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file 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 program 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 program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/configure.ac --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/configure.ac Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,90 @@ +AC_INIT([libconninet], patsubst(esyscmd([dpkg-parsechangelog | sed -n '/^Version: \(.*\)$/ {s//\1/;p}']), [ +]), [jukka.rissanen@nokia.com]) +AM_INIT_AUTOMAKE([foreign]) + +AC_PROG_CXX +AC_PROG_LIBTOOL + +AC_ARG_ENABLE(docs, [ --enable-docs Build DOXYGEN documentation (requires Doxygen)],enable_docs=$enableval,enable_docs=auto) + +AC_PATH_PROG(DOXYGEN, doxygen, no) +AC_MSG_CHECKING([whether to build Doxygen documentation]) + +if test x$DOXYGEN = xno ; then + have_doxygen=no +else + have_doxygen=yes +fi +if test x$enable_docs = xauto ; then + if test x$have_doxygen = xno ; then + enable_docs=no + else + enable_docs=yes + fi +fi +if test x$enable_docs = xyes; then + if test x$have_doxygen = xno; then + AC_MSG_ERROR([Building Doxygen docs explicitly required, but Doxygen not found]) + else + AC_MSG_RESULT(yes) + fi +else + AC_MSG_RESULT(no) +fi + +AM_CONDITIONAL(DOXYGEN_DOCS_ENABLED, test x$enable_docs = xyes) +AC_SUBST(DOXYGEN) + +PKG_CHECK_MODULES(GLIB, glib-2.0) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + +PKG_CHECK_MODULES(QTCORE, QtCore) +AC_SUBST(QTCORE_CFLAGS) +AC_SUBST(QTCORE_LIBS) + +PKG_CHECK_MODULES(QTNETWORK, QtNetwork) +AC_SUBST(QTNETWORK_CFLAGS) +AC_SUBST(QTNETWORK_LIBS) + +PKG_CHECK_MODULES(QTDBUS, QtDBus) +AC_SUBST(QTDBUS_CFLAGS) +AC_SUBST(QTDBUS_LIBS) + +PKG_CHECK_MODULES(QTTEST, QtTest) +AC_SUBST(QTTEST_CFLAGS) +AC_SUBST(QTTEST_LIBS) + +PKG_CHECK_MODULES(DBUS, dbus-glib-1) +AC_SUBST(DBUS_CFLAGS) +AC_SUBST(DBUS_LIBS) + +PKG_CHECK_MODULES(CONNSETTINGS, connsettings) +AC_SUBST(CONNSETTINGS_CFLAGS) +AC_SUBST(CONNSETTINGS_LIBS) + +PKG_CHECK_MODULES(OSSO_IC, osso-ic) +AC_SUBST(OSSO_IC_CFLAGS) +AC_SUBST(OSSO_IC_LIBS) + +PKG_CHECK_MODULES(ICD_DEV, icd2) +AC_SUBST(ICD_DEV_CFLAGS) +AC_SUBST(ICD_DEV_LIBS) + +PKG_CHECK_MODULES(GCONF, gconf-2.0) +AC_SUBST(GCONF_CFLAGS) +AC_SUBST(GCONF_LIBS) + +PKG_CHECK_MODULES(QGCONF, gq-gconf) +AC_SUBST(QGCONF_CFLAGS) +AC_SUBST(QGCONF_LIBS) + +CONCFLAGS="-Wall -Werror -Wmissing-prototypes" +AC_SUBST(CONCFLAGS) + +AC_CONFIG_FILES([Makefile \ + src/Makefile \ + tests/Makefile \ + conninet.pc \ + doxygen.cfg]) +AC_OUTPUT diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/conninet.pc.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/conninet.pc.in Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libconninet +Description: Internet Connectivity support library +Version: @VERSION@ +Requires: dbus-1 >= 0.60 glib-2.0 QtCore QtDBus QtGui +Libs: -lconninet +Cflags: -I${includedir}/conninet diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/debian/changelog --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/debian/changelog Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,293 @@ +libconninet (0.42+0m6) unstable; urgency=low + + * This entry has been added by BIFH queue processor + version has been changed to 0.42+0m6 + + -- Qing Jin Thu, 22 Jul 2010 14:04:58 +0300 + +libconninet (0.42) unstable; urgency=low + + * Fixes: NB#180536 - Uploads to online services are not working. + This is a regression caused by fix to bug 175098, the timeout was never + expiring when waiting reply from icd. + + -- Jukka Rissanen Mon, 19 Jul 2010 12:23:30 +0300 + +libconninet (0.41) unstable; urgency=low + + * Fixes: NB#175098 - Qt4.7 Webkit crashes when bearer API QNetworkSession + constructor calls QNetworkSession::syncStateWithInterface() which in turn + calls Maemo::state() and Maemo::addrinfo() and webkit expects that event + loop is not run but those function process main loop events. + Now Maemo::state() and Maemo::addrinfo() are changed to be synchronous + and fully blocking functions. The old non-blocking versions are called + Maemo::state_non_blocking() and Maemo::addrinfo_non_blocking(). + + -- Jukka Rissanen Wed, 14 Jul 2010 10:12:47 +0300 + +libconninet (0.40) unstable; urgency=low + + * Fixes: NB#167465 - Unable to open network connection using libbearer + + -- Jukka Rissanen Tue, 11 May 2010 10:47:10 +0300 + +libconninet (0.39) unstable; urgency=low + + * Fixes: NB#167982 - initialize DBus vtable in DBusDispatcher. + + -- Aapo Makela Mon, 10 May 2010 14:42:39 +0300 + +libconninet (0.38) unstable; urgency=low + + * Changing icd2 connect_req to be synchronous as the check for + returned connect signal did not work correctly, this caused a + long timeout when connect() was called. + * Scan sometimes missed results and did not return them to caller. + * HTTP proxy settings were not set correctly. + + -- Jukka Rissanen Thu, 15 Apr 2010 11:25:06 +0300 + +libconninet (0.37) unstable; urgency=low + + * Make proxy config reference counting atomic. + + -- Jukka Rissanen Wed, 3 Mar 2010 13:23:08 +0200 + +libconninet (0.36) unstable; urgency=low + + * Fixes: NB#157586 - Cleanup dbus listener when WLAN scanning object is + deleted. + + -- Jukka Rissanen Fri, 26 Feb 2010 13:30:41 +0200 + +libconninet (0.35) unstable; urgency=low + + * Fixes: NB#156883 - libconninet fails to build under the Platform SDK (SB2) + + -- Jukka Rissanen Thu, 18 Feb 2010 12:14:40 +0200 + +libconninet (0.34) unstable; urgency=low + + * Coverity fix + + -- Jukka Rissanen Tue, 16 Feb 2010 16:38:00 +0200 + +libconninet (0.33) unstable; urgency=low + + * Added API to update Qt proxy config. + + -- Jukka Rissanen Tue, 26 Jan 2010 15:48:36 +0200 + +libconninet (0.32) unstable; urgency=low + + * Fixed IAPConf to unset value when set value is invalid. + * Updated IAPMonitor to use libconnsettings. + + -- Aapo Makela Wed, 03 Feb 2010 07:32:45 +0200 + +libconninet (0.31) unstable; urgency=low + + * Fixes: NB#154892 - Check nulls in IAPConf. + + -- Aapo Makela Mon, 01 Feb 2010 09:32:06 +0200 + +libconninet (0.30) unstable; urgency=low + + * Updated IAPConf to use libconnsettings. + + -- Aapo Makela Fri, 29 Jan 2010 12:58:03 +0200 + +libconninet (0.29) unstable; urgency=low + + * Fixed dependencies + + -- Jukka Rissanen Fri, 15 Jan 2010 10:16:07 +0200 + +libconninet (0.28) unstable; urgency=low + + * Get rid of libdui dependency + + -- Jukka Rissanen Wed, 13 Jan 2010 09:56:26 +0200 + +libconninet (0.27) unstable; urgency=low + + * Insert new pending calls to the list in DBusDispatcher. + + -- Aapo Makela Tue, 22 Dec 2009 14:27:32 +0200 + +libconninet (0.26) unstable; urgency=low + + * Added possibility to specify different signal path for DBusDispatcher. + + -- Aapo Makela Wed, 25 Nov 2009 14:27:34 +0200 + +libconninet (0.25) unstable; urgency=low + + * Fixes: NB#146450 - All scan results were not returned to the caller. + + -- Jukka Rissanen Mon, 16 Nov 2009 17:23:15 +0200 + +libconninet (0.24) unstable; urgency=low + + * Wait all scan results for all network types in Maemo::Icd::scan() + + -- Jukka Rissanen Fri, 6 Nov 2009 14:45:23 +0200 + +libconninet (0.23) unstable; urgency=low + + * Fixes: NB#143361 - Assert failure in session class for GPRS IAP. + + -- Jukka Rissanen Mon, 19 Oct 2009 16:00:14 +0300 + +libconninet (0.22) unstable; urgency=low + + * Fixed the error checking if scan returns 0 results. + + -- Jukka Rissanen Wed, 7 Oct 2009 13:50:27 +0300 + +libconninet (0.21) unstable; urgency=low + + * Support multiple DBusDispatcher classes at the same time. This is + required by Maemo::Icd class so that multiple instances of it can + be used the same time. + + -- Jukka Rissanen Mon, 5 Oct 2009 16:33:43 +0300 + +libconninet (0.20) unstable; urgency=low + + * Fixed memory leak in IAPConf::setValue() + + -- Jukka Rissanen Fri, 2 Oct 2009 13:02:21 +0300 + +libconninet (0.19) unstable; urgency=low + + * Fixed connect_req to one specific IAP in Icd class. + + -- Jukka Rissanen Tue, 29 Sep 2009 17:02:46 +0300 + +libconninet (0.18) unstable; urgency=low + + * Make sure the library will not abort in Icd class if scan does + not return any results. + + -- Jukka Rissanen Tue, 22 Sep 2009 17:00:12 +0300 + +libconninet (0.17) unstable; urgency=low + + * Added IAP monitoring support. + + -- Jukka Rissanen Mon, 21 Sep 2009 16:29:31 +0300 + +libconninet (0.16) unstable; urgency=low + + * Disabled the old osso-ic dbus interface as it is currently not used. + * Fixed the addrinfo request, now addresses are returned correctly to + the caller. + + -- Jukka Rissanen Thu, 17 Sep 2009 15:56:13 +0300 + +libconninet (0.15) unstable; urgency=low + + * Enabling state_req, statistics_req and addrinfo_req support + functions in Maemo::Icd as the corresponding DBUS API functions are + fixed in icd2 v0.89 + + -- Jukka Rissanen Fri, 24 Jul 2009 15:23:02 +0300 + +libconninet (0.14) unstable; urgency=low + + * Icd statistics support added. + * Icd address information support added. + * Icd scan method does not return the final (and empty) result any more. + * Added initial unit test implementation for Icd class. + * Some of the status functions in Icd class disabled because of issues + in icd2 and the dbus api. + + -- Jukka Rissanen Thu, 23 Jul 2009 11:03:05 +0300 + +libconninet (0.13) unstable; urgency=low + + * Added API to get all the configured IAPs. + + -- Jukka Rissanen Tue, 21 Jul 2009 09:47:18 +0300 + +libconninet (0.12) unstable; urgency=low + + * Replaced duivaluespace by Dui in pkg-config file because the + duivaluespace is deprecated. + + -- Jukka Rissanen Mon, 20 Jul 2009 16:00:10 +0300 + +libconninet (0.11) unstable; urgency=low + + * Using libdui instead of libduivaluespace because it is deprecated. + * The IAPConf::clear() uses native gconf API instead of launching gconftool + * Check that state_req call returned list and the list contains entries + before trying to access it. + + -- Jukka Rissanen Mon, 20 Jul 2009 14:55:15 +0300 + +libconninet (0.10) unstable; urgency=low + + * connect() did not return ok when connection succeeded. + + -- Jukka Rissanen Thu, 25 Jun 2009 09:31:21 +0300 + +libconninet (0.9) unstable; urgency=low + + * Connection timeout set to 2.5min, same as in fremantle. + + -- Jukka Rissanen Wed, 17 Jun 2009 13:36:40 +0300 + +libconninet (0.8) unstable; urgency=low + + * Fix state_req signal received from Icd + + -- Jukka Rissanen Thu, 11 Jun 2009 17:19:33 +0300 + +libconninet (0.7) unstable; urgency=low + + * Icd disconnect and select reqs are made synchronous as we do not + wait the return status. The previous async version was causing core + dumps if Icd class was destroyed too early. + + -- Jukka Rissanen Thu, 11 Jun 2009 11:52:36 +0300 + +libconninet (0.6) unstable; urgency=low + + * Fixed the libconninet0-dev dependencies. + + -- Jukka Rissanen Mon, 8 Jun 2009 10:47:56 +0300 + +libconninet (0.5) unstable; urgency=low + + * Fixed missing QObject connect functions. + * Fixed IAPConf to return invalid QVariant if the value does not exist. + + -- Jukka Rissanen Mon, 01 Jun 2009 13:58:53 +0300 + +libconninet (0.4) unstable; urgency=low + + * Fixed QObject signal setting for Maemo::Icd + + -- Jukka Rissanen Wed, 20 May 2009 13:51:11 +0300 + +libconninet (0.3) unstable; urgency=low + + * Refactoring classes + * Added IAPConf class. + + -- Jukka Rissanen Thu, 14 May 2009 13:24:11 +0300 + +libconninet (0.2) unstable; urgency=low + + * Fixed pkgconfig file which had wrong dependency + * Added DBus array and struct support to DBusDispatcher. + + -- Jukka Rissanen Wed, 13 May 2009 12:11:00 +0300 + +libconninet (0.1) unstable; urgency=low + + * Initial Release. + + -- Jukka Rissanen Tue, 12 May 2009 16:10:27 +0200 diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/debian/compat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/debian/compat Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +4 diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/debian/control --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/debian/control Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,39 @@ +Source: libconninet +Priority: optional +Maintainer: Jukka Rissanen +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libglib2.0-dev (>= 2.8), + libdbus-1-dev (>= 0.60), libconnsettings0-dev (>= 0.4), icd2-osso-ic-dev, + icd2-dev, libqt4-dev, libgconf2-dev (>> 2.6.4), libgq-gconf-dev +Standards-Version: 3.6.2 +Section: libs + +Package: libconninet0-dev +Section: libdevel +Architecture: any +Depends: libconninet0 (= ${Source-Version}), libdbus-1-dev (>= 0.60), + libglib2.0-dev (>= 2.8), libconnsettings0-dev (>= 0.4), libqt4-dev, + icd2-osso-ic-dev, icd2-dev, libgconf2-dev (>> 2.6.4), libgq-gconf-dev +Description: Internet Connectivity support library development files + Internet Connectivity support library (libconninet) provides common + support functions for connecting to icd2 and accessing configuration + data. + . + This package contains the header files. + +Package: libconninet0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Internet Connectivity support library + Internet Connectivity support library (libconninet) provides common + support functions for connecting to icd2 and accessing configuration + data. + . + This package contains the shared libraries. + +Package: libconninet0-dbg +Section: libs +Architecture: any +Depends: libconninet0 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends} +Description: Debug symbols for the Internet Connectivity support library + Internet Connectivity support library (libconninet) debug symbols. diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/debian/copyright --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/debian/copyright Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,19 @@ +libconninet - Internet Connectivity support library + +Copyright (C) 2009 Nokia Corporation. All rights reserved. + +Contact: Jukka Rissanen + +This library is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License version 2.1 +as published by the Free Software Foundation. + +This library 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 +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/debian/libconninet0-dev.dirs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/debian/libconninet0-dev.dirs Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,2 @@ +usr/lib +usr/include diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/debian/libconninet0-dev.files --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/debian/libconninet0-dev.files Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/lib*.so +usr/lib/pkgconfig/* +usr/share/pkgconfig/* diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/debian/libconninet0.dirs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/debian/libconninet0.dirs Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +usr/lib diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/debian/libconninet0.files --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/debian/libconninet0.files Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +usr/lib/lib*.so.* diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/debian/rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/debian/rules Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,123 @@ +#!/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 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +# shared library versions, option 1 +#version=2.0.5 +#major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +version=`ls src/.libs/lib*.so.* | \ + awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +major=`ls src/.libs/lib*.so.* | \ + awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +configure: configure.ac debian/changelog + -./autogen.sh + +config.status: configure + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info + + +build: build-stamp +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + +# 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_movefiles + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip --dbg-package=libconninet0 + dh_compress + dh_fixperms +# dh_perl +# dh_python + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/doxygen.cfg.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/doxygen.cfg.in Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1147 @@ +# Doxyfile 1.3.7 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "Internet Connectivity Support Library" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = @VERSION@ + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = doc + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 2 levels of 10 sub-directories under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of source +# files, where putting all generated files in the same directory would otherwise +# cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, +# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en +# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, +# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. + +OUTPUT_LANGUAGE = English + +# This tag can be used to specify the encoding used in the generated output. +# The encoding is not always determined by the language that is chosen, +# but also whether or not the output is meant for Windows or non-Windows users. +# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES +# forces the Windows encoding (this is the default for the Windows binary), +# whereas setting the tag to NO uses a Unix-style encoding (the default for +# all platforms other than Windows). + +USE_WINDOWS_ENCODING = NO + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is used +# as the annotated text. Otherwise, the brief description is used as-is. If left +# blank, the following values are used ("$name" is automatically replaced with the +# name of the entity): "The $name class" "The $name widget" "The $name file" +# "is" "provides" "specifies" "contains" "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited +# members of a class in the documentation of that class as if those members were +# ordinary class members. Constructors, destructors and assignment operators of +# the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = NO + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like the Qt-style comments (thus requiring an +# explicit @brief command for a brief description. + +JAVADOC_AUTOBRIEF = YES + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# will output the detailed description near the top, like JavaDoc. +# If set to NO, the detailed description appears after the member +# documentation. + +DETAILS_AT_TOP = YES + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = YES + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources +# only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes +# will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = YES + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = conic/conic.h \ + conic/conicconnection.h \ + conic/conicconnectionevent.h \ + conic/conicevent.h \ + conic/coniciap.h \ + conic/conicstatisticsevent.h + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp +# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories +# that are symbolic links (a Unix filesystem feature) are excluded from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. + +EXCLUDE_PATTERNS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. + +INPUT_FILTER = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_PREDEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse the +# parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or +# super classes. Setting the tag to NO turns the diagrams off. Note that this +# option is superseded by the HAVE_DOT option below. This is only a fallback. It is +# recommended to install and use dot, since it yields more powerful graphs. + +CLASS_DIAGRAMS = YES + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = NO + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found on the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_WIDTH = 1024 + +# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_HEIGHT = 1024 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes that +# lay further from the root node will be omitted. Note that setting this option to +# 1 or 2 may greatly reduce the computation time needed for large code bases. Also +# note that a graph may be further truncated if the graph's image dimensions are +# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). +# If 0 is used for the depth value (the default), the graph is not depth-constrained. + +MAX_DOT_GRAPH_DEPTH = 0 + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/src/dbusdispatcher.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/src/dbusdispatcher.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,611 @@ +/* * This file is part of conninet * + * + * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * + * Contact: Aapo Makela + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include +#include +#include +#include +#include +#include +#include "dbusdispatcher.h" + +namespace Maemo { + +/*! + \class DBusDispatcher + + \brief DBusDispatcher is a class, which is able to send DBUS method call + messages and receive unicast signals from DBUS object. +*/ + +class DBusDispatcherPrivate +{ +public: + DBusDispatcherPrivate(const QString& service, + const QString& path, + const QString& interface, + const QString& signalPath) + : service(service), path(path), interface(interface), + signalPath(signalPath), connection(0) + { + memset(&signal_vtable, 0, sizeof(signal_vtable)); + } + + ~DBusDispatcherPrivate() + { + foreach(DBusPendingCall *call, pending_calls) { + dbus_pending_call_cancel(call); + dbus_pending_call_unref(call); + } + } + + QString service; + QString path; + QString interface; + QString signalPath; + struct DBusConnection *connection; + QList pending_calls; + struct DBusObjectPathVTable signal_vtable; +}; + +static bool constantVariantList(const QVariantList& variantList) { + // Special case, empty list == empty struct + if (variantList.isEmpty()) { + return false; + } else { + QVariant::Type type = variantList[0].type(); + // Iterate items in the list and check if they are same type + foreach(QVariant variant, variantList) { + if (variant.type() != type) { + return false; + } + } + } + return true; +} + +static QString variantToSignature(const QVariant& argument, + bool constantList = true) { + switch (argument.type()) { + case QVariant::Bool: + return "b"; + case QVariant::ByteArray: + return "ay"; + case QVariant::Char: + return "y"; + case QVariant::Int: + return "i"; + case QVariant::UInt: + return "u"; + case QVariant::StringList: + return "as"; + case QVariant::String: + return "s"; + case QVariant::LongLong: + return "x"; + case QVariant::ULongLong: + return "t"; + case QVariant::List: + { + QString signature; + QVariantList variantList = argument.toList(); + if (!constantList) { + signature += DBUS_STRUCT_BEGIN_CHAR_AS_STRING; + foreach(QVariant listItem, variantList) { + signature += variantToSignature(listItem); + } + signature += DBUS_STRUCT_END_CHAR_AS_STRING; + } else { + if (variantList.isEmpty()) + return ""; + signature = "a" + variantToSignature(variantList[0]); + } + + return signature; + } + default: + qDebug() << "Unsupported variant type: " << argument.type(); + break; + } + + return ""; +} + +static bool appendVariantToDBusMessage(const QVariant& argument, + DBusMessageIter *dbus_iter) { + int idx = 0; + DBusMessageIter array_iter; + QStringList str_list; + dbus_bool_t bool_data; + dbus_int32_t int32_data; + dbus_uint32_t uint32_data; + dbus_int64_t int64_data; + dbus_uint64_t uint64_data; + char *str_data; + char char_data; + + switch (argument.type()) { + + case QVariant::Bool: + bool_data = argument.toBool(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_BOOLEAN, + &bool_data); + break; + + case QVariant::ByteArray: + str_data = argument.toByteArray().data(); + dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY, + DBUS_TYPE_BYTE_AS_STRING, &array_iter); + dbus_message_iter_append_fixed_array(&array_iter, + DBUS_TYPE_BYTE, + &str_data, + argument.toByteArray().size()); + dbus_message_iter_close_container(dbus_iter, &array_iter); + break; + + case QVariant::Char: + char_data = argument.toChar().toAscii(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_BYTE, + &char_data); + break; + + case QVariant::Int: + int32_data = argument.toInt(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_INT32, + &int32_data); + break; + + case QVariant::String: + str_data = argument.toString().toLatin1().data(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_STRING, + &str_data); + break; + + case QVariant::StringList: + str_list = argument.toStringList(); + dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY, + "s", &array_iter); + for (idx = 0; idx < str_list.size(); idx++) { + str_data = str_list.at(idx).toLatin1().data(); + dbus_message_iter_append_basic(&array_iter, + DBUS_TYPE_STRING, + &str_data); + } + dbus_message_iter_close_container(dbus_iter, &array_iter); + break; + + case QVariant::UInt: + uint32_data = argument.toUInt(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_UINT32, + &uint32_data); + break; + + case QVariant::ULongLong: + uint64_data = argument.toULongLong(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_UINT64, + &uint64_data); + break; + + case QVariant::LongLong: + int64_data = argument.toLongLong(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_INT64, + &int64_data); + break; + + case QVariant::List: + { + QVariantList variantList = argument.toList(); + bool constantList = constantVariantList(variantList); + DBusMessageIter array_iter; + + // List is mapped either as an DBUS array (all items same type) + // DBUS struct (variable types) depending on constantList + if (constantList) { + // Resolve the signature for the first item + QString signature = ""; + if (!variantList.isEmpty()) { + signature = variantToSignature( + variantList[0], + constantVariantList(variantList[0].toList())); + } + + // Mapped as DBUS array + dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY, + signature.toAscii(), + &array_iter); + + foreach(QVariant listItem, variantList) { + appendVariantToDBusMessage(listItem, &array_iter); + } + + dbus_message_iter_close_container(dbus_iter, &array_iter); + } else { + // Mapped as DBUS struct + dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_STRUCT, + NULL, + &array_iter); + + foreach(QVariant listItem, variantList) { + appendVariantToDBusMessage(listItem, &array_iter); + } + + dbus_message_iter_close_container(dbus_iter, &array_iter); + } + + break; + } + default: + qDebug() << "Unsupported variant type: " << argument.type(); + break; + } + + return true; +} + +static QVariant getVariantFromDBusMessage(DBusMessageIter *iter) { + dbus_bool_t bool_data; + dbus_int32_t int32_data; + dbus_uint32_t uint32_data; + dbus_int64_t int64_data; + dbus_uint64_t uint64_data; + char *str_data; + char char_data; + int argtype = dbus_message_iter_get_arg_type(iter); + + switch (argtype) { + + case DBUS_TYPE_BOOLEAN: + { + dbus_message_iter_get_basic(iter, &bool_data); + QVariant variant((bool)bool_data); + return variant; + } + + case DBUS_TYPE_ARRAY: + { + // Handle all arrays here + int elem_type = dbus_message_iter_get_element_type(iter); + DBusMessageIter array_iter; + + dbus_message_iter_recurse(iter, &array_iter); + + if (elem_type == DBUS_TYPE_BYTE) { + QByteArray byte_array; + do { + dbus_message_iter_get_basic(&array_iter, &char_data); + byte_array.append(char_data); + } while (dbus_message_iter_next(&array_iter)); + QVariant variant(byte_array); + return variant; + } else if (elem_type == DBUS_TYPE_STRING) { + QStringList str_list; + do { + dbus_message_iter_get_basic(&array_iter, &str_data); + str_list.append(str_data); + } while (dbus_message_iter_next(&array_iter)); + QVariant variant(str_list); + return variant; + } else { + QVariantList variantList; + do { + variantList << getVariantFromDBusMessage(&array_iter); + } while (dbus_message_iter_next(&array_iter)); + QVariant variant(variantList); + return variant; + } + break; + } + + case DBUS_TYPE_BYTE: + { + dbus_message_iter_get_basic(iter, &char_data); + QChar ch(char_data); + QVariant variant(ch); + return variant; + } + + case DBUS_TYPE_INT32: + { + dbus_message_iter_get_basic(iter, &int32_data); + QVariant variant((int)int32_data); + return variant; + } + + case DBUS_TYPE_UINT32: + { + dbus_message_iter_get_basic(iter, &uint32_data); + QVariant variant((uint)uint32_data); + return variant; + } + + case DBUS_TYPE_STRING: + { + dbus_message_iter_get_basic(iter, &str_data); + QString str(str_data); + QVariant variant(str); + return variant; + } + + case DBUS_TYPE_INT64: + { + dbus_message_iter_get_basic(iter, &int64_data); + QVariant variant((qlonglong)int64_data); + return variant; + } + + case DBUS_TYPE_UINT64: + { + dbus_message_iter_get_basic(iter, &uint64_data); + QVariant variant((qulonglong)uint64_data); + return variant; + } + + case DBUS_TYPE_STRUCT: + { + // Handle all structs here + DBusMessageIter struct_iter; + dbus_message_iter_recurse(iter, &struct_iter); + + QVariantList variantList; + do { + variantList << getVariantFromDBusMessage(&struct_iter); + } while (dbus_message_iter_next(&struct_iter)); + QVariant variant(variantList); + return variant; + } + + default: + qDebug() << "Unsupported DBUS type: " << argtype; + } + + return QVariant(); +} + +static DBusHandlerResult signalHandler (DBusConnection *connection, + DBusMessage *message, + void *object_ref) { + (void)connection; + QString interface; + QString signal; + DBusDispatcher *dispatcher = (DBusDispatcher *)object_ref; + + if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL) { + interface = dbus_message_get_interface(message); + signal = dbus_message_get_member(message); + + QList arglist; + DBusMessageIter dbus_iter; + + if (dbus_message_iter_init(message, &dbus_iter)) { + // Read return arguments + while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) { + arglist << getVariantFromDBusMessage(&dbus_iter); + dbus_message_iter_next(&dbus_iter); + } + } + + dispatcher->emitSignalReceived(interface, signal, arglist); + return DBUS_HANDLER_RESULT_HANDLED; + } + (void)message; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} + +DBusDispatcher::DBusDispatcher(const QString& service, + const QString& path, + const QString& interface, + QObject *parent) + : QObject(parent), + d_ptr(new DBusDispatcherPrivate(service, path, interface, path)) { + setupDBus(); +} + +DBusDispatcher::DBusDispatcher(const QString& service, + const QString& path, + const QString& interface, + const QString& signalPath, + QObject *parent) + : QObject(parent), + d_ptr(new DBusDispatcherPrivate(service, path, interface, signalPath)) { + setupDBus(); +} + +DBusDispatcher::~DBusDispatcher() +{ + if (d_ptr->connection) { + dbus_connection_close(d_ptr->connection); + dbus_connection_unref(d_ptr->connection); + } + delete d_ptr; +} + +void DBusDispatcher::setupDBus() +{ + d_ptr->connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL); + + if (d_ptr->connection == NULL) + qDebug() << "Unable to get DBUS connection!"; + else { + d_ptr->signal_vtable.message_function = signalHandler; + + dbus_connection_set_exit_on_disconnect(d_ptr->connection, FALSE); + dbus_connection_setup_with_g_main(d_ptr->connection, NULL); + dbus_connection_register_object_path(d_ptr->connection, + d_ptr->signalPath.toLatin1(), + &d_ptr->signal_vtable, + this); + } +} + +static DBusMessage *prepareDBusCall(const QString& service, + const QString& path, + const QString& interface, + const QString& method, + const QVariant& arg1 = QVariant(), + const QVariant& arg2 = QVariant(), + const QVariant& arg3 = QVariant(), + const QVariant& arg4 = QVariant(), + const QVariant& arg5 = QVariant(), + const QVariant& arg6 = QVariant(), + const QVariant& arg7 = QVariant(), + const QVariant& arg8 = QVariant()) +{ + DBusMessage *message = dbus_message_new_method_call(service.toLatin1(), + path.toLatin1(), + interface.toLatin1(), + method.toLatin1()); + DBusMessageIter dbus_iter; + + // Append variants to DBUS message + QList arglist; + if (arg1.isValid()) arglist << arg1; + if (arg2.isValid()) arglist << arg2; + if (arg3.isValid()) arglist << arg3; + if (arg4.isValid()) arglist << arg4; + if (arg5.isValid()) arglist << arg5; + if (arg6.isValid()) arglist << arg6; + if (arg7.isValid()) arglist << arg7; + if (arg8.isValid()) arglist << arg8; + + dbus_message_iter_init_append (message, &dbus_iter); + + while (!arglist.isEmpty()) { + QVariant argument = arglist.takeFirst(); + appendVariantToDBusMessage(argument, &dbus_iter); + } + + return message; +} + +QList DBusDispatcher::call(const QString& method, + const QVariant& arg1, + const QVariant& arg2, + const QVariant& arg3, + const QVariant& arg4, + const QVariant& arg5, + const QVariant& arg6, + const QVariant& arg7, + const QVariant& arg8) { + DBusMessageIter dbus_iter; + DBusMessage *message = prepareDBusCall(d_ptr->service, d_ptr->path, + d_ptr->interface, method, + arg1, arg2, arg3, arg4, arg5, + arg6, arg7, arg8); + DBusMessage *reply = dbus_connection_send_with_reply_and_block( + d_ptr->connection, + message, -1, NULL); + dbus_message_unref(message); + + QList replylist; + if (reply != NULL && dbus_message_iter_init(reply, &dbus_iter)) { + // Read return arguments + while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) { + replylist << getVariantFromDBusMessage(&dbus_iter); + dbus_message_iter_next(&dbus_iter); + } + } + if (reply != NULL) dbus_message_unref(reply); + return replylist; +} + +class PendingCallInfo { +public: + QString method; + DBusDispatcher *dispatcher; + DBusDispatcherPrivate *priv; +}; + +static void freePendingCallInfo(void *memory) { + PendingCallInfo *info = (PendingCallInfo *)memory; + delete info; +} + +static void pendingCallFunction (DBusPendingCall *pending, + void *memory) { + PendingCallInfo *info = (PendingCallInfo *)memory; + QString errorStr; + QList replyList; + DBusMessage *reply = dbus_pending_call_steal_reply (pending); + + Q_ASSERT(reply != NULL); + + if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) { + errorStr = dbus_message_get_error_name (reply); + } else { + DBusMessageIter dbus_iter; + dbus_message_iter_init(reply, &dbus_iter); + // Read return arguments + while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) { + replyList << getVariantFromDBusMessage(&dbus_iter); + dbus_message_iter_next(&dbus_iter); + } + } + + info->priv->pending_calls.removeOne(pending); + info->dispatcher->emitCallReply(info->method, replyList, errorStr); + dbus_message_unref(reply); + dbus_pending_call_unref(pending); +} + +bool DBusDispatcher::callAsynchronous(const QString& method, + const QVariant& arg1, + const QVariant& arg2, + const QVariant& arg3, + const QVariant& arg4, + const QVariant& arg5, + const QVariant& arg6, + const QVariant& arg7, + const QVariant& arg8) { + DBusMessage *message = prepareDBusCall(d_ptr->service, d_ptr->path, + d_ptr->interface, method, + arg1, arg2, arg3, arg4, arg5, + arg6, arg7, arg8); + DBusPendingCall *call = NULL; + dbus_bool_t ret = dbus_connection_send_with_reply(d_ptr->connection, + message, &call, -1); + PendingCallInfo *info = new PendingCallInfo; + info->method = method; + info->dispatcher = this; + info->priv = d_ptr; + + dbus_pending_call_set_notify(call, pendingCallFunction, info, freePendingCallInfo); + d_ptr->pending_calls.append(call); + return (bool)ret; +} + +void DBusDispatcher::emitSignalReceived(const QString& interface, + const QString& signal, + const QList& args) { + emit signalReceived(interface, signal, args); } + +void DBusDispatcher::emitCallReply(const QString& method, + const QList& args, + const QString& error) { + emit callReply(method, args, error); } + +void DBusDispatcher::synchronousDispatch(int timeout_ms) +{ + dbus_connection_read_write_dispatch(d_ptr->connection, timeout_ms); +} + +} // Maemo namespace + diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/src/dbusdispatcher.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/src/dbusdispatcher.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,91 @@ +/* * This file is part of conn-dui-settings-inet * + * + * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * + * Contact: Aapo Makela + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#ifndef DBUSDISPATCHER_H +#define DBUSDISPATCHER_H + +#include +#include + +namespace Maemo { + +class DBusDispatcherPrivate; +class DBusDispatcher : public QObject +{ + Q_OBJECT + +public: + DBusDispatcher(const QString& service, + const QString& path, + const QString& interface, + QObject *parent = 0); + DBusDispatcher(const QString& service, + const QString& path, + const QString& interface, + const QString& signalPath, + QObject *parent = 0); + ~DBusDispatcher(); + + QList call(const QString& method, + const QVariant& arg1 = QVariant(), + const QVariant& arg2 = QVariant(), + const QVariant& arg3 = QVariant(), + const QVariant& arg4 = QVariant(), + const QVariant& arg5 = QVariant(), + const QVariant& arg6 = QVariant(), + const QVariant& arg7 = QVariant(), + const QVariant& arg8 = QVariant()); + bool callAsynchronous(const QString& method, + const QVariant& arg1 = QVariant(), + const QVariant& arg2 = QVariant(), + const QVariant& arg3 = QVariant(), + const QVariant& arg4 = QVariant(), + const QVariant& arg5 = QVariant(), + const QVariant& arg6 = QVariant(), + const QVariant& arg7 = QVariant(), + const QVariant& arg8 = QVariant()); + void emitSignalReceived(const QString& interface, + const QString& signal, + const QList& args); + void emitCallReply(const QString& method, + const QList& args, + const QString& error = ""); + void synchronousDispatch(int timeout_ms); + +Q_SIGNALS: + void signalReceived(const QString& interface, + const QString& signal, + const QList& args); + void callReply(const QString& method, + const QList& args, + const QString& error); + +protected: + void setupDBus(); + +private: + DBusDispatcherPrivate *d_ptr; +}; + +} // Maemo namespace + +#endif diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/src/iapconf.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/src/iapconf.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,299 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. + + Contact: Aapo Makela + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#include +#include +#include + +#include "iapconf.h" + +#define QSTRING_TO_CONST_CSTR(str) \ + str.toUtf8().constData() + +namespace Maemo { + +class IAPConfPrivate { +public: + ConnSettings *settings; + + ConnSettingsValue *variantToValue(const QVariant &variant); + QVariant valueToVariant(ConnSettingsValue *value); +}; + +ConnSettingsValue *IAPConfPrivate::variantToValue(const QVariant &variant) +{ + // Convert variant to ConnSettingsValue + ConnSettingsValue *value = conn_settings_value_new(); + if (value == 0) { + qWarning("IAPConf: Unable to create new ConnSettingsValue"); + return 0; + } + + switch(variant.type()) { + + case QVariant::Invalid: + value->type = CONN_SETTINGS_VALUE_INVALID; + break; + + case QVariant::String: { + char *valueStr = strdup(QSTRING_TO_CONST_CSTR(variant.toString())); + value->type = CONN_SETTINGS_VALUE_STRING; + value->value.string_val = valueStr; + break; + } + + case QVariant::Int: + value->type = CONN_SETTINGS_VALUE_INT; + value->value.int_val = variant.toInt(); + break; + + case QMetaType::Float: + case QVariant::Double: + value->type = CONN_SETTINGS_VALUE_DOUBLE; + value->value.double_val = variant.toDouble(); + break; + + case QVariant::Bool: + value->type = CONN_SETTINGS_VALUE_BOOL; + value->value.bool_val = variant.toBool() ? 1 : 0; + break; + + case QVariant::ByteArray: { + QByteArray array = variant.toByteArray(); + value->type = CONN_SETTINGS_VALUE_BYTE_ARRAY; + value->value.byte_array.len = array.size(); + value->value.byte_array.val = (unsigned char *)malloc(array.size()); + memcpy(value->value.byte_array.val, array.constData(), array.size()); + break; + } + + case QVariant::List: { + QVariantList list = variant.toList(); + ConnSettingsValue **list_val = (ConnSettingsValue **)malloc( + (list.size() + 1) * sizeof(ConnSettingsValue *)); + + for (int idx = 0; idx < list.size(); idx++) { + list_val[idx] = variantToValue(list.at(idx)); + } + list_val[list.size()] = 0; + + value->type = CONN_SETTINGS_VALUE_LIST; + value->value.list_val = list_val; + break; + } + + default: + qWarning("IAPConf: Can not handle QVariant of type %d", + variant.type()); + conn_settings_value_destroy(value); + return 0; + } + + return value; +} + +QVariant IAPConfPrivate::valueToVariant(ConnSettingsValue *value) +{ + if (value == 0 || value->type == CONN_SETTINGS_VALUE_INVALID) { + return QVariant(); + } + + switch(value->type) { + + case CONN_SETTINGS_VALUE_BOOL: + return QVariant(value->value.bool_val ? true : false); + + case CONN_SETTINGS_VALUE_STRING: + return QVariant(QString(value->value.string_val)); + + case CONN_SETTINGS_VALUE_DOUBLE: + return QVariant(value->value.double_val); + + case CONN_SETTINGS_VALUE_INT: + return QVariant(value->value.int_val); + + case CONN_SETTINGS_VALUE_LIST: { + // At least with GConf backend connsettings returns byte array as list + // of ints, first check for that case + if (value->value.list_val && value->value.list_val[0]) { + bool canBeConvertedToByteArray = true; + for (int idx = 0; value->value.list_val[idx]; idx++) { + ConnSettingsValue *val = value->value.list_val[idx]; + if (val->type != CONN_SETTINGS_VALUE_INT + || val->value.int_val > 255 + || val->value.int_val < 0) { + canBeConvertedToByteArray = false; + break; + } + } + + if (canBeConvertedToByteArray) { + QByteArray array; + for (int idx = 0; value->value.list_val[idx]; idx++) { + array.append(value->value.list_val[idx]->value.int_val); + } + return array; + } + + // Create normal list + QVariantList list; + for (int idx = 0; value->value.list_val[idx]; idx++) { + list.append(valueToVariant(value->value.list_val[idx])); + } + return list; + } + } + + case CONN_SETTINGS_VALUE_BYTE_ARRAY: + return QByteArray::fromRawData((char *)value->value.byte_array.val, + value->value.byte_array.len); + + default: + return QVariant(); + } +} + +// Public class implementation + +IAPConf::IAPConf(const QString &iap_id) + : d_ptr(new IAPConfPrivate) +{ + d_ptr->settings = conn_settings_open(CONN_SETTINGS_CONNECTION, + QSTRING_TO_CONST_CSTR(iap_id)); + if (d_ptr->settings == 0) { + qWarning("IAPConf: Unable to open ConnSettings for %s", + QSTRING_TO_CONST_CSTR(iap_id)); + } +} + +IAPConf::~IAPConf() +{ + conn_settings_close(d_ptr->settings); + delete d_ptr; +} + +void IAPConf::setValue(const QString& key, const QVariant& value) +{ + // Invalid value means unsetting the given key + if (!value.isValid()) { + int err = conn_settings_unset(d_ptr->settings, + QSTRING_TO_CONST_CSTR(key)); + if (err != CONN_SETTINGS_E_NO_ERROR) { + qWarning("IAPConf: unable to unset key %s: %s", + QSTRING_TO_CONST_CSTR(key), + conn_settings_error_text((ConnSettingsError)err)); + } + return; + } + + // Convert value to ConnSettingsValue + ConnSettingsValue *val = d_ptr->variantToValue(value); + if (val == 0) return; + + // Set value and handle errors + int error = conn_settings_set(d_ptr->settings, + QSTRING_TO_CONST_CSTR(key), + val); + if (error != CONN_SETTINGS_E_NO_ERROR) { + qWarning("IAPConf: error in setting key %s: %s", + QSTRING_TO_CONST_CSTR(key), + conn_settings_error_text((ConnSettingsError)error)); + } + + // Destroy value + conn_settings_value_destroy(val); + return; +} + +void IAPConf::set(const QString& key1, const QVariant& value1, + const QString& key2, const QVariant& value2, + const QString& key3, const QVariant& value3, + const QString& key4, const QVariant& value4, + const QString& key5, const QVariant& value5, + const QString& key6, const QVariant& value6, + const QString& key7, const QVariant& value7, + const QString& key8, const QVariant& value8, + const QString& key9, const QVariant& value9, + const QString& key10, const QVariant& value10) +{ + if (!key1.isEmpty()) setValue(key1, value1); + if (!key2.isEmpty()) setValue(key2, value2); + if (!key3.isEmpty()) setValue(key3, value3); + if (!key4.isEmpty()) setValue(key4, value4); + if (!key5.isEmpty()) setValue(key5, value5); + if (!key6.isEmpty()) setValue(key6, value6); + if (!key7.isEmpty()) setValue(key7, value7); + if (!key8.isEmpty()) setValue(key8, value8); + if (!key9.isEmpty()) setValue(key9, value9); + if (!key10.isEmpty()) setValue(key10, value10); +} + +QVariant IAPConf::value(const QString& key) const +{ + ConnSettingsValue *val = conn_settings_get(d_ptr->settings, + QSTRING_TO_CONST_CSTR(key)); + + QVariant variant = d_ptr->valueToVariant(val); + conn_settings_value_destroy(val); + return variant; +} + +void IAPConf::clear(const char *default_path) +{ + Q_UNUSED(default_path); // default path is unused + + int error = conn_settings_remove(d_ptr->settings); + if (error != CONN_SETTINGS_E_NO_ERROR) { + qWarning("IAPConf: Error when removing IAP: %s", + conn_settings_error_text((ConnSettingsError)error)); + } +} + +void IAPConf::clearAll() +{ + ConnSettings *settings = conn_settings_open(CONN_SETTINGS_CONNECTION, + NULL); + conn_settings_remove(settings); + conn_settings_close(settings); +} + + +void IAPConf::getAll(QList &all_iaps, bool return_path) +{ + Q_UNUSED(return_path); // We don't use return path currently + + // Go through all available connections and add them to the list + char **ids = conn_settings_list_ids(CONN_SETTINGS_CONNECTION); + if (ids == 0) { + // No ids found - nothing to do + return; + } + + for (int idx = 0; ids[idx]; idx++) { + all_iaps.append(QString(ids[idx])); + free(ids[idx]); + } + free(ids); +} + + +} // namespace Maemo diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/src/iapconf.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/src/iapconf.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,84 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009 Nokia Corporation. All rights reserved. + + Contact: Aapo Makela + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#ifndef IAPCONF_H +#define IAPCONF_H + +#include +#include + +namespace Maemo { + +class IAPConfPrivate; +class IAPConf { +public: + IAPConf(const QString &iap_id); + virtual ~IAPConf(); + + /** + Convenience method for setting multiple IAP values with one call. + */ + void set(const QString& key1, const QVariant& value1, + const QString& key2 = "", const QVariant& value2 = QVariant(), + const QString& key3 = "", const QVariant& value3 = QVariant(), + const QString& key4 = "", const QVariant& value4 = QVariant(), + const QString& key5 = "", const QVariant& value5 = QVariant(), + const QString& key6 = "", const QVariant& value6 = QVariant(), + const QString& key7 = "", const QVariant& value7 = QVariant(), + const QString& key8 = "", const QVariant& value8 = QVariant(), + const QString& key9 = "", const QVariant& value9 = QVariant(), + const QString& key10 = "", const QVariant& value10 = QVariant()); + + /** + Set one IAP value. + */ + void setValue(const QString& key, const QVariant& value); + + /** + Get one IAP value. + */ + QVariant value(const QString& key) const; + + /** + Clear this IAP from GConf + */ + void clear(const char *default_path=0); + + /** + Clear all IAP specific information from GConf (including all IAPs). + DO NOT USE THIS FUNCTION IN ANYWHERE ELSE EXCEPT IN TEST CODE! + */ + void clearAll(); + + /** + Return all the IAPs found in the system. If return_path is true, + then do not strip the IAP path away. + */ + static void getAll(QList &all_iaps, bool return_path=false); + +private: + IAPConfPrivate *d_ptr; +}; + +} // namespace Maemo + +#endif diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/src/iapmonitor.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/src/iapmonitor.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,110 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#include + +#include +#include "iapmonitor.h" + +namespace Maemo { + + +void conn_settings_notify_func (ConnSettingsType type, + const char *id, + const char *key, + ConnSettingsValue *value, + void *user_data); + +class IAPMonitorPrivate { +private: + IAPMonitor *monitor; + ConnSettings *settings; + +public: + + IAPMonitorPrivate(IAPMonitor *monitor) + : monitor(monitor) + { + settings = conn_settings_open(CONN_SETTINGS_CONNECTION, NULL); + conn_settings_add_notify( + settings, + (ConnSettingsNotifyFunc *)conn_settings_notify_func, + this); + } + + ~IAPMonitorPrivate() + { + conn_settings_del_notify(settings); + conn_settings_close(settings); + } + + void iapAdded(const QString &iap) + { + monitor->iapAdded(iap); + } + + void iapRemoved(const QString &iap) + { + monitor->iapRemoved(iap); + } +}; + +void conn_settings_notify_func (ConnSettingsType type, + const char *id, + const char *key, + ConnSettingsValue *value, + void *user_data) +{ + if (type != CONN_SETTINGS_CONNECTION) return; + IAPMonitorPrivate *priv = (IAPMonitorPrivate *)user_data; + + QString iapId(key); + iapId = iapId.split("/")[0]; + if (value != 0) { + priv->iapAdded(iapId); + } else if (iapId == QString(key)) { + // IAP is removed only when the directory gets removed + priv->iapRemoved(iapId); + } +} + +IAPMonitor::IAPMonitor() + : d_ptr(new IAPMonitorPrivate(this)) +{ +} + +IAPMonitor::~IAPMonitor() +{ + delete d_ptr; +} + +void IAPMonitor::iapAdded(const QString &id) +{ + // By default do nothing +} + +void IAPMonitor::iapRemoved(const QString &id) +{ + // By default do nothing +} + +} // namespace Maemo diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/src/iapmonitor.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/src/iapmonitor.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,48 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#ifndef IAPMONITOR_H +#define IAPMONITOR_H + +#include + +namespace Maemo { + +class IAPMonitorPrivate; +class IAPMonitor { +public: + IAPMonitor(); + ~IAPMonitor(); + +protected: + virtual void iapAdded(const QString &id); + virtual void iapRemoved(const QString &id); + +private: + IAPMonitorPrivate *d_ptr; + Q_DECLARE_PRIVATE(IAPMonitor); +}; + +} // namespace Maemo + +#endif // IAPMONITOR_H + diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/src/maemo_icd.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/src/maemo_icd.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1316 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#include +#include "maemo_icd.h" +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +namespace Maemo { + +#undef PRINT_DEBUGINFO +#ifdef PRINT_DEBUGINFO + static FILE *fdebug = NULL; +#define PDEBUG(fmt, args...) \ + do { \ + struct timeval tv; \ + gettimeofday(&tv, 0); \ + fprintf(fdebug, "DEBUG[%d]:%ld.%ld:%s:%s():%d: " fmt, \ + getpid(), \ + tv.tv_sec, tv.tv_usec, \ + __FILE__, __FUNCTION__, __LINE__, args); \ + fflush(fdebug); \ + } while(0) +#else +#define PDEBUG(fmt...) +#endif + + +/* Reference counting singleton class that creates a single connection + * to icd so that icd reference counting works as expected. This is + * needed because DBusDispatcher uses private dbus connections + * which come and go and icd cannot use that information to + * determine whether application quit or not. So we create one + * persistent connection that is only teared down when application + * quits or calls disconnect() + */ +class IcdRefCounting +{ +public: + IcdRefCounting() : first_call(true) { } + void setup(enum icd_connection_flags flag); + void cleanup(); + +private: + bool first_call; + struct DBusConnection *connection; +}; + +Q_GLOBAL_STATIC(IcdRefCounting, icdRefCounting); + + +void IcdRefCounting::setup(enum icd_connection_flags flag) +{ + if (first_call) { + DBusMessage *msg = NULL; + + connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL); + dbus_connection_set_exit_on_disconnect(connection, FALSE); + dbus_connection_setup_with_g_main(connection, NULL); + + msg = dbus_message_new_method_call(ICD_DBUS_API_INTERFACE, + ICD_DBUS_API_PATH, + ICD_DBUS_API_INTERFACE, + ICD_DBUS_API_CONNECT_REQ); + if (msg == NULL) + goto out; + + if (!dbus_message_append_args(msg, + DBUS_TYPE_UINT32, &flag, + DBUS_TYPE_INVALID)) + goto out; + + if (!dbus_connection_send_with_reply(connection, msg, + NULL, 60*1000)) + goto out; + + first_call = false; + return; + + out: + dbus_connection_close(connection); + dbus_connection_unref(connection); + } +} + +void IcdRefCounting::cleanup() +{ + if (!first_call) { + dbus_connection_close(connection); + dbus_connection_unref(connection); + first_call = true; + } +} + + +class IcdPrivate +{ +public: + IcdPrivate(Icd *myfriend) + { + init(10000, IcdNewDbusInterface, myfriend); + } + + IcdPrivate(unsigned int timeout, Icd *myfriend) + { + init(timeout, IcdNewDbusInterface, myfriend); + } + + IcdPrivate(unsigned int timeout, IcdDbusInterfaceVer ver, Icd *myfriend) + { + /* Note that the old Icd interface is currently disabled and + * the new one is always used. + */ + init(timeout, IcdNewDbusInterface, myfriend); + } + + ~IcdPrivate() + { + QObject::disconnect(mDBus, + SIGNAL(signalReceived(const QString&, + const QString&, + const QList&)), + icd, + SLOT(icdSignalReceived(const QString&, + const QString&, + const QList&))); + + QObject::disconnect(mDBus, + SIGNAL(callReply(const QString&, + const QList&, + const QString&)), + icd, + SLOT(icdCallReply(const QString&, + const QList&, + const QString&))); + + delete mDBus; + mDBus = 0; + } + + /* Icd2 dbus API functions */ + QStringList scan(icd_scan_request_flags flags, + QStringList &network_types, + QList& scan_results, + QString& error); + void scanCancel(); + bool connect(icd_connection_flags flags, IcdConnectResult& result); + bool connect(icd_connection_flags flags, QList& params, + IcdConnectResult& result); + bool connect(icd_connection_flags flags, QString& iap, QString& result); + void select(uint flags); + void disconnect(uint connect_flags, QString& service_type, + uint service_attrs, QString& service_id, + QString& network_type, uint network_attrs, + QByteArray& network_id); + void disconnect(uint connect_flags); + + uint state(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStateResult &state_result); + uint statistics(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStatisticsResult& stats_result); + uint addrinfo(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdAddressInfoResult& addr_result); + + uint state(QList& state_results); + uint state_non_blocking(QList& state_results); + uint statistics(QList& stats_results); + uint addrinfo(QList& addr_results); + uint addrinfo_non_blocking(QList& addr_results); + + void signalReceived(const QString& interface, + const QString& signal, + const QList& args); + void callReply(const QString& method, + const QList& args, + const QString& error); + + QString error() { return mError; } + +public: + DBusDispatcher *mDBus; + QString mMethod; + QString mInterface; + QString mSignal; + QString mError; + QList mArgs; + QList receivedSignals; + unsigned int timeout; + IcdDbusInterfaceVer icd_dbus_version; + Icd *icd; + + void init(unsigned int dbus_timeout, IcdDbusInterfaceVer ver, + Icd *myfriend) + { + if (ver == IcdNewDbusInterface) { + mDBus = new DBusDispatcher(ICD_DBUS_API_INTERFACE, + ICD_DBUS_API_PATH, + ICD_DBUS_API_INTERFACE); + } else { + mDBus = new DBusDispatcher(ICD_DBUS_SERVICE, + ICD_DBUS_PATH, + ICD_DBUS_INTERFACE); + } + icd_dbus_version = ver; + + /* This connect has a side effect as it means that only one + * Icd object can exists in one time. This should be fixed! + */ + QObject::connect(mDBus, + SIGNAL(signalReceived(const QString&, + const QString&, + const QList&)), + myfriend, + SLOT(icdSignalReceived(const QString&, + const QString&, + const QList&))); + + QObject::connect(mDBus, + SIGNAL(callReply(const QString&, + const QList&, + const QString&)), + myfriend, + SLOT(icdCallReply(const QString&, + const QList&, + const QString&))); + + icd = myfriend; + timeout = dbus_timeout; + +#ifdef PRINT_DEBUGINFO + if (!fdebug) { + fdebug = fopen("/tmp/maemoicd.log", "a+"); + } + PDEBUG("created %s\n", "IcdPrivate"); +#endif + } + + void clearState() + { + mMethod.clear(); + mInterface.clear(); + mSignal.clear(); + mError.clear(); + mArgs.clear(); + receivedSignals.clear(); + } + + bool doConnect(IcdConnectResult& result); + bool doConnect(QString& result); + bool doState(); +}; + + +void IcdPrivate::signalReceived(const QString& interface, + const QString& signal, + const QList& args) +{ + // Signal handler, which simply records what has been signalled + mInterface = interface; + mSignal = signal; + mArgs = args; + + //qDebug() << "signal" << signal << "received:" << args; + receivedSignals << QVariant(interface) << QVariant(signal) << QVariant(args); +} + + +void IcdPrivate::callReply(const QString& method, + const QList& /*args*/, + const QString& error) +{ + mMethod = method; + mError = error; +} + + +static void get_scan_result(QList& args, + IcdScanResult& ret) +{ + int i=0; + + if (args.isEmpty()) + return; + + ret.status = args[i++].toUInt(); + ret.timestamp = args[i++].toUInt(); + ret.scan.service_type = args[i++].toString(); + ret.service_name = args[i++].toString(); + ret.scan.service_attrs = args[i++].toUInt(); + ret.scan.service_id = args[i++].toString(); + ret.service_priority = args[i++].toInt(); + ret.scan.network_type = args[i++].toString(); + ret.network_name = args[i++].toString(); + ret.scan.network_attrs = args[i++].toUInt(); + ret.scan.network_id = args[i++].toByteArray(); + ret.network_priority = args[i++].toInt(); + ret.signal_strength = args[i++].toInt(); + ret.station_id = args[i++].toString(); + ret.signal_dB = args[i++].toInt(); +} + + +static void get_connect_result(QList& args, + IcdConnectResult& ret) +{ + int i=0; + + if (args.isEmpty()) + return; + + ret.connect.service_type = args[i++].toString(); + ret.connect.service_attrs = args[i++].toInt(); + ret.connect.service_id = args[i++].toString(); + ret.connect.network_type = args[i++].toString(); + ret.connect.network_attrs = args[i++].toInt(); + ret.connect.network_id = args[i++].toByteArray(); + ret.status = args[i++].toInt(); +} + + +QStringList IcdPrivate::scan(icd_scan_request_flags flags, + QStringList &network_types, + QList& scan_results, + QString& error) +{ + QStringList scanned_types; + QTimer timer; + QVariant reply; + QVariantList vl; + bool last_result = false; + IcdScanResult result; + int all_waited; + + clearState(); + reply = mDBus->call(ICD_DBUS_API_SCAN_REQ, (uint)flags); + if (reply.type() != QVariant::List) + return scanned_types; + vl = reply.toList(); + if (vl.isEmpty()) { + error = "Scan did not return anything."; + return scanned_types; + } + reply = vl.first(); + scanned_types = reply.toStringList(); + //qDebug() << "Scanning:" << scanned_types; + all_waited = scanned_types.size(); + + timer.setSingleShot(true); + timer.start(timeout); + + scan_results.clear(); + while (!last_result) { + while (timer.isActive() && mInterface.isEmpty() && mError.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + if (!timer.isActive()) { + //qDebug() << "Timeout happened"; + break; + } + + if (mSignal != ICD_DBUS_API_SCAN_SIG) { + //qDebug() << "Received" << mSignal << "while waiting" << ICD_DBUS_API_SCAN_SIG << ", ignoring"; + mInterface.clear(); + continue; + } + + if (mError.isEmpty()) { + QString msgInterface = receivedSignals.takeFirst().toString(); + QString msgSignal = receivedSignals.takeFirst().toString(); + QList msgArgs = receivedSignals.takeFirst().toList(); + //qDebug() << "Signal" << msgSignal << "received."; + //qDebug() << "Params:" << msgArgs; + + while (!msgSignal.isEmpty()) { + get_scan_result(msgArgs, result); + +#if 0 + qDebug() << "Received: " << + "status =" << result.status << + ", timestamp =" << result.timestamp << + ", service_type =" << result.scan.service_type << + ", service_name =" << result.service_name << + ", service_attrs =" << result.scan.service_attrs << + ", service_id =" << result.scan.service_id << + ", service_priority =" << result.service_priority << + ", network_type =" << result.scan.network_type << + ", network_name =" << result.network_name << + ", network_attrs =" << result.scan.network_attrs << + ", network_id =" << "-" << + ", network_priority =" << result.network_priority << + ", signal_strength =" << result.signal_strength << + ", station_id =" << result.station_id << + ", signal_dB =" << result.signal_dB; +#endif + + if (result.status == ICD_SCAN_COMPLETE) { + //qDebug() << "waited =" << all_waited; + if (--all_waited == 0) { + last_result = true; + break; + } + } else + scan_results << result; + + if (receivedSignals.isEmpty()) + break; + + msgInterface = receivedSignals.takeFirst().toString(); + msgSignal = receivedSignals.takeFirst().toString(); + msgArgs = receivedSignals.takeFirst().toList(); + } + mInterface.clear(); + + } else { + qWarning() << "Error while scanning:" << mError; + break; + } + } + timer.stop(); + + error = mError; + return scanned_types; +} + + +void IcdPrivate::scanCancel() +{ + mDBus->call(ICD_DBUS_API_SCAN_CANCEL); +} + + +bool IcdPrivate::doConnect(IcdConnectResult& result) +{ + QTimer timer; + bool status = false; + + timer.setSingleShot(true); + timer.start(timeout); + + //qDebug() << "Waiting" << ICD_DBUS_API_CONNECT_SIG << "signal"; + + while (timer.isActive() && mInterface.isEmpty() && + mSignal != ICD_DBUS_API_CONNECT_SIG && + mError.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + timer.stop(); + + if (mError.isEmpty()) { + if (!mArgs.isEmpty()) { + get_connect_result(mArgs, result); + status = true; + } else + status = false; + } else + status = false; + + return status; +} + + +bool IcdPrivate::connect(icd_connection_flags flags, IcdConnectResult& result) +{ + clearState(); + //mDBus->callAsynchronous(ICD_DBUS_API_CONNECT_REQ, (uint)flags); + mDBus->call(ICD_DBUS_API_CONNECT_REQ, (uint)flags); + icdRefCounting()->setup(flags); + return doConnect(result); +} + + +bool IcdPrivate::connect(icd_connection_flags flags, QList& params, + IcdConnectResult& result) +{ + QVariantList varlist; + QVariantList varlist2; + + foreach (ConnectParams param, params) { + QVariantList items; + + items.append(QVariant(param.connect.service_type)); + items.append(QVariant(param.connect.service_attrs)); + items.append(QVariant(param.connect.service_id)); + items.append(QVariant(param.connect.network_type)); + items.append(QVariant(param.connect.network_attrs)); + items.append(QVariant(param.connect.network_id)); + + varlist.append(items); + } + + varlist2.append(QVariant(varlist)); + + clearState(); + //mDBus->callAsynchronous(ICD_DBUS_API_CONNECT_REQ, (uint)flags, varlist2); + mDBus->call(ICD_DBUS_API_CONNECT_REQ, (uint)flags, varlist2); + icdRefCounting()->setup(flags); + return doConnect(result); +} + + +bool IcdPrivate::doConnect(QString& ret) +{ + QTimer timer; + bool status = false; + + timer.setSingleShot(true); + timer.start(timeout); + + while (timer.isActive() && mInterface.isEmpty() && + mError.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + timer.stop(); + + if (mError.isEmpty()) { + if (!mArgs.isEmpty()) { + status = true; + //ret = mArgs[0]; // TODO correctly + } else + status = false; + } else + status = false; + + return status; +} + + +bool IcdPrivate::connect(icd_connection_flags flags, QString& iap, QString& result) +{ + clearState(); + //mDBus->callAsynchronous(ICD_CONNECT_REQ, iap, (uint)flags); + mDBus->call(ICD_CONNECT_REQ, iap, (uint)flags); + icdRefCounting()->setup(flags); + return doConnect(result); +} + + +void IcdPrivate::select(uint flags) +{ + mDBus->call(ICD_DBUS_API_SELECT_REQ, flags); +} + + +void IcdPrivate::disconnect(uint flags, QString& service_type, + uint service_attrs, QString& service_id, + QString& network_type, uint network_attrs, + QByteArray& network_id) +{ + clearState(); + mDBus->call(ICD_DBUS_API_DISCONNECT_REQ, flags, + service_type, service_attrs, service_id, + network_type, network_attrs, network_id); + icdRefCounting()->cleanup(); +} + + +void IcdPrivate::disconnect(uint flags) +{ + clearState(); + mDBus->call(ICD_DBUS_API_DISCONNECT_REQ, flags); + icdRefCounting()->cleanup(); +} + + +static void get_state_all_result(QList& args, + IcdStateResult& ret) +{ + int i=0; + + ret.params.service_type = args[i++].toString(); + ret.params.service_attrs = args[i++].toUInt(); + ret.params.service_id = args[i++].toString(); + ret.params.network_type = args[i++].toString(); + ret.params.network_attrs = args[i++].toUInt(); + ret.params.network_id = args[i++].toByteArray(); + ret.error = args[i++].toString(); + ret.state = args[i++].toInt(); +} + + +static void get_state_all_result2(QList& args, + IcdStateResult& ret) +{ + int i=0; + + ret.params.network_type = args[i++].toString(); + ret.state = args[i++].toInt(); + + // Initialize the other values so that the caller can + // notice we only returned partial status + ret.params.service_type = QString(); + ret.params.service_attrs = 0; + ret.params.service_id = QString(); + ret.params.network_attrs = 0; + ret.params.network_id = QByteArray(); + ret.error = QString(); +} + + +uint IcdPrivate::state(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStateResult& state_result) +{ + QTimer timer; + QVariant reply; + uint total_signals; + QVariantList vl; + + clearState(); + + reply = mDBus->call(ICD_DBUS_API_STATE_REQ, + service_type, service_attrs, service_id, + network_type, network_attrs, network_id); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + total_signals = reply.toUInt(); + if (!total_signals) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + + if (mSignal != ICD_DBUS_API_STATE_SIG) { + mInterface.clear(); + continue; + } + } + + timer.stop(); + + if (mError.isEmpty()) { + if (!mArgs.isEmpty()) { + if (mArgs.size()>2) + get_state_all_result(mArgs, state_result); + else { + // We are not connected as we did not get the status we asked + return 0; + } + } + } else { + qWarning() << "Error:" << mError; + } + + // The returned value should be one because we asked for one state + return total_signals; +} + + +uint IcdPrivate::state_non_blocking(QList& state_results) +{ + QTimer timer; + QVariant reply; + QVariantList vl; + uint signals_left, total_signals; + IcdStateResult result; + + PDEBUG("%s\n", "non blocking state"); + + clearState(); + reply = mDBus->call(ICD_DBUS_API_STATE_REQ); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + signals_left = total_signals = reply.toUInt(); + if (!signals_left) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + state_results.clear(); + mError.clear(); + while (signals_left) { + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + if (!timer.isActive()) { + total_signals = 0; + break; + } + + if (mSignal != ICD_DBUS_API_STATE_SIG) { + continue; + } + + if (mError.isEmpty()) { + if (!mArgs.isEmpty()) { + if (mArgs.size()==2) + get_state_all_result2(mArgs, result); + else + get_state_all_result(mArgs, result); + state_results << result; + } + signals_left--; + } else { + qWarning() << "Error:" << mError; + break; + } + } + timer.stop(); + + PDEBUG("total_signals=%d\n", total_signals); + return total_signals; +} + + +/* Special version of the state() call which does not call event loop. + * Needed in order to fix NB#175098 where Qt4.7 webkit crashes because event + * loop is run when webkit does not expect it. This function is called from + * bearer management API syncStateWithInterface() in QNetworkSession + * constructor. + */ +uint IcdPrivate::state(QList& state_results) +{ + QVariant reply; + QVariantList vl; + uint signals_left, total_signals; + IcdStateResult result; + time_t started; + int timeout_secs = timeout / 1000; + + PDEBUG("%s\n", "state_results"); + + clearState(); + reply = mDBus->call(ICD_DBUS_API_STATE_REQ); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + signals_left = total_signals = reply.toUInt(); + if (!signals_left) + return 0; + + started = time(0); + state_results.clear(); + mError.clear(); + while (signals_left) { + mInterface.clear(); + while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) { + mDBus->synchronousDispatch(1000); + } + + if (time(0)>(started+timeout_secs)) { + total_signals = 0; + break; + } + + if (mSignal != ICD_DBUS_API_STATE_SIG) { + continue; + } + + if (mError.isEmpty()) { + if (!mArgs.isEmpty()) { + if (mArgs.size()==2) + get_state_all_result2(mArgs, result); + else + get_state_all_result(mArgs, result); + state_results << result; + } + signals_left--; + } else { + qWarning() << "Error:" << mError; + break; + } + } + + PDEBUG("total_signals=%d\n", total_signals); + return total_signals; +} + + +static void get_statistics_all_result(QList& args, + IcdStatisticsResult& ret) +{ + int i=0; + + if (args.isEmpty()) + return; + + ret.params.service_type = args[i++].toString(); + ret.params.service_attrs = args[i++].toUInt(); + ret.params.service_id = args[i++].toString(); + ret.params.network_type = args[i++].toString(); + ret.params.network_attrs = args[i++].toUInt(); + ret.params.network_id = args[i++].toByteArray(); + ret.time_active = args[i++].toUInt(); + ret.signal_strength = (enum icd_nw_levels)args[i++].toUInt(); + ret.bytes_sent = args[i++].toUInt(); + ret.bytes_received = args[i++].toUInt(); +} + + +uint IcdPrivate::statistics(QList& stats_results) +{ + QTimer timer; + QVariant reply; + QVariantList vl; + uint signals_left, total_signals; + IcdStatisticsResult result; + + clearState(); + reply = mDBus->call(ICD_DBUS_API_STATISTICS_REQ); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + if (reply.type() != QVariant::UInt) + return 0; + signals_left = total_signals = reply.toUInt(); + + if (!signals_left) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + stats_results.clear(); + while (signals_left) { + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + if (!timer.isActive()) { + total_signals = 0; + break; + } + + if (mSignal != ICD_DBUS_API_STATISTICS_SIG) { + continue; + } + + if (mError.isEmpty()) { + get_statistics_all_result(mArgs, result); + stats_results << result; + signals_left--; + } else { + qWarning() << "Error:" << mError; + break; + } + } + timer.stop(); + + return total_signals; +} + + +uint IcdPrivate::statistics(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStatisticsResult& stats_result) +{ + QTimer timer; + QVariant reply; + uint total_signals; + QVariantList vl; + + clearState(); + + reply = mDBus->call(ICD_DBUS_API_STATISTICS_REQ, + service_type, service_attrs, service_id, + network_type, network_attrs, network_id); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + total_signals = reply.toUInt(); + if (!total_signals) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + + if (mSignal != ICD_DBUS_API_STATISTICS_SIG) { + mInterface.clear(); + continue; + } + } + + timer.stop(); + + if (mError.isEmpty()) { + get_statistics_all_result(mArgs, stats_result); + } else { + qWarning() << "Error:" << mError; + } + + // The returned value should be one because we asked for one statistics + return total_signals; +} + + +static void get_addrinfo_all_result(QList& args, + IcdAddressInfoResult& ret) +{ + int i=0; + + if (args.isEmpty()) + return; + + ret.params.service_type = args[i++].toString(); + ret.params.service_attrs = args[i++].toUInt(); + ret.params.service_id = args[i++].toString(); + ret.params.network_type = args[i++].toString(); + ret.params.network_attrs = args[i++].toUInt(); + ret.params.network_id = args[i++].toByteArray(); + + QVariantList vl = args[i].toList(); + QVariant reply = vl.first(); + QList lst = reply.toList(); + for (int k=0; k& addr_results) +{ + QVariant reply; + QVariantList vl; + uint signals_left, total_signals; + IcdAddressInfoResult result; + time_t started; + int timeout_secs = timeout / 1000; + + PDEBUG("%s\n", "addr_results"); + + clearState(); + reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + if (reply.type() != QVariant::UInt) + return 0; + signals_left = total_signals = reply.toUInt(); + if (!signals_left) + return 0; + + started = time(0); + addr_results.clear(); + while (signals_left) { + mInterface.clear(); + while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) { + mDBus->synchronousDispatch(1000); + } + + if (time(0)>(started+timeout_secs)) { + total_signals = 0; + break; + } + + if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) { + continue; + } + + if (mError.isEmpty()) { + get_addrinfo_all_result(mArgs, result); + addr_results << result; + signals_left--; + } else { + qWarning() << "Error:" << mError; + break; + } + } + + PDEBUG("total_signals=%d\n", total_signals); + return total_signals; +} + +uint IcdPrivate::addrinfo_non_blocking(QList& addr_results) +{ + QTimer timer; + QVariant reply; + QVariantList vl; + uint signals_left, total_signals; + IcdAddressInfoResult result; + + PDEBUG("%s\n", "non blocking addrinfo"); + + clearState(); + reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + if (reply.type() != QVariant::UInt) + return 0; + signals_left = total_signals = reply.toUInt(); + if (!signals_left) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + addr_results.clear(); + while (signals_left) { + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + if (!timer.isActive()) { + total_signals = 0; + break; + } + + if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) { + continue; + } + + if (mError.isEmpty()) { + get_addrinfo_all_result(mArgs, result); + addr_results << result; + signals_left--; + } else { + qWarning() << "Error:" << mError; + break; + } + } + timer.stop(); + PDEBUG("total_signals=%d\n", total_signals); + return total_signals; +} + + +uint IcdPrivate::addrinfo(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdAddressInfoResult& addr_result) +{ + QTimer timer; + QVariant reply; + uint total_signals; + QVariantList vl; + + clearState(); + + reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ, + service_type, service_attrs, service_id, + network_type, network_attrs, network_id); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + total_signals = reply.toUInt(); + + if (!total_signals) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + + if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) { + mInterface.clear(); + continue; + } + } + + timer.stop(); + + if (mError.isEmpty()) { + get_addrinfo_all_result(mArgs, addr_result); + } else { + qWarning() << "Error:" << mError; + } + + // The returned value should be one because we asked for one addrinfo + return total_signals; +} + + +Icd::Icd(QObject *parent) + : QObject(parent), d(new IcdPrivate(this)) +{ +} + +Icd::Icd(unsigned int timeout, QObject *parent) + : QObject(parent), d(new IcdPrivate(timeout, this)) +{ +} + +Icd::Icd(unsigned int timeout, IcdDbusInterfaceVer ver, QObject *parent) + : QObject(parent), d(new IcdPrivate(timeout, ver, this)) +{ +} + +Icd::~Icd() +{ + delete d; +} + + +QStringList Icd::scan(icd_scan_request_flags flags, + QStringList &network_types, + QList& scan_results, + QString& error) +{ + return d->scan(flags, network_types, scan_results, error); +} + + +void Icd::scanCancel() +{ + d->scanCancel(); +} + + +bool Icd::connect(icd_connection_flags flags, IcdConnectResult& result) +{ + return d->connect(flags, result); +} + + +bool Icd::connect(icd_connection_flags flags, QList& params, + IcdConnectResult& result) +{ + return d->connect(flags, params, result); +} + + +bool Icd::connect(icd_connection_flags flags, QString& iap, QString& result) +{ + return d->connect(flags, iap, result); +} + + +void Icd::select(uint flags) +{ + d->select(flags); +} + + +void Icd::disconnect(uint connect_flags, QString& service_type, + uint service_attrs, QString& service_id, + QString& network_type, uint network_attrs, + QByteArray& network_id) +{ + d->disconnect(connect_flags, service_type, + service_attrs, service_id, + network_type, network_attrs, + network_id); +} + + +void Icd::disconnect(uint connect_flags) +{ + d->disconnect(connect_flags); +} + + +uint Icd::state(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStateResult &state_result) +{ + return d->state(service_type, service_attrs, service_id, + network_type, network_attrs, network_id, + state_result); +} + + +uint Icd::statistics(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStatisticsResult& stats_result) +{ + return d->statistics(service_type, service_attrs, service_id, + network_type, network_attrs, network_id, + stats_result); +} + + +uint Icd::addrinfo(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdAddressInfoResult& addr_result) +{ + return d->addrinfo(service_type, service_attrs, service_id, + network_type, network_attrs, network_id, + addr_result); +} + + +uint Icd::state(QList& state_results) +{ + return d->state(state_results); +} + +uint Icd::state_non_blocking(QList& state_results) +{ + return d->state_non_blocking(state_results); +} + +uint Icd::statistics(QList& stats_results) +{ + return d->statistics(stats_results); +} + + +uint Icd::addrinfo(QList& addr_results) +{ + return d->addrinfo(addr_results); +} + +uint Icd::addrinfo_non_blocking(QList& addr_results) +{ + return d->addrinfo_non_blocking(addr_results); +} + +void Icd::icdSignalReceived(const QString& interface, + const QString& signal, + const QList& args) +{ + d->signalReceived(interface, signal, args); +} + + +void Icd::icdCallReply(const QString& method, + const QList& args, + const QString& error) +{ + d->callReply(method, args, error); +} + + +QString Icd::error() +{ + return d->error(); +} + +} // Maemo namespace + + diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/src/maemo_icd.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/src/maemo_icd.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,182 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#ifndef MAEMO_ICD_H +#define MAEMO_ICD_H + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "dbusdispatcher.h" +#include + +#define ICD_LONG_SCAN_TIMEOUT (30*1000) /* 30sec */ +#define ICD_SHORT_SCAN_TIMEOUT (10*1000) /* 10sec */ +#define ICD_SHORT_CONNECT_TIMEOUT (10*1000) /* 10sec */ +#define ICD_LONG_CONNECT_TIMEOUT (150*1000) /* 2.5min */ + +namespace Maemo { + +struct CommonParams { + QString service_type; + uint service_attrs; + QString service_id; + QString network_type; + uint network_attrs; + QByteArray network_id; +}; + +struct ConnectParams { + struct CommonParams connect; +}; + +struct IcdScanResult { + uint status; // see #icd_scan_status + uint timestamp; // when last seen + QString service_name; + uint service_priority; // within a service type + QString network_name; + uint network_priority; + struct CommonParams scan; + uint signal_strength; // quality, 0 (none) - 10 (good) + QString station_id; // e.g. MAC address or similar id + uint signal_dB; // use signal strength above unless you know what you are doing + + IcdScanResult() { + status = timestamp = scan.service_attrs = service_priority = + scan.network_attrs = network_priority = signal_strength = + signal_dB = 0; + } +}; + +struct IcdConnectResult { + struct CommonParams connect; + uint status; +}; + +struct IcdStateResult { + struct CommonParams params; + QString error; + uint state; +}; + +struct IcdStatisticsResult { + struct CommonParams params; + uint time_active; // in seconds + enum icd_nw_levels signal_strength; // see network_api_defines.h in icd2-dev package + uint bytes_sent; + uint bytes_received; +}; + +struct IcdIPInformation { + QString address; + QString netmask; + QString default_gateway; + QString dns1; + QString dns2; + QString dns3; +}; + +struct IcdAddressInfoResult { + struct CommonParams params; + QList ip_info; +}; + +enum IcdDbusInterfaceVer { + IcdOldDbusInterface = 0, // use the old OSSO-IC interface + IcdNewDbusInterface // use the new Icd2 interface (default) +}; + + +class IcdPrivate; +class Icd : public QObject +{ + Q_OBJECT + +public: + Icd(QObject *parent = 0); + Icd(unsigned int timeout, QObject *parent = 0); + Icd(unsigned int timeout, IcdDbusInterfaceVer ver, QObject *parent = 0); + ~Icd(); + QString error(); // returns last error string + + /* Icd2 dbus API functions */ + QStringList scan(icd_scan_request_flags flags, + QStringList &network_types, + QList& scan_results, + QString& error); + void scanCancel(); + bool connect(icd_connection_flags flags, IcdConnectResult& result); + bool connect(icd_connection_flags flags, QList& params, + IcdConnectResult& result); + bool connect(icd_connection_flags flags, QString& iap, QString& result); + void select(uint flags); + void disconnect(uint connect_flags, QString& service_type, + uint service_attrs, QString& service_id, + QString& network_type, uint network_attrs, + QByteArray& network_id); + void disconnect(uint connect_flags); + + uint state(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStateResult &state_result); + uint statistics(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStatisticsResult& stats_result); + uint addrinfo(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdAddressInfoResult& addr_result); + + uint state(QList& state_results); + uint state_non_blocking(QList& state_results); + uint statistics(QList& stats_results); + uint addrinfo(QList& addr_results); + uint addrinfo_non_blocking(QList& addr_results); + +private Q_SLOTS: + void icdSignalReceived(const QString& interface, + const QString& signal, + const QList& args); + void icdCallReply(const QString& method, + const QList& args, + const QString& error); + +private: + IcdPrivate *d; + friend class IcdPrivate; +}; + +} // Maemo namespace + +#endif diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/src/proxyconf.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/src/proxyconf.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,315 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#include +#include +#include +#include +#include +#include +#include "proxyconf.h" + +#define CONF_PROXY "/system/proxy" +#define HTTP_PROXY "/system/http_proxy" + + +namespace Maemo { + +class NetworkProxyFactory : QNetworkProxyFactory { +public: + NetworkProxyFactory() { } + QList queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery()); +}; + + +QList NetworkProxyFactory::queryProxy(const QNetworkProxyQuery &query) +{ + ProxyConf proxy_conf; + + QList result = proxy_conf.flush(query); + if (result.isEmpty()) + result << QNetworkProxy::NoProxy; + + return result; +} + + +class ProxyConfPrivate { +private: + // proxy values from gconf + QString mode; + bool use_http_host; + QString autoconfig_url; + QString http_proxy; + quint16 http_port; + QList ignore_hosts; + QString secure_host; + quint16 secure_port; + QString ftp_host; + quint16 ftp_port; + QString socks_host; + quint16 socks_port; + QString rtsp_host; + quint16 rtsp_port; + + QVariant getValue(QString& name); + QVariant getHttpValue(QString& name); + QVariant getValue(const char *name); + QVariant getHttpValue(const char *name); + bool isHostExcluded(const QString &host); + +public: + QString prefix; + QString http_prefix; + + void readProxyData(); + QList flush(const QNetworkProxyQuery &query); +}; + + +QVariant ProxyConfPrivate::getValue(QString& name) +{ + GConfItem item(prefix + name); + return item.value(); +} + +QVariant ProxyConfPrivate::getHttpValue(QString& name) +{ + GConfItem item(http_prefix + name); + return item.value(); +} + + +QVariant ProxyConfPrivate::getValue(const char *name) +{ + QString n = QString(name); + return getValue(n); +} + +QVariant ProxyConfPrivate::getHttpValue(const char *name) +{ + QString n = QString(name); + return getHttpValue(n); +} + + +#define GET(var, type) \ + do { \ + var = getValue(#var).to##type (); \ + /*qDebug()<<"var="<prefix = CONF_PROXY "/"; + d_ptr->http_prefix = HTTP_PROXY "/"; +} + +ProxyConf::~ProxyConf() +{ + delete d_ptr; +} + + +QList ProxyConf::flush(const QNetworkProxyQuery &query) +{ + d_ptr->readProxyData(); + return d_ptr->flush(query); +} + + +static int refcount = 0; +static QReadWriteLock lock; + +void ProxyConf::update() +{ + QWriteLocker locker(&lock); + NetworkProxyFactory *factory = new NetworkProxyFactory(); + QNetworkProxyFactory::setApplicationProxyFactory((QNetworkProxyFactory*)factory); + refcount++; +} + + +void ProxyConf::clear(void) +{ + QWriteLocker locker(&lock); + refcount--; + if (refcount == 0) + QNetworkProxyFactory::setApplicationProxyFactory(NULL); + + if (refcount<0) + refcount = 0; +} + + +} // namespace Maemo diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/src/proxyconf.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/src/proxyconf.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,53 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#ifndef PROXYCONF_H +#define PROXYCONF_H + +#include +#include + +namespace Maemo { + +class ProxyConfPrivate; +class ProxyConf { +private: + ProxyConfPrivate *d_ptr; + +public: + ProxyConf(); + virtual ~ProxyConf(); + + QList flush(const QNetworkProxyQuery &query = QNetworkProxyQuery()); // read the proxies from db + + /* Note that for each update() call there should be corresponding + * clear() call because the ProxyConf class implements a reference + * counting mechanism. The factory is removed only when there is + * no one using the factory any more. + */ + static void update(void); // this builds QNetworkProxy factory + static void clear(void); // this removes QNetworkProxy factory +}; + +} // namespace Maemo + +#endif diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,191 @@ +/* * This file is part of conn-dui-settings-inet * + * + * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * + * Contact: Aapo Makela + * + * This software, including documentation, is protected by copyright + * controlled by Nokia Corporation. All rights are reserved. Copying, + * including reproducing, storing, adapting or translating, any or all of + * this material requires the prior written consent of Nokia Corporation. + * This material also contains confidential information which may not be + * disclosed to others without the prior written consent of Nokia. + */ + +#include +#include +#include +#include +#include + +#include + +class Ut_DBusDispatcher : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void init(); + void cleanup(); + void initTestCase(); + void cleanupTestCase(); + + void simpleSignalReceived(const QString& interface, + const QString& signal, + const QList& args); + void simpleCallReply(const QString& method, + const QList& args, + const QString& error); + void simpleCall(); + + void complexCallReply(const QString& method, + const QList& args, + const QString& error); + void complexCall(); + +private: + Maemo::DBusDispatcher *mSubject; + QProcess *icd_stub; + + QString mMethod; + QString mInterface; + QString mSignal; + QList mArgs; +}; + +void Ut_DBusDispatcher::init() +{ + mSubject = new Maemo::DBusDispatcher("com.nokia.icd2", "/com/nokia/icd2", + "com.nokia.icd2"); + + // Start icd2 stub + icd_stub = new QProcess(this); + icd_stub->start("/usr/bin/icd2_stub.py"); + QTest::qWait(1000); +} + +void Ut_DBusDispatcher::cleanup() +{ + // Terminate icd2 stub + icd_stub->terminate(); + icd_stub->waitForFinished(); + + delete mSubject; + mSubject = 0; +} + +void Ut_DBusDispatcher::initTestCase() +{ +} + +void Ut_DBusDispatcher::cleanupTestCase() +{ +} + +void Ut_DBusDispatcher::simpleSignalReceived(const QString& interface, + const QString& signal, + const QList& args) +{ + // Signal handler, which simply records what has been signalled + mInterface = interface; + mSignal = signal; + mArgs = args; +} + +void Ut_DBusDispatcher::simpleCallReply(const QString& method, + const QList& args, + const QString& error) +{ + mMethod = method; + + // Check that method matches and at least WLAN_INFRA is returned + QVERIFY(error.isEmpty()); + QVERIFY(args[0].toStringList().contains("WLAN_INFRA")); +} + +void Ut_DBusDispatcher::simpleCall() +{ + uint flags = 0; + QList reply; + int idx = 0; + QTimer timer; + + // Connect signals + connect(mSubject, SIGNAL(signalReceived(const QString&, + const QString&, + const QList&)), + this, SLOT(simpleSignalReceived(const QString&, + const QString&, + const QList&))); + connect(mSubject, SIGNAL(callReply(const QString&, + const QList&, + const QString&)), + this, SLOT(simpleCallReply(const QString&, + const QList&, + const QString&))); + + // Request scan and verify the call starts succesfully + QVERIFY(mSubject->callAsynchronous("scan_req", flags)); + + // Wait 1st scan signal for 10 secs + timer.setSingleShot(true); + timer.start(10000); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + idx++; + } + timer.stop(); + + // Sanity checks for the scan result + QVERIFY(mInterface == "com.nokia.icd2"); // interface is icd2 + QVERIFY(mMethod == "scan_req"); // method is scan_req + QVERIFY(mSignal == "scan_result_sig"); // signal is scan result + QVERIFY(mArgs[0] == QVariant(0) || + mArgs[0] == QVariant(4)); // First argument is status + // (0 == NEW, 4 == COMPLETED) + //QVERIFY(mArgs.contains(QVariant("WLAN_INFRA"))); // WLAN scan result +} + +void Ut_DBusDispatcher::complexCallReply(const QString& method, + const QList& args, + const QString& error) +{ + mMethod = method; + + // Check that method has not return arguments and error is not set + QVERIFY(error.isEmpty()); + QVERIFY(args.isEmpty()); +} + +void Ut_DBusDispatcher::complexCall() +{ + uint flags = ICD_CONNECTION_FLAG_UI_EVENT; + QList reply; + QVariantList networks; + QVariantList network1; + + network1 << "" << (uint)0 << "" << "WLAN_INFRA" << (uint)0x05000011 << QByteArray("osso@46@net"); + networks << QVariant(network1); + + // Connect signal + connect(mSubject, SIGNAL(callReply(const QString&, + const QList&, + const QString&)), + this, SLOT(complexCallReply(const QString&, + const QList&, + const QString&))); + + // Request connect and verify the call starts succesfully + QVERIFY(mSubject->callAsynchronous("connect_req", flags, networks)); + + QTest::qWait(1000); + + // Sanity checks for the scan result + QVERIFY(mInterface == "com.nokia.icd2"); // interface is icd2 + QVERIFY(mMethod == "connect_req"); // method connect_req +} + +QTEST_MAIN(Ut_DBusDispatcher) + +#include "ut_dbusdispatcher.moc" diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/tests/ut_iapconf.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/tests/ut_iapconf.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,186 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009 Nokia Corporation. All rights reserved. + + Contact: Aapo Makela + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + + +#include +#include + +#include + +class Ut_IAPConf : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void init(); + void cleanup(); + void initTestCase(); + void cleanupTestCase(); + + void setupIAP(); + void setupIAPContainingDot(); + void unsetIAPValueIsNotValid(); + void verifyAllIAPs(); + void allForEmptyConfReturnsEmptyList(); + void settingInvalidValueUnsetsKey(); + +private: + Maemo::IAPConf *mSubject; +}; + +void Ut_IAPConf::init() +{ + mSubject = new Maemo::IAPConf("test_iap"); +} + +void Ut_IAPConf::cleanup() +{ + // Clear made settings + mSubject->clear(); + + delete mSubject; + mSubject = 0; +} + +void Ut_IAPConf::initTestCase() +{ +} + +void Ut_IAPConf::cleanupTestCase() +{ +} + +void Ut_IAPConf::setupIAP() +{ + // Set bunch of values + mSubject->set("ipv4_type", "AUTO", + "wlan_wepkey1", "connt", + "wlan_wepdefkey", 1, + "wlan_ssid", QByteArray("CONNTEST-1")); + + // Set one value + mSubject->setValue("type", "WLAN_INFRA"); + + // Check all values that they were set correctly + QVERIFY(mSubject->value("ipv4_type").toString() == "AUTO"); + QVERIFY(mSubject->value("wlan_wepkey1").toString() == "connt"); + QVERIFY(mSubject->value("wlan_wepdefkey").toInt() == 1); + QVERIFY(mSubject->value("wlan_ssid").toByteArray() == QByteArray("CONNTEST-1")); + QVERIFY(mSubject->value("type").toString() == "WLAN_INFRA"); +} + +void Ut_IAPConf::setupIAPContainingDot() +{ + delete mSubject; + mSubject = new Maemo::IAPConf("test.iap"); + + // Set and check one value + mSubject->setValue("type", "DUMMY"); + QVERIFY(mSubject->value("type").toString() == "DUMMY"); +} + +void Ut_IAPConf::unsetIAPValueIsNotValid() +{ + QVariant invalidValue = mSubject->value("this_value_does_not_exist"); + QVERIFY(invalidValue.isValid() == false); +} + +void Ut_IAPConf::verifyAllIAPs() +{ + int count = 0, extras = 0; + QRegExp regexp("iap[1-3]"); + Maemo::IAPConf iap1("iap1"); + Maemo::IAPConf iap2("iap2"); + Maemo::IAPConf iap3("iap3"); + + iap1.clear(); + iap2.clear(); + iap3.clear(); + + iap1.setValue("name", "iap1"); + iap2.setValue("name", "iap2"); + iap3.setValue("name", "iap3"); + + count = extras = 0; + QList iaps; + Maemo::IAPConf::getAll(iaps, true); + foreach (QString iap_path, iaps) { + QString iap_id = iap_path.section('/', 5); /* This is the IAP id */ + if (!iap_id.contains(regexp)) { + extras++; + continue; + } + Maemo::IAPConf iap(iap_id); + QString name = iap.value("name").toString(); + QVERIFY(name == iap_id); + count++; + } + QCOMPARE(count, iaps.size()-extras); + + iap1.clear(); + iap2.clear(); + iap3.clear(); + + iap1.setValue("name", "iap1"); + iap2.setValue("name", "iap2"); + iap3.setValue("name", "iap3"); + + count = extras = 0; + Maemo::IAPConf::getAll(iaps); + foreach (QString iap_id, iaps) { + if (!iap_id.contains(regexp)) { + extras++; + continue; + } + Maemo::IAPConf iap(iap_id); + QString name = iap.value("name").toString(); + QVERIFY(name == iap_id); + count++; + } + QCOMPARE(count, iaps.size()-extras); +} + +void Ut_IAPConf::allForEmptyConfReturnsEmptyList() +{ + // Clear everything in configuration + mSubject->clearAll(); + + // Get all for a list and check that it is empty + QStringList iaps; + mSubject->getAll(iaps); + QVERIFY(iaps.isEmpty()); +} + +void Ut_IAPConf::settingInvalidValueUnsetsKey() +{ + // Setup some IAP + setupIAP(); + + // Set invalid value to unset "wlan_wepdefkey" key and verify that the + // value is unset + mSubject->setValue("wlan_wepdefkey", QVariant()); + QVERIFY(!mSubject->value("wlan_wepdefkey").isValid()); +} + +QTEST_MAIN(Ut_IAPConf) + +#include "ut_iapconf.moc" diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/tests/ut_iapmonitor.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/tests/ut_iapmonitor.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,118 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + + +#include +#include + +#include +#include + +static const char *iap_id = "test_monitor_1"; + +class TestIAPMonitor : public Maemo::IAPMonitor +{ +public: + QString addedIap; + QString removedIap; + +protected: + virtual void iapAdded(const QString &id) + { + addedIap = id; + } + + virtual void iapRemoved(const QString &id) + { + removedIap = id; + } +}; + +class Ut_IAPMonitor : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void init(); + void cleanup(); + void initTestCase(); + void cleanupTestCase(); + + void check(); + +private: + TestIAPMonitor *mon; + Maemo::IAPConf *iap; +}; + +void Ut_IAPMonitor::init() +{ + mon = new TestIAPMonitor; +} + +void Ut_IAPMonitor::cleanup() +{ + delete mon; + mon = 0; +} + +void Ut_IAPMonitor::initTestCase() +{ +} + +void Ut_IAPMonitor::cleanupTestCase() +{ +} + +void Ut_IAPMonitor::check() +{ + QVERIFY(mon->addedIap.isEmpty()); + + iap = new Maemo::IAPConf(iap_id); + iap->set("ipv4_type", "AUTO", + "wlan_wepkey1", "connt", + "wlan_wepdefkey", 1, + "wlan_ssid", QByteArray(iap_id)); + + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + QVERIFY(mon->addedIap == iap_id); + mon->addedIap.clear(); + + QVERIFY(mon->removedIap.isEmpty()); + + // Unset only one value and verify that IAP is not removed + iap->set("ipv4_type", QVariant()); + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + QVERIFY(mon->removedIap.isEmpty()); + + // Clear the whole IAP and check that it is removed + iap->clear(); + delete iap; + + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + + QVERIFY(mon->removedIap == iap_id); +} + +QTEST_MAIN(Ut_IAPMonitor) + +#include "ut_iapmonitor.moc" diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/tests/ut_maemo_icd.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/tests/ut_maemo_icd.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,274 @@ +/* + * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * + * Contact: Jukka Rissanen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + + +// !!!! +// !!!! NOTE: THESE TEST DO NOT REALLY WORK YET BECAUSE OF MISSING +// !!!! FUNCTIONALITY IN ICD2 STUB. YOU HAVE BEEN WARNED. +// !!!! + + +#include +#include +#include +#include +#include + +#include "maemo_icd.h" + +class Ut_MaemoIcd : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void init(); + void cleanup(); + void initTestCase(); + void cleanupTestCase(); + + void scan_req(); + void scan_cancel_req(); + void connect_req_default(); + void state_req_all(); + void state_req(); + void statistics_req_all(); + void statistics_req(); + void addrinfo_req_all(); + void addrinfo_req(); + +private: + void disconnect_req_default(); // this is currently not run + void connect_req_specific(); // this is currently not run + QProcess *icd_stub; + bool connect_iap(Maemo::IcdConnectResult &connect_result, + QString &result, + QString &error, + QString iap=QString()); +}; + + +QString create_error_str(Maemo::Icd &icd) +{ + return icd.error(); +} + + +void Ut_MaemoIcd::init() +{ + icd_stub = new QProcess(this); + icd_stub->setStandardOutputFile("/tmp/ut_maemo_icd.log"); + icd_stub->start("/usr/bin/icd2_stub.py"); + QTest::qWait(1000); + + // Set the statistics + QProcess dbus_send; + dbus_send.start("dbus-send --type=method_call --system " + "--dest=com.nokia.icd2 /com/nokia/icd2 " + "com.nokia.icd2.testing.set_statistics " + "uint32:1024 uint32:256"); + dbus_send.waitForFinished(); + +} + +void Ut_MaemoIcd::cleanup() +{ + icd_stub->terminate(); + icd_stub->waitForFinished(); +} + +void Ut_MaemoIcd::initTestCase() +{ +} + +void Ut_MaemoIcd::cleanupTestCase() +{ +} + +void Ut_MaemoIcd::scan_req() +{ + QList scanned; + QStringList scannedNetworkTypes; + QStringList networkTypesToScan; + QString error; + Maemo::Icd icd(ICD_SHORT_SCAN_TIMEOUT); + + scannedNetworkTypes = icd.scan(ICD_SCAN_REQUEST_ACTIVE, + networkTypesToScan, + scanned, + error); + QVERIFY(error.isEmpty()); + QCOMPARE(scanned.size(), 3); + QVERIFY(scannedNetworkTypes[0] == "WLAN_INFRA"); + QVERIFY(scannedNetworkTypes[1] == "DUN_GSM_PS"); +} + +void Ut_MaemoIcd::scan_cancel_req() +{ + Maemo::Icd icd; + icd.scanCancel(); + // Not much to verify here +} + +bool Ut_MaemoIcd::connect_iap(Maemo::IcdConnectResult &connect_result, + QString &result, + QString &error, + QString iap) +{ + icd_connection_flags flags = ICD_CONNECTION_FLAG_USER_EVENT; + bool st; + Maemo::Icd icd(ICD_SHORT_CONNECT_TIMEOUT); + + if (iap.isEmpty()) { + qDebug() << "connecting to default IAP"; + st = icd.connect(flags, connect_result); + } else { + qDebug() << "connecting to" << iap; + st = icd.connect(flags, iap, result); + } + + error = create_error_str(icd); + return st; +} + +void Ut_MaemoIcd::connect_req_default() +{ + Maemo::IcdConnectResult connect_result; + QString result, error; + bool st; + st = connect_iap(connect_result, result, error); + QVERIFY2(st, error.toAscii().data()); + result = connect_result.connect.network_id.data(); + qDebug() << result; +} + + +void Ut_MaemoIcd::disconnect_req_default() +{ + icd_connection_flags flags = ICD_CONNECTION_FLAG_USER_EVENT; + bool st; + Maemo::Icd icd(ICD_SHORT_CONNECT_TIMEOUT); + icd.disconnect(flags); +} + + +void Ut_MaemoIcd::connect_req_specific() +{ + Maemo::IcdConnectResult connect_result; + QString result; + QString error; + bool st; + st = connect_iap(connect_result, result, error, "wpa2gx2.osso.net"); + QVERIFY2(st, error.toAscii().data()); + qDebug() << result; +} + + +void Ut_MaemoIcd::state_req_all() +{ + QList state_results; + Maemo::Icd icd; + int sig; + sig = icd.state(state_results); + QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); +} + + +void Ut_MaemoIcd::state_req() +{ + Maemo::IcdStateResult state_result; + Maemo::Icd icd; + int sig; + QString service_type, service_id; + QString network_type("WLAN_INFRA"); + QByteArray network_id("wpa2gx2.osso.net"); + sig = icd.state(service_type, 0, service_id, + network_type, (uint)0x17a1, network_id, + state_result); + QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); +} + + +void Ut_MaemoIcd::statistics_req_all() +{ + QList stats_results; + Maemo::Icd icd; + int sig; + QString err; + sig = icd.statistics(stats_results); + err = create_error_str(icd); + if (!err.isEmpty()) + QVERIFY2(sig==1, err.toAscii().data()); + else + QCOMPARE(sig, 1); + + for(int i=0; i addr_results; + Maemo::Icd icd; + int sig; + sig = icd.addrinfo(addr_results); + QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); +} + + +void Ut_MaemoIcd::addrinfo_req() +{ + Maemo::IcdAddressInfoResult addr_result; + Maemo::Icd icd; + int sig; + QString service_type, service_id; + QString network_type("WLAN_INFRA"); + QByteArray network_id("wpa2gx2.osso.net"); + sig = icd.addrinfo(service_type, 0, service_id, + network_type, (uint)0x17a1, network_id, + addr_result); + QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); +} + + +QTEST_MAIN(Ut_MaemoIcd) + +#include "ut_maemo_icd.moc" diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libconninet/tests/ut_proxyconf.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libconninet/tests/ut_proxyconf.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,400 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + + +#include +#include +#include +#include + +#include "../src/proxyconf.h" + +class Ut_ProxyConf : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void init(); + void cleanup(); + void initTestCase(); + void cleanupTestCase(); + + // tests without the factory + void proxy_ftp_no_factory_ok_auto(); + void proxy_ftp_no_factory_ok_manual(); + void proxy_http_no_factory_ok_manual(); + void proxy_https_no_factory_ok_manual(); + void proxy_socks_no_factory_ok_manual(); + void proxy_default_no_factory_ok_manual(); + + // tests using the factory + void proxy_ftp_factory_ok_auto(); + void proxy_ftp_factory_ok_manual(); + void proxy_http_factory_ok_manual(); + void proxy_https_factory_ok_manual(); + void proxy_socks_factory_ok_manual(); + void proxy_http_factory_ok_manual_clear(); + void proxy_default_factory_ok_manual(); + void proxy_http_factory_ok_manual_ignore_list(); + void proxy_default_factory_ok_manual_system(); + +private: + Maemo::ProxyConf *pc; +}; + + +void put(QString var, QString type, QString value) +{ + QProcess gconf; + if (value.isEmpty()) + gconf.start(QString("gconftool-2 -u /system/proxy/"+var)); + else + gconf.start(QString("gconftool-2 -s /system/proxy/"+var+" -t "+type+" "+value)); + gconf.waitForFinished(); +} + +void put_http(QString var, QString type, QString value) +{ + QProcess gconf; + if (value.isEmpty()) + gconf.start(QString("gconftool-2 -u /system/http_proxy/"+var)); + else + gconf.start(QString("gconftool-2 -s /system/http_proxy/"+var+" -t "+type+" "+value)); + gconf.waitForFinished(); +} + +void put_list(QString var, QString type, QList value) +{ + QProcess gconf; + QString values = "["; + foreach (QString str, value) + values = values + str + ","; + values.chop(1); + values = values + "]"; + + gconf.start(QString("gconftool-2 -s /system/http_proxy/"+var+" -t list --list-type="+type+" "+values)); + gconf.waitForFinished(); +} + + +void Ut_ProxyConf::init() +{ + put_http("host", "string", "my.proxy.com"); + put_http("port", "int", "8080"); + + QList list; + list.append("foo.bar.com"); + list.append("192.168.19.69"); + list.append("192.168.20.0/24"); + list.append("bar.foo.com"); + put_list("ignore_hosts", "string", list); + put_http("use_http_host", "boolean", "true"); + + put("mode", "string", "auto"); + put("autoconfig_url", "string", "http://foo.bar.com/autoconf"); + put("secure_host", "string", "secure_host.com"); + put("secure_port", "int", "112"); + + put("ftp_host", "string", "ftp.nuukia.com"); + put("ftp_port", "int", "2000"); + put("socks_host", "string", "socks.host.com"); + put("socks_port", "int", "10080"); + put("rtsp_host", "string", "rtsp.voice.com"); + put("rtsp_port", "int", "1554"); + + pc = new Maemo::ProxyConf(); +} + +void Ut_ProxyConf::cleanup() +{ + delete pc; + pc = 0; +} + +void Ut_ProxyConf::initTestCase() +{ +} + +void Ut_ProxyConf::cleanupTestCase() +{ +} + + +void Ut_ProxyConf::proxy_ftp_no_factory_ok_auto() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); + + nplist = pc->flush(query); + QVERIFY(nplist.length()==0); +} + + +void Ut_ProxyConf::proxy_ftp_no_factory_ok_manual() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); + + put("mode", "string", "manual"); + + nplist = pc->flush(query); + foreach (QNetworkProxy proxy, nplist) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(nplist.length()==3); + QVERIFY(nplist.first().type() == QNetworkProxy::FtpCachingProxy); +} + + +void Ut_ProxyConf::proxy_http_no_factory_ok_manual() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + + put("mode", "string", "manual"); + + nplist = pc->flush(query); + foreach (QNetworkProxy proxy, nplist) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(nplist.length()==3); + QVERIFY(nplist.first().type() == QNetworkProxy::HttpProxy); +} + + +void Ut_ProxyConf::proxy_https_no_factory_ok_manual() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("https://maps.google.com/")); + + put("mode", "string", "manual"); + + nplist = pc->flush(query); + foreach (QNetworkProxy proxy, nplist) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(nplist.length()==2); + QVERIFY(nplist.first().type() == QNetworkProxy::HttpProxy); +} + + +void Ut_ProxyConf::proxy_socks_no_factory_ok_manual() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + + put("mode", "string", "manual"); + put_http("host", "string", ""); + + nplist = pc->flush(query); + foreach (QNetworkProxy proxy, nplist) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(nplist.length()==2); + QVERIFY(nplist.first().type() == QNetworkProxy::Socks5Proxy); +} + + +void Ut_ProxyConf::proxy_default_no_factory_ok_manual() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("foobar://maps.google.com/")); + + put("mode", "string", "manual"); + put("socks_host", "string", ""); + put("secure_host", "string", ""); + + nplist = pc->flush(query); + foreach (QNetworkProxy proxy, nplist) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(nplist.length()==0); +} + + +void Ut_ProxyConf::proxy_ftp_factory_ok_auto() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); + Maemo::ProxyConf::update(); + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + QVERIFY(listOfProxies.length()==1); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_ftp_factory_ok_manual() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==3); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::FtpCachingProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_http_factory_ok_manual() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==3); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_https_factory_ok_manual() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("https://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==2); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_socks_factory_ok_manual() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + put_http("host", "string", ""); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==2); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::Socks5Proxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_http_factory_ok_manual_clear() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + put_http("host", "string", "192.168.1.1"); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==3); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); + + Maemo::ProxyConf::clear(); + listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + QVERIFY(listOfProxies.length()==1); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); +} + + +void Ut_ProxyConf::proxy_default_factory_ok_manual() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("foobar://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + put("socks_host", "string", ""); + put("secure_host", "string", ""); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + QVERIFY(listOfProxies.length()==1); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_http_factory_ok_manual_ignore_list() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://192.168.19.70/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==3); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); + + query = QNetworkProxyQuery(QUrl("http://192.168.20.10/")); + listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + QVERIFY(listOfProxies.length()==1); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_default_factory_ok_manual_system() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + + QList listOfProxies = QNetworkProxyFactory::systemProxyForQuery(query); + + QVERIFY(listOfProxies.length()==1); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); + Maemo::ProxyConf::clear(); +} + + + + +QTEST_MAIN(Ut_ProxyConf) + +#include "ut_proxyconf.moc" diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq.pri --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq.pri Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,9 @@ +INCLUDEPATH += $$PWD/libgq/gconf + +HEADERS += \ + $$PWD/libgq/gconf/gconfitem.h \ + $$PWD/libgq/gconf/GConfItem + +SOURCES += \ + $$PWD/libgq/gconf/gconfitem.cpp + diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/.gitignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/.gitignore Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,37 @@ +/Makefile.in +/aclocal.m4 +/autom4te.cache/ +/config.guess +/config.sub +/configure +/depcomp +/gconf/Makefile.in +/install-sh +/ltmain.sh +/missing +/Makefile +/config.log +/config.status +/gconf/.deps/ +/gconf/Makefile +/libtool +/confdefs.h +/gconf/.libs/ +/gconf/libgq-gconf.la +/gconf/gq-gconf.pc +/gconf/moc_gconfitem_h.cpp +/gconf/mocs.cpp +/gconf/test-gconf +/gconf/gconfitem_moc.cpp +/gconf/test-gconf_moc.cpp +/libgq-*.tar.gz +/debian/libgq-gconf-dev/ +/debian/libgq-gconf0/ +/debian/tmp/ +/debian/libgq-gconf0-dbg/ +/debian/libgq-gconf-doc/ +/debian/*.debhelper.log +/debian/*.substvars +/debian/files +/debian/*.debhelper +/gconf/html/ diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/Makefile.am Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,4 @@ +SUBDIRS = gconf + +dist-hook: + rm -rf `find $(distdir) -name '*_moc.cpp'` diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/README Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,6 @@ +This is libgq, a set of small libraries with Q wrappers for G things. + +* GConf + +The libgq-gconf library contains the GConfItem class for accessing +GConf. diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/autogen.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/autogen.sh Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,2 @@ +#! /bin/sh +autoreconf --install --force -v diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/configure.ac --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/configure.ac Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,23 @@ +AC_INIT([libgq],[0.2],[marius.vollmer@nokia.com],[libgq]) +AC_CONFIG_SRCDIR([Makefile.am]) +AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign]) + +AC_PROG_CXX +AC_PROG_LIBTOOL + +PKG_CHECK_MODULES([QT], [QtCore]) +PKG_CHECK_MODULES([QTEST], [QtTest]) +PKG_CHECK_MODULES([GLIB], [glib-2.0]) +PKG_CHECK_MODULES([GCONF], [gconf-2.0]) + +MOC=`pkg-config QtCore --variable=moc_location` +RCC=`pkg-config QtCore --variable=exec_prefix`/bin/rcc + +AC_SUBST([MOC]) +AC_SUBST([RCC]) + +AC_CONFIG_FILES([Makefile + gconf/Makefile + gconf/gq-gconf.pc]) + +AC_OUTPUT diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/debian/README.scratchbox --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/debian/README.scratchbox Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,28 @@ +This packages behaves a bit wierdly inside Scratchbox 1, by design. + +When building it with dpkg-buildpackage or equivalent, it will disable +all devkits and adjust PATH. This means that almost all build +dependencies will come from your installed packages, and not from +Scratchbox or the configured devkits. + +Since some of our packages do not work with Scratchboxes fakeroot +(because the latter is too old), you should use the targets fakeroot +instead. + +You can disable this behavior by setting SBOX_DONT_SANITIZE in the +environment. + +When this package is build in a certain buildbot, it will go further +and permantly change the Scratchbox target. This should not happen to +anyone but the buildbot, but there is a chance it will happen to you +by accident. + +The buildbot is recognized via the $USER environment variable. If it +matches "bifh[0-9]", the permanent changes will be done. + +The permanent changes mostly consist of running apt-get dist-upgrade +and making sure that the targets fakeroot is used. + +This weirdness is brought to you by: + + http://maemo.gitorious.org/maemo-af/maemoify-tools diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/debian/changelog --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/debian/changelog Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,31 @@ +libgq (0.4+0m6) unstable; urgency=low + + * This entry has been added by BIFH queue processor + version has been changed to 0.4+0m6 + + -- Marius Vollmer Fri, 04 Jun 2010 18:28:43 +0300 + +libgq (0.4) unstable; urgency=low + + * Never release the GConf client, to avoid having to recreate it + immediately. Might fix NB#164690. + + -- Marius Vollmer Fri, 04 Jun 2010 18:10:50 +0300 + +libgq (0.3) unstable; urgency=low + + * Added autotools to Build-Depends. + + -- Marius Vollmer Tue, 23 Feb 2010 12:04:45 +0200 + +libgq (0.2) unstable; urgency=low + + * Build fixes. + + -- Marius Vollmer Wed, 16 Dec 2009 15:56:05 +0200 + +libgq (0.1) unstable; urgency=low + + * Initial release. + + -- Marius Vollmer Wed, 16 Dec 2009 15:54:46 +0200 diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/debian/compat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/debian/compat Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +7 diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/debian/control --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/debian/control Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,43 @@ +Source: libgq +Section: libs +Priority: extra +Maintainer: Marius Vollmer +Origin: maemo +Build-Depends: debhelper (>= 7), libqt4-dev, doxygen, libgconf2-dev, libglib2.0-dev, autoconf, automake, libtool +Vcs-Browser: http://gitorious.org/maemo-af/libgq +Vcs-Git: git@gitorious.org:maemo-af/libgq.git + +Package: libgq-gconf0 +Architecture: any +Depends: ${shlibs:Depends} +Description: a Qt wrapper for GConf + This library contains the GConfItem class, for easy + access to GConf from Qt programs. + . + This package contains the shared run-time library. + +Package: libgq-gconf0-dbg +Architecture: any +Depends: libgq-gconf0 (= ${source:Version}) +Description: a Qt wrapper for GConf + This library contains the GConfItem class, for easy + access to GConf from Qt programs. + . + This package contains the debugging symbols. + +Package: libgq-gconf-dev +Architecture: any +Depends: libgq-gconf0 (= ${source:Version}), libqt4-dev, libgconf2-dev +Description: a Qt wrapper for GConf + This library contains the GConfItem class, for easy + access to GConf from Qt programs. + . + This package contains the development files. + +Package: libgq-gconf-doc +Architecture: all +Description: a Qt wrapper for GConf + This library contains the GConfItem class, for easy + access to GConf from Qt programs. + . + This package contains the documentation. diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/debian/copyright --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/debian/copyright Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,8 @@ +Copyright (c) 2009 Nokia Corporation. + +This program, is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License version +2.1 as published by the Free Software Foundation. + +The full text of the LGPL 2.1 can be found in +/usr/share/common-licenses. diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/debian/fixup-scratchbox --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/debian/fixup-scratchbox Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,79 @@ +#! /bin/sh + +# XXX - this needs to run under fakeroot... + +exec 3>&1 1>&2 + +real_dpkg_checkbuilddeps () { + SBOX_REDIRECT_IGNORE=/usr/bin/perl /usr/bin/perl /usr/bin/dpkg-checkbuilddeps "$@" +} + +finish () { + if ! real_dpkg_checkbuilddeps; then + echo "This package does not use any devkits." + echo "Please install all build dependencies as real packages." + echo >&3 FAIL + fi + exit 0 +} + +# The stamp file can not be in the source tree because then it would +# end up in the source package, which is not what we want. We put it +# into /var/tmp so that it gets deleted when a new rootstrap is +# extracted. + +STAMP=/var/tmp/SANITIZED.$(head debian/changelog | md5sum | cut -d' ' -f1) + +if [ -e $STAMP ]; then + exit 0; +fi + +# Only do permanent changes if this is BIFH + +echo "$USER" | grep -q 'bifh[0-9]' || finish + +# prevent bash from killing the system +rm -f /var/lib/bash/provide-sh + +# clean ~/.texmf-var to avoid trouble with stale things hiding there. +rm -rf ~/.texmf-var/ + +pfx="dpkg-checkbuilddeps: Unmet build dependencies:" +deps=`real_dpkg_checkbuilddeps 2>&1 | grep "^$pfx" | \ + sed -e "s/$pfx//" -e s'/([^)]*)//g' -e 's/|//'` +deps="$deps build-essential automake autoconf libtool ed gawk diff dpkg-dev" +for d in $deps; do + echo apt-get "$@" install $d + apt-get -o DPkg::Options::=--force-confold -q --force-yes --yes install $d +done +apt-get -o DPkg::Options::=--force-confold -q --force-yes --yes dist-upgrade + +# Make sure we get a fresh fakeroot installation + +# We can't seem to control the value of LD_PRELOAD well enough, so we +# just copy the good version of libfakeroot over the bad one that +# Scratchbox uses. This will result in a good version of libfakeroot +# talking to a bad version of faked, but that seems to work well +# enough. The protocol between the two is really simple and unlikely +# to change even when new syscalls are wrapped. And this is a +# desperate hack anyway, so it's OK if there is blood all over the +# floor from time to time. +# +# After we have overwritten libfakeroot, it no longer works with any +# host binaries, such as the ones in /scratchbox/compilers/bin or +# /scratchbox/tools/bin. Thus, we must avoid running those when +# fakerooted. +# +# We use "cp -l" here to avoid overwriting a library that is in use. +# +if [ "$(fakeroot -v)" = "fakeroot version 1.4.2" ]; then + apt-get -q --force-yes --yes --reinstall install fakeroot + cp -fl /usr/lib/libfakeroot/libfakeroot-sysv.so /usr/lib/libfakeroot-sysv/libfakeroot.so.0 + cp -fl /usr/lib/libfakeroot/libfakeroot-tcp.so /usr/lib/libfakeroot-tcp/libfakeroot.so.0 +else + echo "We have $(fakeroot -v), hurray!" +fi + +touch $STAMP + +finish diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/debian/libgq-gconf-dev.install --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/debian/libgq-gconf-dev.install Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,5 @@ +usr/include/gq/GConfItem +usr/include/gq/gconfitem.h +usr/lib/libgq-gconf.so +usr/lib/libgq-gconf.a +usr/lib/pkgconfig/gq-gconf.pc diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/debian/libgq-gconf-doc.install --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/debian/libgq-gconf-doc.install Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +gconf/html usr/share/doc/libgq-gconf-doc/ diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/debian/libgq-gconf0.install --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/debian/libgq-gconf0.install Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +usr/lib/libgq-gconf.so.* diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/debian/maemo-sanitize diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/debian/rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/debian/rules Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,32 @@ +#! /usr/bin/make -f + +# Sanitize build environment when running inside Scratchbox 1 +ifneq (,$(wildcard /targets)) + ifeq (,$(SBOX_DONT_SANITIZE)) + export PATH:=/bin:/usr/bin + export MAKE:=make + ifeq (,$(FAKEROOTKEY)) + export SBOX_REDIRECT_TO_DIRS:=/scratchbox/compilers/bin + else + export SBOX_REDIRECT_TO_DIRS:= + endif + ifneq (,$(shell debian/fixup-scratchbox)) + $(error Error) + endif + endif +endif + +override_dh_auto_configure: + ./autogen.sh + dh_auto_configure + +override_dh_auto_build: + dh_auto_build + cd gconf && doxygen + +override_dh_strip: + dh_strip -plibgq-gconf0 --dbg-package=libgq-gconf0-dbg + dh_strip + +%: + dh $@ diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/gconf/Doxyfile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/gconf/Doxyfile Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1514 @@ +# Doxyfile 1.6.1 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = gq-gconf + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = gconfitem.h gconfitem.cpp + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP) +# there is already a search function so this one should typically +# be disabled. + +SEARCHENGINE = YES + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = NO + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = YES + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/gconf/GConfItem --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/gconf/GConfItem Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +#include "gconfitem.h" diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/gconf/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/gconf/Makefile.am Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,37 @@ +AM_CXXFLAGS = $(QT_CFLAGS) $(GLIB_CFLAGS) $(GCONF_CFLAGS) +LIBS += $(QT_LIBS) $(GLIB_LIBS) $(GCONF_LIBS) + +lib_LTLIBRARIES = libgq-gconf.la + +libgq_gconf_la_SOURCES = GConfItem \ + gconfitem.h \ + gconfitem.cpp \ + gconfitem_moc.cpp + +gqincludedir=$(includedir)/gq +gqinclude_HEADERS = gconfitem.h GConfItem + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gq-gconf.pc + +# Tests + +check_PROGRAMS = test-gconf + +test_gconf_SOURCES = test-gconf.h test-gconf.cpp test-gconf_moc.cpp +test_gconf_CFLAGS = $(QTEST_CFLAGS) +test_gconf_LDADD = libgq-gconf.la $(QTEST_LIBS) + +TESTS = run-test-gconf + +EXTRA_DIST = run-test-gconf + +# Moccing + +%_moc.cpp: %.h + $(MOC) -o "$@" "$<" + +clean-moc: + rm -f *_moc.cpp *_moc.lo + +clean-local: clean-moc diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/gconf/gconfitem.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/gconf/gconfitem.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,376 @@ +/* * This file is part of libgq * + * + * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * + * Contact: Marius Vollmer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +#include +#include +#include +#include +#include + +#include "gconfitem.h" + +#include +#include +#include + +struct GConfItemPrivate { + QString key; + QVariant value; + guint notify_id; + + static void notify_trampoline(GConfClient*, guint, GConfEntry *, gpointer); +}; + +/* We get the default client and never release it, on purpose, to + avoid disconnecting from the GConf daemon when a program happens to + not have any GConfItems for short periods of time. + */ +static GConfClient * +get_gconf_client () +{ + static bool initialized = false; + static GConfClient *client; + + if (initialized) + return client; + + g_type_init (); + client = gconf_client_get_default(); + initialized = true; + + return client; +} + +/* Sometimes I like being too clever... + */ +#define withClient(c) for (GConfClient *c = get_gconf_client (); c; c = NULL) + +static QByteArray convertKey (QString key) +{ + if (key.startsWith('/')) + return key.toUtf8(); + else + { + qWarning() << "Using dot-separated key names with GConfItem is deprecated."; + qWarning() << "Please use" << '/' + key.replace('.', '/') << "instead of" << key; + return '/' + key.replace('.', '/').toUtf8(); + } +} + +static QString convertKey(const char *key) +{ + return QString::fromUtf8(key); +} + +static QVariant convertValue(GConfValue *src) +{ + if (!src) { + return QVariant(); + } else { + switch (src->type) { + case GCONF_VALUE_INVALID: + return QVariant(QVariant::Invalid); + case GCONF_VALUE_BOOL: + return QVariant((bool)gconf_value_get_bool(src)); + case GCONF_VALUE_INT: + return QVariant(gconf_value_get_int(src)); + case GCONF_VALUE_FLOAT: + return QVariant(gconf_value_get_float(src)); + case GCONF_VALUE_STRING: + return QVariant(QString::fromUtf8(gconf_value_get_string(src))); + case GCONF_VALUE_LIST: + switch (gconf_value_get_list_type(src)) { + case GCONF_VALUE_STRING: + { + QStringList result; + for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next) + result.append(QString::fromUtf8(gconf_value_get_string((GConfValue *)elts->data))); + return QVariant(result); + } + default: + { + QList result; + for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next) + result.append(convertValue((GConfValue *)elts->data)); + return QVariant(result); + } + } + case GCONF_VALUE_SCHEMA: + default: + return QVariant(); + } + } +} + +static GConfValue *convertString(const QString &str) +{ + GConfValue *v = gconf_value_new (GCONF_VALUE_STRING); + gconf_value_set_string (v, str.toUtf8().data()); + return v; +} + +static GConfValueType primitiveType (const QVariant &elt) +{ + switch(elt.type()) { + case QVariant::String: + return GCONF_VALUE_STRING; + case QVariant::Int: + return GCONF_VALUE_INT; + case QVariant::Double: + return GCONF_VALUE_FLOAT; + case QVariant::Bool: + return GCONF_VALUE_BOOL; + default: + return GCONF_VALUE_INVALID; + } +} + +static GConfValueType uniformType(const QList &list) +{ + GConfValueType result = GCONF_VALUE_INVALID; + + foreach (const QVariant &elt, list) { + GConfValueType elt_type = primitiveType (elt); + + if (elt_type == GCONF_VALUE_INVALID) + return GCONF_VALUE_INVALID; + + if (result == GCONF_VALUE_INVALID) + result = elt_type; + else if (result != elt_type) + return GCONF_VALUE_INVALID; + } + + if (result == GCONF_VALUE_INVALID) + return GCONF_VALUE_STRING; // empty list. + else + return result; +} + +static int convertValue(const QVariant &src, GConfValue **valp) +{ + GConfValue *v; + + switch(src.type()) { + case QVariant::Invalid: + v = NULL; + break; + case QVariant::Bool: + v = gconf_value_new (GCONF_VALUE_BOOL); + gconf_value_set_bool (v, src.toBool()); + break; + case QVariant::Int: + v = gconf_value_new (GCONF_VALUE_INT); + gconf_value_set_int (v, src.toInt()); + break; + case QVariant::Double: + v = gconf_value_new (GCONF_VALUE_FLOAT); + gconf_value_set_float (v, src.toDouble()); + break; + case QVariant::String: + v = convertString(src.toString()); + break; + case QVariant::StringList: + { + GSList *elts = NULL; + v = gconf_value_new(GCONF_VALUE_LIST); + gconf_value_set_list_type(v, GCONF_VALUE_STRING); + foreach (const QString &str, src.toStringList()) + elts = g_slist_prepend(elts, convertString(str)); + gconf_value_set_list_nocopy(v, g_slist_reverse(elts)); + break; + } + case QVariant::List: + { + GConfValueType elt_type = uniformType(src.toList()); + if (elt_type == GCONF_VALUE_INVALID) + v = NULL; + else + { + GSList *elts = NULL; + v = gconf_value_new(GCONF_VALUE_LIST); + gconf_value_set_list_type(v, elt_type); + foreach (const QVariant &elt, src.toList()) + { + GConfValue *val = NULL; + convertValue(elt, &val); // guaranteed to succeed. + elts = g_slist_prepend(elts, val); + } + gconf_value_set_list_nocopy(v, g_slist_reverse(elts)); + } + break; + } + default: + return 0; + } + + *valp = v; + return 1; +} + +void GConfItemPrivate::notify_trampoline (GConfClient*, + guint, + GConfEntry *, + gpointer data) +{ + GConfItem *item = (GConfItem *)data; + item->update_value (true); +} + +void GConfItem::update_value (bool emit_signal) +{ + QVariant new_value; + + withClient(client) { + GError *error = NULL; + QByteArray k = convertKey(priv->key); + GConfValue *v = gconf_client_get(client, k.data(), &error); + + if (error) { + qWarning() << error->message; + g_error_free (error); + new_value = priv->value; + } else { + new_value = convertValue(v); + if (v) + gconf_value_free(v); + } + } + + if (new_value != priv->value) { + priv->value = new_value; + if (emit_signal) + emit valueChanged(); + } +} + +QString GConfItem::key() const +{ + return priv->key; +} + +QVariant GConfItem::value() const +{ + return priv->value; +} + +QVariant GConfItem::value(const QVariant &def) const +{ + if (priv->value.isNull()) + return def; + else + return priv->value; +} + +void GConfItem::set(const QVariant &val) +{ + withClient(client) { + QByteArray k = convertKey(priv->key); + GConfValue *v; + if (convertValue(val, &v)) { + GError *error = NULL; + + if (v) { + gconf_client_set(client, k.data(), v, &error); + gconf_value_free(v); + } else { + gconf_client_unset(client, k.data(), &error); + } + + if (error) { + qWarning() << error->message; + g_error_free(error); + } else if (priv->value != val) { + priv->value = val; + emit valueChanged(); + } + + } else + qWarning() << "Can't store a" << val.typeName(); + } +} + +void GConfItem::unset() { + set(QVariant()); +} + +QList GConfItem::listDirs() const +{ + QList children; + + withClient(client) { + QByteArray k = convertKey(priv->key); + GSList *dirs = gconf_client_all_dirs(client, k.data(), NULL); + for (GSList *d = dirs; d; d = d->next) { + children.append(convertKey((char *)d->data)); + g_free (d->data); + } + g_slist_free (dirs); + } + + return children; +} + +QList GConfItem::listEntries() const +{ + QList children; + + withClient(client) { + QByteArray k = convertKey(priv->key); + GSList *entries = gconf_client_all_entries(client, k.data(), NULL); + for (GSList *e = entries; e; e = e->next) { + children.append(convertKey(((GConfEntry *)e->data)->key)); + gconf_entry_free ((GConfEntry *)e->data); + } + g_slist_free (entries); + } + + return children; +} + +GConfItem::GConfItem(const QString &key, QObject *parent) + : QObject (parent) +{ + priv = new GConfItemPrivate; + priv->key = key; + priv->notify_id = 0; + withClient(client) { + update_value (false); + QByteArray k = convertKey(priv->key); + gconf_client_add_dir (client, k.data(), GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); + priv->notify_id = gconf_client_notify_add (client, k.data(), + GConfItemPrivate::notify_trampoline, this, + NULL, NULL); + } +} + +GConfItem::~GConfItem() +{ + withClient(client) { + QByteArray k = convertKey(priv->key); + if (priv->notify_id) + gconf_client_notify_remove (client, priv->notify_id); + gconf_client_remove_dir (client, k.data(), NULL); + } + delete priv; +} diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/gconf/gconfitem.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/gconf/gconfitem.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,147 @@ +/* * This file is part of libgq * + * + * Copyright (C) 2009 Nokia Corporation. + * + * Contact: Marius Vollmer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +#ifndef GCONFITEM_H +#define GCONFITEM_H + +#include +#include +#include + +/*! + + \brief GConfItem is a simple C++ wrapper for GConf. + + Creating a GConfItem instance gives you access to a single GConf + key. You can get and set its value, and connect to its + valueChanged() signal to be notified about changes. + + The value of a GConf key is returned to you as a QVariant, and you + pass in a QVariant when setting the value. GConfItem converts + between a QVariant and GConf values as needed, and according to the + following rules: + + - A QVariant of type QVariant::Invalid denotes an unset GConf key. + + - QVariant::Int, QVariant::Double, QVariant::Bool are converted to + and from the obvious equivalents. + + - QVariant::String is converted to/from a GConf string and always + uses the UTF-8 encoding. No other encoding is supported. + + - QVariant::StringList is converted to a list of UTF-8 strings. + + - QVariant::List (which denotes a QList) is converted + to/from a GConf list. All elements of such a list must have the + same type, and that type must be one of QVariant::Int, + QVariant::Double, QVariant::Bool, or QVariant::String. (A list of + strings is returned as a QVariant::StringList, however, when you + get it back.) + + - Any other QVariant or GConf value is essentially ignored. + + \warning GConfItem is as thread-safe as GConf. + +*/ + +class GConfItem : public QObject +{ + Q_OBJECT + + public: + /*! Initializes a GConfItem to access the GConf key denoted by + \a key. Key names should follow the normal GConf conventions + like "/myapp/settings/first". + + \param key The name of the key. + \param parent Parent object + */ + explicit GConfItem(const QString &key, QObject *parent = 0); + + /*! Finalizes a GConfItem. + */ + virtual ~GConfItem(); + + /*! Returns the key of this item, as given to the constructor. + */ + QString key() const; + + /*! Returns the current value of this item, as a QVariant. + */ + QVariant value() const; + + /*! Returns the current value of this item, as a QVariant. If + * there is no value for this item, return \a def instead. + */ + QVariant value(const QVariant &def) const; + + /*! Set the value of this item to \a val. If \a val can not be + represented in GConf or GConf refuses to accept it for other + reasons, the current value is not changed and nothing happens. + + When the new value is different from the old value, the + changedValue() signal is emitted on this GConfItem as part + of calling set(), but other GConfItem:s for the same key do + only receive a notification once the main loop runs. + + \param val The new value. + */ + void set(const QVariant &val); + + /*! Unset this item. This is equivalent to + + \code + item.set(QVariant(QVariant::Invalid)); + \endcode + */ + void unset(); + + /*! Return a list of the directories below this item. The + returned strings are absolute key names like + "/myapp/settings". + + A directory is a key that has children. The same key might + also have a value, but that is confusing and best avoided. + */ + QList listDirs() const; + + /*! Return a list of entries below this item. The returned + strings are absolute key names like "/myapp/settings/first". + + A entry is a key that has a value. The same key might also + have children, but that is confusing and is best avoided. + */ + QList listEntries() const; + + signals: + /*! Emitted when the value of this item has changed. + */ + void valueChanged(); + + private: + friend struct GConfItemPrivate; + struct GConfItemPrivate *priv; + + void update_value(bool emit_signal); +}; + +#endif // GCONFITEM_H diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/gconf/gq-gconf.pc.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/gconf/gq-gconf.pc.in Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gq-gconf +Description: Qt/GConf wrapper +Version: @VERSION@ +Requires: QtCore +Libs: -L${libdir} -lgq-gconf +Cflags: -I${includedir}/gq diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/gconf/run-test-gconf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/gconf/run-test-gconf Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,49 @@ +#!/bin/sh + +# please make sure that the en_US.UTF-8 locale is available! +# - apt-get install locales +# - make sure /etc/locale.gen contains the line "en_US.UTF-8 UTF-8" +# - run /usr/sbin/locale-gen +LC_ALL=en_US.UTF-8 +export LC_ALL + +gconftool-2 -s -t bool /Test/Bool true +VALUE=$(gconftool-2 -g /Test/Bool) +if [ "$VALUE" != "true" ]; then + echo "GConf is not running, skipping all tests" + exit 77 +fi + +# Setup values expected by the external_values() test. + +gconftool-2 -s -t int /Test/Int 123 +gconftool-2 -s -t string /Test/String "Hello GConf" +gconftool-2 -s -t float /Test/Double 3.5 +gconftool-2 -s -t list --list-type string /Test/StringList "[Hello,GConf,ÄÖÜ]" +gconftool-2 -s -t list --list-type int /Test/IntList "[1,2,3,4]" +gconftool-2 -s -t list --list-type float /Test/DoubleList "[3.5,3.5,3.5]" +gconftool-2 -s -t list --list-type bool /Test/BoolList "[false,true,true,false]" +gconftool-2 -u /Test/UnsetBefore +gconftool-2 -s -t int /Test/UnsetAfter 100 +gconftool-2 -s -t int /Test/Dir/Entry 200 + +./test-gconf $* || exit 1 + +# Check what set_external() has left behind. + +compare() { + if [ "$1" != "$2" ]; then + echo "FAIL: '$1' != '$2'" + exit 1 + fi +} + +compare "`gconftool-2 -g /Test/Bool`" false +compare "`gconftool-2 -g /Test/Int`" 54321 +compare "`gconftool-2 -g /Test/String`" "Good bye GConf" +compare "`gconftool-2 -g /Test/Double`" -2.5 +compare "`gconftool-2 -g /Test/StringList`" "[Good,bye,GConf,äöü]" +compare "`gconftool-2 -g /Test/IntList`" "[5,4,3,2,1]" +compare "`gconftool-2 -g /Test/DoubleList`" "[-2.5,-2.5]" +compare "`gconftool-2 -g /Test/BoolList`" "[false,false,true,true]" +compare "`gconftool-2 -g /Test/UnsetAfter 2>&1`" 'No value set for `/Test/UnsetAfter'"'" diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/gconf/test-gconf.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/gconf/test-gconf.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,299 @@ +#include "test-gconf.h" + +#define MYLOGLEVEL 2 +void myMessageOutput(QtMsgType type, const char *msg) +{ + switch (type) { + case QtDebugMsg: + if (MYLOGLEVEL <= 0) + fprintf(stderr, "Debug: %s\n", msg); + break; + case QtWarningMsg: + if (MYLOGLEVEL <= 1) + fprintf(stderr, "Warning: %s\n", msg); + break; + case QtCriticalMsg: + if (MYLOGLEVEL <= 2) + fprintf(stderr, "Critical: %s\n", msg); + break; + case QtFatalMsg: + if (MYLOGLEVEL <= 3) + fprintf(stderr, "Fatal: %s\n", msg); + abort(); + } +} + +// +// Definition of testcases: Normal tests +// + +void GConfItemTests::timeout() +{ + timed_out = true; + timer.stop(); +} + +// Before all tests +void GConfItemTests::initTestCase() +{ + connect(&timer, SIGNAL(timeout()), + this, SLOT(timeout())); +} + +// After all tests +void GConfItemTests::cleanupTestCase() +{ +} + +// Before each test +void GConfItemTests::init() +{ + boolItem = new GConfItem("/Test/Bool"); + intItem = new GConfItem("/Test/Int"); + stringItem = new GConfItem("/Test/String"); + doubleItem = new GConfItem("/Test/Double"); + stringListItem = new GConfItem("/Test/StringList"); + intListItem = new GConfItem("/Test/IntList"); + doubleListItem = new GConfItem("/Test/DoubleList"); + boolListItem = new GConfItem("/Test/BoolList"); + unsetBeforeItem = new GConfItem("/Test/UnsetBefore"); + unsetAfterItem = new GConfItem("/Test/UnsetAfter"); + signalSpy = new SignalListener(); + QObject::connect(boolItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::connect(intItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::connect(stringItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::connect(doubleItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::connect(stringListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::connect(intListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::connect(doubleListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::connect(boolListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); +} + +// After each test +void GConfItemTests::cleanup() +{ + QObject::disconnect(boolItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::disconnect(intItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::disconnect(stringItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::disconnect(doubleItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::disconnect(stringListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::disconnect(intListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::disconnect(doubleListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + QObject::disconnect(boolListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged())); + delete signalSpy; + delete boolItem; + delete intItem; + delete stringItem; + delete doubleItem; + delete stringListItem; + delete intListItem; + delete doubleListItem; + delete boolListItem; + delete unsetBeforeItem; + delete unsetAfterItem; + + timer.stop(); +} + +void GConfItemTests::path() +{ + QCOMPARE(boolItem->key(), QString("/Test/Bool")); + QCOMPARE(intItem->key(), QString("/Test/Int")); + QCOMPARE(stringItem->key(), QString("/Test/String")); + QCOMPARE(doubleItem->key(), QString("/Test/Double")); + QCOMPARE(stringListItem->key(), QString("/Test/StringList")); + QCOMPARE(intListItem->key(), QString("/Test/IntList")); + QCOMPARE(doubleListItem->key(), QString("/Test/DoubleList")); + QCOMPARE(boolListItem->key(), QString("/Test/BoolList")); + QCOMPARE(unsetBeforeItem->key(), QString("/Test/UnsetBefore")); + QCOMPARE(unsetAfterItem->key(), QString("/Test/UnsetAfter")); +} + +void GConfItemTests::external_values() +{ + // These values are set before this program starts. + QCOMPARE(boolItem->value().toBool(), true); + QCOMPARE(intItem->value().toInt(), 123); + QCOMPARE(stringItem->value().toString(), QString("Hello GConf")); + QCOMPARE(doubleItem->value().toDouble(), 3.5); + QCOMPARE(stringListItem->value().toStringList(), QStringList() << "Hello" << "GConf" << QString::fromUtf8("ÄÖÜ")); + QCOMPARE(intListItem->value().toList(), QList() << 1 << 2 << 3 << 4); + QCOMPARE(doubleListItem->value().toList(), QList() << 3.5 << 3.5 << 3.5); + QCOMPARE(boolListItem->value().toList(), QList() << false << true << true << false); + QCOMPARE(unsetBeforeItem->value().isValid(), false); + QCOMPARE(unsetAfterItem->value().isValid(), true); +} + +void GConfItemTests::set_bool() +{ + signalSpy->numberOfCalls = 0; + + boolItem->set(false); + QCOMPARE(boolItem->value().toBool(), false); + boolItem->set(true); + QCOMPARE(boolItem->value().toBool(), true); + + QCOMPARE(signalSpy->numberOfCalls, 2); +} + +void GConfItemTests::set_int() +{ + signalSpy->numberOfCalls = 0; + + intItem->set(12); + QCOMPARE(intItem->value().toInt(), 12); + intItem->set(-5); + QCOMPARE(intItem->value().toInt(), -5); + + QCOMPARE(signalSpy->numberOfCalls, 2); +} + +void GConfItemTests::set_string() +{ + signalSpy->numberOfCalls = 0; + + stringItem->set("Hi"); + QCOMPARE(stringItem->value().toString(), QString("Hi")); + + QCOMPARE(signalSpy->numberOfCalls, 1); +} + +void GConfItemTests::set_unicode_string() +{ + signalSpy->numberOfCalls = 0; + + stringItem->set(QString::fromUtf8("Höäü")); + QCOMPARE(stringItem->value().toString(), QString::fromUtf8("Höäü")); + + QCOMPARE(signalSpy->numberOfCalls, 1); +} + +void GConfItemTests::set_double() +{ + signalSpy->numberOfCalls = 0; + + doubleItem->set(1.2345); + QCOMPARE(doubleItem->value().toDouble(), 1.2345); + + QCOMPARE(signalSpy->numberOfCalls, 1); +} + +void GConfItemTests::set_string_list() +{ + signalSpy->numberOfCalls = 0; + + stringListItem->set(QStringList() << "one" << "two" << "three"); + QCOMPARE(stringListItem->value().toStringList(), QStringList() << "one" << "two" << "three"); + + QCOMPARE(signalSpy->numberOfCalls, 1); +} + +void GConfItemTests::set_int_list() +{ + signalSpy->numberOfCalls = 0; + + intListItem->set(QList() << 10 << 11 << 12); + QCOMPARE(intListItem->value().toList(), QList() << 10 << 11 << 12); + + QCOMPARE(signalSpy->numberOfCalls, 1); +} + +void GConfItemTests::set_double_list() +{ + signalSpy->numberOfCalls = 0; + + doubleListItem->set(QList() << 1.1 << 2.2 << 3.3); + QCOMPARE(doubleListItem->value().toList(), QList() << 1.1 << 2.2 << 3.3); + + QCOMPARE(signalSpy->numberOfCalls, 1); +} + +void GConfItemTests::set_bool_list() +{ + signalSpy->numberOfCalls = 0; + + boolListItem->set(QList() << true << true << false); + QCOMPARE(boolListItem->value().toList(), QList() << true << true << false); + + QCOMPARE(signalSpy->numberOfCalls, 1); +} + +void GConfItemTests::unset () +{ + signalSpy->numberOfCalls = 0; + + boolItem->unset(); + QCOMPARE(boolItem->value().isValid(), false); + + QCOMPARE(signalSpy->numberOfCalls, 1); +} + +void GConfItemTests::list_dirs () +{ + GConfItem test("/Test"); + QStringList dirs = test.listDirs(); + + QVERIFY (!dirs.contains("/Test/Bool")); + QVERIFY (!dirs.contains("/Test/Int")); + QVERIFY (!dirs.contains("/Test/String")); + QVERIFY (!dirs.contains("/Test/Double")); + QVERIFY (!dirs.contains("/Test/StringList")); + QVERIFY (!dirs.contains("/Test/IntList")); + QVERIFY (!dirs.contains("/Test/DoubleList")); + QVERIFY (!dirs.contains("/Test/BoolList")); + QVERIFY (!dirs.contains("/Test/UnsetBefore")); + QVERIFY (!dirs.contains("/Test/UnsetAfter")); + QVERIFY (dirs.contains("/Test/Dir")); +} + +void GConfItemTests::list_entries () +{ + GConfItem test("/Test"); + QStringList entries = test.listEntries(); + + QVERIFY (!entries.contains("/Test/Bool")); // has been unset above + QVERIFY (entries.contains("/Test/Int")); + QVERIFY (entries.contains("/Test/String")); + QVERIFY (entries.contains("/Test/Double")); + QVERIFY (entries.contains("/Test/StringList")); + QVERIFY (entries.contains("/Test/IntList")); + QVERIFY (entries.contains("/Test/DoubleList")); + QVERIFY (entries.contains("/Test/BoolList")); + QVERIFY (!entries.contains("/Test/UnsetBefore")); + QVERIFY (entries.contains("/Test/UnsetAfter")); + QVERIFY (!entries.contains("/Test/Dir")); +} + +void GConfItemTests::get_default () +{ + intItem->unset(); + QCOMPARE(intItem->value(123).toInt(), 123); + intItem->set(234); + QCOMPARE(intItem->value(123).toInt(), 234); +} + +void GConfItemTests::propagate () +{ + GConfItem secondIntItem("/Test/Int"); + secondIntItem.set(3000); + QVERIFY_TIMEOUT(2000, intItem->value() == secondIntItem.value()); + QCOMPARE(signalSpy->numberOfCalls, 2); +} + +void GConfItemTests::set_external() +{ + // This must be the last test case. The values that are set here + // are checked after this program exits. + + boolItem->set(false); + intItem->set(54321); + stringItem->set("Good bye GConf"); + doubleItem->set(-2.5); + stringListItem->set(QStringList() << "Good" << "bye" << "GConf" << QString::fromUtf8("äöü")); + intListItem->set(QList() << 5 << 4 << 3 << 2 << 1); + doubleListItem->set(QList() << -2.5 << -2.5); + boolListItem->set(QList() << false << false << true << true); + unsetAfterItem->set(QVariant()); +} + +QTEST_MAIN(GConfItemTests); diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/libgq/gconf/test-gconf.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/3rdparty/libgq/gconf/test-gconf.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,86 @@ +#include +#include +#include + +#include "GConfItem" + +// Helper class for listening to signals +class SignalListener : public QObject +{ + Q_OBJECT +public: + int numberOfCalls; + SignalListener() : numberOfCalls(0) { + } + +public slots: + void valueChanged() + { + numberOfCalls++; + } +}; + +// Tests for the public API +class GConfItemTests : public QObject +{ + Q_OBJECT + + // Stored pointers etc. +private: + GConfItem *boolItem; + GConfItem *intItem; + GConfItem *stringItem; + GConfItem *doubleItem; + GConfItem *stringListItem; + GConfItem *intListItem; + GConfItem *doubleListItem; + GConfItem *boolListItem; + GConfItem *unsetBeforeItem; + GConfItem *unsetAfterItem; + + SignalListener *signalSpy; + + QTimer timer; + bool timed_out; + + // Tests +private slots: + // Init and cleanup helper functions + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + void timeout (); + + // Public API + void path(); + void external_values(); + void set_bool(); + void set_int(); + void set_string(); + void set_unicode_string(); + void set_double(); + void set_string_list(); + void set_int_list(); + void set_double_list(); + void set_bool_list(); + void unset(); + void get_default(); + void list_dirs(); + void list_entries(); + void propagate(); + void set_external(); +}; + +// Useful if you need to process some events until a condition becomes +// true. + +#define QVERIFY_TIMEOUT(msecs, expr) \ + do { \ + timed_out = false; \ + timer.start(msecs); \ + while (!timed_out && !(expr)) { \ + QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents); \ + } \ + QVERIFY((expr)); \ + } while(0) diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/CMakeLists.txt --- a/src/3rdparty/phonon/CMakeLists.txt Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/CMakeLists.txt Mon Oct 04 01:19:32 2010 +0300 @@ -94,7 +94,7 @@ set( __KDE_HAVE_GCC_VISIBILITY ${__KDE_HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility") # get the gcc version - exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) + exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: @@ -152,8 +152,8 @@ set(CMAKE_COLOR_MAKEFILE ON) set(PHONON_LIB_MAJOR_VERSION "4") -set(PHONON_LIB_MINOR_VERSION "3") -set(PHONON_LIB_PATCH_VERSION "80") +set(PHONON_LIB_MINOR_VERSION "4") +set(PHONON_LIB_PATCH_VERSION "0") set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.4.0") set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/gstreamer/mediaobject.cpp --- a/src/3rdparty/phonon/gstreamer/mediaobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/gstreamer/mediaobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -219,9 +219,9 @@ if ( status != GST_INSTALL_PLUGINS_STARTED_OK ) { if( status == GST_INSTALL_PLUGINS_HELPER_MISSING ) - setError(QString(tr("Missing codec helper script assistant.")), Phonon::FatalError ); + setError(tr("Missing codec helper script assistant."), Phonon::FatalError ); else - setError(QString(tr("Plugin codec installation failed for codec: %0")) + setError(tr("Plugin codec installation failed for codec: %0") .arg(m_missingCodecs[0].split("|")[3]), error); } m_missingCodecs.clear(); @@ -232,7 +232,7 @@ m_hasVideo = false; emit hasVideoChanged(false); } - setError(QString(tr("A required codec is missing. You need to install the following codec(s) to play this content: %0")).arg(codecs), error); + setError(tr("A required codec is missing. You need to install the following codec(s) to play this content: %0").arg(codecs), error); m_missingCodecs.clear(); #endif } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/mmf/abstractmediaplayer.cpp --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -16,6 +16,7 @@ */ +#include #include #include "abstractmediaplayer.h" @@ -216,9 +217,10 @@ TRACE_EXIT_0(); } -void MMF::AbstractMediaPlayer::open(const MediaSource &source, RFile& file) +void MMF::AbstractMediaPlayer::open() { - TRACE_CONTEXT(AbstractMediaPlayer::setFileSource, EAudioApi); + TRACE_CONTEXT(AbstractMediaPlayer::open, EAudioApi); + const MediaSource source = m_parent->source(); TRACE_ENTRY("state %d source.type %d", privateState(), source.type()); close(); @@ -229,7 +231,9 @@ switch (source.type()) { case MediaSource::LocalFile: { - symbianErr = openFile(file); + RFile *const file = m_parent->file(); + Q_ASSERT(file); + symbianErr = openFile(*file); if (KErrNone != symbianErr) errorMessage = tr("Error opening file"); break; @@ -237,9 +241,10 @@ case MediaSource::Url: { const QUrl url(source.url()); - if (url.scheme() == QLatin1String("file")) { - symbianErr = openFile(file); + RFile *const file = m_parent->file(); + Q_ASSERT(file); + symbianErr = openFile(*file); if (KErrNone != symbianErr) errorMessage = tr("Error opening file"); } else { @@ -251,6 +256,19 @@ break; } + case MediaSource::Stream: { + QResource *const resource = m_parent->resource(); + if (resource) { + m_buffer.Set(resource->data(), resource->size()); + symbianErr = openDescriptor(m_buffer); + if (KErrNone != symbianErr) + errorMessage = tr("Error opening resource"); + } else { + errorMessage = tr("Error opening source: resource not opened"); + } + break; + } + // Other source types are handled in MediaObject::createPlayer // Protection against adding new media types and forgetting to update this switch diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/mmf/abstractmediaplayer.h --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.h Mon Oct 04 01:19:32 2010 +0300 @@ -47,7 +47,7 @@ AbstractMediaPlayer(MediaObject *parent, const AbstractPlayer *player); public: - virtual void open(const Phonon::MediaSource&, RFile&); + virtual void open(); // MediaObjectInterface virtual void play(); @@ -70,6 +70,7 @@ virtual int setDeviceVolume(int mmfVolume) = 0; virtual int openFile(RFile& file) = 0; virtual int openUrl(const QString& url) = 0; + virtual int openDescriptor(const TDesC8 &des) = 0; virtual int bufferStatus() const = 0; void updateMetaData(); @@ -123,6 +124,9 @@ bool m_prefinishMarkSent; bool m_aboutToFinishSent; + // Used for playback of resource files + TPtrC8 m_buffer; + QMultiMap m_metaData; }; diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/mmf/abstractplayer.h --- a/src/3rdparty/phonon/mmf/abstractplayer.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/mmf/abstractplayer.h Mon Oct 04 01:19:32 2010 +0300 @@ -26,8 +26,6 @@ #include "abstractvideooutput.h" -class RFile; - QT_BEGIN_NAMESPACE namespace Phonon @@ -54,7 +52,7 @@ public: AbstractPlayer(const AbstractPlayer *player); - virtual void open(const Phonon::MediaSource&, RFile&) = 0; + virtual void open() = 0; virtual void close() = 0; // MediaObjectInterface (implemented) diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/mmf/abstractvideoplayer.cpp --- a/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -144,6 +144,12 @@ return err; } +int MMF::AbstractVideoPlayer::openDescriptor(const TDesC8 &des) +{ + TRAPD(err, m_player->OpenDesL(des)); + return err; +} + int MMF::AbstractVideoPlayer::bufferStatus() const { int result = 0; diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/mmf/abstractvideoplayer.h --- a/src/3rdparty/phonon/mmf/abstractvideoplayer.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/mmf/abstractvideoplayer.h Mon Oct 04 01:19:32 2010 +0300 @@ -66,6 +66,7 @@ virtual int setDeviceVolume(int mmfVolume); virtual int openFile(RFile &file); virtual int openUrl(const QString &url); + virtual int openDescriptor(const TDesC8 &des); virtual int bufferStatus() const; virtual void close(); diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/mmf/audioplayer.cpp --- a/src/3rdparty/phonon/mmf/audioplayer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/mmf/audioplayer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -137,6 +137,12 @@ return 0; } +int MMF::AudioPlayer::openDescriptor(const TDesC8 &des) +{ + TRAPD(err, m_player->OpenDesL(des)); + return err; +} + int MMF::AudioPlayer::bufferStatus() const { int result = 0; diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/mmf/audioplayer.h --- a/src/3rdparty/phonon/mmf/audioplayer.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/mmf/audioplayer.h Mon Oct 04 01:19:32 2010 +0300 @@ -67,6 +67,7 @@ virtual int setDeviceVolume(int mmfVolume); virtual int openFile(RFile& file); virtual int openUrl(const QString& url); + virtual int openDescriptor(const TDesC8 &des); virtual int bufferStatus() const; virtual void close(); diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/mmf/dummyplayer.cpp --- a/src/3rdparty/phonon/mmf/dummyplayer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/mmf/dummyplayer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -92,7 +92,7 @@ return 0; } -void MMF::DummyPlayer::open(const Phonon::MediaSource &, RFile &) +void MMF::DummyPlayer::open() { } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/mmf/dummyplayer.h --- a/src/3rdparty/phonon/mmf/dummyplayer.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/mmf/dummyplayer.h Mon Oct 04 01:19:32 2010 +0300 @@ -57,7 +57,7 @@ virtual qint64 totalTime() const; // AbstractPlayer - virtual void open(const Phonon::MediaSource&, RFile&); + virtual void open(); virtual void close(); virtual void doSetTickInterval(qint32 interval); }; diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/mmf/mediaobject.cpp --- a/src/3rdparty/phonon/mmf/mediaobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/mmf/mediaobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -34,6 +34,7 @@ #include "mediaobject.h" #include +#include #include QT_BEGIN_NAMESPACE @@ -52,6 +53,8 @@ MMF::MediaObject::MediaObject(QObject *parent) : MMF::MediaNode::MediaNode(parent) , m_recognizerOpened(false) , m_nextSourceSet(false) + , m_file(0) + , m_resource(0) { m_player.reset(new DummyPlayer()); @@ -68,7 +71,12 @@ TRACE_CONTEXT(MediaObject::~MediaObject, EAudioApi); TRACE_ENTRY_0(); - m_file.Close(); + delete m_resource; + + if (m_file) + m_file->Close(); + delete m_file; + m_fileServer.Close(); m_recognizer.Close(); @@ -122,12 +130,13 @@ const QHBufC fileNameSymbian(QDir::toNativeSeparators(fileName)); - m_file.Close(); - TInt err = m_file.Open(m_fileServer, *fileNameSymbian, EFileRead | EFileShareReadersOnly); + Q_ASSERT(!m_file); + m_file = new RFile; + TInt err = m_file->Open(m_fileServer, *fileNameSymbian, EFileRead | EFileShareReadersOnly); if (KErrNone == err) { TDataRecognitionResult recognizerResult; - err = m_recognizer.RecognizeData(m_file, recognizerResult); + err = m_recognizer.RecognizeData(*m_file, recognizerResult); if (KErrNone == err) { const TPtrC mimeType = recognizerResult.iDataType.Des(); result = Utils::mimeTypeToMediaType(mimeType); @@ -142,6 +151,23 @@ return result; } +MMF::MediaType MMF::MediaObject::bufferMediaType(const uchar *data, qint64 size) +{ + TRACE_CONTEXT(MediaObject::bufferMediaType, EAudioInternal); + MediaType result = MediaTypeUnknown; + if (openRecognizer()) { + TDataRecognitionResult recognizerResult; + const TPtrC8 des(data, size); + const TInt err = m_recognizer.RecognizeData(KNullDesC, des, recognizerResult); + if (KErrNone == err) { + const TPtrC mimeType = recognizerResult.iDataType.Des(); + result = Utils::mimeTypeToMediaType(mimeType); + } else { + TRACE("RApaLsSession::RecognizeData error %d", err); + } + } + return result; +} //----------------------------------------------------------------------------- // MediaObjectInterface @@ -228,9 +254,17 @@ void MMF::MediaObject::switchToSource(const MediaSource &source) { + if (m_file) + m_file->Close(); + delete m_file; + m_file = 0; + + delete m_resource; + m_resource = 0; + createPlayer(source); m_source = source; - m_player->open(m_source, m_file); + m_player->open(); emit currentSourceChanged(m_source); } @@ -272,8 +306,27 @@ case MediaSource::Invalid: case MediaSource::Disc: + errorMessage = tr("Error opening source: type not supported"); + break; + case MediaSource::Stream: - errorMessage = tr("Error opening source: type not supported"); + { + const QString fileName = source.url().toLocalFile(); + if (fileName.startsWith(QLatin1String(":/")) || fileName.startsWith(QLatin1String("qrc://"))) { + Q_ASSERT(!m_resource); + m_resource = new QResource(fileName); + if (m_resource->isValid()) { + if (m_resource->isCompressed()) + errorMessage = tr("Error opening source: resource is compressed"); + else + mediaType = bufferMediaType(m_resource->data(), m_resource->size()); + } else { + errorMessage = tr("Error opening source: resource not valid"); + } + } else { + errorMessage = tr("Error opening source: type not supported"); + } + } break; case MediaSource::Empty: @@ -374,6 +427,16 @@ m_player->volumeChanged(volume); } +RFile* MMF::MediaObject::file() const +{ + return m_file; +} + +QResource* MMF::MediaObject::resource() const +{ + return m_resource; +} + //----------------------------------------------------------------------------- // MediaNode //----------------------------------------------------------------------------- diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/mmf/mediaobject.h --- a/src/3rdparty/phonon/mmf/mediaobject.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/mmf/mediaobject.h Mon Oct 04 01:19:32 2010 +0300 @@ -33,6 +33,8 @@ QT_BEGIN_NAMESPACE +class QResource; + namespace Phonon { namespace MMF @@ -87,6 +89,9 @@ void setVideoOutput(AbstractVideoOutput* videoOutput); + RFile* file() const; + QResource* resource() const; + public Q_SLOTS: void volumeChanged(qreal volume); void switchToNextSource(); @@ -117,6 +122,7 @@ // Audio / video media type recognition MediaType fileMediaType(const QString& fileName); + MediaType bufferMediaType(const uchar *data, qint64 size); // TODO: urlMediaType function static qint64 toMilliSeconds(const TTimeIntervalMicroSeconds &); @@ -132,9 +138,8 @@ MediaSource m_nextSource; bool m_nextSourceSet; - // Storing the file handle here to work around KErrInUse error - // from MMF player utility OpenFileL functions - RFile m_file; + RFile* m_file; + QResource* m_resource; QScopedPointer m_player; diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/phonon/mediasource.cpp --- a/src/3rdparty/phonon/phonon/mediasource.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/phonon/mediasource.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -58,6 +58,7 @@ d->type = Stream; d->ioDevice = new QFile(filename); d->setStream(new IODeviceStream(d->ioDevice, d->ioDevice)); + d->url = QUrl::fromLocalFile(fileInfo.absoluteFilePath()); #else d->type = Invalid; #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/phonon/phonon/phononnamespace.h --- a/src/3rdparty/phonon/phonon/phononnamespace.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/phonon/phonon/phononnamespace.h Mon Oct 04 01:19:32 2010 +0300 @@ -41,12 +41,12 @@ /** * PHONON_VERSION is (major << 16) + (minor << 8) + patch. */ -#define PHONON_VERSION PHONON_VERSION_CHECK(4, 3, 1) +#define PHONON_VERSION PHONON_VERSION_CHECK(4, 4, 0) /** * PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1" */ -#define PHONON_VERSION_STR "4.3.1" +#define PHONON_VERSION_STR "4.4.0" QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/.tag --- a/src/3rdparty/webkit/.tag Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/.tag Mon Oct 04 01:19:32 2010 +0300 @@ -1,1 +1,1 @@ -669858f9bbd4913fd16c642090375c81acbfdb04 +72b1c38579ca1fdb3f242e29cd16e5bfb4925813 diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/JavaScriptCore/ChangeLog --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog Mon Oct 04 01:19:32 2010 +0300 @@ -1,3 +1,90 @@ +2010-07-02 Peter Varga + + Reviewed by Oliver Hunt. + + The alternativeFrameLocation value is wrong in the emitDisjunction function in + case of PatternTerm::TypeParentheticalAssertion. This value needs to be + computed from term.frameLocation instead of term.inputPosition. This mistake caused glibc + memory corruption in some cases. + Layout test added for checking of TypeParentheticalAssertion case. + https://bugs.webkit.org/show_bug.cgi?id=41458 + + * yarr/RegexInterpreter.cpp: + (JSC::Yarr::ByteCompiler::emitDisjunction): + +2010-07-03 Yong Li + + Reviewed by Darin Adler. + + Make Arguments::MaxArguments clamping work for numbers >= 0x80000000 in + the interpreter as well as the JIT. + + https://bugs.webkit.org/show_bug.cgi?id=41351 + rdar://problem/8142141 + + * interpreter/Interpreter.cpp: + (JSC::Interpreter::privateExecute): Fix signed integer overflow problem + in op_load_varargs handling. 0xFFFFFFFF was read as -1. + +2010-07-04 Mark Rowe + + Build fix after r62456. + + * interpreter/Interpreter.cpp: + (JSC::Interpreter::privateExecute): Be slightly more consistent in using uint32_t to prevent + warnings about comparisons between signed and unsigned types, and attempts to call an overload + of std::min that doesn't exist. + +2010-07-02 Oliver Hunt + + Reviewed by Gavin Barraclough. + + Clamp the number of arguments supported by function.apply + https://bugs.webkit.org/show_bug.cgi?id=41351 + + + Add clamping logic to function.apply similar to that + enforced by firefox. We have a smaller clamp than + firefox as our calling convention means that stack + usage is proportional to argument count -- the firefox + limit is larger than you could actually call. + + * interpreter/Interpreter.cpp: + (JSC::Interpreter::privateExecute): + * jit/JITStubs.cpp: + (JSC::DEFINE_STUB_FUNCTION): + * runtime/Arguments.h: + (JSC::Arguments::): + +2010-07-01 Oliver Hunt + + Reviewed by Geoff Garen. + + Improve reentrancy logic in polymorphic cache stubs + + + + Make the polymorphic cache stubs handle reentrancy + better. + + * jit/JITStubs.cpp: + (JSC::DEFINE_STUB_FUNCTION): + (JSC::getPolymorphicAccessStructureListSlot): + +2009-10-30 Tor Arne Vestbø + + Reviewed by Kenneth Rohde Christiansen. + + [Qt] Use the default timeout interval for JS as the HTML tokenizer delay for setHtml() + + This ensures that long-running JavaScript (for example due to a modal alert() dialog), + will not trigger a deferred load after only 500ms (the default tokenizer delay) while + still giving a reasonable timeout (10 seconds) to prevent deadlock. + + https://bugs.webkit.org/show_bug.cgi?id=29381 + + * runtime/TimeoutChecker.h: Add getter for the timeout interval + 2010-05-18 Anders Carlsson Reviewed by Sam Weinig. diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp --- a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2008, 2009, 2010 Apple Inc. All rights reserved. * Copyright (C) 2008 Cameron Zwarich * * Redistribution and use in source and binary forms, with or without @@ -3454,9 +3454,10 @@ int argsOffset = vPC[2].u.operand; JSValue arguments = callFrame->r(argsOffset).jsValue(); - int32_t argCount = 0; + uint32_t argCount = 0; if (!arguments) { argCount = (uint32_t)(callFrame->argumentCount()) - 1; + argCount = min(argCount, Arguments::MaxArguments); int32_t sizeDelta = argsOffset + argCount + RegisterFile::CallFrameHeaderSize; Register* newEnd = callFrame->registers() + sizeDelta; if (!registerFile->grow(newEnd) || ((newEnd - callFrame->registers()) != sizeDelta)) { @@ -3464,9 +3465,9 @@ goto vm_throw; } ASSERT(!callFrame->callee()->isHostFunction()); - int32_t expectedParams = callFrame->callee()->jsExecutable()->parameterCount(); - int32_t inplaceArgs = min(argCount, expectedParams); - int32_t i = 0; + uint32_t expectedParams = callFrame->callee()->jsExecutable()->parameterCount(); + uint32_t inplaceArgs = min(argCount, expectedParams); + uint32_t i = 0; Register* argStore = callFrame->registers() + argsOffset; // First step is to copy the "expected" parameters from their normal location relative to the callframe @@ -3483,6 +3484,7 @@ if (asObject(arguments)->classInfo() == &Arguments::info) { Arguments* args = asArguments(arguments); argCount = args->numProvidedArguments(callFrame); + argCount = min(argCount, Arguments::MaxArguments); int32_t sizeDelta = argsOffset + argCount + RegisterFile::CallFrameHeaderSize; Register* newEnd = callFrame->registers() + sizeDelta; if (!registerFile->grow(newEnd) || ((newEnd - callFrame->registers()) != sizeDelta)) { @@ -3493,6 +3495,7 @@ } else if (isJSArray(&callFrame->globalData(), arguments)) { JSArray* array = asArray(arguments); argCount = array->length(); + argCount = min(argCount, Arguments::MaxArguments); int32_t sizeDelta = argsOffset + argCount + RegisterFile::CallFrameHeaderSize; Register* newEnd = callFrame->registers() + sizeDelta; if (!registerFile->grow(newEnd) || ((newEnd - callFrame->registers()) != sizeDelta)) { @@ -3503,6 +3506,7 @@ } else if (asObject(arguments)->inherits(&JSArray::info)) { JSObject* argObject = asObject(arguments); argCount = argObject->get(callFrame, callFrame->propertyNames().length).toUInt32(callFrame); + argCount = min(argCount, Arguments::MaxArguments); int32_t sizeDelta = argsOffset + argCount + RegisterFile::CallFrameHeaderSize; Register* newEnd = callFrame->registers() + sizeDelta; if (!registerFile->grow(newEnd) || ((newEnd - callFrame->registers()) != sizeDelta)) { @@ -3510,7 +3514,7 @@ goto vm_throw; } Register* argsBuffer = callFrame->registers() + argsOffset; - for (int32_t i = 0; i < argCount; ++i) { + for (uint32_t i = 0; i < argCount; ++i) { argsBuffer[i] = asObject(arguments)->get(callFrame, i); CHECK_FOR_EXCEPTION(); } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp --- a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1330,17 +1330,18 @@ if (stubInfo->accessType == access_get_by_id_self) { ASSERT(!stubInfo->stubRoutine); polymorphicStructureList = new PolymorphicAccessStructureList(CodeLocationLabel(), stubInfo->u.getByIdSelf.baseObjectStructure); - stubInfo->initGetByIdSelfList(polymorphicStructureList, 2); + stubInfo->initGetByIdSelfList(polymorphicStructureList, 1); } else { polymorphicStructureList = stubInfo->u.getByIdSelfList.structureList; listIndex = stubInfo->u.getByIdSelfList.listSize; - stubInfo->u.getByIdSelfList.listSize++; } - - JIT::compileGetByIdSelfList(callFrame->scopeChain()->globalData, codeBlock, stubInfo, polymorphicStructureList, listIndex, asCell(baseValue)->structure(), ident, slot, slot.cachedOffset()); - - if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1)) - ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_generic)); + if (listIndex < POLYMORPHIC_LIST_CACHE_SIZE) { + stubInfo->u.getByIdSelfList.listSize++; + JIT::compileGetByIdSelfList(callFrame->scopeChain()->globalData, codeBlock, stubInfo, polymorphicStructureList, listIndex, asCell(baseValue)->structure(), ident, slot, slot.cachedOffset()); + + if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1)) + ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_generic)); + } } else ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_generic)); return JSValue::encode(result); @@ -1365,13 +1366,14 @@ case access_get_by_id_proto_list: prototypeStructureList = stubInfo->u.getByIdProtoList.structureList; listIndex = stubInfo->u.getByIdProtoList.listSize; - stubInfo->u.getByIdProtoList.listSize++; + if (listIndex < POLYMORPHIC_LIST_CACHE_SIZE) + stubInfo->u.getByIdProtoList.listSize++; break; default: ASSERT_NOT_REACHED(); } - ASSERT(listIndex < POLYMORPHIC_LIST_CACHE_SIZE); + ASSERT(listIndex <= POLYMORPHIC_LIST_CACHE_SIZE); return prototypeStructureList; } @@ -1446,21 +1448,24 @@ int listIndex; PolymorphicAccessStructureList* prototypeStructureList = getPolymorphicAccessStructureListSlot(stubInfo, listIndex); - - JIT::compileGetByIdProtoList(callFrame->scopeChain()->globalData, callFrame, codeBlock, stubInfo, prototypeStructureList, listIndex, structure, slotBaseObject->structure(), propertyName, slot, offset); - - if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1)) - ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_list_full)); + if (listIndex < POLYMORPHIC_LIST_CACHE_SIZE) { + JIT::compileGetByIdProtoList(callFrame->scopeChain()->globalData, callFrame, codeBlock, stubInfo, prototypeStructureList, listIndex, structure, slotBaseObject->structure(), propertyName, slot, offset); + + if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1)) + ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_list_full)); + } } else if (size_t count = normalizePrototypeChain(callFrame, baseValue, slot.slotBase(), propertyName, offset)) { ASSERT(!asCell(baseValue)->structure()->isDictionary()); int listIndex; PolymorphicAccessStructureList* prototypeStructureList = getPolymorphicAccessStructureListSlot(stubInfo, listIndex); - - StructureChain* protoChain = structure->prototypeChain(callFrame); - JIT::compileGetByIdChainList(callFrame->scopeChain()->globalData, callFrame, codeBlock, stubInfo, prototypeStructureList, listIndex, structure, protoChain, count, propertyName, slot, offset); - - if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1)) - ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_list_full)); + + if (listIndex < POLYMORPHIC_LIST_CACHE_SIZE) { + StructureChain* protoChain = structure->prototypeChain(callFrame); + JIT::compileGetByIdChainList(callFrame->scopeChain()->globalData, callFrame, codeBlock, stubInfo, prototypeStructureList, listIndex, structure, protoChain, count, propertyName, slot, offset); + + if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1)) + ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_list_full)); + } } else ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); @@ -2129,6 +2134,7 @@ if (!arguments) { int providedParams = callFrame->registers()[RegisterFile::ArgumentCount].i() - 1; argCount = providedParams; + argCount = min(argCount, static_cast(Arguments::MaxArguments)); int32_t sizeDelta = argsOffset + argCount + RegisterFile::CallFrameHeaderSize; Register* newEnd = callFrame->registers() + sizeDelta; if (!registerFile->grow(newEnd) || ((newEnd - callFrame->registers()) != sizeDelta)) { @@ -2164,6 +2170,7 @@ if (asObject(arguments)->classInfo() == &Arguments::info) { Arguments* argsObject = asArguments(arguments); argCount = argsObject->numProvidedArguments(callFrame); + argCount = min(argCount, static_cast(Arguments::MaxArguments)); int32_t sizeDelta = argsOffset + argCount + RegisterFile::CallFrameHeaderSize; Register* newEnd = callFrame->registers() + sizeDelta; if (!registerFile->grow(newEnd) || ((newEnd - callFrame->registers()) != sizeDelta)) { @@ -2174,6 +2181,7 @@ } else if (isJSArray(&callFrame->globalData(), arguments)) { JSArray* array = asArray(arguments); argCount = array->length(); + argCount = min(argCount, static_cast(Arguments::MaxArguments)); int32_t sizeDelta = argsOffset + argCount + RegisterFile::CallFrameHeaderSize; Register* newEnd = callFrame->registers() + sizeDelta; if (!registerFile->grow(newEnd) || ((newEnd - callFrame->registers()) != sizeDelta)) { @@ -2184,6 +2192,7 @@ } else if (asObject(arguments)->inherits(&JSArray::info)) { JSObject* argObject = asObject(arguments); argCount = argObject->get(callFrame, callFrame->propertyNames().length).toUInt32(callFrame); + argCount = min(argCount, static_cast(Arguments::MaxArguments)); int32_t sizeDelta = argsOffset + argCount + RegisterFile::CallFrameHeaderSize; Register* newEnd = callFrame->registers() + sizeDelta; if (!registerFile->grow(newEnd) || ((newEnd - callFrame->registers()) != sizeDelta)) { diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/JavaScriptCore/runtime/Arguments.h --- a/src/3rdparty/webkit/JavaScriptCore/runtime/Arguments.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Arguments.h Mon Oct 04 01:19:32 2010 +0300 @@ -55,6 +55,10 @@ class Arguments : public JSObject { public: + // Use an enum because otherwise gcc insists on doing a memory + // read. + enum { MaxArguments = 0x10000 }; + enum NoParametersType { NoParameters }; Arguments(CallFrame*); diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/JavaScriptCore/runtime/JSArray.cpp --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSArray.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSArray.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -948,10 +948,10 @@ void JSArray::copyToRegisters(ExecState* exec, Register* buffer, uint32_t maxSize) { - ASSERT(m_storage->m_length == maxSize); + ASSERT(m_storage->m_length >= maxSize); UNUSED_PARAM(maxSize); JSValue* vector = m_storage->m_vector; - unsigned vectorEnd = min(m_storage->m_length, m_vectorLength); + unsigned vectorEnd = min(maxSize, m_vectorLength); unsigned i = 0; for (; i < vectorEnd; ++i) { JSValue& v = vector[i]; @@ -960,7 +960,7 @@ buffer[i] = v; } - for (; i < m_storage->m_length; ++i) + for (; i < maxSize; ++i) buffer[i] = get(exec, i); } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/JavaScriptCore/runtime/TimeoutChecker.h --- a/src/3rdparty/webkit/JavaScriptCore/runtime/TimeoutChecker.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/TimeoutChecker.h Mon Oct 04 01:19:32 2010 +0300 @@ -40,6 +40,7 @@ TimeoutChecker(); void setTimeoutInterval(unsigned timeoutInterval) { m_timeoutInterval = timeoutInterval; } + unsigned timeoutInterval() const { return m_timeoutInterval; } unsigned ticksUntilNextCheck() { return m_ticksUntilNextCheck; } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp --- a/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/JavaScriptCore/yarr/RegexInterpreter.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1554,7 +1554,7 @@ } case PatternTerm::TypeParentheticalAssertion: { - unsigned alternativeFrameLocation = term.inputPosition + RegexStackSpaceForBackTrackInfoParentheticalAssertion; + unsigned alternativeFrameLocation = term.frameLocation + RegexStackSpaceForBackTrackInfoParentheticalAssertion; atomParentheticalAssertionBegin(term.parentheses.subpatternId, term.invertOrCapture, term.frameLocation, alternativeFrameLocation); emitDisjunction(term.parentheses.disjunction, currentCountAlreadyChecked, 0); diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/VERSION --- a/src/3rdparty/webkit/VERSION Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/VERSION Mon Oct 04 01:19:32 2010 +0300 @@ -4,4 +4,4 @@ and has the sha1 checksum - 669858f9bbd4913fd16c642090375c81acbfdb04 + 72b1c38579ca1fdb3f242e29cd16e5bfb4925813 diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/ChangeLog --- a/src/3rdparty/webkit/WebCore/ChangeLog Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/ChangeLog Mon Oct 04 01:19:32 2010 +0300 @@ -1,3 +1,280 @@ +2010-08-10 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + Make sure NPAPI plugins get an initial setNPWindow on Mac + + https://bugs.webkit.org/show_bug.cgi?id=43782 + + * plugins/mac/PluginViewMac.mm: + +2010-06-14 Andreas Kling + + Reviewed by Tor Arne Vestbø. + + [Qt] Stack overflow when converting navigator object to QVariant + https://bugs.webkit.org/show_bug.cgi?id=40572 + + Protect against infinite recursion in JSValue->QVariant conversion. + This fixes a crash when trying to convert MimeType objects (they + recurse infinitely and on-the-fly via the enabledPlugin property.) + + * bridge/qt/qt_runtime.cpp: + (JSC::Bindings::convertValueToQVariant): + +2010-03-30 Kent Tamura + + Reviewed by Brady Eidson. + + REGRESSION (r56439) - Crash when a renderer for a file upload control + with a selected file is recreated + https://bugs.webkit.org/show_bug.cgi?id=36723 + + RenderFileUploadControl::chooseIconForFiles was called before + m_fileChooser was initialized. + + * platform/FileChooser.cpp: + (WebCore::FileChooser::FileChooser): Introduce m_isInitializing flag to + avoid FileChooserClient::repaint() call. + (WebCore::FileChooser::loadIcon): + (WebCore::FileChooser::iconLoaded): + * platform/FileChooser.h: Add a FielChooser parameter to + FileChooserClient::chooseIconForFiles(). + * rendering/RenderFileUploadControl.cpp: + (WebCore::RenderFileUploadControl::chooseIconForFiles): + (WebCore::RenderFileUploadControl::paintObject): Add an assertion. + * rendering/RenderFileUploadControl.h: + +2010-07-06 Nikolas Zimmermann + + Reviewed by Dirk Schulze. + + on causes crashes, if SVGUseElement gets detached + https://bugs.webkit.org/show_bug.cgi?id=41621 + + Do not call removeFromMappedElementSheet() from the SVGFontFaceElement destructor, + as that can potentially cause the element to be reattached while destructing. + + In order to fix the crash in the testcase, the order of calling the base-class detach + method in SVGUseElement and the instance/shadow tree destruction has to be reversed, + matching the order in removedFromDocument(). + + Test: svg/custom/use-font-face-crash.svg + + * svg/SVGFontFaceElement.cpp: + (WebCore::SVGFontFaceElement::~SVGFontFaceElement): Remove removeFromMappedElementSheet() call. + * svg/SVGUseElement.cpp: + (WebCore::SVGUseElement::detach): Reverse order of calling base-class detach method and instance/shadow tree destruction. + +2010-07-06 Nikolas Zimmermann + + Reviewed by Darin Adler. + + on causes crashes, if SVGUseElement gets detached + https://bugs.webkit.org/show_bug.cgi?id=41621 + + Do not call removeFromMappedElementSheet() from the destructor, as the call to document()->updateStyleSelector() that can potentially + cause the element to be reattached while destructing. It's not needed at all, because removedFromDocument() is called before destruction, + which already calls removeFromMappedElementSheet() - at this point it's still safe to update the style selector. + + The crash is reproducable when using on . + + Test: svg/custom/use-font-face-crash.svg + + * svg/SVGFontFaceElement.cpp: + (WebCore::SVGFontFaceElement::~SVGFontFaceElement): + +2010-07-05 Nikolas Zimmermann + + Reviewed by Darin Adler. + + Memory corruption with SVG element + https://bugs.webkit.org/show_bug.cgi?id=40994 + + Fix race condition in svgAttributeChanged. Never call svgAttributeChanged() from attributeChanged() + when we're synchronizing SVG attributes. It leads to either unnecessary extra work being done or + crashes. Especially together with / which always synchronize the SVGAnimatedPoints + datastructure with the points attribute, no matter if there are changes are not. This should be + furhter optimized, but this fix is sane and fixes the root of the evil races. + + Test: svg/custom/use-property-synchronization-crash.svg + + * svg/SVGElement.cpp: + (WebCore::SVGElement::attributeChanged): + +2010-06-11 Abhishek Arya + + Reviewed by David Hyatt. + + Don't process floats if parent node is not a RenderBlock. + https://bugs.webkit.org/show_bug.cgi?id=40033 + + Test: svg/text/clear-floats-crash.svg + + * rendering/RenderBlock.cpp: + (WebCore::RenderBlock::clearFloats): + +2010-06-23 Nikolas Zimmermann + + Reviewed by Eric Seidel. + + Reproducible crash in com.apple.WebCore 0x01ed3784 WebCore::RenderLineBoxList::appendLineBox(WebCore::InlineFlowBox*) + 36 + https://bugs.webkit.org/show_bug.cgi?id=40953 + + REGRESSION (r58209-58231): Memory corruption with invalid SVG + https://bugs.webkit.org/show_bug.cgi?id=40173 + + Fix several crashes, all related to and/or invalid SVG documents. + - Only allow nodes, as direct children of a , not any other "partial" SVG content. + - Assure to create RenderSVGRoot objects for nodes in , treat them as "outermost SVG elements". + - Never allow any partial SVG content to appear in any document. Only elements are allowed. + + Tests: svg/custom/bug45331.svg + svg/foreignObject/disallowed-svg-nodes-as-direct-children.svg + svg/foreignObject/no-crash-with-svg-content-in-html-document.svg + svg/foreignObject/svg-document-as-direct-child.svg + svg/foreignObject/svg-document-in-html-document.svg + svg/foreignObject/text-tref-02-b.svg + + * dom/Element.cpp: Added childShouldCreateRenderer, with ENABLE(SVG) guards. + (WebCore::Element::childShouldCreateRenderer): Only create a renderer for a SVG child, if we're a SVG element, or if the child is a element. + * dom/Element.h: Added childShouldCreateRenderer, with ENABLE(SVG) guards. + * svg/SVGForeignObjectElement.cpp: + (WebCore::SVGForeignObjectElement::childShouldCreateRenderer): Disallow arbitary SVG content, only elements are allowed as direct children of a + * svg/SVGSVGElement.cpp: + (WebCore::SVGSVGElement::isOutermostSVG): Be sure to create RenderSVGRoot objects for elements inside + +2010-06-10 Abhishek Arya + + Reviewed by Dave Hyatt. + + Do not render CSS Styles :first-letter and :first-line in a SVG text element context. + https://bugs.webkit.org/show_bug.cgi?id=40031 + + Test: svg/text/text-style-invalid.svg + + * rendering/RenderSVGText.cpp: + (WebCore::RenderSVGText::firstLineBlock): + (WebCore::RenderSVGText::updateFirstLetter): + * rendering/RenderSVGText.h: + +2010-07-01 Justin Schuh + + Reviewed by Dan Bernstein. + + Prevent crash on counter destruction + https://bugs.webkit.org/show_bug.cgi?id=40032 + + Added counter destruction to RenderWidget::destroy() + + Test: fast/css/counters/destroy-counter-crash.html + + * rendering/RenderWidget.cpp: + (WebCore::RenderWidget::destroy): + +2010-06-29 Dan Bernstein + + Reviewed by Darin Adler. + + Certain text is repeated after using splitText() + + Tests: fast/text/setData-dirty-lines.html + fast/text/splitText-dirty-lines.html + + * dom/CharacterData.cpp: + (WebCore::CharacterData::setData): Call RenderText::setTextWithOffset() rather than + setText(), because only the former correctly dirties line boxes. + * dom/Text.cpp: + (WebCore::Text::splitText): Ditto. + +2010-06-25 Dan Bernstein + + Reviewed by Sam Weinig. + + Certain text is repeated before and after a line break + + Test: fast/text/bidi-explicit-embedding-past-end.html + + * platform/text/BidiResolver.h: + (WebCore::::createBidiRunsForLine): Committing explicit embedding past the end of the range + creates BidiRuns up to the end of the range, so at that point, we can stop iterating. + +2010-06-10 Tony Chang + + Reviewed by Kent Tamura. + + crash when focus is changed while trying to focus next element + https://bugs.webkit.org/show_bug.cgi?id=40407 + + Test: fast/events/focus-change-crash.html + + * dom/Element.cpp: + (WebCore::Element::focus): + +2010-07-01 Andreas Kling + + Reviewed by Tor Arne Vestbø. + + [Qt] Clamp color stops passed to QGradient to 1.0 + [https://bugs.webkit.org/show_bug.cgi?id=41484 + + Fixes an issue where color stops would be silently dropped from radial gradients. + + * platform/graphics/qt/GradientQt.cpp: + (WebCore::Gradient::platformGradient): + +2010-07-07 Tor Arne Vestbø + + Reviewed by Darin Adler. + + Prevent assertion/duplicate loads for non-deferred subtitute-data loads + + https://bugs.webkit.org/show_bug.cgi?id=30879 + + MainResourceLoader uses the member m_initialRequest to store requests for future + deferred loads. When doing the actual load in handleDataLoadNow(), we therefore + have to clear this request so that subsequent entries into the loader will not + start yet another load. + + This can happen as a result of a PageGroupLoadDeferrer going out of scope when + returning from Chrome::runJavaScriptAlert(), which calls setDeferredLoading(false), + but only in the case of using both substitute-data and non-deferred main resource + load together. That's why two new DRT functions were added: + + * queueLoadHTMLString() + * setDeferMainResourceLoad() + + The change adds DRT hooks for Mac, Win and Qt for these two functions. For Mac + and Win the hook uses new SPI in WebDataSource. For Qt a new static member was + added to the FrameLoaderClientQt and accessed though DumpRenderTreeSupportQt. + + Test: fast/loader/non-deferred-substitute-load.html + + * loader/MainResourceLoader.cpp: + (WebCore::MainResourceLoader::handleDataLoadNow): + +2010-07-16 Antonio Gomes + + Reviewed by Simon Fraser. + + Spatial navigation: do not consider outline for focusable element boundaries + https://bugs.webkit.org/show_bug.cgi?id=42474 + + Test: fast/events/spatial-navigation/snav-zero-margin-content.html + + Currently in WebCore::renderRectRelativeToRootDocument function, we are calling + RenderObject::absoluteClippedOverflowRect to obtain the rect boundary of a given + renderer/element. This method deals with outline, which is out of elements boundary. + It makes spatial navigation to fail on common sites like google.gom: "Web, Images, Map, etc" + are inaccessible. + + Patch replaces RenderObject::absoluteClippedOverflowRect by Node::getRect, + which returns only the absolute bounding box rect of the Element. + + * page/SpatialNavigation.cpp: + (WebCore::renderRectRelativeToRootDocument): + (WebCore::checkNegativeCoordsForNode): + 2010-07-21 Kristian Amlie Reviewed by Kenneth Rohde Christiansen. diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/WebCore.pro --- a/src/3rdparty/webkit/WebCore/WebCore.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro Mon Oct 04 01:19:32 2010 +0300 @@ -83,7 +83,7 @@ symbian: TARGET =$$TARGET$${QT_LIBINFIX} } moduleFile=$$PWD/../WebKit/qt/qt_webkit_version.pri -include($$moduleFile) +isEmpty(QT_BUILD_TREE):include($$moduleFile) VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION} unix { @@ -2858,6 +2858,25 @@ } } +!symbian-abld:!symbian-sbsv2 { + modfile.files = $$moduleFile + modfile.path = $$[QMAKE_MKSPECS]/modules + + INSTALLS += modfile +} else { + # INSTALLS is not implemented in qmake's mmp generators, copy headers manually + + inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} + inst_modfile.input = moduleFile + inst_modfile.output = $$[QMAKE_MKSPECS]/modules + inst_modfile.CONFIG = no_clean + + QMAKE_EXTRA_COMPILERS += inst_modfile + + install.depends += compiler_inst_modfile_make_all + QMAKE_EXTRA_TARGETS += install +} + include($$PWD/../WebKit/qt/Api/headers.pri) HEADERS += $$WEBKIT_API_HEADERS @@ -2874,10 +2893,7 @@ !isEmpty(INSTALL_LIBS): target.path = $$INSTALL_LIBS else: target.path = $$[QT_INSTALL_LIBS] - modfile.files = $$moduleFile - modfile.path = $$[QMAKE_MKSPECS]/modules - - INSTALLS += target headers modfile + INSTALLS += target headers } else { # INSTALLS is not implemented in qmake's s60 generators, copy headers manually inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} @@ -2889,15 +2905,7 @@ QMAKE_EXTRA_COMPILERS += inst_headers - inst_modfile.commands = $$inst_headers.commands - inst_modfile.input = moduleFile - inst_modfile.output = $$[QMAKE_MKSPECS]/modules - inst_modfile.CONFIG = no_clean - - QMAKE_EXTRA_COMPILERS += inst_modfile - - install.depends += compiler_inst_headers_make_all compiler_inst_modfile_make_all - QMAKE_EXTRA_TARGETS += install + install.depends += compiler_inst_headers_make_all } win32-*|wince* { diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp --- a/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -162,9 +162,11 @@ return String; // I don't know. } -QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type hint, int *distance, HashSet* visitedObjects) +QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type hint, int *distance, HashSet* visitedObjects, int recursionLimit) { - if (!value) + --recursionLimit; + + if (!value || !recursionLimit) return QVariant(); JSObject* object = 0; @@ -344,7 +346,7 @@ while(it != properties.end()) { if (object->propertyIsEnumerable(exec, *it)) { JSValue val = object->get(exec, *it); - QVariant v = convertValueToQVariant(exec, val, QMetaType::Void, &objdist, visitedObjects); + QVariant v = convertValueToQVariant(exec, val, QMetaType::Void, &objdist, visitedObjects, recursionLimit); if (objdist >= 0) { UString ustring = (*it).ustring(); QString id = QString((const QChar*)ustring.rep()->characters(), ustring.size()); @@ -368,7 +370,7 @@ qConvDebug() << "converting a " << len << " length Array"; for (int i = 0; i < len; ++i) { JSValue val = rtarray->getConcreteArray()->valueAt(exec, i); - result.append(convertValueToQVariant(exec, val, QMetaType::Void, &objdist, visitedObjects)); + result.append(convertValueToQVariant(exec, val, QMetaType::Void, &objdist, visitedObjects, recursionLimit)); if (objdist == -1) { qConvDebug() << "Failed converting element at index " << i; break; // Failed converting a list entry, so fail the array @@ -387,7 +389,7 @@ qConvDebug() << "converting a " << len << " length Array"; for (int i = 0; i < len; ++i) { JSValue val = array->get(exec, i); - result.append(convertValueToQVariant(exec, val, QMetaType::Void, &objdist, visitedObjects)); + result.append(convertValueToQVariant(exec, val, QMetaType::Void, &objdist, visitedObjects, recursionLimit)); if (objdist == -1) { qConvDebug() << "Failed converting element at index " << i; break; // Failed converting a list entry, so fail the array @@ -401,7 +403,7 @@ // Make a single length array int objdist; qConvDebug() << "making a single length variantlist"; - QVariant var = convertValueToQVariant(exec, value, QMetaType::Void, &objdist, visitedObjects); + QVariant var = convertValueToQVariant(exec, value, QMetaType::Void, &objdist, visitedObjects, recursionLimit); if (objdist != -1) { QVariantList result; result << var; @@ -645,7 +647,7 @@ for (int i = 0; i < len; ++i) { JSValue val = rtarray->getConcreteArray()->valueAt(exec, i); int itemdist = -1; - QVariant item = convertValueToQVariant(exec, val, QMetaType::QObjectStar, &itemdist, visitedObjects); + QVariant item = convertValueToQVariant(exec, val, QMetaType::QObjectStar, &itemdist, visitedObjects, recursionLimit); if (itemdist >= 0) result.append(item.value()); else @@ -664,7 +666,7 @@ for (int i = 0; i < len; ++i) { JSValue val = array->get(exec, i); int itemdist = -1; - QVariant item = convertValueToQVariant(exec, val, QMetaType::QObjectStar, &itemdist, visitedObjects); + QVariant item = convertValueToQVariant(exec, val, QMetaType::QObjectStar, &itemdist, visitedObjects, recursionLimit); if (itemdist >= 0) result.append(item.value()); else @@ -679,7 +681,7 @@ // Make a single length array QObjectList result; int itemdist = -1; - QVariant item = convertValueToQVariant(exec, value, QMetaType::QObjectStar, &itemdist, visitedObjects); + QVariant item = convertValueToQVariant(exec, value, QMetaType::QObjectStar, &itemdist, visitedObjects, recursionLimit); if (itemdist >= 0) { result.append(item.value()); dist = 10; @@ -696,7 +698,7 @@ for (int i = 0; i < len; ++i) { JSValue val = rtarray->getConcreteArray()->valueAt(exec, i); int itemdist = -1; - QVariant item = convertValueToQVariant(exec, val, QMetaType::Int, &itemdist, visitedObjects); + QVariant item = convertValueToQVariant(exec, val, QMetaType::Int, &itemdist, visitedObjects, recursionLimit); if (itemdist >= 0) result.append(item.value()); else @@ -715,7 +717,7 @@ for (int i = 0; i < len; ++i) { JSValue val = array->get(exec, i); int itemdist = -1; - QVariant item = convertValueToQVariant(exec, val, QMetaType::Int, &itemdist, visitedObjects); + QVariant item = convertValueToQVariant(exec, val, QMetaType::Int, &itemdist, visitedObjects, recursionLimit); if (itemdist >= 0) result.append(item.value()); else @@ -730,7 +732,7 @@ // Make a single length array QList result; int itemdist = -1; - QVariant item = convertValueToQVariant(exec, value, QMetaType::Int, &itemdist, visitedObjects); + QVariant item = convertValueToQVariant(exec, value, QMetaType::Int, &itemdist, visitedObjects, recursionLimit); if (itemdist >= 0) { result.append(item.value()); dist = 10; @@ -757,7 +759,7 @@ } // And then recurse with the autodetect flag - ret = convertValueToQVariant(exec, value, QMetaType::Void, distance, visitedObjects); + ret = convertValueToQVariant(exec, value, QMetaType::Void, distance, visitedObjects, recursionLimit); dist = 10; } break; @@ -777,8 +779,9 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type hint, int *distance) { + const int recursionLimit = 200; HashSet visitedObjects; - return convertValueToQVariant(exec, value, hint, distance, &visitedObjects); + return convertValueToQVariant(exec, value, hint, distance, &visitedObjects, recursionLimit); } JSValue convertQVariantToValue(ExecState* exec, PassRefPtr root, const QVariant& variant) diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/dom/CharacterData.cpp --- a/src/3rdparty/webkit/WebCore/dom/CharacterData.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/dom/CharacterData.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -46,15 +46,15 @@ int oldLength = length(); RefPtr oldStr = m_data; m_data = dataImpl; - + if ((!renderer() || !rendererIsNeeded(renderer()->style())) && attached()) { detach(); attach(); } else if (renderer()) - toRenderText(renderer())->setText(m_data); - + toRenderText(renderer())->setTextWithOffset(m_data, 0, oldLength); + dispatchModifiedEvent(oldStr.get()); - + document()->textRemoved(this, 0, oldLength); } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/dom/Element.cpp --- a/src/3rdparty/webkit/WebCore/dom/Element.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/dom/Element.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1311,8 +1311,12 @@ return; } - if (Page* page = doc->page()) + RefPtr protect; + if (Page* page = doc->page()) { + // Focus and change event handlers can cause us to lose our last ref. + protect = this; page->focusController()->setFocusedNode(this, doc->frame()); + } // Setting the focused node above might have invalidated the layout due to scripts. doc->updateLayoutIgnorePendingStylesheets(); @@ -1535,4 +1539,15 @@ return rareData()->m_idAttributeName; } +#if ENABLE(SVG) +bool Element::childShouldCreateRenderer(Node* child) const +{ + // Only create renderers for SVG elements whose parents are SVG elements, or for proper subdocuments. + if (child->isSVGElement()) + return child->hasTagName(SVGNames::svgTag) || isSVGElement(); + + return Node::childShouldCreateRenderer(child); +} +#endif + } // namespace WebCore diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/dom/Element.h --- a/src/3rdparty/webkit/WebCore/dom/Element.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/dom/Element.h Mon Oct 04 01:19:32 2010 +0300 @@ -270,6 +270,10 @@ virtual void dispatchFormControlChangeEvent() { } +#if ENABLE(SVG) + virtual bool childShouldCreateRenderer(Node*) const; +#endif + protected: Element(const QualifiedName&, Document*, ConstructionType); diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/dom/Text.cpp --- a/src/3rdparty/webkit/WebCore/dom/Text.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/dom/Text.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -77,7 +77,7 @@ document()->textNodeSplit(this); if (renderer()) - toRenderText(renderer())->setText(dataImpl()); + toRenderText(renderer())->setTextWithOffset(dataImpl(), 0, oldStr->length()); return newText.release(); } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/loader/MainResourceLoader.cpp --- a/src/3rdparty/webkit/WebCore/loader/MainResourceLoader.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/loader/MainResourceLoader.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -464,6 +464,10 @@ KURL url = m_substituteData.responseURL(); if (url.isEmpty()) url = m_initialRequest.url(); + + // Clear the initial request here so that subsequent entries into the + // loader will not think there's still a deferred load left to do. + m_initialRequest = ResourceRequest(); ResourceResponse response(url, m_substituteData.mimeType(), m_substituteData.content()->size(), m_substituteData.textEncoding(), ""); didReceiveResponse(response); diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/page/SpatialNavigation.cpp --- a/src/3rdparty/webkit/WebCore/page/SpatialNavigation.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/page/SpatialNavigation.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -102,14 +102,9 @@ // FIXME: This function does not behave correctly with transformed frames. static IntRect renderRectRelativeToRootDocument(RenderObject* render) { - ASSERT(render); - - IntRect rect(render->absoluteClippedOverflowRect()); + ASSERT(render && render->node()); - if (rect.isEmpty()) { - Element* e = static_cast(render->node()); - rect = e->getRect(); - } + IntRect rect = render->node()->getRect(); // In cases when the |render|'s associated node is in a scrollable inner // document, we only consider its scrollOffset if it is not offscreen. @@ -516,7 +511,7 @@ { ASSERT(node || node->renderer()); - if (curRect.x() > 0 && curRect.y() > 0) + if (curRect.x() >= 0 && curRect.y() >= 0) return true; bool canBeScrolled = false; diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/platform/FileChooser.cpp --- a/src/3rdparty/webkit/WebCore/platform/FileChooser.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/platform/FileChooser.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -39,9 +39,11 @@ inline FileChooser::FileChooser(FileChooserClient* client, const Vector& initialFilenames) : m_client(client) + , m_isInitializing(true) { m_filenames = initialFilenames; loadIcon(); + m_isInitializing = false; } PassRefPtr FileChooser::create(FileChooserClient* client, const Vector& initialFilenames) @@ -79,13 +81,13 @@ void FileChooser::loadIcon() { if (m_filenames.size() && m_client) - m_client->chooseIconForFiles(m_filenames); + m_client->chooseIconForFiles(this, m_filenames); } void FileChooser::iconLoaded(PassRefPtr icon) { m_icon = icon; - if (m_icon && m_client) + if (!m_isInitializing && m_icon && m_client) m_client->repaint(); } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/platform/FileChooser.h --- a/src/3rdparty/webkit/WebCore/platform/FileChooser.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/platform/FileChooser.h Mon Oct 04 01:19:32 2010 +0300 @@ -35,6 +35,7 @@ namespace WebCore { +class FileChooser; class Font; class Icon; @@ -44,7 +45,7 @@ virtual void repaint() = 0; virtual bool allowsMultipleFiles() = 0; virtual String acceptTypes() = 0; - virtual void chooseIconForFiles(const Vector&) = 0; + virtual void chooseIconForFiles(FileChooser*, const Vector&) = 0; virtual ~FileChooserClient(); }; @@ -79,6 +80,7 @@ FileChooserClient* m_client; Vector m_filenames; RefPtr m_icon; + bool m_isInitializing; }; } // namespace WebCore diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -65,7 +65,7 @@ lastStop = stopIterator->stop; if (m_radial && m_r0) lastStop = m_r0 / m_r1 + lastStop * (1.0f - m_r0 / m_r1); - m_gradient->setColorAt(lastStop, stopColor); + m_gradient->setColorAt(qMin(lastStop, qreal(1.0f)), stopColor); // Keep the lastStop as orginal value, since the following stopColor depend it lastStop = stopIterator->stop; ++stopIterator; diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/platform/text/BidiResolver.h --- a/src/3rdparty/webkit/WebCore/platform/text/BidiResolver.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/platform/text/BidiResolver.h Mon Oct 04 01:19:32 2010 +0300 @@ -806,35 +806,33 @@ break; } - if (pastEnd) { - if (eor == current) { - if (!reachedEndOfLine) { - eor = endOfLine; - switch (m_status.eor) { - case LeftToRight: - case RightToLeft: - case ArabicNumber: - m_direction = m_status.eor; - break; - case EuropeanNumber: - m_direction = m_status.lastStrong == LeftToRight ? LeftToRight : EuropeanNumber; - break; - default: - ASSERT(false); - } - appendRun(); + if (pastEnd && eor == current) { + if (!reachedEndOfLine) { + eor = endOfLine; + switch (m_status.eor) { + case LeftToRight: + case RightToLeft: + case ArabicNumber: + m_direction = m_status.eor; + break; + case EuropeanNumber: + m_direction = m_status.lastStrong == LeftToRight ? LeftToRight : EuropeanNumber; + break; + default: + ASSERT(false); } - current = end; - m_status = stateAtEnd.m_status; - sor = stateAtEnd.sor; - eor = stateAtEnd.eor; - last = stateAtEnd.last; - reachedEndOfLine = stateAtEnd.reachedEndOfLine; - lastBeforeET = stateAtEnd.lastBeforeET; - emptyRun = stateAtEnd.emptyRun; - m_direction = OtherNeutral; - break; + appendRun(); } + current = end; + m_status = stateAtEnd.m_status; + sor = stateAtEnd.sor; + eor = stateAtEnd.eor; + last = stateAtEnd.last; + reachedEndOfLine = stateAtEnd.reachedEndOfLine; + lastBeforeET = stateAtEnd.lastBeforeET; + emptyRun = stateAtEnd.emptyRun; + m_direction = OtherNeutral; + break; } // set m_status.last as needed. @@ -887,8 +885,21 @@ } increment(); - if (!m_currentExplicitEmbeddingSequence.isEmpty()) + if (!m_currentExplicitEmbeddingSequence.isEmpty()) { commitExplicitEmbedding(); + if (pastEnd) { + current = end; + m_status = stateAtEnd.m_status; + sor = stateAtEnd.sor; + eor = stateAtEnd.eor; + last = stateAtEnd.last; + reachedEndOfLine = stateAtEnd.reachedEndOfLine; + lastBeforeET = stateAtEnd.lastBeforeET; + emptyRun = stateAtEnd.emptyRun; + m_direction = OtherNeutral; + break; + } + } if (emptyRun && (dirCurrent == RightToLeftEmbedding || dirCurrent == LeftToRightEmbedding diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm --- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -227,7 +227,10 @@ #endif } - show(); + updatePluginWidget(); + + if (!m_plugin->quirks().contains(PluginQuirkDeferFirstSetWindowCall)) + setNPWindowIfNeeded(); // TODO: Implement null timer throttling depending on plugin activation m_nullEventTimer.set(new Timer(this, &PluginView::nullEventTimerFired)); diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/rendering/RenderBlock.cpp --- a/src/3rdparty/webkit/WebCore/rendering/RenderBlock.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/rendering/RenderBlock.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -2981,6 +2981,12 @@ m_floatingObjects->clear(); } + // We should not process floats if the parent node is not a RenderBlock. Otherwise, we will add + // floats in an invalid context. This will cause a crash arising from a bad cast on the parent. + // See , where float property is applied on a text node in a SVG. + if (!parent() || !parent()->isRenderBlock()) + return; + // Attempt to locate a previous sibling with overhanging floats. We skip any elements that are // out of flow (like floating/positioned elements), and we also skip over any objects that may have shifted // to avoid floats. diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.cpp --- a/src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -114,10 +114,10 @@ return static_cast(node())->accept(); } -void RenderFileUploadControl::chooseIconForFiles(const Vector& filenames) +void RenderFileUploadControl::chooseIconForFiles(FileChooser* chooser, const Vector& filenames) { if (Chrome* chromePointer = chrome()) - chromePointer->chooseIconForFiles(filenames, m_fileChooser); + chromePointer->chooseIconForFiles(filenames, chooser); } void RenderFileUploadControl::click() @@ -195,6 +195,7 @@ { if (style()->visibility() != VISIBLE) return; + ASSERT(m_fileChooser); // Push a clip. if (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseChildBlockBackgrounds) { diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.h --- a/src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/rendering/RenderFileUploadControl.h Mon Oct 04 01:19:32 2010 +0300 @@ -63,7 +63,7 @@ void repaint() { RenderBlock::repaint(); } bool allowsMultipleFiles(); String acceptTypes(); - void chooseIconForFiles(const Vector&); + void chooseIconForFiles(FileChooser*, const Vector&); Chrome* chrome() const; int maxFilenameWidth() const; diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/rendering/RenderSVGText.cpp --- a/src/3rdparty/webkit/WebCore/rendering/RenderSVGText.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/rendering/RenderSVGText.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -225,6 +225,19 @@ return repaintRect; } +// Fix for . We should not render :first-line CSS Style +// in a SVG text element context. +RenderBlock* RenderSVGText::firstLineBlock() const +{ + return 0; +} + +// Fix for . We should not render :first-letter CSS Style +// in a SVG text element context. +void RenderSVGText::updateFirstLetter() +{ +} + } #endif // ENABLE(SVG) diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/rendering/RenderSVGText.h --- a/src/3rdparty/webkit/WebCore/rendering/RenderSVGText.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/rendering/RenderSVGText.h Mon Oct 04 01:19:32 2010 +0300 @@ -72,6 +72,9 @@ virtual RootInlineBox* createRootInlineBox(); + virtual RenderBlock* firstLineBlock() const; + virtual void updateFirstLetter(); + AffineTransform m_localTransform; }; diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp --- a/src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -27,6 +27,7 @@ #include "AnimationController.h" #include "GraphicsContext.h" #include "HitTestResult.h" +#include "RenderCounter.h" #include "RenderView.h" #include "RenderWidgetProtector.h" @@ -114,6 +115,9 @@ if (RenderView* v = view()) v->removeWidget(this); + if (m_hasCounterNodeMap) + RenderCounter::destroyCounterNodes(this); + if (AXObjectCache::accessibilityEnabled()) { document()->axObjectCache()->childrenChanged(this->parent()); document()->axObjectCache()->remove(this); diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/svg/SVGElement.cpp --- a/src/3rdparty/webkit/WebCore/svg/SVGElement.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/svg/SVGElement.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -304,6 +304,15 @@ return; StyledElement::attributeChanged(attr, preserveDecls); + + // When an animated SVG property changes through SVG DOM, svgAttributeChanged() is called, not attributeChanged(). + // Next time someone tries to access the XML attributes, the synchronization code starts. During that synchronization + // SVGAnimatedPropertySynchronizer may call NamedNodeMap::removeAttribute(), which in turn calls attributeChanged(). + // At this point we're not allowed to call svgAttributeChanged() again - it may lead to extra work being done, or crashes + // see bug https://bugs.webkit.org/show_bug.cgi?id=40994. + if (m_synchronizingSVGAttributes) + return; + svgAttributeChanged(attr->name()); } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/svg/SVGFontFaceElement.cpp --- a/src/3rdparty/webkit/WebCore/svg/SVGFontFaceElement.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/svg/SVGFontFaceElement.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -59,7 +59,6 @@ SVGFontFaceElement::~SVGFontFaceElement() { - removeFromMappedElementSheet(); } static int cssPropertyIdForSVGAttributeName(const QualifiedName& attrName) diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/svg/SVGForeignObjectElement.cpp --- a/src/3rdparty/webkit/WebCore/svg/SVGForeignObjectElement.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/svg/SVGForeignObjectElement.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -125,6 +125,10 @@ bool SVGForeignObjectElement::childShouldCreateRenderer(Node* child) const { + // Disallow arbitary SVG content. Only allow proper subdocuments. + if (child->isSVGElement()) + return child->hasTagName(SVGNames::svgTag); + // Skip over SVG rules which disallow non-SVG kids return StyledElement::childShouldCreateRenderer(child); } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/svg/SVGSVGElement.cpp --- a/src/3rdparty/webkit/WebCore/svg/SVGSVGElement.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/svg/SVGSVGElement.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -538,6 +538,10 @@ if (!parentNode()) return true; + // We act like an outermost SVG element, if we're a direct child of a element. + if (parentNode()->hasTagName(SVGNames::foreignObjectTag)) + return true; + // This is true whenever this is the outermost SVG, even if there are HTML elements outside it return !parentNode()->isSVGElement(); } diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebCore/svg/SVGUseElement.cpp --- a/src/3rdparty/webkit/WebCore/svg/SVGUseElement.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebCore/svg/SVGUseElement.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -572,8 +572,8 @@ void SVGUseElement::detach() { + m_targetElementInstance = 0; SVGStyledTransformableElement::detach(); - m_targetElementInstance = 0; } static bool isDirectReference(Node* n) diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -959,6 +959,10 @@ The \a html is loaded immediately; external objects are loaded asynchronously. + If a script in the \a html runs longer than the default script timeout (currently 10 seconds), + for example due to being blocked by a modal JavaScript alert dialog, this method will return + as soon as possible after the timeout and any subsequent \a html will be loaded asynchronously. + When using this method WebKit assumes that external resources such as JavaScript programs or style sheets are encoded in UTF-8 unless otherwise specified. For example, the encoding of an external script can be specified through the charset attribute of the HTML script tag. It is also possible diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebKit/qt/ChangeLog --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog Mon Oct 04 01:19:32 2010 +0300 @@ -1,3 +1,84 @@ +2010-08-05 David Leong + + Reviewed by Simon Hausmann. + + [Qt] Input mode states are not reset after entering a password field + https://bugs.webkit.org/show_bug.cgi?id=43530 + + Input mode hints are not reset if clicking on password elements then + clicking on
+ diff -r ef0373b55136 -r 758a864f9613 src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -264,26 +264,58 @@ #else QVERIFY(webView->inputMethodHints() == Qt::ImhNone); #endif + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'password' field webView->fireMouseClick(QPoint(20, 60)); - QVERIFY(webView->inputMethodHints() & Qt::ImhHiddenText); + QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'tel' field webView->fireMouseClick(QPoint(20, 110)); - QVERIFY(webView->inputMethodHints() & Qt::ImhDialableCharactersOnly); + QVERIFY(webView->inputMethodHints() == Qt::ImhDialableCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'number' field webView->fireMouseClick(QPoint(20, 160)); - QVERIFY(webView->inputMethodHints() & Qt::ImhDigitsOnly); + QVERIFY(webView->inputMethodHints() == Qt::ImhDigitsOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'email' field webView->fireMouseClick(QPoint(20, 210)); - QVERIFY(webView->inputMethodHints() & Qt::ImhEmailCharactersOnly); + QVERIFY(webView->inputMethodHints() == Qt::ImhEmailCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'url' field webView->fireMouseClick(QPoint(20, 260)); - QVERIFY(webView->inputMethodHints() & Qt::ImhUrlCharactersOnly); + QVERIFY(webView->inputMethodHints() == Qt::ImhUrlCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + // 'password' field + webView->fireMouseClick(QPoint(20, 60)); + QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + // 'text' type + webView->fireMouseClick(QPoint(20, 10)); +#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN) + QVERIFY(webView->inputMethodHints() & Qt::ImhNoAutoUppercase); + QVERIFY(webView->inputMethodHints() & Qt::ImhNoPredictiveText); +#else + QVERIFY(webView->inputMethodHints() == Qt::ImhNone); +#endif + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + // 'password' field + webView->fireMouseClick(QPoint(20, 60)); + QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + qWarning("clicking on text area"); + // 'text area' field + webView->fireMouseClick(QPoint(20, 320)); + QVERIFY(webView->inputMethodHints() == Qt::ImhNone); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); delete webView; diff -r ef0373b55136 -r 758a864f9613 src/corelib/codecs/qtextcodec_symbian.cpp --- a/src/corelib/codecs/qtextcodec_symbian.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/codecs/qtextcodec_symbian.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -53,8 +53,10 @@ const char *aliases; }; -/* This table contains the known Symbian codecs aliases. It is ordered by charsetId. - It is required as symbian does not provide have aliases. +/* This table contains the known Symbian codecs aliases. + It is required because symbian does not provide aliases for codecs. + It is also faster to have a name here than asking the system. + It is ordered by charsetId to allow binary search lookup */ static const QSymbianCodecInitData codecsData[] = { { /*268439485*/ KCharacterSetIdentifierShiftJis, 17, "Shift_JIS\0MS_Kanji\0csShiftJIS\0MS_KANJI\0SJIS\0" }, diff -r ef0373b55136 -r 758a864f9613 src/corelib/concurrent/qtconcurrentexception.cpp --- a/src/corelib/concurrent/qtconcurrentexception.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/concurrent/qtconcurrentexception.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -66,7 +66,7 @@ the Qt Concurrent functions will throw a QtConcurrent::UnhandledException in the receiver thread. - When using QFuture, transferred exceptions willl be thrown when calling the following functions: + When using QFuture, transferred exceptions will be thrown when calling the following functions: \list \o QFuture::waitForFinished() \o QFuture::result() diff -r ef0373b55136 -r 758a864f9613 src/corelib/concurrent/qtconcurrentfilter.cpp --- a/src/corelib/concurrent/qtconcurrentfilter.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/concurrent/qtconcurrentfilter.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -117,7 +117,7 @@ function, and should merge the \e{intermediate} into the \e{result} variable. QtConcurrent::filteredReduced() guarantees that only one thread will call reduce at a time, so using a mutex to lock the result variable - is not neccesary. The QtConcurrent::ReduceOptions enum provides a way to + is not necessary. The QtConcurrent::ReduceOptions enum provides a way to control the order in which the reduction is done. \section1 Additional API Features diff -r ef0373b55136 -r 758a864f9613 src/corelib/concurrent/qtconcurrentmap.cpp --- a/src/corelib/concurrent/qtconcurrentmap.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/concurrent/qtconcurrentmap.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -161,7 +161,7 @@ function, and should merge the \e{intermediate} into the \e{result} variable. QtConcurrent::mappedReduced() guarantees that only one thread will call reduce at a time, so using a mutex to lock the result variable - is not neccesary. The QtConcurrent::ReduceOptions enum provides a way to + is not necessary. The QtConcurrent::ReduceOptions enum provides a way to control the order in which the reduction is done. If QtConcurrent::UnorderedReduce is used (the default), the order is undefined, while QtConcurrent::OrderedReduce ensures that the reduction diff -r ef0373b55136 -r 758a864f9613 src/corelib/concurrent/qtconcurrentresultstore.cpp --- a/src/corelib/concurrent/qtconcurrentresultstore.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/concurrent/qtconcurrentresultstore.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -236,7 +236,7 @@ return resultCount; } -// returns the insert index, calling this funciton with +// returns the insert index, calling this function with // index equal to -1 returns the next available index. int ResultStoreBase::updateInsertIndex(int index, int _count) { diff -r ef0373b55136 -r 758a864f9613 src/corelib/concurrent/qtconcurrentrun.cpp --- a/src/corelib/concurrent/qtconcurrentrun.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/concurrent/qtconcurrentrun.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -99,7 +99,7 @@ functions; passing by pointer is useful for calling non-const member functions that modify the instance. - For example, calling QString::split() (a const member function) in a + For example, calling QByteArray::split() (a const member function) in a separate thread is done like this: \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp 4 diff -r ef0373b55136 -r 758a864f9613 src/corelib/corelib.pro --- a/src/corelib/corelib.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/corelib.pro Mon Oct 04 01:19:32 2010 +0300 @@ -36,7 +36,6 @@ # Workaroud for problems with paging this dll MMP_RULES -= PAGED MMP_RULES *= UNPAGED - LIBS += -lflogger # Partial upgrade SIS file vendorinfo = \ @@ -54,39 +53,9 @@ DEPLOYMENT = partial_upgrade $$DEPLOYMENT } -mmx { - DEFINES += QT_HAVE_MMX -} -3dnow { - DEFINES += QT_HAVE_3DNOW -} -sse { - DEFINES += QT_HAVE_SSE - DEFINES += QT_HAVE_MMXEXT -} -sse2 { - DEFINES += QT_HAVE_SSE2 -} -sse3 { - DEFINES += QT_HAVE_SSE3 -} -ssse3 { - DEFINES += QT_HAVE_SSSE3 -} -sse4_1 { - DEFINES += QT_HAVE_SSE4_1 -} -sse4_2 { - DEFINES += QT_HAVE_SSE4_2 -} -avx { - DEFINES += QT_HAVE_AVX -} -iwmmxt { - DEFINES += QT_HAVE_IWMMXT -} neon { DEFINES += QT_HAVE_NEON QMAKE_CXXFLAGS *= -mfpu=neon } + diff -r ef0373b55136 -r 758a864f9613 src/corelib/global/global.pri --- a/src/corelib/global/global.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/global/global.pri Mon Oct 04 01:19:32 2010 +0300 @@ -19,7 +19,7 @@ # Only used on platforms with CONFIG += precompile_header PRECOMPILED_HEADER = global/qt_pch.h -linux*-g++*:!static { +linux*:!static:!linux-armcc:!linux-gcce { QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate prog=$$quote(if (/program interpreter: (.*)]/) { print $1; }) DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\" diff -r ef0373b55136 -r 758a864f9613 src/corelib/global/qglobal.cpp --- a/src/corelib/global/qglobal.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/global/qglobal.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -81,7 +81,6 @@ #if defined(Q_OS_SYMBIAN) #include #include -#include #include #include # include "private/qcore_symbian_p.h" @@ -1829,6 +1828,7 @@ CDir* contents; TInt err = fileFinder.FindWildByDir(qt_S60Filter, qt_S60SystemInstallDir, contents); if (err == KErrNone) { + QScopedPointer contentsDeleter(contents); err = contents->Sort(EDescending|ESortByName); if (err == KErrNone && contents->Count() > 0 && (*contents)[0].iName.Length() >= 12) { TInt major = (*contents)[0].iName[9] - '0'; @@ -1851,7 +1851,6 @@ } } } - delete contents; } # ifdef Q_CC_NOKIAX86 @@ -1878,9 +1877,9 @@ case SV_S60_5_0: return SV_9_4; case SV_S60_5_1: - return SV_9_4; + return SV_SF_2; case SV_S60_5_2: - return SV_9_4; + return SV_SF_3; default: return SV_Unknown; } @@ -2222,20 +2221,6 @@ RDebug::Print(format, hbuffer); } delete hbuffer; - _LIT( KLogDir, "QT" ); - _LIT( KLogFile, "QT.log" ); - _LIT( KLogStarting, "Starting: %S"); - static bool logStarted; - if ( !logStarted ){ - RProcess curProc; - TBuf procName; - TFullName fullName = curProc.FullName(); - procName.Format(KLogStarting, &fullName); - RFileLogger::Write( KLogDir, KLogFile, EFileLoggingModeAppend, procName); - logStarted = true; - } - - RFileLogger::Write( KLogDir, KLogFile, EFileLoggingModeAppend, ptr ); #else fprintf(stderr, "%s\n", buf); fflush(stderr); @@ -2389,7 +2374,7 @@ This syntax inserts a space between each item, and appends a newline at the end. - To supress the output at runtime, install your own message handler + To suppress the output at runtime, install your own message handler with qInstallMsgHandler(). \sa qDebug(), qCritical(), qFatal(), qInstallMsgHandler(), @@ -2425,7 +2410,7 @@ A space is inserted between the items, and a newline is appended at the end. - To supress the output at runtime, install your own message handler + To suppress the output at runtime, install your own message handler with qInstallMsgHandler(). \sa qDebug(), qWarning(), qFatal(), qInstallMsgHandler(), @@ -2490,7 +2475,7 @@ Example: \snippet doc/src/snippets/code/src_corelib_global_qglobal.cpp 30 - To supress the output at runtime, install your own message handler + To suppress the output at runtime, install your own message handler with qInstallMsgHandler(). \sa qDebug(), qCritical(), qWarning(), qInstallMsgHandler(), @@ -2929,8 +2914,9 @@ \relates You can use this macro to specify information about a custom type - \a Type. With accurate type information, Qt's \l{generic - containers} can choose appropriate storage methods and algorithms. + \a Type. With accurate type information, Qt's \l{Container Classes} + {generic containers} can choose appropriate storage methods and + algorithms. \a Flags can be one of the following: diff -r ef0373b55136 -r 758a864f9613 src/corelib/global/qglobal.h --- a/src/corelib/global/qglobal.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/global/qglobal.h Mon Oct 04 01:19:32 2010 +0300 @@ -981,9 +981,11 @@ # undef QT_DEPRECATED_VARIABLE # undef QT_DEPRECATED_CONSTRUCTOR #elif defined(QT_DEPRECATED_WARNINGS) +# ifdef QT3_SUPPORT /* enable Qt3 support warnings as well */ -# undef QT3_SUPPORT_WARNINGS -# define QT3_SUPPORT_WARNINGS +# undef QT3_SUPPORT_WARNINGS +# define QT3_SUPPORT_WARNINGS +# endif # undef QT_DEPRECATED # define QT_DEPRECATED Q_DECL_DEPRECATED # undef QT_DEPRECATED_VARIABLE diff -r ef0373b55136 -r 758a864f9613 src/corelib/global/qlibraryinfo.cpp --- a/src/corelib/global/qlibraryinfo.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/global/qlibraryinfo.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -66,6 +66,8 @@ QT_BEGIN_NAMESPACE +extern void qDumpCPUFeatures(); // in qsimd.cpp + #ifndef QT_NO_SETTINGS struct QLibrarySettings @@ -476,7 +478,7 @@ \value PrefixPath The default prefix for all paths. \value DocumentationPath The location for documentation upon install. \value HeadersPath The location for all headers. - \value LibrariesPath The location of installed librarires. + \value LibrariesPath The location of installed libraries. \value BinariesPath The location of installed Qt binaries (tools and applications). \value PluginsPath The location of installed Qt plugins. \value ImportsPath The location of installed QML extensions to import. @@ -508,6 +510,14 @@ "Contact: Nokia Corporation (qt-info@nokia.com)\n" "\n" "Build key: " QT_BUILD_KEY "\n" + "Compat build key: " +#ifdef QT_BUILD_KEY_COMPAT + "| " QT_BUILD_KEY_COMPAT " " +#endif +#ifdef QT_BUILD_KEY_COMPAT2 + "| " QT_BUILD_KEY_COMPAT2 " " +#endif + "|\n" "Build date: %s\n" "Installation prefix: %s\n" "Library path: %s\n" @@ -517,6 +527,8 @@ qt_configure_libraries_path_str + 12, qt_configure_headers_path_str + 12); + QT_PREPEND_NAMESPACE(qDumpCPUFeatures)(); + #ifdef QT_EVAL extern void qt_core_eval_init(uint); qt_core_eval_init(1); diff -r ef0373b55136 -r 758a864f9613 src/corelib/io/qfileinfo.cpp --- a/src/corelib/io/qfileinfo.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/io/qfileinfo.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -797,12 +797,12 @@ \bold{Note:} The QDir returned always corresponds to the object's parent directory, even if the QFileInfo represents a directory. - For each of the follwing, dir() returns a QDir for + For each of the following, dir() returns a QDir for \c{"~/examples/191697"}. \snippet doc/src/snippets/fileinfo/main.cpp 0 - For each of the follwing, dir() returns a QDir for + For each of the following, dir() returns a QDir for \c{"."}. \snippet doc/src/snippets/fileinfo/main.cpp 1 diff -r ef0373b55136 -r 758a864f9613 src/corelib/io/qfilesystemwatcher_kqueue.cpp --- a/src/corelib/io/qfilesystemwatcher_kqueue.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/io/qfilesystemwatcher_kqueue.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -295,12 +295,12 @@ path = idToPath.value(id); if (path.isEmpty()) { DEBUG() << "QKqueueFileSystemWatcherEngine: received a kevent for a file we're not watching"; - continue; + goto process_next_event; } } if (kev.filter != EVFILT_VNODE) { DEBUG() << "QKqueueFileSystemWatcherEngine: received a kevent with the wrong filter"; - continue; + goto process_next_event; } if ((kev.fflags & (NOTE_DELETE | NOTE_REVOKE | NOTE_RENAME)) != 0) { @@ -337,6 +337,7 @@ } // are there any more? +process_next_event: r = kevent(kqfd, 0, 0, &kev, 1, &ZeroTimeout); } while (r > 0); } diff -r ef0373b55136 -r 758a864f9613 src/corelib/io/qfsfileengine_win.cpp --- a/src/corelib/io/qfsfileengine_win.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/io/qfsfileengine_win.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1958,6 +1958,10 @@ OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + // Since this is a special case, we check if the return value was NULL and if so + // we change it to INVALID_HANDLE_VALUE to follow the logic inside this function. + if(0 == handle) + handle = INVALID_HANDLE_VALUE; #endif if (handle == INVALID_HANDLE_VALUE) { diff -r ef0373b55136 -r 758a864f9613 src/corelib/io/qprocess_symbian.cpp --- a/src/corelib/io/qprocess_symbian.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/io/qprocess_symbian.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -375,10 +375,9 @@ // Nothing to do } -// Called from ProcessManagerThread +// Called from main thread QProcessActive::~QProcessActive() { - Cancel(); process = NULL; pproc = NULL; } @@ -482,10 +481,9 @@ // Nothing to do } -// Called from ProcessManagerThread +// Called from main thread QProcessManagerMediator::~QProcessManagerMediator() { - Cancel(); processManagerThread.Close(); currentCommand = ENoCommand; currentObserver = NULL; @@ -648,25 +646,36 @@ QProcessManager::~QProcessManager() { QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager()"); - // Cancel death listening for all child processes - if (mediator) { - QMap::Iterator it = children.begin(); - while (it != children.end()) { - // Remove all monitors - QProcessActive *active = it.value(); - mediator->remove(active); + + // Check if manager thread is still alive. If this destructor is ran as part of global + // static cleanup, manager thread will most likely be terminated by kernel at this point, + // so trying to delete QProcessActives and QProcessMediators will panic as they + // will still be active. They can also no longer be canceled as the thread is already gone. + // In case manager thread has already died, we simply do nothing and let the deletion of + // the main heap at process exit take care of stray objects. - QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager() removed listening for a process"); - ++it; + if (managerThread.Handle() && managerThread.ExitType() == EExitPending) { + // Cancel death listening for all child processes + if (mediator) { + QMap::Iterator it = children.begin(); + while (it != children.end()) { + // Remove all monitors + QProcessActive *active = it.value(); + mediator->remove(active); + + QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager() removed listening for a process"); + ++it; + } + + // Terminate process manager thread. + mediator->terminate(); + delete mediator; } - // Terminate process manager thread. - mediator->terminate(); - delete mediator; + qDeleteAll(children.values()); + children.clear(); } - qDeleteAll(children.values()); - children.clear(); managerThread.Close(); managerMutex.Close(); } diff -r ef0373b55136 -r 758a864f9613 src/corelib/io/qtextstream.cpp --- a/src/corelib/io/qtextstream.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/io/qtextstream.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1991,7 +1991,7 @@ return true; buf[i] = '\0'; - // backward-compatibility. Old implmentation supported +nan/-nan + // backward-compatibility. Old implementation supported +nan/-nan // for some reason. QLocale only checks for lower-case // nan/+inf/-inf, so here we also check for uppercase and mixed // case versions. diff -r ef0373b55136 -r 758a864f9613 src/corelib/io/qurl.cpp --- a/src/corelib/io/qurl.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/io/qurl.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -4958,6 +4958,10 @@ pairDelimiter(), and the key and value are delimited by valueDelimiter(). + \note This method does not encode spaces (ASCII 0x20) as plus (+) signs, + like HTML forms do. If you need that kind of encoding, you must encode + the value yourself and use QUrl::setEncodedQueryItems. + \sa setQueryDelimiters(), queryItems(), setEncodedQueryItems() */ void QUrl::setQueryItems(const QList > &query) @@ -5028,6 +5032,10 @@ character returned by valueDelimiter(). Each key/value pair is delimited by the character returned by pairDelimiter(). + \note This method does not encode spaces (ASCII 0x20) as plus (+) signs, + like HTML forms do. If you need that kind of encoding, you must encode + the value yourself and use QUrl::addEncodedQueryItem. + \sa addEncodedQueryItem() */ void QUrl::addQueryItem(const QString &key, const QString &value) @@ -5084,6 +5092,10 @@ /*! Returns the query string of the URL, as a map of keys and values. + \note This method does not decode spaces plus (+) signs as spaces (ASCII + 0x20), like HTML forms do. If you need that kind of decoding, you must + use QUrl::encodedQueryItems and decode the data yourself. + \sa setQueryItems(), setEncodedQuery() */ QList > QUrl::queryItems() const @@ -5188,6 +5200,10 @@ Returns the first query string value whose key is equal to \a key from the URL. + \note This method does not decode spaces plus (+) signs as spaces (ASCII + 0x20), like HTML forms do. If you need that kind of decoding, you must + use QUrl::encodedQueryItemValue and decode the data yourself. + \sa allQueryItemValues() */ QString QUrl::queryItemValue(const QString &key) const @@ -5232,6 +5248,10 @@ Returns the a list of query string values whose key is equal to \a key from the URL. + \note This method does not decode spaces plus (+) signs as spaces (ASCII + 0x20), like HTML forms do. If you need that kind of decoding, you must + use QUrl::allEncodedQueryItemValues and decode the data yourself. + \sa queryItemValue() */ QStringList QUrl::allQueryItemValues(const QString &key) const @@ -5610,7 +5630,7 @@ if ((options & QUrl::RemoveAuthority) != QUrl::RemoveAuthority) { bool doFileScheme = d->scheme == QLatin1String("file") && ourPath.startsWith(QLatin1Char('/')); QString tmp = d->authority(options); - if (!tmp.isEmpty() || doFileScheme) { + if (!tmp.isNull() || doFileScheme) { if (doFileScheme && !ourPath.startsWith(QLatin1Char('/'))) url += QLatin1Char('/'); url += QLatin1String("//"); diff -r ef0373b55136 -r 758a864f9613 src/corelib/kernel/qbasictimer.cpp --- a/src/corelib/kernel/qbasictimer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/kernel/qbasictimer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -54,7 +54,8 @@ This is a fast, lightweight, and low-level class used by Qt internally. We recommend using the higher-level QTimer class rather than this class if you want to use timers in your - applications. + applications. Note that this timer is a repeating timer that + will send subsequent timer events unless the stop() function is called. To use this class, create a QBasicTimer, and call its start() function with a timeout interval and with a pointer to a QObject @@ -88,8 +89,8 @@ /*! \fn bool QBasicTimer::isActive() const - Returns true if the timer is running, has not yet timed - out, and has not been stopped; otherwise returns false. + Returns true if the timer is running and has not been stopped; otherwise + returns false. \sa start() stop() */ diff -r ef0373b55136 -r 758a864f9613 src/corelib/kernel/qcoreapplication.cpp --- a/src/corelib/kernel/qcoreapplication.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/kernel/qcoreapplication.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -2308,6 +2308,7 @@ if (!coreappdata()->app_libpaths) coreappdata()->app_libpaths = new QStringList; *(coreappdata()->app_libpaths) = paths; + locker.unlock(); QFactoryLoader::refreshAll(); } @@ -2341,6 +2342,7 @@ if (!canonicalPath.isEmpty() && !coreappdata()->app_libpaths->contains(canonicalPath)) { coreappdata()->app_libpaths->prepend(canonicalPath); + locker.unlock(); QFactoryLoader::refreshAll(); } } diff -r ef0373b55136 -r 758a864f9613 src/corelib/kernel/qeventdispatcher_symbian.cpp --- a/src/corelib/kernel/qeventdispatcher_symbian.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -232,8 +232,12 @@ void QTimerActiveObject::RunL() { - int error; - QT_TRYCATCH_ERROR(error, Run()); + int error = KErrNone; + if (iStatus == KErrNone) { + QT_TRYCATCH_ERROR(error, Run()); + } else { + error = iStatus.Int(); + } // All Symbian error codes are negative. if (error < 0) { CActiveScheduler::Current()->Error(error); // stop and report here, as this timer will be deleted on scope exit @@ -423,7 +427,7 @@ // ones that return -1 in select // after loop update notifiers for all of them - // as we dont have "exception" notifier type + // as we don't have "exception" notifier type // we should force monitoring fd_set of this // type as well diff -r ef0373b55136 -r 758a864f9613 src/corelib/kernel/qeventdispatcher_unix.cpp --- a/src/corelib/kernel/qeventdispatcher_unix.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -331,7 +331,7 @@ } #endif - firstTimerInfo = currentTimerInfo = 0; + firstTimerInfo = 0; } timeval QTimerInfoList::updateCurrentTime() @@ -445,7 +445,7 @@ // Find first waiting timer not already active QTimerInfo *t = 0; for (QTimerInfoList::const_iterator it = constBegin(); it != constEnd(); ++it) { - if (!(*it)->inTimerEvent) { + if (!(*it)->activateRef) { t = *it; break; } @@ -474,7 +474,7 @@ t->interval.tv_usec = (interval % 1000) * 1000; t->timeout = updateCurrentTime() + t->interval; t->obj = object; - t->inTimerEvent = false; + t->activateRef = 0; timerInsert(t); } @@ -489,8 +489,8 @@ removeAt(i); if (t == firstTimerInfo) firstTimerInfo = 0; - if (t == currentTimerInfo) - currentTimerInfo = 0; + if (t->activateRef) + *(t->activateRef) = 0; // release the timer id if (!QObjectPrivate::get(t->obj)->inThreadChangeEvent) @@ -515,8 +515,8 @@ removeAt(i); if (t == firstTimerInfo) firstTimerInfo = 0; - if (t == currentTimerInfo) - currentTimerInfo = 0; + if (t->activateRef) + *(t->activateRef) = 0; // release the timer id if (!QObjectPrivate::get(t->obj)->inThreadChangeEvent) @@ -552,10 +552,7 @@ bool firstTime = true; timeval currentTime; int n_act = 0, maxCount = count(); - - QTimerInfo *saveFirstTimerInfo = firstTimerInfo; - QTimerInfo *saveCurrentTimerInfo = currentTimerInfo; - firstTimerInfo = currentTimerInfo = 0; + firstTimerInfo = 0; while (maxCount--) { currentTime = updateCurrentTime(); @@ -567,7 +564,7 @@ if (isEmpty()) break; - currentTimerInfo = first(); + QTimerInfo *currentTimerInfo = first(); if (currentTime < currentTimerInfo->timeout) break; // no timer has expired @@ -594,21 +591,19 @@ if (currentTimerInfo->interval.tv_usec > 0 || currentTimerInfo->interval.tv_sec > 0) n_act++; - if (!currentTimerInfo->inTimerEvent) { + if (!currentTimerInfo->activateRef) { // send event, but don't allow it to recurse - currentTimerInfo->inTimerEvent = true; + currentTimerInfo->activateRef = ¤tTimerInfo; QTimerEvent e(currentTimerInfo->id); QCoreApplication::sendEvent(currentTimerInfo->obj, &e); if (currentTimerInfo) - currentTimerInfo->inTimerEvent = false; + currentTimerInfo->activateRef = 0; } } - firstTimerInfo = saveFirstTimerInfo; - currentTimerInfo = saveCurrentTimerInfo; - + firstTimerInfo = 0; return n_act; } diff -r ef0373b55136 -r 758a864f9613 src/corelib/kernel/qeventdispatcher_unix_p.h --- a/src/corelib/kernel/qeventdispatcher_unix_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -77,7 +77,7 @@ timeval interval; // - timer interval timeval timeout; // - when to sent event QObject *obj; // - object to receive event - bool inTimerEvent; + QTimerInfo **activateRef; // - ref from activateTimers }; class QTimerInfoList : public QList @@ -92,7 +92,7 @@ #endif // state variables used by activateTimers() - QTimerInfo *firstTimerInfo, *currentTimerInfo; + QTimerInfo *firstTimerInfo; public: QTimerInfoList(); diff -r ef0373b55136 -r 758a864f9613 src/corelib/kernel/qmetaobject.cpp --- a/src/corelib/kernel/qmetaobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/kernel/qmetaobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1009,8 +1009,11 @@ int argdepth = 0; int templdepth = 0; while (*d) { - if (argdepth == 1) + if (argdepth == 1) { d = qNormalizeType(d, templdepth, result); + if (!*d) //most likely an invalid signature. + break; + } if (*d == '(') ++argdepth; if (*d == ')') diff -r ef0373b55136 -r 758a864f9613 src/corelib/kernel/qmetatype.cpp --- a/src/corelib/kernel/qmetatype.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/kernel/qmetatype.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1415,7 +1415,7 @@ \snippet doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp 4 - This function is usefull to register typedefs so they can be used + This function is useful to register typedefs so they can be used by QMetaProperty, or in QueuedConnections \snippet doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp 9 diff -r ef0373b55136 -r 758a864f9613 src/corelib/plugin/qlibrary.cpp --- a/src/corelib/plugin/qlibrary.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/plugin/qlibrary.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -295,14 +295,6 @@ #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN) && !defined(QT_NO_PLUGIN_CHECK) -#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX) -# define USE_MMAP -QT_BEGIN_INCLUDE_NAMESPACE -# include -# include -QT_END_INCLUDE_NAMESPACE -#endif // Q_OS_FREEBSD || Q_OS_LINUX - static long qt_find_pattern(const char *s, ulong s_len, const char *pattern, ulong p_len) { @@ -363,34 +355,15 @@ } QByteArray data; - char *filedata = 0; - ulong fdlen = 0; - -# ifdef USE_MMAP - char *mapaddr = 0; - size_t maplen = file.size(); - mapaddr = (char *) mmap(mapaddr, maplen, PROT_READ, MAP_PRIVATE, file.handle(), 0); - if (mapaddr != MAP_FAILED) { - // mmap succeeded - filedata = mapaddr; - fdlen = maplen; - } else { - // mmap failed - if (qt_debug_component()) { - qWarning("mmap: %s", qPrintable(qt_error_string(errno))); - } - if (lib) - lib->errorString = QLibrary::tr("Could not mmap '%1': %2") - .arg(library) - .arg(qt_error_string()); -# endif // USE_MMAP + const char *filedata = 0; + ulong fdlen = file.size(); + filedata = (char *) file.map(0, fdlen); + if (filedata == 0) { // try reading the data into memory instead data = file.readAll(); - filedata = data.data(); + filedata = data.constData(); fdlen = data.size(); -# ifdef USE_MMAP } -# endif // USE_MMAP // verify that the pattern is present in the plugin const char pattern[] = "pattern=QT_PLUGIN_VERIFICATION_DATA"; @@ -403,17 +376,6 @@ if (!ret && lib) lib->errorString = QLibrary::tr("Plugin verification data mismatch in '%1'").arg(library); -# ifdef USE_MMAP - if (mapaddr != MAP_FAILED && munmap(mapaddr, maplen) != 0) { - if (qt_debug_component()) - qWarning("munmap: %s", qPrintable(qt_error_string(errno))); - if (lib) - lib->errorString = QLibrary::tr("Could not unmap '%1': %2") - .arg(library) - .arg( qt_error_string() ); - } -# endif // USE_MMAP - file.close(); return ret; } @@ -790,10 +752,13 @@ .arg(qt_version&0xff) .arg(debug ? QLatin1String("debug") : QLatin1String("release")); } else if (key != QT_BUILD_KEY + // we may have some compatibility keys, try them too: #ifdef QT_BUILD_KEY_COMPAT - // be sure to load plugins using an older but compatible build key && key != QT_BUILD_KEY_COMPAT #endif +#ifdef QT_BUILD_KEY_COMPAT2 + && key != QT_BUILD_KEY_COMPAT2 +#endif ) { if (qt_debug_component()) { qWarning("In %s:\n" diff -r ef0373b55136 -r 758a864f9613 src/corelib/thread/qmutexpool.cpp --- a/src/corelib/thread/qmutexpool.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/thread/qmutexpool.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -// qt_global_mutexpool is here for backwards compatability only, +// qt_global_mutexpool is here for backwards compatibility only, // use QMutexpool::instance() in new clode. Q_CORE_EXPORT QMutexPool *qt_global_mutexpool = 0; Q_GLOBAL_STATIC_WITH_ARGS(QMutexPool, globalMutexPool, (QMutex::Recursive)) diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qbytearray.cpp --- a/src/corelib/tools/qbytearray.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qbytearray.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1809,7 +1809,7 @@ Replaces \a len bytes from index position \a pos with the zero terminated string \a after. - Notice: this can change the lenght of the byte array. + Notice: this can change the length of the byte array. */ QByteArray &QByteArray::replace(int pos, int len, const char *after) { diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qbytearraymatcher.h --- a/src/corelib/tools/qbytearraymatcher.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qbytearraymatcher.h Mon Oct 04 01:19:32 2010 +0300 @@ -78,7 +78,7 @@ QByteArrayMatcherPrivate *d; QByteArray q_pattern; #ifdef Q_CC_RVCT -// explicitely allow anonymous unions for RVCT to prevent compiler warnings +// explicitly allow anonymous unions for RVCT to prevent compiler warnings # pragma push # pragma anon_unions #endif diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qeasingcurve.cpp --- a/src/corelib/tools/qeasingcurve.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qeasingcurve.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -91,6 +91,16 @@ animation.setDuration(1000); animation.setEasingCurve(QEasingCurve::InOutQuad); \endcode + + The ability to set an amplitude, overshoot, or period depends on the QEasingCurve type. Amplitude access + is available to curves that behave as springs such as elastic and bounce curves. Changing the amplitude changes + the height of the curve. Period access is only available to elastic curves and setting a higher period slows + the rate of bounce. Only curves that have "boomerang" behaviors such as the InBack, OutBack, InOutBack, and OutInBack + have overshoot settings. These curves will interpolate beyond the end points and return to the end point, + acting similar to a boomerang. + + The \l{Easing Curves Example} contains samples of QEasingCurve types and lets you change the curve settings. + */ /*! @@ -140,15 +150,15 @@ accelerating from zero velocity. \value OutQuart \inlineimage qeasingcurve-outquart.png \br - Easing curve for a cubic (t^4) function: + Easing curve for a quartic (t^4) function: decelerating to zero velocity. \value InOutQuart \inlineimage qeasingcurve-inoutquart.png \br - Easing curve for a cubic (t^4) function: + Easing curve for a quartic (t^4) function: acceleration until halfway, then deceleration. \value OutInQuart \inlineimage qeasingcurve-outinquart.png \br - Easing curve for a cubic (t^4) function: + Easing curve for a quartic (t^4) function: deceleration until halfway, then acceleration. \value InQuint \inlineimage qeasingcurve-inquint.png \br @@ -156,15 +166,15 @@ in: accelerating from zero velocity. \value OutQuint \inlineimage qeasingcurve-outquint.png \br - Easing curve for a cubic (t^5) function: + Easing curve for a quintic (t^5) function: decelerating to zero velocity. \value InOutQuint \inlineimage qeasingcurve-inoutquint.png \br - Easing curve for a cubic (t^5) function: + Easing curve for a quintic (t^5) function: acceleration until halfway, then deceleration. \value OutInQuint \inlineimage qeasingcurve-outinquint.png \br - Easing curve for a cubic (t^5) function: + Easing curve for a quintic (t^5) function: deceleration until halfway, then acceleration. \value InSine \inlineimage qeasingcurve-insine.png \br diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qelapsedtimer_unix.cpp --- a/src/corelib/tools/qelapsedtimer_unix.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qelapsedtimer_unix.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -40,22 +40,58 @@ ****************************************************************************/ #include "qelapsedtimer.h" -#include "qpair.h" #include #include #include -#if !defined(QT_NO_CLOCK_MONOTONIC) -# if defined(QT_BOOTSTRAPPED) -# define QT_NO_CLOCK_MONOTONIC +#if defined(QT_NO_CLOCK_MONOTONIC) || defined(QT_BOOTSTRAPPED) +// turn off the monotonic clock +# ifdef _POSIX_MONOTONIC_CLOCK +# undef _POSIX_MONOTONIC_CLOCK # endif +# define _POSIX_MONOTONIC_CLOCK -1 #endif QT_BEGIN_NAMESPACE -static qint64 fractionAdjustment() +#if (_POSIX_MONOTONIC_CLOCK-0 != 0) +static const bool monotonicClockChecked = true; +static const bool monotonicClockAvailable = _POSIX_MONOTONIC_CLOCK > 0; +#else +static int monotonicClockChecked = false; +static int monotonicClockAvailable = false; +#endif + +#ifdef Q_CC_GNU +# define is_likely(x) __builtin_expect((x), 1) +#else +# define is_likely(x) (x) +#endif +#define load_acquire(x) ((volatile const int&)(x)) +#define store_release(x,v) ((volatile int&)(x) = (v)) + +static void unixCheckClockType() { - if (QElapsedTimer::isMonotonic()) { +#if (_POSIX_MONOTONIC_CLOCK-0 == 0) + if (is_likely(load_acquire(monotonicClockChecked))) + return; + +# if defined(_SC_MONOTONIC_CLOCK) + // detect if the system support monotonic timers + long x = sysconf(_SC_MONOTONIC_CLOCK); + store_release(monotonicClockAvailable, x >= 200112L); +# endif + + store_release(monotonicClockChecked, true); +#endif +} + +static inline qint64 fractionAdjustment() +{ + // disabled, but otherwise indicates bad usage of QElapsedTimer + //Q_ASSERT(monotonicClockChecked); + + if (monotonicClockAvailable) { // the monotonic timer is measured in nanoseconds // 1 ms = 1000000 ns return 1000*1000ull; @@ -68,90 +104,73 @@ bool QElapsedTimer::isMonotonic() { -#if (_POSIX_MONOTONIC_CLOCK-0 > 0) - return true; -#else - static int returnValue = 0; - - if (returnValue == 0) { -# if (_POSIX_MONOTONIC_CLOCK-0 < 0) || !defined(_SC_MONOTONIC_CLOCK) - returnValue = -1; -# elif (_POSIX_MONOTONIC_CLOCK == 0) - // detect if the system support monotonic timers - long x = sysconf(_SC_MONOTONIC_CLOCK); - returnValue = (x >= 200112L) ? 1 : -1; -# endif - } - - return returnValue != -1; -#endif + unixCheckClockType(); + return monotonicClockAvailable; } QElapsedTimer::ClockType QElapsedTimer::clockType() { - return isMonotonic() ? MonotonicClock : SystemTime; + unixCheckClockType(); + return monotonicClockAvailable ? MonotonicClock : SystemTime; } -static inline QPair do_gettime() +static inline void do_gettime(qint64 *sec, qint64 *frac) { -#if (_POSIX_MONOTONIC_CLOCK-0 > 0) - timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - return qMakePair(ts.tv_sec, ts.tv_nsec); -#else -# if !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED) - if (QElapsedTimer::isMonotonic()) { +#if (_POSIX_MONOTONIC_CLOCK-0 >= 0) + unixCheckClockType(); + if (is_likely(monotonicClockAvailable)) { timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); - return qMakePair(ts.tv_sec, ts.tv_nsec); + *sec = ts.tv_sec; + *frac = ts.tv_nsec; + return; } -# endif +#endif // use gettimeofday timeval tv; ::gettimeofday(&tv, 0); - return qMakePair(tv.tv_sec, tv.tv_usec); -#endif + *sec = tv.tv_sec; + *frac = tv.tv_usec; } // used in qcore_unix.cpp and qeventdispatcher_unix.cpp timeval qt_gettime() { - QPair r = do_gettime(); + qint64 sec, frac; + do_gettime(&sec, &frac); timeval tv; - tv.tv_sec = r.first; - tv.tv_usec = r.second; - if (QElapsedTimer::isMonotonic()) + tv.tv_sec = sec; + tv.tv_usec = frac; + if (monotonicClockAvailable) tv.tv_usec /= 1000; return tv; } +static qint64 elapsedAndRestart(qint64 sec, qint64 frac, + qint64 *nowsec, qint64 *nowfrac) +{ + do_gettime(nowsec, nowfrac); + sec = *nowsec - sec; + frac = *nowfrac - frac; + return sec * Q_INT64_C(1000) + frac / fractionAdjustment(); +} + void QElapsedTimer::start() { - QPair r = do_gettime(); - t1 = r.first; - t2 = r.second; + do_gettime(&t1, &t2); } qint64 QElapsedTimer::restart() { - QPair r = do_gettime(); - qint64 oldt1 = t1; - qint64 oldt2 = t2; - t1 = r.first; - t2 = r.second; - - r.first -= oldt1; - r.second -= oldt2; - return r.first * Q_INT64_C(1000) + r.second / fractionAdjustment(); + return elapsedAndRestart(t1, t2, &t1, &t2); } qint64 QElapsedTimer::elapsed() const { - QElapsedTimer now; - now.start(); - return msecsTo(now); + qint64 sec, frac; + return elapsedAndRestart(t1, t2, &sec, &frac); } qint64 QElapsedTimer::msecsSinceReference() const diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qhash.h --- a/src/corelib/tools/qhash.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qhash.h Mon Oct 04 01:19:32 2010 +0300 @@ -589,10 +589,11 @@ Q_INLINE_TEMPLATE QHash &QHash::operator=(const QHash &other) { if (d != other.d) { - other.d->ref.ref(); + QHashData *o = other.d; + o->ref.ref(); if (!d->ref.deref()) freeData(d); - d = other.d; + d = o; if (!d->sharable) detach_helper(); } diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qlinkedlist.h --- a/src/corelib/tools/qlinkedlist.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qlinkedlist.h Mon Oct 04 01:19:32 2010 +0300 @@ -312,10 +312,11 @@ QLinkedList &QLinkedList::operator=(const QLinkedList &l) { if (d != l.d) { - l.d->ref.ref(); + QLinkedListData *o = l.d; + o->ref.ref(); if (!d->ref.deref()) free(d); - d = l.d; + d = o; if (!d->sharable) detach_helper(); } diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qlist.h --- a/src/corelib/tools/qlist.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qlist.h Mon Oct 04 01:19:32 2010 +0300 @@ -424,10 +424,11 @@ Q_INLINE_TEMPLATE QList &QList::operator=(const QList &l) { if (d != l.d) { - l.d->ref.ref(); + QListData::Data *o = l.d; + o->ref.ref(); if (!d->ref.deref()) free(d); - d = l.d; + d = o; if (!d->sharable) detach_helper(); } diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qmap.h --- a/src/corelib/tools/qmap.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qmap.h Mon Oct 04 01:19:32 2010 +0300 @@ -426,10 +426,11 @@ Q_INLINE_TEMPLATE QMap &QMap::operator=(const QMap &other) { if (d != other.d) { - other.d->ref.ref(); + QMapData* o = other.d; + o->ref.ref(); if (!d->ref.deref()) freeData(d); - d = other.d; + d = o; if (!d->sharable) detach_helper(); } diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qpair.qdoc --- a/src/corelib/tools/qpair.qdoc Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qpair.qdoc Mon Oct 04 01:19:32 2010 +0300 @@ -35,7 +35,7 @@ pair type is not available. It stores one value of type T1 and one value of type T2. It can be used as a return value for a function that needs to return two values, or as the value type of - a \l{generic container}. + a \l{Container classes}{generic container}. Here's an example of a QPair that stores one QString and one \c double value: @@ -53,7 +53,7 @@ requirements; these requirements are documented on a per-function basis. - \sa {Generic Containers} + \sa {Container Classes} */ /*! \typedef QPair::first_type diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qshareddata.h --- a/src/corelib/tools/qshareddata.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qshareddata.h Mon Oct 04 01:19:32 2010 +0300 @@ -95,9 +95,10 @@ if (o.d != d) { if (o.d) o.d->ref.ref(); - if (d && !d->ref.deref()) - delete d; + T *old = d; d = o.d; + if (old && !old->ref.deref()) + delete old; } return *this; } @@ -105,9 +106,10 @@ if (o != d) { if (o) o->ref.ref(); - if (d && !d->ref.deref()) - delete d; + T *old = d; d = o; + if (old && !old->ref.deref()) + delete old; } return *this; } @@ -174,9 +176,10 @@ if (o.d != d) { if (o.d) o.d->ref.ref(); - if (d && !d->ref.deref()) - delete d; + T *old = d; d = o.d; + if (old && !old->ref.deref()) + delete old; } return *this; } @@ -184,9 +187,10 @@ if (o != d) { if (o) o->ref.ref(); - if (d && !d->ref.deref()) - delete d; + T *old = d; d = o; + if (old && !old->ref.deref()) + delete old; } return *this; } diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qsharedpointer.cpp --- a/src/corelib/tools/qsharedpointer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qsharedpointer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -67,8 +67,8 @@ QSharedPointer and QWeakPointer are thread-safe and operate atomically on the pointer value. Different threads can also access - the same QSharedPointer or QWeakPointer object at the same time - without need for locking mechanisms. + the QSharedPointer or QWeakPointer pointing to the same object at + the same time without need for locking mechanisms. It should be noted that, while the pointer value can be accessed in this manner, QSharedPointer and QWeakPointer provide no @@ -482,7 +482,7 @@ becomes managed by this QSharedPointer and must not be passed to another QSharedPointer object or deleted outside this object. - The \a deleter paramter specifies the custom deleter for this + The \a deleter parameter specifies the custom deleter for this object. The custom deleter is called when the strong reference count drops to 0 instead of the operator delete(). This is useful, for instance, for calling deleteLater() in a QObject instead: diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qsimd.cpp --- a/src/corelib/tools/qsimd.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qsimd.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -41,20 +41,42 @@ #include "qsimd_p.h" #include +#include #if defined(Q_OS_WINCE) #include #endif +#if defined(Q_OS_WIN64) && !defined(Q_CC_GNU) +#include +#endif + +#if defined(Q_OS_LINUX) && defined(__arm__) +#include "private/qcore_unix_p.h" + +// the kernel header definitions for HWCAP_* +// (the ones we need/may need anyway) + +// copied from (ARM) +#define HWCAP_IWMMXT 512 +#define HWCAP_CRUNCH 1024 +#define HWCAP_THUMBEE 2048 +#define HWCAP_NEON 4096 +#define HWCAP_VFPv3 8192 +#define HWCAP_VFPv3D16 16384 + +// copied from +#define AT_HWCAP 16 /* arch dependent hints at CPU capabilities */ + +#endif + QT_BEGIN_NAMESPACE -uint qDetectCPUFeatures() +#if defined (Q_OS_WINCE) +static inline uint detectProcessorFeatures() { - static uint features = 0xffffffff; - if (features != 0xffffffff) - return features; + uint features = 0; -#if defined (Q_OS_WINCE) #if defined (ARM) if (IsProcessorFeaturePresent(PF_ARM_INTEL_WMMX)) { features = IWMMXT; @@ -74,75 +96,98 @@ #endif features = 0; return features; -#elif defined(QT_HAVE_IWMMXT) +} + +#elif defined(__arm__) || defined(__arm) || defined(QT_HAVE_IWMMXT) || defined(QT_HAVE_NEON) +static inline uint detectProcessorFeatures() +{ + uint features = 0; + +#if defined(Q_OS_LINUX) + int auxv = ::qt_safe_open("/proc/self/auxv", O_RDONLY); + if (auxv != -1) { + unsigned long vector[64]; + int nread; + while (features == 0) { + nread = ::qt_safe_read(auxv, (char *)vector, sizeof vector); + if (nread <= 0) { + // EOF or error + break; + } + + int max = nread / (sizeof vector[0]); + for (int i = 0; i < max; i += 2) + if (vector[i] == AT_HWCAP) { + if (vector[i+1] & HWCAP_IWMMXT) + features |= IWMMXT; + if (vector[i+1] & HWCAP_NEON) + features |= NEON; + break; + } + } + + ::qt_safe_close(auxv); + return features; + } + // fall back if /proc/self/auxv wasn't found +#endif + +#if defined(QT_HAVE_IWMMXT) // runtime detection only available when running as a previlegied process - static const bool doIWMMXT = !qgetenv("QT_NO_IWMMXT").toInt(); - features = doIWMMXT ? IWMMXT : 0; - return features; + features = IWMMXT; #elif defined(QT_HAVE_NEON) - static const bool doNEON = !qgetenv("QT_NO_NEON").toInt(); - features = doNEON ? NEON : 0; + features = NEON; +#endif + return features; -#else - features = 0; -#if defined(__x86_64__) || defined(Q_OS_WIN64) - features = MMX|SSE|SSE2|CMOV; -#elif defined(__ia64__) - features = MMX|SSE|SSE2; +} + #elif defined(__i386__) || defined(_M_IX86) +static inline uint detectProcessorFeatures() +{ + uint features = 0; + unsigned int extended_result = 0; + unsigned int feature_result = 0; uint result = 0; /* see p. 118 of amd64 instruction set manual Vol3 */ #if defined(Q_CC_GNU) - asm ("push %%ebx\n" - "pushf\n" - "pop %%eax\n" - "mov %%eax, %%ebx\n" - "xor $0x00200000, %%eax\n" - "push %%eax\n" + long cpuid_supported, tmp1; + asm ("pushf\n" + "pop %0\n" + "mov %0, %1\n" + "xor $0x00200000, %0\n" + "push %0\n" "popf\n" "pushf\n" - "pop %%eax\n" - "xor %%edx, %%edx\n" - "xor %%ebx, %%eax\n" - "jz 1f\n" - - "mov $0x00000001, %%eax\n" - "cpuid\n" - "1:\n" - "pop %%ebx\n" - "mov %%edx, %0\n" - : "=r" (result) - : - : "%eax", "%ecx", "%edx" - ); + "pop %0\n" + "xor %1, %0\n" // %eax is now 0 if CPUID is not supported + : "=a" (cpuid_supported), "=r" (tmp1) + ); + if (cpuid_supported) { + asm ("xchg %%ebx, %2\n" + "cpuid\n" + "xchg %%ebx, %2\n" + : "=c" (feature_result), "=d" (result), "=&r" (tmp1) + : "a" (1)); - asm ("push %%ebx\n" - "pushf\n" - "pop %%eax\n" - "mov %%eax, %%ebx\n" - "xor $0x00200000, %%eax\n" - "push %%eax\n" - "popf\n" - "pushf\n" - "pop %%eax\n" - "xor %%edx, %%edx\n" - "xor %%ebx, %%eax\n" - "jz 2f\n" + asm ("xchg %%ebx, %1\n" + "cpuid\n" + "cmp $0x80000000, %%eax\n" + "jnbe 1f\n" + "xor %0, %0\n" + "jmp 2f\n" + "1:\n" + "mov $0x80000001, %%eax\n" + "cpuid\n" + "2:\n" + "xchg %%ebx, %1\n" + : "=d" (extended_result), "=&r" (tmp1) + : "a" (0x80000000) + : "%ecx" + ); + } - "mov $0x80000000, %%eax\n" - "cpuid\n" - "cmp $0x80000000, %%eax\n" - "jbe 2f\n" - "mov $0x80000001, %%eax\n" - "cpuid\n" - "2:\n" - "pop %%ebx\n" - "mov %%edx, %0\n" - : "=r" (extended_result) - : - : "%eax", "%ecx", "%edx" - ); #elif defined (Q_OS_WIN) _asm { push eax @@ -164,6 +209,7 @@ mov eax, 1 cpuid mov result, edx + mov feature_result, ecx skip: pop edx pop ecx @@ -203,6 +249,7 @@ } #endif + // result now contains the standard feature bits if (result & (1u << 15)) features |= CMOV; @@ -218,44 +265,141 @@ features |= SSE; if (result & (1u << 26)) features |= SSE2; - if (extended_result & (1u)) + if (feature_result & (1u)) features |= SSE3; - if (extended_result & (1u << 9)) + if (feature_result & (1u << 9)) features |= SSSE3; - if (extended_result & (1u << 19)) + if (feature_result & (1u << 19)) features |= SSE4_1; - if (extended_result & (1u << 20)) + if (feature_result & (1u << 20)) features |= SSE4_2; - if (extended_result & (1u << 28)) + if (feature_result & (1u << 28)) + features |= AVX; + + return features; +} + +#elif defined(__x86_64) || defined(Q_OS_WIN64) +static inline uint detectProcessorFeatures() +{ + uint features = MMX|SSE|SSE2|CMOV; + uint feature_result = 0; + +#if defined(Q_CC_GNU) + asm ("cpuid" + : "=c" (feature_result) + : "a" (1) + : "%ebx", "%edx" + ); +#elif defined (Q_OS_WIN64) + { + int info[4]; + __cpuid(info, 1); + feature_result = info[2]; + } +#endif + + if (feature_result & (1u)) + features |= SSE3; + if (feature_result & (1u << 9)) + features |= SSSE3; + if (feature_result & (1u << 19)) + features |= SSE4_1; + if (feature_result & (1u << 20)) + features |= SSE4_2; + if (feature_result & (1u << 28)) features |= AVX; -#endif // i386 - -#if defined(QT_HAVE_MMX) - if (qgetenv("QT_NO_MMX").toInt()) - features ^= MMX; -#endif - if (qgetenv("QT_NO_MMXEXT").toInt()) - features ^= MMXEXT; + return features; +} -#if defined(QT_HAVE_3DNOW) - if (qgetenv("QT_NO_3DNOW").toInt()) - features ^= MMX3DNOW; -#endif - if (qgetenv("QT_NO_3DNOWEXT").toInt()) - features ^= MMX3DNOWEXT; +#elif defined(__ia64__) +static inline uint detectProcessorFeatures() +{ + return MMX|SSE|SSE2; +} -#if defined(QT_HAVE_SSE) - if (qgetenv("QT_NO_SSE").toInt()) - features ^= SSE; -#endif -#if defined(QT_HAVE_SSE2) - if (qgetenv("QT_NO_SSE2").toInt()) - features ^= SSE2; +#else +static inline uint detectProcessorFeatures() +{ + return 0; +} #endif +/* + * Use kdesdk/scripts/generate_string_table.pl to update the table below. + * Here's the data (don't forget the ONE leading space): + mmx + mmxext + mmx3dnow + mmx3dnowext + sse + sse2 + cmov + iwmmxt + neon + sse3 + ssse3 + sse4.1 + sse4.2 + avx + */ + +// begin generated +static const char features_string[] = + " mmx\0" + " mmxext\0" + " mmx3dnow\0" + " mmx3dnowext\0" + " sse\0" + " sse2\0" + " cmov\0" + " iwmmxt\0" + " neon\0" + " sse3\0" + " ssse3\0" + " sse4.1\0" + " sse4.2\0" + " avx\0" + "\0"; + +static const int features_indices[] = { + 0, 5, 13, 23, 36, 41, 47, 53, + 61, 67, 73, 80, 88, 96, -1 +}; +// end generated + +const int features_count = (sizeof features_indices - 1) / (sizeof features_indices[0]); + +uint qDetectCPUFeatures() +{ + static QBasicAtomicInt features = Q_BASIC_ATOMIC_INITIALIZER(-1); + if (features != -1) + return features; + + uint f = detectProcessorFeatures(); + QByteArray disable = qgetenv("QT_NO_CPU_FEATURE"); + if (!disable.isEmpty()) { + disable.prepend(' '); + for (int i = 0; i < features_count; ++i) { + if (disable.contains(features_string + features_indices[i])) + f &= ~(1 << i); + } + } + + features = f; return features; -#endif +} + +void qDumpCPUFeatures() +{ + uint features = qDetectCPUFeatures(); + printf("Processor features: "); + for (int i = 0; i < features_count; ++i) { + if (features & (1 << i)) + printf("%s", features_string + features_indices[i]); + } + puts(""); } QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qsimd_p.h --- a/src/corelib/tools/qsimd_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qsimd_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -51,8 +51,13 @@ #if defined(QT_NO_MAC_XARCH) || (defined(Q_OS_DARWIN) && (defined(__ppc__) || defined(__ppc64__))) // Disable MMX and SSE on Mac/PPC builds, or if the compiler // does not support -Xarch argument passing +#undef QT_HAVE_SSE #undef QT_HAVE_SSE2 -#undef QT_HAVE_SSE +#undef QT_HAVE_SSE3 +#undef QT_HAVE_SSSE3 +#undef QT_HAVE_SSE4_1 +#undef QT_HAVE_SSE4_2 +#undef QT_HAVE_AVX #undef QT_HAVE_3DNOW #undef QT_HAVE_MMX #endif @@ -72,6 +77,28 @@ # include #endif +// SSE3 intrinsics +#if defined(QT_HAVE_SSE3) && (defined(__SSE3__) || defined(Q_CC_MSVC)) +#include +#endif + +// SSSE3 intrinsics +#if defined(QT_HAVE_SSSE3) && (defined(__SSSE3__) || defined(Q_CC_MSVC)) +#include +#endif + +// SSE4.1 and SSE4.2 intrinsics +#if (defined(QT_HAVE_SSE4_1) || defined(QT_HAVE_SSE4_2)) && (defined(__SSE4_1__) || defined(Q_CC_MSVC)) +#include +#include +#endif + +// AVX intrinsics +#if defined(QT_HAVE_AVX) && (defined(__AVX__) || defined(Q_CC_MSVC)) +#include +#endif + + #if !defined(QT_BOOTSTRAPPED) && (!defined(Q_CC_MSVC) || (defined(_M_X64) || _M_IX86_FP == 2)) #define QT_ALWAYS_HAVE_SSE2 #endif @@ -129,7 +156,9 @@ Q_CORE_EXPORT uint qDetectCPUFeatures(); -Q_CORE_EXPORT uint qDetectCPUFeatures(); + +#define ALIGNMENT_PROLOGUE_16BYTES(ptr, i, length) \ + for (; i < static_cast(qMin(static_cast(length), ((4 - ((reinterpret_cast(ptr) >> 2) & 0x3)) & 0x3))); ++i) QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qstring.cpp --- a/src/corelib/tools/qstring.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qstring.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -173,19 +173,6 @@ return 1; } -// Unicode case-insensitive comparison -static int ucstrcmp(const QChar *a, int alen, const QChar *b, int blen) -{ - if (a == b && alen == blen) - return 0; - int l = qMin(alen, blen); - while (l-- && *a == *b) - a++,b++; - if (l == -1) - return (alen-blen); - return a->unicode() - b->unicode(); -} - // Unicode case-sensitive compare two same-sized strings static int ucstrncmp(const QChar *a, const QChar *b, int l) { @@ -196,28 +183,71 @@ return a->unicode() - b->unicode(); } +// Unicode case-sensitive comparison +static int ucstrcmp(const QChar *a, int alen, const QChar *b, int blen) +{ + if (a == b && alen == blen) + return 0; + int l = qMin(alen, blen); + int cmp = ucstrncmp(a, b, l); + return cmp ? cmp : (alen-blen); +} + // Unicode case-insensitive compare two same-sized strings static int ucstrnicmp(const ushort *a, const ushort *b, int l) { return ucstricmp(a, a + l, b, b + l); } +// Benchmarking indicates that doing memcmp is much slower than +// executing the comparison ourselves. +// +// The profiling was done on a population of calls to qMemEquals, generated +// during a run of the demo browser. The profile of the data (32-bit x86 +// Linux) was: +// +// total number of comparisons: 21353 +// longest string compared: 95 +// average comparison length: 14.8786 +// cache-line crosses: 5661 (13.3%) +// alignment histogram: +// 0xXXX0 = 512 (1.2%) strings, 0 (0.0%) of which same-aligned +// 0xXXX2 = 15087 (35.3%) strings, 5145 (34.1%) of which same-aligned +// 0xXXX4 = 525 (1.2%) strings, 0 (0.0%) of which same-aligned +// 0xXXX6 = 557 (1.3%) strings, 6 (1.1%) of which same-aligned +// 0xXXX8 = 509 (1.2%) strings, 0 (0.0%) of which same-aligned +// 0xXXXa = 24358 (57.0%) strings, 9901 (40.6%) of which same-aligned +// 0xXXXc = 557 (1.3%) strings, 0 (0.0%) of which same-aligned +// 0xXXXe = 601 (1.4%) strings, 15 (2.5%) of which same-aligned +// total = 42706 (100%) strings, 15067 (35.3%) of which same-aligned +// +// 92% of the strings have alignment of 2 or 10, which is due to malloc on +// 32-bit Linux returning values aligned to 8 bytes, and offsetof(array, QString::Data) == 18. +// +// The profile on 64-bit will be different since offsetof(array, QString::Data) == 26. +// +// The benchmark results were, for a Core-i7 @ 2.67 GHz 32-bit, compiled with -O3 -funroll-loops: +// 16-bit loads only: 872,301 CPU ticks [Qt 4.5 / memcmp] +// 32- and 16-bit loads: 773,362 CPU ticks [Qt 4.6] +// SSE2 "movdqu" 128-bit loads: 618,736 CPU ticks +// SSE3 "lddqu" 128-bit loads: 619,954 CPU ticks +// SSSE3 "palignr" corrections: 852,147 CPU ticks +// SSE4.2 "pcmpestrm": 738,702 CPU ticks +// +// The same benchmark on an Atom N450 @ 1.66 GHz, is: +// 16-bit loads only: 2,185,882 CPU ticks +// 32- and 16-bit loads: 1,805,060 CPU ticks +// SSE2 "movdqu" 128-bit loads: 2,529,843 CPU ticks +// SSE3 "lddqu" 128-bit loads: 2,514,858 CPU ticks +// SSSE3 "palignr" corrections: 2,160,325 CPU ticks +// SSE4.2 not available +// +// The conclusion we reach is that alignment the SSE2 unaligned code can gain +// 20% improvement in performance in some systems, but suffers a penalty due +// to the unaligned loads on others. + static bool qMemEquals(const quint16 *a, const quint16 *b, int length) { - // Benchmarking indicates that doing memcmp is much slower than - // executing the comparison ourselves. - // To make it even faster, we do a 32-bit comparison, comparing - // twice the amount of data as a normal word-by-word comparison. - // - // Benchmarking results on a 2.33 GHz Core2 Duo, with a 64-QChar - // block of data, with 4194304 iterations (per iteration): - // operation usec cpu ticks - // memcmp 330 710 - // 16-bit 79 167-171 - // 32-bit aligned 49 105-109 - // - // Testing also indicates that unaligned 32-bit loads are as - // performant as 32-bit aligned. if (a == b || !length) return true; @@ -6645,8 +6675,9 @@ QString locale_arg; if (d.locale_occurrences > 0) { QLocale locale; - locale_arg = locale.d()->longLongToString(a, -1, base, fieldWidth, - flags | QLocalePrivate::ThousandsGroup); + if (!locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->longLongToString(a, -1, base, fieldWidth, flags); } return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg, fillChar); @@ -6688,8 +6719,9 @@ QString locale_arg; if (d.locale_occurrences > 0) { QLocale locale; - locale_arg = locale.d()->unsLongLongToString(a, -1, base, fieldWidth, - flags | QLocalePrivate::ThousandsGroup); + if (!locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->unsLongLongToString(a, -1, base, fieldWidth, flags); } return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg, fillChar); @@ -6822,7 +6854,8 @@ if (d.locale_occurrences > 0) { QLocale locale; - flags |= QLocalePrivate::ThousandsGroup; + if (!locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; locale_arg = locale.d()->doubleToString(a, prec, form, fieldWidth, flags); } diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qstring.h --- a/src/corelib/tools/qstring.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qstring.h Mon Oct 04 01:19:32 2010 +0300 @@ -616,6 +616,7 @@ ushort asciiCache : 1; ushort capacity : 1; ushort reserved : 11; + // ### Qt5: try to ensure that "array" is aligned to 16 bytes on both 32- and 64-bit ushort array[1]; }; static Data shared_null; diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qstringmatcher.h --- a/src/corelib/tools/qstringmatcher.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qstringmatcher.h Mon Oct 04 01:19:32 2010 +0300 @@ -78,7 +78,7 @@ QString q_pattern; Qt::CaseSensitivity q_cs; #ifdef Q_CC_RVCT -// explicitely allow anonymous unions for RVCT to prevent compiler warnings +// explicitly allow anonymous unions for RVCT to prevent compiler warnings # pragma push # pragma anon_unions #endif diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qtextboundaryfinder.cpp --- a/src/corelib/tools/qtextboundaryfinder.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qtextboundaryfinder.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -244,7 +244,7 @@ data required, it will use this instead of allocating its own buffer. \warning QTextBoundaryFinder does not create a copy of \a chars. It is the - application programmer's responsability to ensure the array is allocated for + application programmer's responsibility to ensure the array is allocated for as long as the QTextBoundaryFinder object stays alive. The same applies to \a buffer. */ diff -r ef0373b55136 -r 758a864f9613 src/corelib/tools/qvector.h --- a/src/corelib/tools/qvector.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/tools/qvector.h Mon Oct 04 01:19:32 2010 +0300 @@ -377,10 +377,11 @@ template QVector &QVector::operator=(const QVector &v) { - v.d->ref.ref(); + QVectorData *o = v.d; + o->ref.ref(); if (!d->ref.deref()) free(p); - d = v.d; + d = o; if (!d->sharable) detach_helper(); return *this; diff -r ef0373b55136 -r 758a864f9613 src/corelib/xml/qxmlstream.cpp --- a/src/corelib/xml/qxmlstream.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/corelib/xml/qxmlstream.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1523,7 +1523,7 @@ decoder = codec->makeDecoder(); } - decoder->toUnicode(&readBuffer, rawReadBuffer.data(), nbytesread); + decoder->toUnicode(&readBuffer, rawReadBuffer.constData(), nbytesread); if(lockEncoding && decoder->hasFailure()) { raiseWellFormedError(QXmlStream::tr("Encountered incorrectly encoded content.")); diff -r ef0373b55136 -r 758a864f9613 src/dbus/qdbusargument.cpp --- a/src/dbus/qdbusargument.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/dbus/qdbusargument.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -825,7 +825,7 @@ \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 6 If the type you want to marshall is a QList, QVector or any of the - Qt's \l {Generic Containers} that take one template parameter, + Qt's \l {Container Classes} that take one template parameter, you need not declare an \c{operator<<} function for it, since QtDBus provides generic templates to do the job of marshalling the data. The same applies for STL's sequence containers, such @@ -952,7 +952,7 @@ \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 9 If the type you want to demarshall is a QList, QVector or any of the - Qt's \l {Generic Containers} that take one template parameter, you + Qt's \l {Container Classes} that take one template parameter, you need not declare an \c{operator>>} function for it, since QtDBus provides generic templates to do the job of demarshalling the data. The same applies for STL's sequence containers, such as \c {std::list}, diff -r ef0373b55136 -r 758a864f9613 src/dbus/qdbusconnection.cpp --- a/src/dbus/qdbusconnection.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/dbus/qdbusconnection.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -173,6 +173,9 @@ The connection is then torn down using the disconnectFromBus() function. + Once disconnected, calling connectToBus() will not reestablish a + connection, you must create a new QDBusConnection instance. + As a convenience for the two most common connection types, the sessionBus() and systemBus() functions return open connections to the session server daemon and the system server daemon, @@ -209,6 +212,7 @@ \value ExportScriptableSlots export this object's scriptable slots \value ExportScriptableSignals export this object's scriptable signals \value ExportScriptableProperties export this object's scriptable properties + \value ExportScriptableInvokables export this object's scriptable invokables \value ExportScriptableContents shorthand form for ExportScriptableSlots | ExportScriptableSignals | ExportScriptableProperties @@ -216,6 +220,7 @@ \value ExportNonScriptableSlots export this object's non-scriptable slots \value ExportNonScriptableSignals export this object's non-scriptable signals \value ExportNonScriptableProperties export this object's non-scriptable properties + \value ExportNonScriptableInvokables export this object's non-scriptable invokables \value ExportNonScriptableContents shorthand form for ExportNonScriptableSlots | ExportNonScriptableSignals | ExportNonScriptableProperties @@ -223,8 +228,8 @@ \value ExportAllSlots export all of this object's slots \value ExportAllSignals export all of this object's signals \value ExportAllProperties export all of this object's properties + \value ExportAllInvokables export all of this object's invokables \value ExportAllContents export all of this object's contents - \value ExportChildObjects export this object's child objects \sa registerObject(), QDBusAbstractAdaptor, {usingadaptors.html}{Using adaptors} @@ -853,10 +858,6 @@ /*! Returns true if this QDBusConnection object is connected. - - If it isn't connected, calling connectToBus() on the same - connection name will not make be connected. You need to call the - QDBusConnection constructor again. */ bool QDBusConnection::isConnected() const { @@ -916,7 +917,7 @@ /*! Attempts to register the \a serviceName on the D-Bus server and - returns true if the registration succeded. The registration will + returns true if the registration succeeded. The registration will fail if the name is already registered by another application. \sa unregisterService(), QDBusConnectionInterface::registerService() diff -r ef0373b55136 -r 758a864f9613 src/dbus/qdbusconnection.h --- a/src/dbus/qdbusconnection.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/dbus/qdbusconnection.h Mon Oct 04 01:19:32 2010 +0300 @@ -85,16 +85,19 @@ ExportScriptableSlots = 0x10, ExportScriptableSignals = 0x20, ExportScriptableProperties = 0x40, + ExportScriptableInvokables = 0x80, ExportScriptableContents = 0xf0, ExportNonScriptableSlots = 0x100, ExportNonScriptableSignals = 0x200, ExportNonScriptableProperties = 0x400, + ExportNonScriptableInvokables = 0x800, ExportNonScriptableContents = 0xf00, ExportAllSlots = ExportScriptableSlots|ExportNonScriptableSlots, ExportAllSignals = ExportScriptableSignals|ExportNonScriptableSignals, ExportAllProperties = ExportScriptableProperties|ExportNonScriptableProperties, + ExportAllInvokables = ExportScriptableInvokables|ExportNonScriptableInvokables, ExportAllContents = ExportScriptableContents|ExportNonScriptableContents, #ifndef Q_QDOC diff -r ef0373b55136 -r 758a864f9613 src/dbus/qdbusintegrator.cpp --- a/src/dbus/qdbusintegrator.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/dbus/qdbusintegrator.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -618,7 +618,7 @@ continue; // check type: - if (mm.methodType() != QMetaMethod::Slot) + if (mm.methodType() != QMetaMethod::Slot && mm.methodType() != QMetaMethod::Method) continue; // check name: @@ -682,10 +682,17 @@ if (isAsync && metaTypes.count() > i + 1) continue; - if (isScriptable && (flags & QDBusConnection::ExportScriptableSlots) == 0) - continue; // not exported - if (!isScriptable && (flags & QDBusConnection::ExportNonScriptableSlots) == 0) - continue; // not exported + if (mm.methodType() == QMetaMethod::Slot) { + if (isScriptable && (flags & QDBusConnection::ExportScriptableSlots) == 0) + continue; // scriptable slots not exported + if (!isScriptable && (flags & QDBusConnection::ExportNonScriptableSlots) == 0) + continue; // non-scriptable slots not exported + } else { + if (isScriptable && (flags & QDBusConnection::ExportScriptableInvokables) == 0) + continue; // scriptable invokables not exported + if (!isScriptable && (flags & QDBusConnection::ExportNonScriptableInvokables) == 0) + continue; // non-scriptable invokables not exported + } // if we got here, this slot matched return idx; @@ -707,6 +714,9 @@ if (metaTypes[n] == QDBusMetaTypeId::message) --n; + if (msg.arguments().count() < n) + return 0; // too few arguments + // check that types match for (int i = 0; i < n; ++i) if (metaTypes.at(i + 1) != msg.arguments().at(i).userType() && @@ -1379,7 +1389,8 @@ return; // internal filters have already run or an error has been sent // try the object itself: - if (node.flags & (QDBusConnection::ExportScriptableSlots|QDBusConnection::ExportNonScriptableSlots)) { + if (node.flags & (QDBusConnection::ExportScriptableSlots|QDBusConnection::ExportNonScriptableSlots) || + node.flags & (QDBusConnection::ExportScriptableInvokables|QDBusConnection::ExportNonScriptableInvokables)) { bool interfaceFound = true; if (!msg.interface().isEmpty()) interfaceFound = qDBusInterfaceInObject(node.obj, msg.interface()); diff -r ef0373b55136 -r 758a864f9613 src/dbus/qdbusinterface.cpp --- a/src/dbus/qdbusinterface.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/dbus/qdbusinterface.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -277,7 +277,7 @@ // signal relay from D-Bus world to Qt world QMetaObject::activate(q, metaObject, id, argv); - } else if (mm.methodType() == QMetaMethod::Slot) { + } else if (mm.methodType() == QMetaMethod::Slot || mm.methodType() == QMetaMethod::Method) { // method call relay from Qt world to D-Bus world // get D-Bus equivalent signature QString methodName = QLatin1String(metaObject->dbusNameForMethod(id)); diff -r ef0373b55136 -r 758a864f9613 src/dbus/qdbusserver.cpp --- a/src/dbus/qdbusserver.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/dbus/qdbusserver.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -100,7 +100,7 @@ } /*! - Returns the address this server is assosiated with. + Returns the address this server is associated with. */ QString QDBusServer::address() const { diff -r ef0373b55136 -r 758a864f9613 src/dbus/qdbusxmlgenerator.cpp --- a/src/dbus/qdbusxmlgenerator.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/dbus/qdbusxmlgenerator.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -133,7 +133,7 @@ if (mm.methodType() == QMetaMethod::Signal) // adding a signal isSignal = true; - else if (mm.methodType() == QMetaMethod::Slot && mm.access() == QMetaMethod::Public) + else if (mm.access() == QMetaMethod::Public && (mm.methodType() == QMetaMethod::Slot || mm.methodType() == QMetaMethod::Method)) isSignal = false; else continue; // neither signal nor public slot @@ -141,9 +141,9 @@ if (isSignal && !(flags & (QDBusConnection::ExportScriptableSignals | QDBusConnection::ExportNonScriptableSignals))) continue; // we're not exporting any signals - if (!isSignal && !(flags & (QDBusConnection::ExportScriptableSlots | - QDBusConnection::ExportNonScriptableSlots))) - continue; // we're not exporting any slots + if (!isSignal && (!(flags & (QDBusConnection::ExportScriptableSlots | QDBusConnection::ExportNonScriptableSlots)) && + !(flags & (QDBusConnection::ExportScriptableInvokables | QDBusConnection::ExportNonScriptableInvokables)))) + continue; // we're not exporting any slots or invokables QString xml = QString::fromLatin1(" <%1 name=\"%2\">\n") .arg(isSignal ? QLatin1String("signal") : QLatin1String("method")) diff -r ef0373b55136 -r 758a864f9613 src/declarative/debugger/qdeclarativedebug.cpp --- a/src/declarative/debugger/qdeclarativedebug.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/debugger/qdeclarativedebug.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -340,6 +340,8 @@ if (!watch) return; emit watch->valueChanged(name, value); + } else if (type == "OBJECT_CREATED") { + emit q_func()->newObjects(); } } @@ -507,7 +509,7 @@ QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId() - << false; + << false << true; d->client->sendMessage(message); } else { query->m_state = QDeclarativeDebugQuery::Error; @@ -530,7 +532,7 @@ QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId() - << true; + << true << true; d->client->sendMessage(message); } else { query->m_state = QDeclarativeDebugQuery::Error; diff -r ef0373b55136 -r 758a864f9613 src/declarative/debugger/qdeclarativedebug_p.h --- a/src/declarative/debugger/qdeclarativedebug_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/debugger/qdeclarativedebug_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -99,6 +99,9 @@ bool resetBindingForObject(int objectDebugId, const QString &propertyName); bool setMethodBody(int objectDebugId, const QString &methodName, const QString &methodBody); +Q_SIGNALS: + void newObjects(); + private: Q_DECLARE_PRIVATE(QDeclarativeEngineDebug) }; diff -r ef0373b55136 -r 758a864f9613 src/declarative/debugger/qdeclarativedebugservice.cpp --- a/src/declarative/debugger/qdeclarativedebugservice.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/debugger/qdeclarativedebugservice.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -128,6 +128,8 @@ if (d->connection) { qWarning("QDeclarativeDebugServer error: another client is already connected"); + QTcpSocket *faultyConnection = d->tcpServer->nextPendingConnection(); + delete faultyConnection; return; } diff -r ef0373b55136 -r 758a864f9613 src/declarative/debugger/qpacketprotocol.cpp --- a/src/declarative/debugger/qpacketprotocol.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/debugger/qpacketprotocol.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -125,7 +125,7 @@ QObject::connect(this, SIGNAL(invalidPacket()), parent, SIGNAL(invalidPacket())); QObject::connect(dev, SIGNAL(readyRead()), - this, SLOT(readyToRead())); + this, SLOT(readyToRead()), Qt::QueuedConnection); QObject::connect(dev, SIGNAL(aboutToClose()), this, SLOT(aboutToClose())); QObject::connect(dev, SIGNAL(bytesWritten(qint64)), @@ -422,7 +422,7 @@ /*! Creates a copy of \a other. The initial stream positions are shared, but the - two packets are otherwise independant. + two packets are otherwise independent. */ QPacket::QPacket(const QPacket & other) : QDataStream(), b(other.b), buf(0) diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeanchors.cpp --- a/src/declarative/graphicsitems/qdeclarativeanchors.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeanchors.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -148,15 +148,6 @@ return ret; } -/*! - \internal - \class QDeclarativeAnchors - \since 4.7 - \brief The QDeclarativeAnchors class provides a way to lay out items relative to other items. - - \warning Currently, only anchoring to siblings or parent is supported. -*/ - QDeclarativeAnchors::QDeclarativeAnchors(QObject *parent) : QObject(*new QDeclarativeAnchorsPrivate(0), parent) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -54,15 +54,11 @@ QT_BEGIN_NAMESPACE /*! - \class QDeclarativeAnimatedImage - \internal -*/ - -/*! \qmlclass AnimatedImage QDeclarativeAnimatedImage \inherits Image \since 4.7 - + \ingroup basic-visual-elements + The AnimatedImage element provides for playing animations stored as images containing a series of frames, such as GIF files. diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeborderimage.cpp --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -56,6 +56,7 @@ \brief The BorderImage element provides an image that can be used as a border. \inherits Item \since 4.7 + \ingroup qm-basic-visual-elements A BorderImage breaks an image into 9 sections, as shown below: @@ -78,12 +79,6 @@ rectangular item. */ -/*! - \class QDeclarativeBorderImage BorderImage - \internal - \brief The QDeclarativeBorderImage class provides an image item that you can add to a QDeclarativeView. -*/ - QDeclarativeBorderImage::QDeclarativeBorderImage(QDeclarativeItem *parent) : QDeclarativeImageBase(*(new QDeclarativeBorderImagePrivate), parent) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeevents.cpp --- a/src/declarative/graphicsitems/qdeclarativeevents.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -45,6 +45,8 @@ /*! \qmlclass KeyEvent QDeclarativeKeyEvent \since 4.7 + \ingroup qml-event-elements + \brief The KeyEvent object provides information about a key event. For example, the following changes the Item's state property when the Enter @@ -58,11 +60,6 @@ */ /*! - \internal - \class QDeclarativeKeyEvent -*/ - -/*! \qmlproperty int KeyEvent::key This property holds the code of the key that was pressed or released. @@ -115,6 +112,8 @@ /*! \qmlclass MouseEvent QDeclarativeMouseEvent \since 4.7 + \ingroup qml-event-elements + \brief The MouseEvent object provides information about a mouse event. The position of the mouse can be found via the x and y properties. diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeflickable.cpp --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -54,7 +54,7 @@ static const int FlickThreshold = 20; // Really slow flicks can be annoying. -static const int minimumFlickVelocity = 200; +static const int MinimumFlickVelocity = 75; QDeclarativeFlickableVisibleArea::QDeclarativeFlickableVisibleArea(QDeclarativeFlickable *parent) : QObject(parent), flickable(parent), m_xPosition(0.), m_widthRatio(0.) @@ -345,6 +345,8 @@ /*! \qmlclass Flickable QDeclarativeFlickable \since 4.7 + \ingroup qml-basic-interaction-elements + \brief The Flickable item provides a surface that can be "flicked". \inherits Item @@ -651,6 +653,8 @@ timeline.clear(); hData.velocity = 0; vData.velocity = 0; + hData.dragStartOffset = 0; + vData.dragStartOffset = 0; lastPos = QPoint(); QDeclarativeItemPrivate::start(lastPosTime); pressPos = event->pos(); @@ -673,7 +677,9 @@ if (q->yflick()) { int dy = int(event->pos().y() - pressPos.y()); if (qAbs(dy) > QApplication::startDragDistance() || QDeclarativeItemPrivate::elapsed(pressTime) > 200) { - qreal newY = dy + vData.pressPos; + if (!vMoved) + vData.dragStartOffset = dy; + qreal newY = dy + vData.pressPos - vData.dragStartOffset; const qreal minY = q->minYExtent(); const qreal maxY = q->maxYExtent(); if (newY > minY) @@ -681,12 +687,15 @@ if (newY < maxY && maxY - minY <= 0) newY = maxY + (newY - maxY) / 2; if (boundsBehavior == QDeclarativeFlickable::StopAtBounds && (newY > minY || newY < maxY)) { - if (newY > minY) + rejectY = true; + if (newY < maxY) { + newY = maxY; + rejectY = false; + } + if (newY > minY) { newY = minY; - else if (newY < maxY) - newY = maxY; - else - rejectY = true; + rejectY = false; + } } if (!rejectY && stealMouse) { vData.move.setValue(qRound(newY)); @@ -700,7 +709,9 @@ if (q->xflick()) { int dx = int(event->pos().x() - pressPos.x()); if (qAbs(dx) > QApplication::startDragDistance() || QDeclarativeItemPrivate::elapsed(pressTime) > 200) { - qreal newX = dx + hData.pressPos; + if (!hMoved) + hData.dragStartOffset = dx; + qreal newX = dx + hData.pressPos - hData.dragStartOffset; const qreal minX = q->minXExtent(); const qreal maxX = q->maxXExtent(); if (newX > minX) @@ -708,12 +719,15 @@ if (newX < maxX && maxX - minX <= 0) newX = maxX + (newX - maxX) / 2; if (boundsBehavior == QDeclarativeFlickable::StopAtBounds && (newX > minX || newX < maxX)) { - if (newX > minX) + rejectX = true; + if (newX < maxX) { + newX = maxX; + rejectX = false; + } + if (newX > minX) { newX = minX; - else if (newX < maxX) - newX = maxX; - else - rejectX = true; + rejectX = false; + } } if (!rejectX && stealMouse) { hData.move.setValue(qRound(newX)); @@ -771,23 +785,15 @@ } vTime = timeline.time(); - if (qAbs(vData.velocity) > 10 && qAbs(event->pos().y() - pressPos.y()) > FlickThreshold) { - qreal velocity = vData.velocity; - if (qAbs(velocity) < minimumFlickVelocity) // Minimum velocity to avoid annoyingly slow flicks. - velocity = velocity < 0 ? -minimumFlickVelocity : minimumFlickVelocity; - flickY(velocity); - } else { + if (qAbs(vData.velocity) > MinimumFlickVelocity && qAbs(event->pos().y() - pressPos.y()) > FlickThreshold) + flickY(vData.velocity); + else fixupY(); - } - if (qAbs(hData.velocity) > 10 && qAbs(event->pos().x() - pressPos.x()) > FlickThreshold) { - qreal velocity = hData.velocity; - if (qAbs(velocity) < minimumFlickVelocity) // Minimum velocity to avoid annoyingly slow flicks. - velocity = velocity < 0 ? -minimumFlickVelocity : minimumFlickVelocity; - flickX(velocity); - } else { + if (qAbs(hData.velocity) > MinimumFlickVelocity && qAbs(event->pos().x() - pressPos.x()) > FlickThreshold) + flickX(hData.velocity); + else fixupX(); - } lastPosTime.invalidate(); @@ -995,12 +1001,16 @@ bool changed = false; if (newGeometry.width() != oldGeometry.width()) { + if (xflick()) + changed = true; if (d->hData.viewSize < 0) { d->contentItem->setWidth(width()); emit contentWidthChanged(); } } if (newGeometry.height() != oldGeometry.height()) { + if (yflick()) + changed = true; if (d->vData.viewSize < 0) { d->contentItem->setHeight(height()); emit contentHeightChanged(); @@ -1021,7 +1031,7 @@ void QDeclarativeFlickablePrivate::data_append(QDeclarativeListProperty *prop, QObject *o) { - QDeclarativeItem *i = qobject_cast(o); + QGraphicsObject *i = qobject_cast(o); if (i) i->setParentItem(static_cast(prop->data)->contentItem); else @@ -1248,6 +1258,7 @@ if (mouseEvent.type() == QEvent::GraphicsSceneMouseRelease) { d->clearDelayedPress(); d->stealMouse = false; + d->pressed = false; } return false; } @@ -1426,21 +1437,23 @@ if (!d->flickingHorizontally) emit flickEnded(); } - if (d->movingHorizontally) { - d->movingHorizontally = false; - d->hMoved = false; - emit movingChanged(); - emit movingHorizontallyChanged(); - if (!d->movingVertically) - emit movementEnded(); - } - if (d->movingVertically) { - d->movingVertically = false; - d->vMoved = false; - emit movingChanged(); - emit movingVerticallyChanged(); - if (!d->movingHorizontally) - emit movementEnded(); + if (!d->pressed && !d->stealMouse) { + if (d->movingHorizontally) { + d->movingHorizontally = false; + d->hMoved = false; + emit movingChanged(); + emit movingHorizontallyChanged(); + if (!d->movingVertically) + emit movementEnded(); + } + if (d->movingVertically) { + d->movingVertically = false; + d->vMoved = false; + emit movingChanged(); + emit movingVerticallyChanged(); + if (!d->movingHorizontally) + emit movementEnded(); + } } d->hData.smoothVelocity.setValue(0); d->vData.smoothVelocity.setValue(0); diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeflickable_p_p.h --- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -96,6 +96,7 @@ QDeclarativeTimeLineValueProxy move; qreal viewSize; qreal pressPos; + qreal dragStartOffset; qreal velocity; qreal flickTarget; QDeclarativeFlickablePrivate::Velocity smoothVelocity; diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeflipable.cpp --- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -70,6 +70,8 @@ /*! \qmlclass Flipable QDeclarativeFlipable \since 4.7 + \ingroup qml-basic-interaction-elements + \brief The Flipable item provides a surface that can be flipped. \inherits Item @@ -83,23 +85,20 @@ \image flipable.gif - The \l Rotation element is used to specify the angle and axis of the flip, - and the \l State defines the changes in angle which produce the flipping - effect. Finally, the \l Transition creates the animation that changes the - angle over one second. + The \l Rotation element is used to specify the angle and axis of the flip. + When \c flipped is \c true, the item changes to the "back" state, where + the angle is changed to 180 degrees to produce the flipping effect. + Finally, the \l Transition creates the animation that changes the + angle over one second: when the item changes between its "back" and + default states, the NumberAnimation animates the angle between + its old and new values. + + See the \l {QML States} and \l {QML Animation} documentation for more + details on state changes and how animations work within transitions. \sa {declarative/ui-components/flipable}{Flipable example} */ -/*! - \internal - \class QDeclarativeFlipable - \brief The Flipable item provides a surface that can be flipped. - - Flipable is an item that can be visibly "flipped" between its front and - back sides. -*/ - QDeclarativeFlipable::QDeclarativeFlipable(QDeclarativeItem *parent) : QDeclarativeItem(*(new QDeclarativeFlipablePrivate), parent) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativefocuspanel.cpp --- a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -51,6 +51,8 @@ /*! \qmlclass FocusPanel QDeclarativeFocusPanel \since 4.7 + \ingroup qml-basic-interaction-elements + \brief The FocusPanel item explicitly creates a focus panel. \inherits Item @@ -59,11 +61,6 @@ \l {qmlfocus}{keyboard focus documentation}. */ -/*! - \internal - \class QDeclarativeFocusPanel -*/ - QDeclarativeFocusPanel::QDeclarativeFocusPanel(QDeclarativeItem *parent) : QDeclarativeItem(parent) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativefocusscope.cpp --- a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -48,6 +48,8 @@ /*! \qmlclass FocusScope QDeclarativeFocusScope \since 4.7 + \ingroup qml-basic-interaction-elements + \brief The FocusScope object explicitly creates a focus scope. \inherits Item @@ -58,11 +60,6 @@ \sa {declarative/keyinteraction/focus}{Keyboard focus example} */ -/*! - \internal - \class QDeclarativeFocusScope -*/ - QDeclarativeFocusScope::QDeclarativeFocusScope(QDeclarativeItem *parent) : QDeclarativeItem(parent) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp --- a/src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -68,7 +68,6 @@ delete d->_anchors; d->_anchors = 0; } -/*! \internal */ QDeclarativeAnchors *QDeclarativeGraphicsWidget::anchors() { Q_D(QDeclarativeGraphicsWidget); @@ -85,54 +84,36 @@ return _anchorLines; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::left() const { Q_D(const QDeclarativeGraphicsWidget); return d->anchorLines()->left; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::right() const { Q_D(const QDeclarativeGraphicsWidget); return d->anchorLines()->right; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::horizontalCenter() const { Q_D(const QDeclarativeGraphicsWidget); return d->anchorLines()->hCenter; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::top() const { Q_D(const QDeclarativeGraphicsWidget); return d->anchorLines()->top; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::bottom() const { Q_D(const QDeclarativeGraphicsWidget); return d->anchorLines()->bottom; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::verticalCenter() const { Q_D(const QDeclarativeGraphicsWidget); diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativegridview.cpp --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -64,7 +64,7 @@ FxGridItem(QDeclarativeItem *i, QDeclarativeGridView *v) : item(i), view(v) { attached = static_cast(qmlAttachedPropertiesObject(item)); if (attached) - attached->m_view = view; + attached->setView(view); } ~FxGridItem() {} @@ -1056,6 +1056,8 @@ /*! \qmlclass GridView QDeclarativeGridView \since 4.7 + \ingroup qml-view-elements + \inherits Flickable \brief The GridView item provides a grid view of items provided by a model. @@ -1085,13 +1087,15 @@ \c portrait data directly. An improved grid view is shown below. The delegate is visually improved and is moved - into a separate \c contactDelegate component. Also, the currently selected item is highlighted - with a blue \l Rectangle using the \l highlight property, and \c focus is set to \c true - to enable keyboard navigation for the grid view. + into a separate \c contactDelegate component. \snippet doc/src/snippets/declarative/gridview/gridview.qml classdocs advanced \image gridview-highlight.png + The currently selected item is highlighted with a blue \l Rectangle using the \l highlight property, + and \c focus is set to \c true to enable keyboard navigation for the grid view. + The grid view itself is a focus scope (see \l{qmlfocus#Acquiring Focus and Focus Scopes}{the focus documentation page} for more details). + Delegates are instantiated as needed and may be destroyed at any time. State should \e never be stored in a delegate. @@ -1276,6 +1280,11 @@ if (QDeclarativeVisualDataModel *dataModel = qobject_cast(d->model)) { dataModel->setDelegate(delegate); if (isComponentComplete()) { + for (int i = 0; i < d->visibleItems.count(); ++i) + d->releaseItem(d->visibleItems.at(i)); + d->visibleItems.clear(); + d->releaseItem(d->currentItem); + d->currentItem = 0; refill(); d->moveReason = QDeclarativeGridViewPrivate::SetIndex; d->updateCurrent(d->currentIndex); @@ -2203,7 +2212,7 @@ if (trackedPos < d->startPosition() + d->highlightRangeStart) { pos = d->startPosition(); } else if (d->trackedItem->endRowPos() > d->endPosition() - d->size() + d->highlightRangeEnd) { - pos = d->endPosition() - d->size(); + pos = d->endPosition() - d->size() + 1; if (pos < d->startPosition()) pos = d->startPosition(); } else { @@ -2217,14 +2226,14 @@ } else { if (trackedPos < viewPos && d->currentItem->rowPos() < viewPos) { pos = d->currentItem->rowPos() < trackedPos ? trackedPos : d->currentItem->rowPos(); - } else if (d->trackedItem->endRowPos() > viewPos + d->size() - && d->currentItem->endRowPos() > viewPos + d->size()) { - if (d->trackedItem->endRowPos() < d->currentItem->endRowPos()) { - pos = d->trackedItem->endRowPos() - d->size(); + } else if (d->trackedItem->endRowPos() >= viewPos + d->size() + && d->currentItem->endRowPos() >= viewPos + d->size()) { + if (d->trackedItem->endRowPos() <= d->currentItem->endRowPos()) { + pos = d->trackedItem->endRowPos() - d->size() + 1; if (d->rowSize() > d->size()) pos = trackedPos; } else { - pos = d->currentItem->endRowPos() - d->size(); + pos = d->currentItem->endRowPos() - d->size() + 1; if (d->rowSize() > d->size()) pos = d->currentItem->rowPos(); } diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativegridview_p.h --- a/src/declarative/graphicsitems/qdeclarativegridview_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -43,6 +43,7 @@ #define QDECLARATIVEGRIDVIEW_H #include "private/qdeclarativeflickable_p.h" +#include "private/qdeclarativeguard_p.h" QT_BEGIN_HEADER @@ -220,8 +221,14 @@ : QObject(parent), m_view(0), m_isCurrent(false), m_delayRemove(false) {} ~QDeclarativeGridViewAttached() {} - Q_PROPERTY(QDeclarativeGridView *view READ view CONSTANT) + Q_PROPERTY(QDeclarativeGridView *view READ view NOTIFY viewChanged) QDeclarativeGridView *view() { return m_view; } + void setView(QDeclarativeGridView *view) { + if (view != m_view) { + m_view = view; + emit viewChanged(); + } + } Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY currentItemChanged) bool isCurrentItem() const { return m_isCurrent; } @@ -249,9 +256,10 @@ void delayRemoveChanged(); void add(); void remove(); + void viewChanged(); public: - QDeclarativeGridView *m_view; + QDeclarativeGuard m_view; bool m_isCurrent : 1; bool m_delayRemove : 1; }; diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeimage.cpp --- a/src/declarative/graphicsitems/qdeclarativeimage.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -51,6 +51,8 @@ /*! \qmlclass Image QDeclarativeImage \since 4.7 + \ingroup qml-vasic-visual-elements + \brief The Image element allows you to add bitmaps to a scene. \inherits Item @@ -89,19 +91,6 @@ \sa {declarative/imageelements/image}{Image example}, QDeclarativeImageProvider */ -/*! - \internal - \class QDeclarativeImage Image - \brief The QDeclarativeImage class provides an image item that you can add to a QDeclarativeView. - - Example: - \qml - Image { source: "pics/star.png" } - \endqml - - A QDeclarativeImage object can be instantiated in QML using the tag \l Image. -*/ - QDeclarativeImage::QDeclarativeImage(QDeclarativeItem *parent) : QDeclarativeImageBase(*(new QDeclarativeImagePrivate), parent) { @@ -329,7 +318,7 @@ Unlike the \l {Item::}{width} and \l {Item::}{height} properties, which scale the painting of the image, this property sets the actual number of pixels stored for the loaded image so that large images do not use more - memory than necessary. For example, this ensures the image is memory is no + memory than necessary. For example, this ensures the image in memory is no larger than 1024x1024 pixels, regardless of the Image's \l {Item::}{width} and \l {Item::}{height} values: diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeimagebase.cpp --- a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -50,13 +50,6 @@ QT_BEGIN_NAMESPACE - -/*! - \class QDeclarativeImageBase - \internal - \brief The base class for declarative images. - */ - QDeclarativeImageBase::QDeclarativeImageBase(QDeclarativeImageBasePrivate &dd, QDeclarativeItem *parent) : QDeclarativeItem(dd, parent) { @@ -150,7 +143,9 @@ pixmapChange(); update(); } else { + d->status = Loading; + emit statusChanged(d->status); d->pix.load(qmlEngine(this), d->url, d->sourcesize, d->async); @@ -169,53 +164,35 @@ d->pix.connectDownloadProgress(this, thisRequestProgress); } else { - QSize impsize = d->pix.implicitSize(); - setImplicitWidth(impsize.width()); - setImplicitHeight(impsize.height()); - - if (d->pix.isReady()) { - d->status = Ready; - - if (!d->sourcesize.isValid()) - emit sourceSizeChanged(); - - } else { - d->status = Error; - qmlInfo(this) << d->pix.error(); - } - d->progress = 1.0; - emit statusChanged(d->status); - emit progressChanged(d->progress); - pixmapChange(); - update(); + requestFinished(); } - } - - emit statusChanged(d->status); } void QDeclarativeImageBase::requestFinished() { Q_D(QDeclarativeImageBase); - QSize impsize = d->pix.implicitSize(); - if (d->pix.isError()) { d->status = Error; qmlInfo(this) << d->pix.error(); + } else { + d->status = Ready; } - setImplicitWidth(impsize.width()); - setImplicitHeight(impsize.height()); + d->progress = 1.0; + + setImplicitWidth(d->pix.width()); + setImplicitHeight(d->pix.height()); - if (d->status == Loading) - d->status = Ready; - d->progress = 1.0; + if (d->sourcesize.width() != d->pix.width() || d->sourcesize.height() != d->pix.height()) { + d->sourcesize.setWidth(d->pix.width()); + d->sourcesize.setHeight(d->pix.height()); + emit sourceSizeChanged(); + } + emit statusChanged(d->status); - emit progressChanged(1.0); - if (!d->sourcesize.isValid()) - emit sourceSizeChanged(); + emit progressChanged(d->progress); pixmapChange(); update(); } diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeitem.cpp --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -69,6 +69,7 @@ /*! \qmlclass Transform QGraphicsTransform + \ingroup qml-transform-elements \since 4.7 \brief The Transform elements provide a way of building advanced transformations on Items. @@ -90,6 +91,7 @@ /*! \qmlclass Translate QDeclarativeTranslate + \ingroup qml-transform-elements \since 4.7 \brief The Translate object provides a way to move an Item without changing its x or y properties. @@ -131,6 +133,7 @@ /*! \qmlclass Scale QGraphicsScale + \ingroup qml-transform-elements \since 4.7 \brief The Scale element provides a way to scale an Item. @@ -172,6 +175,7 @@ /*! \qmlclass Rotation QGraphicsRotation + \ingroup qml-transform-elements \since 4.7 \brief The Rotation object provides a way to rotate an Item. @@ -225,12 +229,6 @@ The angle to rotate, in degrees clockwise. */ -/*! - \internal - \class QDeclarativeContents - \brief The QDeclarativeContents class gives access to the height and width of an item's contents. - -*/ QDeclarativeContents::QDeclarativeContents(QDeclarativeItem *item) : m_item(item), m_x(0), m_y(0), m_width(0), m_height(0) { //### optimize @@ -419,11 +417,12 @@ /*! \qmlclass KeyNavigation QDeclarativeKeyNavigationAttached + \ingroup qml-basic-interaction-elements \since 4.7 \brief The KeyNavigation attached property supports key navigation by arrow keys. It is common in key-based UIs to use arrow keys to navigate - between focussed items. The KeyNavigation property provides a + between focused items. The KeyNavigation property provides a convenient way of specifying which item will gain focus when an arrow key is pressed. The following example provides key navigation for a 2x2 grid of items. @@ -511,8 +510,10 @@ void QDeclarativeKeyNavigationAttached::setLeft(QDeclarativeItem *i) { Q_D(QDeclarativeKeyNavigationAttached); + if (d->left == i) + return; d->left = i; - emit changed(); + emit leftChanged(); } QDeclarativeItem *QDeclarativeKeyNavigationAttached::right() const @@ -524,8 +525,10 @@ void QDeclarativeKeyNavigationAttached::setRight(QDeclarativeItem *i) { Q_D(QDeclarativeKeyNavigationAttached); + if (d->right == i) + return; d->right = i; - emit changed(); + emit rightChanged(); } QDeclarativeItem *QDeclarativeKeyNavigationAttached::up() const @@ -537,8 +540,10 @@ void QDeclarativeKeyNavigationAttached::setUp(QDeclarativeItem *i) { Q_D(QDeclarativeKeyNavigationAttached); + if (d->up == i) + return; d->up = i; - emit changed(); + emit upChanged(); } QDeclarativeItem *QDeclarativeKeyNavigationAttached::down() const @@ -550,8 +555,10 @@ void QDeclarativeKeyNavigationAttached::setDown(QDeclarativeItem *i) { Q_D(QDeclarativeKeyNavigationAttached); + if (d->down == i) + return; d->down = i; - emit changed(); + emit downChanged(); } QDeclarativeItem *QDeclarativeKeyNavigationAttached::tab() const @@ -563,8 +570,10 @@ void QDeclarativeKeyNavigationAttached::setTab(QDeclarativeItem *i) { Q_D(QDeclarativeKeyNavigationAttached); + if (d->tab == i) + return; d->tab = i; - emit changed(); + emit tabChanged(); } QDeclarativeItem *QDeclarativeKeyNavigationAttached::backtab() const @@ -576,8 +585,10 @@ void QDeclarativeKeyNavigationAttached::setBacktab(QDeclarativeItem *i) { Q_D(QDeclarativeKeyNavigationAttached); + if (d->backtab == i) + return; d->backtab = i; - emit changed(); + emit backtabChanged(); } /*! @@ -713,6 +724,7 @@ /*! \qmlclass Keys QDeclarativeKeysAttached + \ingroup qml-basic-interaction-elements \since 4.7 \brief The Keys attached property provides key handling to Items. @@ -1298,6 +1310,7 @@ /*! \qmlclass Item QDeclarativeItem + \ingroup qml-basic-visual-elements \since 4.7 \brief The Item is the most basic of all visual items in QML. @@ -1420,11 +1433,6 @@ */ /*! - \fn void QDeclarativeItem::childrenChanged() - \internal -*/ - -/*! \fn void QDeclarativeItem::focusChanged(bool) \internal */ @@ -1714,7 +1722,6 @@ specify it. */ -/*! \internal */ QDeclarativeListProperty QDeclarativeItemPrivate::data() { return QDeclarativeListProperty(q_func(), 0, QDeclarativeItemPrivate::data_append); @@ -1876,6 +1883,12 @@ } } + for(int ii = 0; ii < d->changeListeners.count(); ++ii) { + const QDeclarativeItemPrivate::ChangeListener &change = d->changeListeners.at(ii); + if (change.types & QDeclarativeItemPrivate::Geometry) + change.listener->itemGeometryChanged(this, newGeometry, oldGeometry); + } + if (newGeometry.x() != oldGeometry.x()) emit xChanged(); if (newGeometry.width() != oldGeometry.width()) @@ -1884,12 +1897,6 @@ emit yChanged(); if (newGeometry.height() != oldGeometry.height()) emit heightChanged(); - - for(int ii = 0; ii < d->changeListeners.count(); ++ii) { - const QDeclarativeItemPrivate::ChangeListener &change = d->changeListeners.at(ii); - if (change.types & QDeclarativeItemPrivate::Geometry) - change.listener->itemGeometryChanged(this, newGeometry, oldGeometry); - } } void QDeclarativeItemPrivate::removeItemChangeListener(QDeclarativeItemChangeListener *listener, ChangeTypes types) @@ -2399,21 +2406,9 @@ Q_Q(QDeclarativeItem); if (!(flags & QGraphicsItem::ItemIsFocusScope) && parent) emit q->activeFocusChanged(flag); //see also QDeclarativeItemPrivate::subFocusItemChange() - - bool inScope = false; - QGraphicsItem *p = parent; - while (p) { - if (p->flags() & QGraphicsItem::ItemIsFocusScope) { - inScope = true; - break; - } - p = p->parentItem(); - } - if (!inScope) - emit q->focusChanged(flag); + emit q->focusChanged(flag); } -/*! \internal */ QDeclarativeListProperty QDeclarativeItemPrivate::resources() { return QDeclarativeListProperty(q_func(), 0, QDeclarativeItemPrivate::resources_append, @@ -2438,7 +2433,6 @@ \sa {qmlstate}{States} */ -/*! \internal */ QDeclarativeListProperty QDeclarativeItemPrivate::states() { return _states()->statesProperty(); @@ -2458,11 +2452,10 @@ } \endqml - \sa {state-transitions}{Transitions} + \sa {qdeclarativeanimation.html#transitions}{QML Transitions} */ -/*! \internal */ QDeclarativeListProperty QDeclarativeItemPrivate::transitions() { return _states()->transitionsProperty(); @@ -2482,7 +2475,7 @@ Item { filter: [ Blur { ... }, - Relection { ... } + Reflection { ... } ... ] } @@ -2504,7 +2497,9 @@ This property holds whether clipping is enabled. if clipping is enabled, an item will clip its own painting, as well - as the painting of its children, to its bounding rectangle. + as the painting of its children, to its bounding rectangle. If you set + clipping during an item's paint operation, remember to re-set it to + prevent clipping the rest of your scene. Non-rectangular clipping regions are not supported for performance reasons. */ @@ -2533,7 +2528,6 @@ \sa {qmlstates}{States} */ -/*! \internal */ QString QDeclarativeItemPrivate::state() const { if (!_stateGroup) @@ -2542,7 +2536,6 @@ return _stateGroup->state(); } -/*! \internal */ void QDeclarativeItemPrivate::setState(const QString &state) { _states()->setState(state); @@ -2728,12 +2721,12 @@ } break; case ItemChildAddedChange: - if (d->_contents) + if (d->_contents && d->componentComplete) d->_contents->childAdded(qobject_cast( value.value())); break; case ItemChildRemovedChange: - if (d->_contents) + if (d->_contents && d->componentComplete) d->_contents->childRemoved(qobject_cast( value.value())); break; @@ -2843,6 +2836,41 @@ } /*! + \property QDeclarativeItem::anchors + \internal +*/ + +/*! + \property QDeclarativeItem::left + \internal +*/ + +/*! + \property QDeclarativeItem::right + \internal +*/ + +/*! + \property QDeclarativeItem::horizontalCenter + \internal +*/ + +/*! + \property QDeclarativeItem::top + \internal +*/ + +/*! + \property QDeclarativeItem::bottom + \internal +*/ + +/*! + \property QDeclarativeItem::verticalCenter + \internal +*/ + +/*! \property QDeclarativeItem::focus \internal */ @@ -2863,6 +2891,41 @@ */ /*! + \property QDeclarativeItem::baseline + \internal +*/ + +/*! + \property QDeclarativeItem::data + \internal +*/ + +/*! + \property QDeclarativeItem::resources + \internal +*/ + +/*! + \property QDeclarativeItem::state + \internal +*/ + +/*! + \property QDeclarativeItem::states + \internal +*/ + +/*! + \property QDeclarativeItem::transformOriginPoint + \internal +*/ + +/*! + \property QDeclarativeItem::transitions + \internal +*/ + +/*! \internal Return the width of the item */ @@ -3130,8 +3193,7 @@ { Q_D(const QDeclarativeItem); return focusItem() == this || - (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0) || - (!parentItem() && focusItem() != 0); + (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0); } /*! @@ -3151,10 +3213,8 @@ } \endqml - For the purposes of this property, the top level item in the scene - is assumed to act like a focus scope, and to always have active focus - when the scene has focus. On a practical level, that means the following - QML will give active focus to \c input on startup. + For the purposes of this property, the scene as a whole is assumed to act like a focus scope. + On a practical level, that means the following QML will give active focus to \c input on startup. \qml Rectangle { @@ -3180,7 +3240,7 @@ p = p->parentItem(); } - return hasActiveFocus() ? true : (!QGraphicsItem::parentItem() ? true : false); + return hasActiveFocus(); } /*! \internal */ diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeitem_p.h --- a/src/declarative/graphicsitems/qdeclarativeitem_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -363,12 +363,12 @@ Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeKeyNavigationAttached) - Q_PROPERTY(QDeclarativeItem *left READ left WRITE setLeft NOTIFY changed) - Q_PROPERTY(QDeclarativeItem *right READ right WRITE setRight NOTIFY changed) - Q_PROPERTY(QDeclarativeItem *up READ up WRITE setUp NOTIFY changed) - Q_PROPERTY(QDeclarativeItem *down READ down WRITE setDown NOTIFY changed) - Q_PROPERTY(QDeclarativeItem *tab READ tab WRITE setTab NOTIFY changed) - Q_PROPERTY(QDeclarativeItem *backtab READ backtab WRITE setBacktab NOTIFY changed) + Q_PROPERTY(QDeclarativeItem *left READ left WRITE setLeft NOTIFY leftChanged) + Q_PROPERTY(QDeclarativeItem *right READ right WRITE setRight NOTIFY rightChanged) + Q_PROPERTY(QDeclarativeItem *up READ up WRITE setUp NOTIFY upChanged) + Q_PROPERTY(QDeclarativeItem *down READ down WRITE setDown NOTIFY downChanged) + Q_PROPERTY(QDeclarativeItem *tab READ tab WRITE setTab NOTIFY tabChanged) + Q_PROPERTY(QDeclarativeItem *backtab READ backtab WRITE setBacktab NOTIFY backtabChanged) Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged) Q_ENUMS(Priority) @@ -396,7 +396,12 @@ static QDeclarativeKeyNavigationAttached *qmlAttachedProperties(QObject *); Q_SIGNALS: - void changed(); + void leftChanged(); + void rightChanged(); + void upChanged(); + void downChanged(); + void tabChanged(); + void backtabChanged(); void priorityChanged(); private: diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp --- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -142,7 +142,9 @@ qmlRegisterType("Qt",4,7,"Scale"); qmlRegisterType("Qt",4,7,"Text"); qmlRegisterType("Qt",4,7,"TextEdit"); +#ifndef QT_NO_LINEEDIT qmlRegisterType("Qt",4,7,"TextInput"); +#endif qmlRegisterType("Qt",4,7,"ViewSection"); qmlRegisterType("Qt",4,7,"VisualDataModel"); qmlRegisterType("Qt",4,7,"VisualItemModel"); diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativelayoutitem.cpp --- a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -49,6 +49,7 @@ /*! \qmlclass LayoutItem QDeclarativeLayoutItem + \ingroup qml-utility-elements \since 4.7 \brief The LayoutItem element allows declarative UI elements to be placed inside Qt's Graphics View layouts. @@ -65,13 +66,6 @@ */ /*! - \internal - \class QDeclarativeLayoutItem - \brief The QDeclarativeLayoutItem class allows you to place your QML UI elements inside Qt's Graphics View layouts. -*/ - - -/*! \qmlproperty QSizeF LayoutItem::maximumSize The maximumSize property can be set to specify the maximum desired size of this LayoutItem diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativelistview.cpp --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -60,7 +60,7 @@ { if (property != m_property) { m_property = property; - emit changed(); + emit propertyChanged(); } } @@ -68,7 +68,7 @@ { if (criteria != m_criteria) { m_criteria = criteria; - emit changed(); + emit criteriaChanged(); } } @@ -96,7 +96,7 @@ FxListItem(QDeclarativeItem *i, QDeclarativeListView *v) : item(i), section(0), view(v) { attached = static_cast(qmlAttachedPropertiesObject(item)); if (attached) - attached->m_view = view; + attached->setView(view); } ~FxListItem() {} qreal position() const { @@ -105,12 +105,23 @@ else return (view->orientation() == QDeclarativeListView::Vertical ? item->y() : item->x()); } + qreal itemPosition() const { + return (view->orientation() == QDeclarativeListView::Vertical ? item->y() : item->x()); + } qreal size() const { if (section) - return (view->orientation() == QDeclarativeListView::Vertical ? item->height()+section->height() : item->width()+section->height()); + return (view->orientation() == QDeclarativeListView::Vertical ? item->height()+section->height() : item->width()+section->width()); else return (view->orientation() == QDeclarativeListView::Vertical ? item->height() : item->width()); } + qreal itemSize() const { + return (view->orientation() == QDeclarativeListView::Vertical ? item->height() : item->width()); + } + qreal sectionSize() const { + if (section) + return (view->orientation() == QDeclarativeListView::Vertical ? section->height() : section->width()); + return 0.0; + } qreal endPosition() const { return (view->orientation() == QDeclarativeListView::Vertical ? item->y() + (item->height() > 0 ? item->height() : 1) @@ -131,6 +142,12 @@ item->setX(pos); } } + void setSize(qreal size) { + if (view->orientation() == QDeclarativeListView::Vertical) + item->setHeight(size); + else + item->setWidth(size); + } bool contains(int x, int y) const { return (x >= item->x() && x < item->x() + item->width() && y >= item->y() && y < item->y() + item->height()); @@ -256,7 +273,12 @@ if (!visibleItems.isEmpty()) { if (modelIndex < visibleIndex) { int count = visibleIndex - modelIndex; - return (*visibleItems.constBegin())->position() - count * (averageSize + spacing); + qreal cs = 0; + if (modelIndex == currentIndex && currentItem) { + cs = currentItem->size() + spacing; + --count; + } + return (*visibleItems.constBegin())->position() - count * (averageSize + spacing) - cs; } else { int idx = visibleItems.count() - 1; while (idx >= 0 && visibleItems.at(idx)->index == -1) @@ -575,9 +597,11 @@ listItem->attached->m_prevSection = item->attached->section(); else listItem->attached->m_prevSection = sectionAt(modelIndex-1); + } + if (modelIndex < model->count()-1) { if (FxListItem *item = visibleItem(modelIndex+1)) listItem->attached->m_nextSection = item->attached->section(); - else if (modelIndex < model->count()-1) + else listItem->attached->m_nextSection = sectionAt(modelIndex+1); } } @@ -714,6 +738,11 @@ if (visibleItems.count()) visiblePos = (*visibleItems.constBegin())->position(); updateAverage(); + if (currentIndex >= 0 && currentItem && !visibleItem(currentIndex)) { + currentItem->setPosition(positionAt(currentIndex)); + updateHighlight(); + } + if (sectionCriteria) updateCurrentSection(); if (header) @@ -883,8 +912,8 @@ createHighlight(); if (currentItem && autoHighlight && highlight && !movingHorizontally && !movingVertically) { // auto-update highlight - highlightPosAnimator->to = currentItem->position(); - highlightSizeAnimator->to = currentItem->size(); + highlightPosAnimator->to = currentItem->itemPosition(); + highlightSizeAnimator->to = currentItem->itemSize(); if (orient == QDeclarativeListView::Vertical) { if (highlight->item->width() == 0) highlight->item->setWidth(currentItem->item->width()); @@ -981,11 +1010,11 @@ void QDeclarativeListViewPrivate::updateCurrentSection() { if (!sectionCriteria || visibleItems.isEmpty()) { - currentSection = QString(); + currentSection.clear(); return; } int index = 0; - while (visibleItems.at(index)->endPosition() < position() && index < visibleItems.count()) + while (index < visibleItems.count() && visibleItems.at(index)->endPosition() < position()) ++index; if (index < visibleItems.count()) @@ -1019,7 +1048,7 @@ if (oldCurrentItem && (!currentItem || oldCurrentItem->item != currentItem->item)) oldCurrentItem->attached->setIsCurrentItem(false); if (currentItem) { - if (modelIndex == visibleIndex - 1) { + if (modelIndex == visibleIndex - 1 && visibleItems.count()) { // We can calculate exact postion in this case currentItem->setPosition(visibleItems.first()->position() - currentItem->size() - spacing); } else { @@ -1170,9 +1199,9 @@ } if (currentItem && haveHighlightRange && highlightRange == QDeclarativeListView::StrictlyEnforceRange) { updateHighlight(); - qreal currPos = currentItem->position(); - if (pos < currPos + currentItem->size() - highlightRangeEnd) - pos = currPos + currentItem->size() - highlightRangeEnd; + qreal currPos = currentItem->itemPosition(); + if (pos < currPos + currentItem->itemSize() - highlightRangeEnd) + pos = currPos + currentItem->itemSize() - highlightRangeEnd; if (pos > currPos - highlightRangeStart) pos = currPos - highlightRangeStart; } @@ -1189,10 +1218,10 @@ } else if (haveHighlightRange && highlightRange == QDeclarativeListView::StrictlyEnforceRange) { if (currentItem) { updateHighlight(); - qreal pos = currentItem->position(); + qreal pos = currentItem->itemPosition(); qreal viewPos = position(); - if (viewPos < pos + currentItem->size() - highlightRangeEnd) - viewPos = pos + currentItem->size() - highlightRangeEnd; + if (viewPos < pos + currentItem->itemSize() - highlightRangeEnd) + viewPos = pos + currentItem->itemSize() - highlightRangeEnd; if (viewPos > pos - highlightRangeStart) viewPos = pos - highlightRangeStart; @@ -1355,6 +1384,7 @@ /*! \qmlclass ListView QDeclarativeListView + \ingroup qml-view-elements \since 4.7 \inherits Flickable \brief The ListView item provides a list view of items provided by a model. @@ -1385,14 +1415,16 @@ the delegate is able to access the model's \c name and \c number data directly. An improved list view is shown below. The delegate is visually improved and is moved - into a separate \c contactDelegate component. Also, the currently selected item is highlighted - with a blue \l Rectangle using the \l highlight property, and \c focus is set to \c true - to enable keyboard navigation for the list view. + into a separate \c contactDelegate component. \snippet doc/src/snippets/declarative/listview/listview.qml classdocs advanced \image listview-highlight.png - In a GridView, delegates are instantiated as needed and may be destroyed at any time. + The currently selected item is highlighted with a blue \l Rectangle using the \l highlight property, + and \c focus is set to \c true to enable keyboard navigation for the list view. + The list view itself is a focus scope (see \l{qmlfocus#Acquiring Focus and Focus Scopes}{the focus documentation page} for more details). + + Delegates are instantiated as needed and may be destroyed at any time. State should \e never be stored in a delegate. \note Views do not enable \e clip automatically. If the view @@ -1616,6 +1648,8 @@ for (int i = 0; i < d->visibleItems.count(); ++i) d->releaseItem(d->visibleItems.at(i)); d->visibleItems.clear(); + d->releaseItem(d->currentItem); + d->currentItem = 0; refill(); d->moveReason = QDeclarativeListViewPrivate::SetIndex; d->updateCurrent(d->currentIndex); @@ -2335,6 +2369,10 @@ d->minExtent += d->header->size(); if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) { d->minExtent += d->highlightRangeStart; + if (d->sectionCriteria) { + if (d->visibleItem(0)) + d->minExtent -= d->visibleItem(0)->sectionSize(); + } d->minExtent = qMax(d->minExtent, -(d->endPositionAt(0) - d->highlightRangeEnd + 1)); } d->minExtentDirty = false; @@ -2447,6 +2485,16 @@ QDeclarativeFlickable::keyPressEvent(event); } +void QDeclarativeListView::geometryChanged(const QRectF &newGeometry, + const QRectF &oldGeometry) +{ + Q_D(QDeclarativeListView); + d->maxExtentDirty = true; + d->minExtentDirty = true; + QDeclarativeFlickable::geometryChanged(newGeometry, oldGeometry); +} + + /*! \qmlmethod ListView::incrementCurrentIndex() @@ -2572,6 +2620,11 @@ d->moveReason = QDeclarativeListViewPrivate::Other; cancelFlick(); d->setPosition(pos); + if (d->highlight) { + d->highlight->setPosition(d->currentItem->itemPosition()); + d->highlight->setSize(d->currentItem->itemSize()); + d->updateHighlight(); + } } d->fixupPosition(); } @@ -2632,7 +2685,12 @@ if (!d->trackedItem || !d->currentItem) return; if (d->moveReason == QDeclarativeListViewPrivate::SetIndex) { - const qreal trackedPos = qCeil(d->trackedItem->position()); + qreal trackedPos = qCeil(d->trackedItem->position()); + qreal trackedSize = d->trackedItem->size(); + if (d->trackedItem != d->currentItem) { + trackedPos -= d->currentItem->sectionSize(); + trackedSize += d->currentItem->sectionSize(); + } const qreal viewPos = d->position(); qreal pos = viewPos; if (d->haveHighlightRange) { @@ -2645,28 +2703,28 @@ if (trackedPos < d->startPosition() + d->highlightRangeStart) { pos = d->startPosition(); } else if (d->trackedItem->endPosition() > d->endPosition() - d->size() + d->highlightRangeEnd) { - pos = d->endPosition() - d->size(); + pos = d->endPosition() - d->size() + 1; if (pos < d->startPosition()) pos = d->startPosition(); } else { if (trackedPos < viewPos + d->highlightRangeStart) { pos = trackedPos - d->highlightRangeStart; - } else if (trackedPos > viewPos + d->highlightRangeEnd - d->trackedItem->size()) { - pos = trackedPos - d->highlightRangeEnd + d->trackedItem->size(); + } else if (trackedPos > viewPos + d->highlightRangeEnd - trackedSize) { + pos = trackedPos - d->highlightRangeEnd + trackedSize; } } } } else { if (trackedPos < viewPos && d->currentItem->position() < viewPos) { pos = d->currentItem->position() < trackedPos ? trackedPos : d->currentItem->position(); - } else if (d->trackedItem->endPosition() > viewPos + d->size() - && d->currentItem->endPosition() > viewPos + d->size()) { - if (d->trackedItem->endPosition() < d->currentItem->endPosition()) { - pos = d->trackedItem->endPosition() - d->size(); - if (d->trackedItem->size() > d->size()) + } else if (d->trackedItem->endPosition() >= viewPos + d->size() + && d->currentItem->endPosition() >= viewPos + d->size()) { + if (d->trackedItem->endPosition() <= d->currentItem->endPosition()) { + pos = d->trackedItem->endPosition() - d->size() + 1; + if (trackedSize > d->size()) pos = trackedPos; } else { - pos = d->currentItem->endPosition() - d->size(); + pos = d->currentItem->endPosition() - d->size() + 1; if (d->currentItem->size() > d->size()) pos = d->currentItem->position(); } @@ -2899,14 +2957,18 @@ } if (removedVisible && d->visibleItems.isEmpty()) { - d->visibleIndex = 0; - d->visiblePos = d->header ? d->header->size() : 0; d->timeline.clear(); - d->setPosition(0); if (d->itemCount == 0) { + d->visibleIndex = 0; + d->visiblePos = d->header ? d->header->size() : 0; + d->setPosition(0); d->updateHeader(); d->updateFooter(); update(); + } else { + if (modelIndex < d->visibleIndex) + d->visibleIndex = modelIndex+1; + d->visibleIndex = qMax(qMin(d->visibleIndex, d->itemCount-1), 0); } } diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativelistview_p.h --- a/src/declarative/graphicsitems/qdeclarativelistview_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -43,6 +43,7 @@ #define QDECLARATIVELISTVIEW_H #include "private/qdeclarativeflickable_p.h" +#include "private/qdeclarativeguard_p.h" QT_BEGIN_HEADER @@ -53,8 +54,8 @@ class Q_AUTOTEST_EXPORT QDeclarativeViewSection : public QObject { Q_OBJECT - Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY changed) - Q_PROPERTY(SectionCriteria criteria READ criteria WRITE setCriteria NOTIFY changed) + Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged) + Q_PROPERTY(SectionCriteria criteria READ criteria WRITE setCriteria NOTIFY criteriaChanged) Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) Q_ENUMS(SectionCriteria) public: @@ -73,7 +74,8 @@ QString sectionString(const QString &value); Q_SIGNALS: - void changed(); + void propertyChanged(); + void criteriaChanged(); void delegateChanged(); private: @@ -244,6 +246,7 @@ virtual qreal minXExtent() const; virtual qreal maxXExtent() const; virtual void keyPressEvent(QKeyEvent *); + virtual void geometryChanged(const QRectF &newGeometry,const QRectF &oldGeometry); virtual void componentComplete(); private Q_SLOTS: @@ -267,8 +270,14 @@ : QObject(parent), m_view(0), m_isCurrent(false), m_delayRemove(false) {} ~QDeclarativeListViewAttached() {} - Q_PROPERTY(QDeclarativeListView *view READ view CONSTANT) + Q_PROPERTY(QDeclarativeListView *view READ view NOTIFY viewChanged) QDeclarativeListView *view() { return m_view; } + void setView(QDeclarativeListView *view) { + if (view != m_view) { + m_view = view; + emit viewChanged(); + } + } Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY currentItemChanged) bool isCurrentItem() const { return m_isCurrent; } @@ -326,9 +335,10 @@ void delayRemoveChanged(); void add(); void remove(); + void viewChanged(); public: - QDeclarativeListView *m_view; + QDeclarativeGuard m_view; mutable QString m_section; QString m_prevSection; QString m_nextSection; diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativeloader.cpp --- a/src/declarative/graphicsitems/qdeclarativeloader.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -108,68 +108,87 @@ /*! \qmlclass Loader QDeclarativeLoader + \ingroup qml-utility-elements \since 4.7 \inherits Item \brief The Loader item allows dynamically loading an Item-based subtree from a URL or Component. - The Loader element instantiates an item from a component. The component to - be instantiated may be specified directly by the \l sourceComponent - property, or loaded from a URL via the \l source property. + Loader is used to dynamically load visual QML components. It can load a + QML file (using the \l source property) or a \l Component object (using + the \l sourceComponent property). It is useful for delaying the creation + of a component until it is required: for example, when a component should + be created on demand, or when a component should not be created + unnecessarily for performance reasons. - Loader can be used to delay the creation of a component until it - is required. For example, this loads "Page1.qml" as a component - into the Loader element, when the \l MouseArea is clicked: + Here is a Loader that loads "Page1.qml" as a component when the + \l MouseArea is clicked: + + \snippet doc/src/snippets/declarative/loader/simple.qml 0 + + The loaded item can be accessed using the \l item property. - \code - import Qt 4.7 + Loader is like any other visual item and must be positioned and sized + accordingly to become visible. Once the component is loaded, the Loader + is automatically resized to the size of the component. - Item { - width: 200; height: 200 + If the \l source or \l sourceComponent changes, any previously instantiated + items are destroyed. Setting \l source to an empty string or setting + \l sourceComponent to \c undefined destroys the currently loaded item, + freeing resources and leaving the Loader empty. + - MouseArea { - anchors.fill: parent - onClicked: pageLoader.source = "Page1.qml" - } + \section2 Receiving signals from loaded items + + Any signals emitted from the loaded item can be received using the + \l Connections element. For example, the following \c application.qml + loads \c MyItem.qml, and is able to receive the \c message signal from + the loaded item through a \l Connections object: - Loader { id: pageLoader } - } - \endcode + \table + \row + \o application.qml + \o MyItem.qml + \row + \o \snippet doc/src/snippets/declarative/loader/connections.qml 0 + \o \snippet doc/src/snippets/declarative/loader/MyItem.qml 0 + \endtable - Note that Loader is like any other graphical Item and needs to be positioned - and sized accordingly to become visible. When a component is loaded, the - Loader is automatically resized to the size of the component. + Alternatively, since \c MyItem.qml is loaded within the scope of the + Loader, it could also directly call any function defined in the Loader or + its parent \l Item. + + + \section2 Focus and key events - If the Loader source is changed, any previous items instantiated - will be destroyed. Setting \l source to an empty string, or setting - sourceComponent to \e undefined - will destroy the currently instantiated items, freeing resources - and leaving the Loader empty. For example: + Loader is a focus scope. Its \l {Item::}{focus} property must be set to + \c true for any of its children to get the \e {active focus}. (See + \l{qmlfocus#Acquiring Focus and Focus Scopes}{the focus documentation page} + for more details.) Any key events received in the loaded item should likely + also be \l {KeyEvent::}{accepted} so they are not propagated to the Loader. + + For example, the following \c application.qml loads \c KeyReader.qml when + the \l MouseArea is clicked. Notice the \l {Item::}{focus} property is + set to \c true for the Loader as well as the \l Item in the dynamically + loaded object: - \code - pageLoader.source = "" - \endcode - - or + \table + \row + \o application.qml + \o KeyReader.qml + \row + \o \snippet doc/src/snippets/declarative/loader/focus.qml 0 + \o \snippet doc/src/snippets/declarative/loader/KeyReader.qml 0 + \endtable - \code - pageLoader.sourceComponent = undefined - \endcode - - unloads "Page1.qml" and frees resources consumed by it. + Once \c KeyReader.qml is loaded, it accepts key events and sets + \c event.accepted to \c true so that the event is not propagated to the + parent \l Rectangle. \sa {dynamic-object-creation}{Dynamic Object Creation} */ -/*! - \internal - \class QDeclarativeLoader - */ - -/*! - Create a new QDeclarativeLoader instance. - */ QDeclarativeLoader::QDeclarativeLoader(QDeclarativeItem *parent) : QDeclarativeItem(*(new QDeclarativeLoaderPrivate), parent) { @@ -177,9 +196,6 @@ d->flags |= QGraphicsItem::ItemIsFocusScope; } -/*! - Destroy the loader instance. - */ QDeclarativeLoader::~QDeclarativeLoader() { Q_D(QDeclarativeLoader); @@ -194,8 +210,13 @@ /*! \qmlproperty url Loader::source - This property holds the URL of the QML component to - instantiate. + This property holds the URL of the QML component to instantiate. + + Note the QML component must be an \l Item-based component. Loader cannot + load non-visual components. + + To unload the currently loaded item, set this property to an empty string, + or set \l sourceComponent to \c undefined. \sa sourceComponent, status, progress */ @@ -254,7 +275,8 @@ } \endqml - Note this value must hold a \l Component object; it cannot be a \l Item. + To unload the currently loaded item, set this property to an empty string, + or set \l sourceComponent to \c undefined. \sa source, progress */ @@ -473,7 +495,7 @@ /*! \qmlproperty Item Loader::item - This property holds the top-level item created from source. + This property holds the top-level item that is currently loaded. */ QGraphicsObject *QDeclarativeLoader::item() const { diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativemousearea.cpp --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -180,6 +180,7 @@ /*! \qmlclass MouseArea QDeclarativeMouseArea + \ingroup qml-basic-interaction-elements \since 4.7 \brief The MouseArea item enables simple mouse handling. \inherits Item @@ -316,16 +317,6 @@ \l Flickable, \c onCanceled should be used in addition to onReleased. */ -/*! - \internal - \class QDeclarativeMouseArea - \brief The QDeclarativeMouseArea class provides a simple mouse handling abstraction for use within QML. - - All QDeclarativeItem derived classes can do mouse handling but the QDeclarativeMouseArea class exposes mouse - handling data as properties and tracks flicking and dragging of the mouse. - - A QDeclarativeMouseArea object can be instantiated in QML using the tag \l MouseArea. - */ QDeclarativeMouseArea::QDeclarativeMouseArea(QDeclarativeItem *parent) : QDeclarativeItem(*(new QDeclarativeMouseAreaPrivate), parent) { @@ -689,7 +680,6 @@ d->lastPos = mapFromScene(d->lastScenePos); } -/*! \internal */ QVariant QDeclarativeMouseArea::itemChange(GraphicsItemChange change, const QVariant &value) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativepath.cpp --- a/src/declarative/graphicsitems/qdeclarativepath.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativepath.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -51,6 +51,7 @@ /*! \qmlclass PathElement QDeclarativePathElement + \ingroup qml-view-elements \since 4.7 \brief PathElement is the base path type. @@ -61,12 +62,8 @@ */ /*! - \internal - \class QDeclarativePathElement -*/ - -/*! \qmlclass Path QDeclarativePath + \ingroup qml-view-elements \since 4.7 \brief A Path object defines a path for use by \l PathView. @@ -81,13 +78,6 @@ \sa PathView, PathAttribute, PathPercent, PathLine, PathQuad, PathCubic */ - -/*! - \internal - \class QDeclarativePath - \brief The QDeclarativePath class defines a path. - \sa QDeclarativePathView -*/ QDeclarativePath::QDeclarativePath(QObject *parent) : QObject(*(new QDeclarativePathPrivate), parent) { @@ -474,6 +464,7 @@ { if (_x != x) { _x = x; + emit xChanged(); emit changed(); } } @@ -487,6 +478,7 @@ { if (_y != y) { _y = y; + emit yChanged(); emit changed(); } } @@ -495,6 +487,7 @@ /*! \qmlclass PathAttribute QDeclarativePathAttribute + \ingroup qml-view-elements \since 4.7 \brief The PathAttribute allows setting an attribute at a given position in a Path. @@ -522,15 +515,6 @@ */ /*! - \internal - \class QDeclarativePathAttribute - \brief The QDeclarativePathAttribute class allows to set the value of an attribute at a given position in the path. - - \sa QDeclarativePath -*/ - - -/*! \qmlproperty string PathAttribute::name the name of the attribute to change. @@ -576,6 +560,7 @@ { if (_value != value) { _value = value; + emit valueChanged(); emit changed(); } } @@ -584,6 +569,7 @@ /*! \qmlclass PathLine QDeclarativePathLine + \ingroup qml-view-elements \since 4.7 \brief The PathLine defines a straight line. @@ -601,14 +587,6 @@ */ /*! - \internal - \class QDeclarativePathLine - \brief The QDeclarativePathLine class defines a straight line. - - \sa QDeclarativePath -*/ - -/*! \qmlproperty real PathLine::x \qmlproperty real PathLine::y @@ -624,6 +602,7 @@ /*! \qmlclass PathQuad QDeclarativePathQuad + \ingroup qml-view-elements \since 4.7 \brief The PathQuad defines a quadratic Bezier curve with a control point. @@ -644,15 +623,6 @@ */ /*! - \internal - \class QDeclarativePathQuad - \brief The QDeclarativePathQuad class defines a quadratic Bezier curve with a control point. - - \sa QDeclarativePath -*/ - - -/*! \qmlproperty real PathQuad::x \qmlproperty real PathQuad::y @@ -678,6 +648,7 @@ { if (_controlX != x) { _controlX = x; + emit controlXChanged(); emit changed(); } } @@ -695,6 +666,7 @@ { if (_controlY != y) { _controlY = y; + emit controlYChanged(); emit changed(); } } @@ -708,6 +680,7 @@ /*! \qmlclass PathCubic QDeclarativePathCubic + \ingroup qml-view-elements \since 4.7 \brief The PathCubic defines a cubic Bezier curve with two control points. @@ -732,14 +705,6 @@ */ /*! - \internal - \class QDeclarativePathCubic - \brief The QDeclarativePathCubic class defines a cubic Bezier curve with two control points. - - \sa QDeclarativePath -*/ - -/*! \qmlproperty real PathCubic::x \qmlproperty real PathCubic::y @@ -761,6 +726,7 @@ { if (_control1X != x) { _control1X = x; + emit control1XChanged(); emit changed(); } } @@ -774,6 +740,7 @@ { if (_control1Y != y) { _control1Y = y; + emit control1YChanged(); emit changed(); } } @@ -793,6 +760,7 @@ { if (_control2X != x) { _control2X = x; + emit control2XChanged(); emit changed(); } } @@ -806,6 +774,7 @@ { if (_control2Y != y) { _control2Y = y; + emit control2YChanged(); emit changed(); } } @@ -819,6 +788,7 @@ /*! \qmlclass PathPercent QDeclarativePathPercent + \ingroup qml-view-elements \since 4.7 \brief The PathPercent manipulates the way a path is interpreted. @@ -856,18 +826,6 @@ \sa Path */ -/*! - \internal - \class QDeclarativePathPercent - \brief The QDeclarativePathPercent class manipulates the way a path is interpreted. - - QDeclarativePathPercent allows you to bunch up items (or spread out items) along various - segments of a QDeclarativePathView's path. - - \sa QDeclarativePath - -*/ - qreal QDeclarativePathPercent::value() const { return _value; @@ -877,6 +835,7 @@ { if (_value != value) { _value = value; + emit valueChanged(); emit changed(); } } diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativepath_p.h --- a/src/declarative/graphicsitems/qdeclarativepath_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativepath_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -68,7 +68,7 @@ Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) - Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY changed) + Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged) public: QDeclarativePathAttribute(QObject *parent=0) : QDeclarativePathElement(parent), _value(0) {} @@ -81,6 +81,7 @@ Q_SIGNALS: void nameChanged(); + void valueChanged(); private: QString _name; @@ -91,8 +92,8 @@ { Q_OBJECT - Q_PROPERTY(qreal x READ x WRITE setX NOTIFY changed) - Q_PROPERTY(qreal y READ y WRITE setY NOTIFY changed) + Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged) + Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged) public: QDeclarativeCurve(QObject *parent=0) : QDeclarativePathElement(parent), _x(0), _y(0) {} @@ -104,6 +105,10 @@ virtual void addToPath(QPainterPath &) {} +Q_SIGNALS: + void xChanged(); + void yChanged(); + private: qreal _x; qreal _y; @@ -122,8 +127,8 @@ { Q_OBJECT - Q_PROPERTY(qreal controlX READ controlX WRITE setControlX NOTIFY changed) - Q_PROPERTY(qreal controlY READ controlY WRITE setControlY NOTIFY changed) + Q_PROPERTY(qreal controlX READ controlX WRITE setControlX NOTIFY controlXChanged) + Q_PROPERTY(qreal controlY READ controlY WRITE setControlY NOTIFY controlYChanged) public: QDeclarativePathQuad(QObject *parent=0) : QDeclarativeCurve(parent), _controlX(0), _controlY(0) {} @@ -135,6 +140,10 @@ void addToPath(QPainterPath &path); +Q_SIGNALS: + void controlXChanged(); + void controlYChanged(); + private: qreal _controlX; qreal _controlY; @@ -144,10 +153,10 @@ { Q_OBJECT - Q_PROPERTY(qreal control1X READ control1X WRITE setControl1X NOTIFY changed) - Q_PROPERTY(qreal control1Y READ control1Y WRITE setControl1Y NOTIFY changed) - Q_PROPERTY(qreal control2X READ control2X WRITE setControl2X NOTIFY changed) - Q_PROPERTY(qreal control2Y READ control2Y WRITE setControl2Y NOTIFY changed) + Q_PROPERTY(qreal control1X READ control1X WRITE setControl1X NOTIFY control1XChanged) + Q_PROPERTY(qreal control1Y READ control1Y WRITE setControl1Y NOTIFY control1YChanged) + Q_PROPERTY(qreal control2X READ control2X WRITE setControl2X NOTIFY control2XChanged) + Q_PROPERTY(qreal control2Y READ control2Y WRITE setControl2Y NOTIFY control2YChanged) public: QDeclarativePathCubic(QObject *parent=0) : QDeclarativeCurve(parent), _control1X(0), _control1Y(0), _control2X(0), _control2Y(0) {} @@ -165,23 +174,32 @@ void addToPath(QPainterPath &path); +Q_SIGNALS: + void control1XChanged(); + void control1YChanged(); + void control2XChanged(); + void control2YChanged(); + private: - int _control1X; - int _control1Y; - int _control2X; - int _control2Y; + qreal _control1X; + qreal _control1Y; + qreal _control2X; + qreal _control2Y; }; class Q_AUTOTEST_EXPORT QDeclarativePathPercent : public QDeclarativePathElement { Q_OBJECT - Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY changed) + Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged) public: QDeclarativePathPercent(QObject *parent=0) : QDeclarativePathElement(parent) {} qreal value() const; void setValue(qreal value); +signals: + void valueChanged(); + private: qreal _value; }; diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativepathview.cpp --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -67,7 +67,7 @@ static QDeclarativeOpenMetaObjectType *qPathViewAttachedType = 0; QDeclarativePathViewAttached::QDeclarativePathViewAttached(QObject *parent) -: QObject(parent), m_view(0), m_onPath(false), m_isCurrent(false) +: QObject(parent), m_percent(-1), m_view(0), m_onPath(false), m_isCurrent(false) { if (qPathViewAttachedType) { m_metaobject = new QDeclarativeOpenMetaObject(this, qPathViewAttachedType); @@ -90,6 +90,26 @@ m_metaobject->setValue(name, val); } + +void QDeclarativePathViewPrivate::init() +{ + Q_Q(QDeclarativePathView); + offset = 0; + q->setAcceptedMouseButtons(Qt::LeftButton); + q->setFlag(QGraphicsItem::ItemIsFocusScope); + q->setFiltersChildEvents(true); + q->connect(&tl, SIGNAL(updated()), q, SLOT(ticked())); + lastPosTime.invalidate(); + static int timelineCompletedIdx = -1; + static int movementEndingIdx = -1; + if (timelineCompletedIdx == -1) { + timelineCompletedIdx = QDeclarativeTimeLine::staticMetaObject.indexOfSignal("completed()"); + movementEndingIdx = QDeclarativePathView::staticMetaObject.indexOfSlot("movementEnding()"); + } + QMetaObject::connect(&tl, timelineCompletedIdx, + q, movementEndingIdx, Qt::DirectConnection); +} + QDeclarativeItem *QDeclarativePathViewPrivate::getItem(int modelIndex) { Q_Q(QDeclarativePathView); @@ -144,8 +164,8 @@ void QDeclarativePathViewPrivate::updateMappedRange() { - if (model && pathItems != -1 && pathItems < model->count()) - mappedRange = qreal(pathItems)/model->count(); + if (model && pathItems != -1 && pathItems < modelCount) + mappedRange = qreal(pathItems)/modelCount; else mappedRange = 1.0; } @@ -154,13 +174,13 @@ { qreal pos = -1.0; - if (model && index >= 0 && index < model->count()) { + if (model && index >= 0 && index < modelCount) { qreal start = 0.0; if (haveHighlightRange && highlightRangeMode != QDeclarativePathView::NoHighlightRange) start = highlightRangeStart; qreal globalPos = index + offset; - globalPos = qmlMod(globalPos, qreal(model->count())) / model->count(); - if (pathItems != -1 && pathItems < model->count()) { + globalPos = qmlMod(globalPos, qreal(modelCount)) / modelCount; + if (pathItems != -1 && pathItems < modelCount) { globalPos += start * mappedRange; globalPos = qmlMod(globalPos, 1.0); if (globalPos < mappedRange) @@ -222,21 +242,22 @@ } else { qreal target = currentIndex; + offsetAdj = 0.0; tl.reset(moveHighlight); moveHighlight.setValue(highlightPosition); const int duration = highlightMoveDuration; - if (target - highlightPosition > model->count()/2) { + if (target - highlightPosition > modelCount/2) { highlightUp = false; - qreal distance = model->count() - target + highlightPosition; + qreal distance = modelCount - target + highlightPosition; tl.move(moveHighlight, 0.0, QEasingCurve(QEasingCurve::InQuad), int(duration * highlightPosition / distance)); - tl.set(moveHighlight, model->count()-0.01); - tl.move(moveHighlight, target, QEasingCurve(QEasingCurve::OutQuad), int(duration * (model->count()-target) / distance)); - } else if (target - highlightPosition <= -model->count()/2) { + tl.set(moveHighlight, modelCount-0.01); + tl.move(moveHighlight, target, QEasingCurve(QEasingCurve::OutQuad), int(duration * (modelCount-target) / distance)); + } else if (target - highlightPosition <= -modelCount/2) { highlightUp = true; - qreal distance = model->count() - highlightPosition + target; - tl.move(moveHighlight, model->count()-0.01, QEasingCurve(QEasingCurve::InQuad), int(duration * (model->count()-highlightPosition) / distance)); + qreal distance = modelCount - highlightPosition + target; + tl.move(moveHighlight, modelCount-0.01, QEasingCurve(QEasingCurve::InQuad), int(duration * (modelCount-highlightPosition) / distance)); tl.set(moveHighlight, 0.0); tl.move(moveHighlight, target, QEasingCurve(QEasingCurve::OutQuad), int(duration * target / distance)); } else { @@ -257,7 +278,7 @@ end = highlightRangeEnd; } - qreal range = qreal(model->count()); + qreal range = qreal(modelCount); // calc normalized position of highlight relative to offset qreal relativeHighlight = qmlMod(pos + offset, range) / range; @@ -280,6 +301,9 @@ void QDeclarativePathViewPrivate::updateItem(QDeclarativeItem *item, qreal percent) { if (QDeclarativePathViewAttached *att = attached(item)) { + if (qFuzzyCompare(att->m_percent, percent)) + return; + att->m_percent = percent; foreach(const QString &attr, path->attributes()) att->setValue(attr.toUtf8(), path->attributeAt(attr, percent)); } @@ -306,6 +330,7 @@ /*! \qmlclass PathView QDeclarativePathView + \ingroup qml-view-elements \since 4.7 \brief The PathView element lays out model-provided items on a path. \inherits Item @@ -314,7 +339,7 @@ and XmlListModel, or custom model classes defined in C++ that inherit from QAbstractListModel. - A ListView has a \l model, which defines the data to be displayed, and + The view has a \l model, which defines the data to be displayed, and a \l delegate, which defines how the data should be displayed. The \l delegate is instantiated for each item on the \l path. The items may be flicked to move them along the path. @@ -333,6 +358,9 @@ opacity of the items as they rotate. This additional code can be seen in the PathAttribute documentation.) + The \c focus can be set to \c true to enable keyboard navigation. + The path view itself is a focus scope (see \l{qmlfocus#Acquiring Focus and Focus Scopes}{the focus documentation page} for more details). + Delegates are instantiated as needed and may be destroyed at any time. State should \e never be stored in a delegate. @@ -341,7 +369,7 @@ to set \e {clip: true} in order to have the out of view items clipped nicely. - \sa Path + \sa Path, {declarative/modelviews/pathview}{PathView example} */ QDeclarativePathView::QDeclarativePathView(QDeclarativeItem *parent) @@ -403,7 +431,7 @@ The model provides a set of data that is used to create the items for the view. For large or dynamic datasets the model is usually provided by a C++ model object. - Models can also be created directly in XML, using the ListModel element. + Models can also be created directly in QML, using the ListModel element. \sa {qmlmodels}{Data Models} */ @@ -449,16 +477,19 @@ if (QDeclarativeVisualDataModel *dataModel = qobject_cast(d->model)) dataModel->setModel(model); } + d->modelCount = 0; if (d->model) { connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int))); connect(d->model, SIGNAL(itemsRemoved(int,int)), this, SLOT(itemsRemoved(int,int))); connect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int))); connect(d->model, SIGNAL(modelReset()), this, SLOT(modelReset())); connect(d->model, SIGNAL(createdItem(int, QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*))); - } - d->offset = qmlMod(d->offset, qreal(d->model->count())); - if (d->offset < 0) - d->offset = d->model->count() + d->offset; + d->modelCount = d->model->count(); + if (d->model->count()) + d->offset = qmlMod(d->offset, qreal(d->model->count())); + if (d->offset < 0) + d->offset = d->model->count() + d->offset; +} d->regenerate(); d->fixOffset(); emit countChanged(); @@ -472,7 +503,7 @@ int QDeclarativePathView::count() const { Q_D(const QDeclarativePathView); - return d->model ? d->model->count() : 0; + return d->model ? d->modelCount : 0; } /*! @@ -520,11 +551,11 @@ void QDeclarativePathView::setCurrentIndex(int idx) { Q_D(QDeclarativePathView); - if (d->model && d->model->count()) - idx = qAbs(idx % d->model->count()); + if (d->model && d->modelCount) + idx = qAbs(idx % d->modelCount); if (d->model && idx != d->currentIndex) { - if (d->model->count()) { - int itemIndex = (d->currentIndex - d->firstIndex + d->model->count()) % d->model->count(); + if (d->modelCount) { + int itemIndex = (d->currentIndex - d->firstIndex + d->modelCount) % d->modelCount; if (itemIndex < d->items.count()) { if (QDeclarativeItem *item = d->items.at(itemIndex)) { if (QDeclarativePathViewAttached *att = d->attached(item)) @@ -535,10 +566,10 @@ d->currentItem = 0; d->moveReason = QDeclarativePathViewPrivate::SetIndex; d->currentIndex = idx; - if (d->model->count()) { + if (d->modelCount) { if (d->haveHighlightRange && d->highlightRangeMode == QDeclarativePathView::StrictlyEnforceRange) d->snapToCurrent(); - int itemIndex = (idx - d->firstIndex + d->model->count()) % d->model->count(); + int itemIndex = (idx - d->firstIndex + d->modelCount) % d->modelCount; if (itemIndex < d->items.count()) { d->currentItem = d->items.at(itemIndex); d->currentItem->setFocus(true); @@ -575,10 +606,10 @@ void QDeclarativePathView::decrementCurrentIndex() { Q_D(QDeclarativePathView); - if (d->model && d->model->count()) { + if (d->model && d->modelCount) { int idx = currentIndex()-1; if (idx < 0) - idx = d->model->count() - 1; + idx = d->modelCount - 1; setCurrentIndex(idx); } } @@ -607,9 +638,9 @@ Q_Q(QDeclarativePathView); if (offset != o) { if (isValid() && q->isComponentComplete()) { - offset = qmlMod(o, qreal(model->count())); + offset = qmlMod(o, qreal(modelCount)); if (offset < 0) - offset += qreal(model->count()); + offset += qreal(modelCount); q->refill(); } else { offset = o; @@ -618,6 +649,11 @@ } } +void QDeclarativePathViewPrivate::setAdjustedOffset(qreal o) +{ + setOffset(o+offsetAdj); +} + /*! \qmlproperty Component PathView::highlight This property holds the component to use as the highlight. @@ -627,8 +663,8 @@ so as to stay with the current item. The below example demonstrates how to make a simple highlight. Note the use - of the PathView.onPath property to ensure that the highlight is hidden - when flicked off of the path. + of the \l{PathView::onPath}{PathView.onPath} attached property to ensure that + the highlight is hidden when flicked away from the path. \code Component { @@ -680,6 +716,8 @@ These properties set the preferred range of the highlight (current item) within the view. The preferred values must be in the range 0.0-1.0. + If highlightRangeMode is set to \e PathView.NoHighlightRange + If highlightRangeMode is set to \e PathView.ApplyRange the view will attempt to maintain the highlight within the range, however the highlight can move outside of the range at the ends of the path @@ -848,6 +886,61 @@ } /*! + \qmlproperty bool PathView::moving + + This property holds whether the view is currently moving + due to the user either dragging or flicking the view. +*/ +bool QDeclarativePathView::isMoving() const +{ + Q_D(const QDeclarativePathView); + return d->moving; +} + +/*! + \qmlproperty bool PathView::flicking + + This property holds whether the view is currently moving + due to the user flicking the view. +*/ +bool QDeclarativePathView::isFlicking() const +{ + Q_D(const QDeclarativePathView); + return d->flicking; +} + +/*! + \qmlsignal PathView::onMovementStarted() + + This handler is called when the view begins moving due to user + interaction. +*/ + +/*! + \qmlsignal PathView::onMovementEnded() + + This handler is called when the view stops moving due to user + interaction. If a flick was generated, this handler will + be triggered once the flick stops. If a flick was not + generated, the handler will be triggered when the + user stops dragging - i.e. a mouse or touch release. +*/ + +/*! + \qmlsignal PathView::onFlickStarted() + + This handler is called when the view is flicked. A flick + starts from the point that the mouse or touch is released, + while still in motion. +*/ + +/*! + \qmlsignal PathView::onFlickEnded() + + This handler is called when the view stops moving due to a flick. +*/ + +/*! \qmlproperty Component PathView::delegate The delegate provides a template defining each item instantiated by the view. @@ -964,7 +1057,11 @@ return; } - d->stealMouse = false; + if (d->tl.isActive() && d->flicking) + d->stealMouse = true; // If we've been flicked then steal the click. + else + d->stealMouse = false; + d->lastElapsed = 0; d->lastDist = 0; QDeclarativeItemPrivate::start(d->lastPosTime); @@ -979,7 +1076,7 @@ if (!d->stealMouse) { QPointF delta = event->pos() - d->startPoint; - if (qAbs(delta.x()) > QApplication::startDragDistance() && qAbs(delta.y()) > QApplication::startDragDistance()) + if (qAbs(delta.x()) > QApplication::startDragDistance() || qAbs(delta.y()) > QApplication::startDragDistance()) d->stealMouse = true; } @@ -987,19 +1084,24 @@ d->moveReason = QDeclarativePathViewPrivate::Mouse; qreal newPc; d->pointNear(event->pos(), &newPc); - qreal diff = (newPc - d->startPc)*d->model->count()*d->mappedRange; + qreal diff = (newPc - d->startPc)*d->modelCount*d->mappedRange; if (diff) { setOffset(d->offset + diff); - if (diff > d->model->count()/2) - diff -= d->model->count(); - else if (diff < -d->model->count()/2) - diff += d->model->count(); + if (diff > d->modelCount/2) + diff -= d->modelCount; + else if (diff < -d->modelCount/2) + diff += d->modelCount; d->lastElapsed = QDeclarativeItemPrivate::restart(d->lastPosTime); d->lastDist = diff; d->startPc = newPc; } + if (!d->moving) { + d->moving = true; + emit movingChanged(); + emit movementStarted(); + } } } @@ -1013,15 +1115,15 @@ qreal elapsed = qreal(d->lastElapsed + QDeclarativeItemPrivate::elapsed(d->lastPosTime)) / 1000.; qreal velocity = elapsed > 0. ? d->lastDist / elapsed : 0; - if (d->model && d->model->count() && qAbs(velocity) > 1.) { - qreal count = d->pathItems == -1 ? d->model->count() : d->pathItems; + if (d->model && d->modelCount && qAbs(velocity) > 1.) { + qreal count = d->pathItems == -1 ? d->modelCount : d->pathItems; if (qAbs(velocity) > count * 2) // limit velocity velocity = (velocity > 0 ? count : -count) * 2; // Calculate the distance to be travelled qreal v2 = velocity*velocity; qreal accel = d->deceleration/10; // + 0.25 to encourage moving at least one item in the flick direction - qreal dist = qMin(qreal(d->model->count()-1), qreal(v2 / (accel * 2.0) + 0.25)); + qreal dist = qMin(qreal(d->modelCount-1), qreal(v2 / (accel * 2.0) + 0.25)); if (d->haveHighlightRange && d->highlightRangeMode == QDeclarativePathView::StrictlyEnforceRange) { // round to nearest item. if (velocity > 0.) @@ -1036,15 +1138,23 @@ accel = v2 / (2.0f * qAbs(dist)); } } + d->offsetAdj = 0.0; d->moveOffset.setValue(d->offset); d->tl.accel(d->moveOffset, velocity, accel, dist); d->tl.callback(QDeclarativeTimeLineCallback(&d->moveOffset, d->fixOffsetCallback, d)); + if (!d->flicking) { + d->flicking = true; + emit flickingChanged(); + emit flickStarted(); + } } else { d->fixOffset(); } d->lastPosTime.invalidate(); ungrabMouse(); + if (!d->tl.isActive()) + movementEnding(); } bool QDeclarativePathView::sendMouseEvent(QGraphicsSceneMouseEvent *event) @@ -1164,79 +1274,81 @@ d->updateItem(item, 1.0); d->releaseItem(item); if (it == d->items.begin()) { - if (++d->firstIndex >= d->model->count()) + if (++d->firstIndex >= d->modelCount) d->firstIndex = 0; } it = d->items.erase(it); } ++idx; - if (idx >= d->model->count()) + if (idx >= d->modelCount) idx = 0; } - // add items to beginning and end - int count = d->pathItems == -1 ? d->model->count() : qMin(d->pathItems, d->model->count()); - if (d->items.count() < count) { - int idx = qRound(d->model->count() - d->offset) % d->model->count(); - qreal startPos = 0.0; - if (d->haveHighlightRange && d->highlightRangeMode != QDeclarativePathView::NoHighlightRange) - startPos = d->highlightRangeStart; - if (d->firstIndex >= 0) { - startPos = d->positionOfIndex(d->firstIndex); - idx = (d->firstIndex + d->items.count()) % d->model->count(); - } - qreal pos = d->positionOfIndex(idx); - while ((pos > startPos || !d->items.count()) && d->items.count() < count) { -// qDebug() << "append" << idx; - QDeclarativeItem *item = d->getItem(idx); - if (d->model->completePending()) - item->setZValue(idx+1); - if (d->currentIndex == idx) { - item->setFocus(true); - if (QDeclarativePathViewAttached *att = d->attached(item)) - att->setIsCurrentItem(true); - currentVisible = true; - d->currentItemOffset = pos; - d->currentItem = item; + if (d->modelCount) { + // add items to beginning and end + int count = d->pathItems == -1 ? d->modelCount : qMin(d->pathItems, d->modelCount); + if (d->items.count() < count) { + int idx = qRound(d->modelCount - d->offset) % d->modelCount; + qreal startPos = 0.0; + if (d->haveHighlightRange && d->highlightRangeMode != QDeclarativePathView::NoHighlightRange) + startPos = d->highlightRangeStart; + if (d->firstIndex >= 0) { + startPos = d->positionOfIndex(d->firstIndex); + idx = (d->firstIndex + d->items.count()) % d->modelCount; } - if (d->items.count() == 0) - d->firstIndex = idx; - d->items.append(item); - d->updateItem(item, pos); - if (d->model->completePending()) - d->model->completeItem(); - ++idx; - if (idx >= d->model->count()) - idx = 0; - pos = d->positionOfIndex(idx); - } + qreal pos = d->positionOfIndex(idx); + while ((pos > startPos || !d->items.count()) && d->items.count() < count) { + // qDebug() << "append" << idx; + QDeclarativeItem *item = d->getItem(idx); + if (d->model->completePending()) + item->setZValue(idx+1); + if (d->currentIndex == idx) { + item->setFocus(true); + if (QDeclarativePathViewAttached *att = d->attached(item)) + att->setIsCurrentItem(true); + currentVisible = true; + d->currentItemOffset = pos; + d->currentItem = item; + } + if (d->items.count() == 0) + d->firstIndex = idx; + d->items.append(item); + d->updateItem(item, pos); + if (d->model->completePending()) + d->model->completeItem(); + ++idx; + if (idx >= d->modelCount) + idx = 0; + pos = d->positionOfIndex(idx); + } - idx = d->firstIndex - 1; - if (idx < 0) - idx = d->model->count() - 1; - pos = d->positionOfIndex(idx); - while (pos >= 0.0 && pos < startPos) { -// qDebug() << "prepend" << idx; - QDeclarativeItem *item = d->getItem(idx); - if (d->model->completePending()) - item->setZValue(idx+1); - if (d->currentIndex == idx) { - item->setFocus(true); - if (QDeclarativePathViewAttached *att = d->attached(item)) - att->setIsCurrentItem(true); - currentVisible = true; - d->currentItemOffset = pos; - d->currentItem = item; - } - d->items.prepend(item); - d->updateItem(item, pos); - if (d->model->completePending()) - d->model->completeItem(); - d->firstIndex = idx; idx = d->firstIndex - 1; if (idx < 0) - idx = d->model->count() - 1; + idx = d->modelCount - 1; pos = d->positionOfIndex(idx); + while (pos >= 0.0 && pos < startPos) { + // qDebug() << "prepend" << idx; + QDeclarativeItem *item = d->getItem(idx); + if (d->model->completePending()) + item->setZValue(idx+1); + if (d->currentIndex == idx) { + item->setFocus(true); + if (QDeclarativePathViewAttached *att = d->attached(item)) + att->setIsCurrentItem(true); + currentVisible = true; + d->currentItemOffset = pos; + d->currentItem = item; + } + d->items.prepend(item); + d->updateItem(item, pos); + if (d->model->completePending()) + d->model->completeItem(); + d->firstIndex = idx; + idx = d->firstIndex - 1; + if (idx < 0) + idx = d->modelCount - 1; + pos = d->positionOfIndex(idx); + } } } @@ -1252,6 +1364,8 @@ if (QDeclarativePathViewAttached *att = d->attached(d->highlightItem)) att->setOnPath(currentVisible); } + while (d->itemCache.count()) + d->releaseItem(d->itemCache.takeLast()); } void QDeclarativePathView::itemsInserted(int modelIndex, int count) @@ -1261,16 +1375,25 @@ if (!d->isValid() || !isComponentComplete()) return; - QList removedItems = d->items; + d->itemCache += d->items; d->items.clear(); if (modelIndex <= d->currentIndex) { d->currentIndex += count; emit currentIndexChanged(); + } else if (d->offset != 0) { + d->offset += count; + d->offsetAdj += count; } - d->regenerate(); - while (removedItems.count()) - d->releaseItem(removedItems.takeLast()); - d->updateCurrent(); + + d->modelCount = d->model->count(); + if (d->flicking || d->moving) { + d->regenerate(); + d->updateCurrent(); + } else { + d->firstIndex = -1; + d->updateMappedRange(); + d->scheduleLayout(); + } emit countChanged(); } @@ -1278,7 +1401,7 @@ { //XXX support animated removal Q_D(QDeclarativePathView); - if (!d->isValid() || !isComponentComplete()) + if (!d->model || !d->modelCount || !d->model->isValid() || !d->path || !isComponentComplete()) return; // fix current @@ -1288,7 +1411,7 @@ currentChanged = true; } else if (d->currentIndex >= modelIndex && d->currentIndex < modelIndex + count) { // current item has been removed. - d->currentIndex = qMin(modelIndex, d->model->count()-1); + d->currentIndex = qMin(modelIndex, d->modelCount-1); if (d->currentItem) { if (QDeclarativePathViewAttached *att = d->attached(d->currentItem)) att->setIsCurrentItem(true); @@ -1296,15 +1419,21 @@ currentChanged = true; } - QList removedItems = d->items; + d->itemCache += d->items; d->items.clear(); - if (d->offset >= d->model->count()) - d->offset = d->model->count() - 1; + if (modelIndex > d->currentIndex) { + if (d->offset >= count) { + d->offset -= count; + d->offsetAdj -= count; + } + } + + d->modelCount = d->model->count(); d->regenerate(); - while (removedItems.count()) - d->releaseItem(removedItems.takeLast()); d->updateCurrent(); + if (!d->modelCount) + update(); if (currentChanged) emit currentIndexChanged(); emit countChanged(); @@ -1335,6 +1464,7 @@ void QDeclarativePathView::modelReset() { Q_D(QDeclarativePathView); + d->modelCount = d->model->count(); d->regenerate(); emit countChanged(); } @@ -1372,16 +1502,31 @@ d->updateCurrent(); } +void QDeclarativePathView::movementEnding() +{ + Q_D(QDeclarativePathView); + if (d->flicking) { + d->flicking = false; + emit flickingChanged(); + emit flickEnded(); + } + if (d->moving && !d->stealMouse) { + d->moving = false; + emit movingChanged(); + emit movementEnded(); + } +} + // find the item closest to the snap position int QDeclarativePathViewPrivate::calcCurrentIndex() { int current = -1; if (model && items.count()) { - offset = qmlMod(offset, model->count()); + offset = qmlMod(offset, modelCount); if (offset < 0) - offset += model->count(); - current = qRound(qAbs(qmlMod(model->count() - offset, model->count()))); - current = current % model->count(); + offset += modelCount; + current = qRound(qAbs(qmlMod(modelCount - offset, modelCount))); + current = current % modelCount; } return current; @@ -1397,7 +1542,7 @@ int idx = calcCurrentIndex(); if (model && idx != currentIndex) { - int itemIndex = (currentIndex - firstIndex + model->count()) % model->count(); + int itemIndex = (currentIndex - firstIndex + modelCount) % modelCount; if (itemIndex < items.count()) { if (QDeclarativeItem *item = items.at(itemIndex)) { if (QDeclarativePathViewAttached *att = attached(item)) @@ -1406,7 +1551,7 @@ } currentIndex = idx; currentItem = 0; - itemIndex = (idx - firstIndex + model->count()) % model->count(); + itemIndex = (idx - firstIndex + modelCount) % modelCount; if (itemIndex < items.count()) { currentItem = items.at(itemIndex); currentItem->setFocus(true); @@ -1438,25 +1583,26 @@ void QDeclarativePathViewPrivate::snapToCurrent() { - if (!model || model->count() <= 0) + if (!model || modelCount <= 0) return; - qreal targetOffset = model->count() - currentIndex; + qreal targetOffset = modelCount - currentIndex; moveReason = Other; + offsetAdj = 0.0; tl.reset(moveOffset); moveOffset.setValue(offset); const int duration = highlightMoveDuration; - if (targetOffset - offset > model->count()/2) { - qreal distance = model->count() - targetOffset + offset; + if (targetOffset - offset > modelCount/2) { + qreal distance = modelCount - targetOffset + offset; tl.move(moveOffset, 0.0, QEasingCurve(QEasingCurve::InQuad), int(duration * offset / distance)); - tl.set(moveOffset, model->count()); - tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::OutQuad), int(duration * (model->count()-targetOffset) / distance)); - } else if (targetOffset - offset <= -model->count()/2) { - qreal distance = model->count() - offset + targetOffset; - tl.move(moveOffset, model->count(), QEasingCurve(QEasingCurve::InQuad), int(duration * (model->count()-offset) / distance)); + tl.set(moveOffset, modelCount); + tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::OutQuad), int(duration * (modelCount-targetOffset) / distance)); + } else if (targetOffset - offset <= -modelCount/2) { + qreal distance = modelCount - offset + targetOffset; + tl.move(moveOffset, modelCount, QEasingCurve(QEasingCurve::InQuad), int(duration * (modelCount-offset) / distance)); tl.set(moveOffset, 0.0); tl.move(moveOffset, targetOffset, QEasingCurve(QEasingCurve::OutQuad), int(duration * targetOffset / distance)); } else { diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativepathview_p.h --- a/src/declarative/graphicsitems/qdeclarativepathview_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -74,6 +74,9 @@ Q_PROPERTY(qreal flickDeceleration READ flickDeceleration WRITE setFlickDeceleration NOTIFY flickDecelerationChanged) Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged) + Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged) + Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged) + Q_PROPERTY(int count READ count NOTIFY countChanged) Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) Q_PROPERTY(int pathItemCount READ pathItemCount WRITE setPathItemCount NOTIFY pathItemCountChanged) @@ -122,6 +125,9 @@ bool isInteractive() const; void setInteractive(bool); + bool isMoving() const; + bool isFlicking() const; + int count() const; QDeclarativeComponent *delegate() const; @@ -151,9 +157,15 @@ void pathItemCountChanged(); void flickDecelerationChanged(); void interactiveChanged(); + void movingChanged(); + void flickingChanged(); void highlightChanged(); void highlightItemChanged(); void highlightMoveDurationChanged(); + void movementStarted(); + void movementEnded(); + void flickStarted(); + void flickEnded(); protected: void mousePressEvent(QGraphicsSceneMouseEvent *event); @@ -167,6 +179,7 @@ private Q_SLOTS: void refill(); void ticked(); + void movementEnding(); void itemsInserted(int index, int count); void itemsRemoved(int index, int count); void itemsMoved(int,int,int); @@ -213,6 +226,7 @@ emit pathChanged(); } } + qreal m_percent; Q_SIGNALS: void currentItemChanged(); diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativepathview_p_p.h --- a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -75,34 +75,29 @@ public: QDeclarativePathViewPrivate() : path(0), currentIndex(0), currentItemOffset(0.0), startPc(0), lastDist(0) - , lastElapsed(0), mappedRange(1.0) + , lastElapsed(0), offset(0.0), offsetAdj(0.0), mappedRange(1.0) , stealMouse(false), ownModel(false), interactive(true), haveHighlightRange(true) , autoHighlight(true), highlightUp(false), layoutScheduled(false) + , moving(false), flicking(false) , dragMargin(0), deceleration(100) - , moveOffset(this, &QDeclarativePathViewPrivate::setOffset) + , moveOffset(this, &QDeclarativePathViewPrivate::setAdjustedOffset) , firstIndex(-1), pathItems(-1), requestedIndex(-1) , moveReason(Other), attType(0), highlightComponent(0), highlightItem(0) , moveHighlight(this, &QDeclarativePathViewPrivate::setHighlightPosition) , highlightPosition(0) , highlightRangeStart(0), highlightRangeEnd(0) , highlightRangeMode(QDeclarativePathView::StrictlyEnforceRange) - , highlightMoveDuration(300) + , highlightMoveDuration(300), modelCount(0) { } - void init() { - Q_Q(QDeclarativePathView); - offset = 0; - q->setAcceptedMouseButtons(Qt::LeftButton); - q->setFlag(QGraphicsItem::ItemIsFocusScope); - q->setFiltersChildEvents(true); - q->connect(&tl, SIGNAL(updated()), q, SLOT(ticked())); - lastPosTime.invalidate(); - } + void init(); void itemGeometryChanged(QDeclarativeItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) { if ((newGeometry.size() != oldGeometry.size()) && (!highlightItem || item != highlightItem)) { + if (QDeclarativePathViewAttached *att = attached(item)) + att->m_percent = -1; scheduleLayout(); } } @@ -133,6 +128,7 @@ static void fixOffsetCallback(void*); void fixOffset(); void setOffset(qreal offset); + void setAdjustedOffset(qreal offset); void regenerate(); void updateItem(QDeclarativeItem *, qreal); void snapToCurrent(); @@ -147,6 +143,7 @@ qreal lastDist; int lastElapsed; qreal offset; + qreal offsetAdj; qreal mappedRange; bool stealMouse : 1; bool ownModel : 1; @@ -155,6 +152,8 @@ bool autoHighlight : 1; bool highlightUp : 1; bool layoutScheduled : 1; + bool moving : 1; + bool flicking : 1; QElapsedTimer lastPosTime; QPointF lastPos; qreal dragMargin; @@ -165,6 +164,7 @@ int pathItems; int requestedIndex; QList items; + QList itemCache; QDeclarativeGuard model; QVariant modelVariant; enum MovementReason { Other, SetIndex, Mouse }; @@ -178,6 +178,7 @@ qreal highlightRangeEnd; QDeclarativePathView::HighlightRangeMode highlightRangeMode; int highlightMoveDuration; + int modelCount; }; QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativepositioners.cpp --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -61,16 +61,37 @@ | QDeclarativeItemPrivate::Opacity | QDeclarativeItemPrivate::Destroyed; -void QDeclarativeBasePositionerPrivate::watchChanges(QDeclarativeItem *other) +void QDeclarativeBasePositionerPrivate::watchChanges(QGraphicsObject *other) { - QDeclarativeItemPrivate *otherPrivate = static_cast(QGraphicsItemPrivate::get(other)); - otherPrivate->addItemChangeListener(this, watchedChanges); + if (QGraphicsItemPrivate::get(other)->isDeclarativeItem) { + QDeclarativeItemPrivate *otherPrivate = static_cast(QGraphicsItemPrivate::get(other)); + otherPrivate->addItemChangeListener(this, watchedChanges); + } else { + Q_Q(QDeclarativeBasePositioner); + QObject::connect(other, SIGNAL(widthChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::connect(other, SIGNAL(heightChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::connect(other, SIGNAL(opacityChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::connect(other, SIGNAL(visibleChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + } } -void QDeclarativeBasePositionerPrivate::unwatchChanges(QDeclarativeItem* other) +void QDeclarativeBasePositionerPrivate::unwatchChanges(QGraphicsObject* other) { - QDeclarativeItemPrivate *otherPrivate = static_cast(QGraphicsItemPrivate::get(other)); - otherPrivate->removeItemChangeListener(this, watchedChanges); + if (QGraphicsItemPrivate::get(other)->isDeclarativeItem) { + QDeclarativeItemPrivate *otherPrivate = static_cast(QGraphicsItemPrivate::get(other)); + otherPrivate->removeItemChangeListener(this, watchedChanges); + } else { + Q_Q(QDeclarativeBasePositioner); + QObject::disconnect(other, SIGNAL(widthChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::disconnect(other, SIGNAL(heightChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::disconnect(other, SIGNAL(opacityChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::disconnect(other, SIGNAL(visibleChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + } +} + +void QDeclarativeBasePositioner::graphicsWidgetGeometryChanged() +{ + prePositioning(); } /*! @@ -87,8 +108,7 @@ You also need to set a PositionerType, to declare whether you are positioning the x, y or both for the child items. Depending on the chosen type, only x or y changes will be applied. - Note that the subclass is responsible for adding the - spacing in between items. + Note that the subclass is responsible for adding the spacing in between items. */ QDeclarativeBasePositioner::QDeclarativeBasePositioner(PositionerType at, QDeclarativeItem *parent) : QDeclarativeItem(*(new QDeclarativeBasePositionerPrivate), parent) @@ -174,16 +194,16 @@ Q_D(QDeclarativeBasePositioner); if (change == ItemChildAddedChange){ QGraphicsItem* item = value.value(); - QDeclarativeItem* child = 0; + QGraphicsObject* child = 0; if(item) - child = qobject_cast(item->toGraphicsObject()); + child = item->toGraphicsObject(); if (child) prePositioning(); } else if (change == ItemChildRemovedChange) { QGraphicsItem* item = value.value(); - QDeclarativeItem* child = 0; + QGraphicsObject* child = 0; if(item) - child = qobject_cast(item->toGraphicsObject()); + child = item->toGraphicsObject(); if (child) { QDeclarativeBasePositioner::PositionedItem posItem(child); int idx = positionedItems.find(posItem); @@ -194,7 +214,6 @@ prePositioning(); } } - return QDeclarativeItem::itemChange(change, value); } @@ -216,10 +235,10 @@ QPODVector oldItems; positionedItems.copyAndClear(oldItems); for (int ii = 0; ii < children.count(); ++ii) { - QDeclarativeItem *child = qobject_cast(children.at(ii)); + QGraphicsObject *child = children.at(ii)->toGraphicsObject(); if (!child) continue; - QDeclarativeItemPrivate *childPrivate = static_cast(QGraphicsItemPrivate::get(child)); + QGraphicsItemPrivate *childPrivate = static_cast(QGraphicsItemPrivate::get(child)); PositionedItem *item = 0; PositionedItem posItem(child); int wIdx = oldItems.find(posItem); @@ -228,13 +247,13 @@ positionedItems.append(posItem); item = &positionedItems[positionedItems.count()-1]; item->isNew = true; - if (child->opacity() <= 0.0 || childPrivate->explicitlyHidden) + if (child->opacity() <= 0.0 || childPrivate->explicitlyHidden || !childPrivate->width() || !childPrivate->height()) item->isVisible = false; } else { item = &oldItems[wIdx]; // Items are only omitted from positioning if they are explicitly hidden // i.e. their positioning is not affected if an ancestor is hidden. - if (child->opacity() <= 0.0 || childPrivate->explicitlyHidden) { + if (child->opacity() <= 0.0 || childPrivate->explicitlyHidden || !childPrivate->width() || !childPrivate->height()) { item->isVisible = false; } else if (!item->isVisible) { item->isVisible = true; @@ -302,14 +321,9 @@ d->moveActions.clear(); } -static inline bool isInvisible(QDeclarativeItem *child) -{ - QDeclarativeItemPrivate *childPrivate = static_cast(QGraphicsItemPrivate::get(child)); - return child->opacity() == 0.0 || childPrivate->explicitlyHidden || !child->width() || !child->height(); -} - /*! \qmlclass Column QDeclarativeColumn + \ingroup qml-positioning-elements \since 4.7 \brief The Column item arranges its children vertically. \inherits Item @@ -418,11 +432,6 @@ \image spacing_b.png */ -/*! - \internal - \class QDeclarativeColumn - \brief The QDeclarativeColumn class lines up items vertically. -*/ QDeclarativeColumn::QDeclarativeColumn(QDeclarativeItem *parent) : QDeclarativeBasePositioner(Vertical, parent) { @@ -434,15 +443,15 @@ for (int ii = 0; ii < positionedItems.count(); ++ii) { const PositionedItem &child = positionedItems.at(ii); - if (!child.item || isInvisible(child.item)) + if (!child.item || !child.isVisible) continue; if(child.item->y() != voffset) positionY(voffset, child); - contentSize->setWidth(qMax(contentSize->width(), child.item->width())); + contentSize->setWidth(qMax(contentSize->width(), QGraphicsItemPrivate::get(child.item)->width())); - voffset += child.item->height(); + voffset += QGraphicsItemPrivate::get(child.item)->height(); voffset += spacing(); } @@ -454,8 +463,8 @@ QDeclarativeBasePositionerPrivate *d = static_cast(QDeclarativeBasePositionerPrivate::get(this)); for (int ii = 0; ii < positionedItems.count(); ++ii) { const PositionedItem &child = positionedItems.at(ii); - if (child.item) { - QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(child.item)->_anchors; + if (child.item && QGraphicsItemPrivate::get(child.item)->isDeclarativeItem) { + QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(static_cast(child.item))->_anchors; if (anchors) { QDeclarativeAnchors::Anchors usedAnchors = anchors->usedAnchors(); if (usedAnchors & QDeclarativeAnchors::TopAnchor || @@ -475,6 +484,7 @@ /*! \qmlclass Row QDeclarativeRow + \ingroup qml-positioning-elements \since 4.7 \brief The Row item arranges its children horizontally. \inherits Item @@ -557,11 +567,6 @@ \image spacing_b.png */ -/*! - \internal - \class QDeclarativeRow - \brief The QDeclarativeRow class lines up items horizontally. -*/ QDeclarativeRow::QDeclarativeRow(QDeclarativeItem *parent) : QDeclarativeBasePositioner(Horizontal, parent) { @@ -573,15 +578,15 @@ for (int ii = 0; ii < positionedItems.count(); ++ii) { const PositionedItem &child = positionedItems.at(ii); - if (!child.item || isInvisible(child.item)) + if (!child.item || !child.isVisible) continue; if(child.item->x() != hoffset) positionX(hoffset, child); - contentSize->setHeight(qMax(contentSize->height(), child.item->height())); + contentSize->setHeight(qMax(contentSize->height(), QGraphicsItemPrivate::get(child.item)->height())); - hoffset += child.item->width(); + hoffset += QGraphicsItemPrivate::get(child.item)->width(); hoffset += spacing(); } @@ -593,8 +598,8 @@ QDeclarativeBasePositionerPrivate *d = static_cast(QDeclarativeBasePositionerPrivate::get(this)); for (int ii = 0; ii < positionedItems.count(); ++ii) { const PositionedItem &child = positionedItems.at(ii); - if (child.item) { - QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(child.item)->_anchors; + if (child.item && QGraphicsItemPrivate::get(child.item)->isDeclarativeItem) { + QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(static_cast(child.item))->_anchors; if (anchors) { QDeclarativeAnchors::Anchors usedAnchors = anchors->usedAnchors(); if (usedAnchors & QDeclarativeAnchors::LeftAnchor || @@ -613,6 +618,7 @@ /*! \qmlclass Grid QDeclarativeGrid + \ingroup qml-positioning-elements \since 4.7 \brief The Grid item positions its children in a grid. \inherits Item @@ -713,11 +719,6 @@ \image spacing_b.png */ -/*! - \internal - \class QDeclarativeGrid - \brief The QDeclarativeGrid class lays out items in a grid. -*/ QDeclarativeGrid::QDeclarativeGrid(QDeclarativeItem *parent) : QDeclarativeBasePositioner(Both, parent), m_rows(-1), m_columns(-1), m_flow(LeftToRight) { @@ -786,9 +787,17 @@ void QDeclarativeGrid::doPositioning(QSizeF *contentSize) { + int c = m_columns; int r = m_rows; - int numVisible = positionedItems.count(); + //Is allocating the extra QPODVector too much overhead? + QPODVector visibleItems;//we aren't concerned with invisible items + visibleItems.reserve(positionedItems.count()); + for(int i=0; iwidth() > maxColWidth[j]) - maxColWidth[j] = child.item->width(); - if (child.item->height() > maxRowHeight[i]) - maxRowHeight[i] = child.item->height(); + if (childIndex == visibleItems.count()) + break; + + const PositionedItem &child = visibleItems.at(childIndex++); + QGraphicsItemPrivate *childPrivate = QGraphicsItemPrivate::get(child.item); + if (childPrivate->width() > maxColWidth[j]) + maxColWidth[j] = childPrivate->width(); + if (childPrivate->height() > maxRowHeight[i]) + maxRowHeight[i] = childPrivate->height(); } } } else { @@ -829,14 +838,14 @@ maxColWidth << 0; if (childIndex == positionedItems.count()) - continue; - const PositionedItem &child = positionedItems.at(childIndex++); - if (!child.item || isInvisible(child.item)) - continue; - if (child.item->width() > maxColWidth[j]) - maxColWidth[j] = child.item->width(); - if (child.item->height() > maxRowHeight[i]) - maxRowHeight[i] = child.item->height(); + break; + + const PositionedItem &child = visibleItems.at(childIndex++); + QGraphicsItemPrivate *childPrivate = QGraphicsItemPrivate::get(child.item); + if (childPrivate->width() > maxColWidth[j]) + maxColWidth[j] = childPrivate->width(); + if (childPrivate->height() > maxRowHeight[i]) + maxRowHeight[i] = childPrivate->height(); } } } @@ -845,17 +854,15 @@ int yoffset=0; int curRow =0; int curCol =0; - for (int i = 0; i < positionedItems.count(); ++i) { - const PositionedItem &child = positionedItems.at(i); - if (!child.item || isInvisible(child.item)) - continue; + for (int i = 0; i < visibleItems.count(); ++i) { + const PositionedItem &child = visibleItems.at(i); if((child.item->x()!=xoffset)||(child.item->y()!=yoffset)){ positionX(xoffset, child); positionY(yoffset, child); } if (m_flow == LeftToRight) { - contentSize->setWidth(qMax(contentSize->width(), xoffset + child.item->width())); + contentSize->setWidth(qMax(contentSize->width(), xoffset + QGraphicsItemPrivate::get(child.item)->width())); contentSize->setHeight(yoffset + maxRowHeight[curRow]); xoffset+=maxColWidth[curCol]+spacing(); @@ -869,7 +876,7 @@ break; } } else { - contentSize->setHeight(qMax(contentSize->height(), yoffset + child.item->height())); + contentSize->setHeight(qMax(contentSize->height(), yoffset + QGraphicsItemPrivate::get(child.item)->height())); contentSize->setWidth(xoffset + maxColWidth[curCol]); yoffset+=maxRowHeight[curRow]+spacing(); @@ -891,8 +898,8 @@ QDeclarativeBasePositionerPrivate *d = static_cast(QDeclarativeBasePositionerPrivate::get(this)); for (int ii = 0; ii < positionedItems.count(); ++ii) { const PositionedItem &child = positionedItems.at(ii); - if (child.item) { - QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(child.item)->_anchors; + if (child.item && QGraphicsItemPrivate::get(child.item)->isDeclarativeItem) { + QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(static_cast(child.item))->_anchors; if (anchors && (anchors->usedAnchors() || anchors->fill() || anchors->centerIn())) { d->anchorConflict = true; break; @@ -905,6 +912,7 @@ /*! \qmlclass Flow QDeclarativeFlow + \ingroup qml-positioning-elements \since 4.7 \brief The Flow item arranges its children side by side, wrapping as necessary. \inherits Item @@ -1023,17 +1031,18 @@ for (int i = 0; i < positionedItems.count(); ++i) { const PositionedItem &child = positionedItems.at(i); - if (!child.item || isInvisible(child.item)) + if (!child.item || !child.isVisible) continue; + QGraphicsItemPrivate *childPrivate = QGraphicsItemPrivate::get(child.item); if (d->flow == LeftToRight) { - if (widthValid() && hoffset && hoffset + child.item->width() > width()) { + if (widthValid() && hoffset && hoffset + childPrivate->width() > width()) { hoffset = 0; voffset += linemax + spacing(); linemax = 0; } } else { - if (heightValid() && voffset && voffset + child.item->height() > height()) { + if (heightValid() && voffset && voffset + childPrivate->height() > height()) { voffset = 0; hoffset += linemax + spacing(); linemax = 0; @@ -1045,17 +1054,17 @@ positionY(voffset, child); } - contentSize->setWidth(qMax(contentSize->width(), hoffset + child.item->width())); - contentSize->setHeight(qMax(contentSize->height(), voffset + child.item->height())); + contentSize->setWidth(qMax(contentSize->width(), hoffset + childPrivate->width())); + contentSize->setHeight(qMax(contentSize->height(), voffset + childPrivate->height())); if (d->flow == LeftToRight) { - hoffset += child.item->width(); + hoffset += childPrivate->width(); hoffset += spacing(); - linemax = qMax(linemax, qCeil(child.item->height())); + linemax = qMax(linemax, qCeil(childPrivate->height())); } else { - voffset += child.item->height(); + voffset += childPrivate->height(); voffset += spacing(); - linemax = qMax(linemax, qCeil(child.item->width())); + linemax = qMax(linemax, qCeil(childPrivate->width())); } } } @@ -1065,8 +1074,8 @@ Q_D(QDeclarativeFlow); for (int ii = 0; ii < positionedItems.count(); ++ii) { const PositionedItem &child = positionedItems.at(ii); - if (child.item) { - QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(child.item)->_anchors; + if (child.item && QGraphicsItemPrivate::get(child.item)->isDeclarativeItem) { + QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(static_cast(child.item))->_anchors; if (anchors && (anchors->usedAnchors() || anchors->fill() || anchors->centerIn())) { d->anchorConflict = true; break; diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativepositioners_p.h --- a/src/declarative/graphicsitems/qdeclarativepositioners_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -91,14 +91,16 @@ protected Q_SLOTS: void prePositioning(); + void graphicsWidgetGeometryChanged(); protected: virtual void doPositioning(QSizeF *contentSize)=0; virtual void reportConflictingAnchors()=0; - struct PositionedItem { - PositionedItem(QDeclarativeItem *i) : item(i), isNew(false), isVisible(true) {} + class PositionedItem { + public : + PositionedItem(QGraphicsObject *i) : item(i), isNew(false), isVisible(true) {} bool operator==(const PositionedItem &other) const { return other.item == item; } - QDeclarativeItem *item; + QGraphicsObject *item; bool isNew; bool isVisible; }; diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativepositioners_p_p.h --- a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -94,8 +94,8 @@ QDeclarativeTransitionManager addTransitionManager; QDeclarativeTransitionManager moveTransitionManager; - void watchChanges(QDeclarativeItem *other); - void unwatchChanges(QDeclarativeItem* other); + void watchChanges(QGraphicsObject *other); + void unwatchChanges(QGraphicsObject* other); bool queuedPositioning : 1; bool doingPositioning : 1; bool anchorConflict : 1; @@ -123,6 +123,7 @@ if (newGeometry.size() != oldGeometry.size()) q->prePositioning(); } + virtual void itemVisibilityChanged(QDeclarativeItem *) { schedulePositioning(); diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativerectangle.cpp --- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -84,6 +84,7 @@ /*! \qmlclass GradientStop QDeclarativeGradientStop + \ingroup qml-basic-visual-elements \since 4.7 \brief The GradientStop item defines the color at a position in a Gradient @@ -105,6 +106,7 @@ /*! \qmlclass Gradient QDeclarativeGradient + \ingroup qml-basic-visual-elements \since 4.7 \brief The Gradient item defines a gradient fill. @@ -152,6 +154,7 @@ /*! \qmlclass Rectangle QDeclarativeRectangle + \ingroup qml-basic-visual-elements \since 4.7 \brief The Rectangle item allows you to add rectangles to a scene. \inherits Item @@ -177,11 +180,6 @@ int QDeclarativeRectanglePrivate::doUpdateSlotIdx = -1; -/*! - \internal - \class QDeclarativeRectangle - \brief The QDeclarativeRectangle class provides a rectangle item that you can add to a QDeclarativeView. -*/ QDeclarativeRectangle::QDeclarativeRectangle(QDeclarativeItem *parent) : QDeclarativeItem(*(new QDeclarativeRectanglePrivate), parent) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativerepeater.cpp --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -62,6 +62,7 @@ /*! \qmlclass Repeater QDeclarativeRepeater + \ingroup qml-utility-elements \since 4.7 \inherits Item @@ -133,35 +134,23 @@ create items as they are required. Also, note that Repeater is \l {Item}-based, and can only repeat \l {Item}-derived objects. - For example, it cannot be used to repeat QtObjects: + For example, it cannot be used to repeat QObjects: \badcode Item { - //XXX does not work! Can't repeat QtObject as it doesn't derive from Item. + //XXX does not work! Can't repeat QObject as it doesn't derive from Item. Repeater { model: 10 - QtObject {} + QObject {} } } \endcode */ -/*! - \internal - \class QDeclarativeRepeater - */ - -/*! - Create a new QDeclarativeRepeater instance. - */ QDeclarativeRepeater::QDeclarativeRepeater(QDeclarativeItem *parent) : QDeclarativeItem(*(new QDeclarativeRepeaterPrivate), parent) { } -/*! - Destroy the repeater instance. All items it instantiated are also - destroyed. - */ QDeclarativeRepeater::~QDeclarativeRepeater() { } @@ -245,8 +234,8 @@ connect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*))); */ regenerate(); - emit countChanged(); } + emit countChanged(); } /*! @@ -300,18 +289,12 @@ } -/*! - \internal - */ void QDeclarativeRepeater::componentComplete() { QDeclarativeItem::componentComplete(); regenerate(); } -/*! - \internal - */ QVariant QDeclarativeRepeater::itemChange(GraphicsItemChange change, const QVariant &value) { @@ -334,9 +317,6 @@ d->deletables.clear(); } -/*! - \internal - */ void QDeclarativeRepeater::regenerate() { Q_D(QDeclarativeRepeater); @@ -377,6 +357,7 @@ d->deletables.insert(modelIndex, item); } } + emit countChanged(); } void QDeclarativeRepeater::itemsRemoved(int index, int count) @@ -391,6 +372,7 @@ else break; } + emit countChanged(); } void QDeclarativeRepeater::itemsMoved(int from, int to, int count) @@ -420,6 +402,7 @@ if (!isComponentComplete()) return; regenerate(); + emit countChanged(); } QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativetext.cpp --- a/src/declarative/graphicsitems/qdeclarativetext.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -162,7 +162,8 @@ /*! \qmlclass Text QDeclarativeText - \since 4.7 + \ingroup qml-basic-visual-elements + \since 4.7 \brief The Text item allows you to add formatted text to a scene. \inherits Item @@ -189,32 +190,6 @@ \sa {declarative/text/fonts}{Fonts example} */ - -/*! - \internal - \class QDeclarativeText - \qmlclass Text - - \brief The QDeclarativeText class provides a formatted text item that you can add to a QDeclarativeView. - - Text was designed for read-only text; it does not allow for any text editing. - It can display both plain and rich text. For example: - - \qml - Text { text: "Hello World!"; font.family: "Helvetica"; font.pointSize: 24; color: "red" } - Text { text: "Hello World!" } - \endqml - - \image text.png - - If height and width are not explicitly set, Text will attempt to determine how - much room is needed and set it accordingly. Unless \c wrapMode is set, it will always - prefer width to height (all text will be placed on a single line). - - The \c elide property can alternatively be used to fit a line of plain text to a set width. - - A QDeclarativeText object can be instantiated in QML using the tag \c Text. -*/ QDeclarativeText::QDeclarativeText(QDeclarativeItem *parent) : QDeclarativeItem(*(new QDeclarativeTextPrivate), parent) { @@ -1046,10 +1021,10 @@ QAbstractTextDocumentLayout::PaintContext context; + QTextOption oldOption(doc->defaultTextOption()); if (drawStyle) { context.palette.setColor(QPalette::Text, styleColor); - // ### Do we really want this? - QTextOption colorOption; + QTextOption colorOption(doc->defaultTextOption()); colorOption.setFlags(QTextOption::SuppressColors); doc->setDefaultTextOption(colorOption); } else { @@ -1057,7 +1032,7 @@ } doc->documentLayout()->draw(&p, context); if (drawStyle) - doc->setDefaultTextOption(QTextOption()); + doc->setDefaultTextOption(oldOption); return img; } @@ -1217,7 +1192,7 @@ if (!d->richText || !d->doc || d->doc->documentLayout()->anchorAt(event->pos()).isEmpty()) { event->setAccepted(false); - d->activeLink = QString(); + d->activeLink.clear(); } else { d->activeLink = d->doc->documentLayout()->anchorAt(event->pos()); } diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativetextedit.cpp --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -61,6 +61,7 @@ /*! \qmlclass TextEdit QDeclarativeTextEdit + \ingroup qml-basic-visual-elements \since 4.7 \brief The TextEdit item displays multiple lines of editable formatted text. \inherits Item @@ -102,23 +103,6 @@ \sa Text, TextInput, {declarative/text/textselection}{Text Selection example} */ -/*! - \internal - \class QDeclarativeTextEdit - \qmlclass TextEdit - - \brief The QDeclarativeTextEdit class provides an editable formatted text item that you can add to a QDeclarativeView. - - It can display both plain and rich text. - - \image declarative-textedit.png - - A QDeclarativeTextEdit object can be instantiated in QML using the tag \c <TextEdit>. -*/ - -/*! - Constructs a new QDeclarativeTextEdit. -*/ QDeclarativeTextEdit::QDeclarativeTextEdit(QDeclarativeItem *parent) : QDeclarativePaintedItem(*(new QDeclarativeTextEditPrivate), parent) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativetextinput.cpp --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -51,10 +51,13 @@ #include #include +#ifndef QT_NO_LINEEDIT + QT_BEGIN_NAMESPACE /*! \qmlclass TextInput QDeclarativeTextInput + \ingroup qml-basic-visual-elements \since 4.7 \brief The TextInput item displays an editable line of text. \inherits Item @@ -274,8 +277,10 @@ QPalette p = d->control->palette(); p.setColor(QPalette::Highlight, d->selectionColor); d->control->setPalette(p); - clearCache(); - update(); + if (d->control->hasSelectedText()) { + clearCache(); + update(); + } emit selectionColorChanged(color); } @@ -300,8 +305,10 @@ QPalette p = d->control->palette(); p.setColor(QPalette::HighlightedText, d->selectedTextColor); d->control->setPalette(p); - clearCache(); - update(); + if (d->control->hasSelectedText()) { + clearCache(); + update(); + } emit selectedTextColorChanged(color); } @@ -430,8 +437,6 @@ } /*! - \internal - Returns a Rect which encompasses the cursor, but which may be larger than is required. Ignores custom cursor delegates. */ @@ -559,6 +564,7 @@ /*! \qmlclass IntValidator QIntValidator + \ingroup qml-basic-visual-elements This element provides a validator for integer values. */ @@ -577,6 +583,7 @@ /*! \qmlclass DoubleValidator QDoubleValidator + \ingroup qml-basic-visual-elements This element provides a validator for non-integer numbers. */ @@ -615,6 +622,7 @@ /*! \qmlclass RegExpValidator QRegExpValidator + \ingroup qml-basic-visual-elements This element provides a validator, which counts as valid any string which matches a specified regular expression. @@ -1227,8 +1235,12 @@ Q_D(QDeclarativeTextInput); if(str.length() < 1) return; + d->control->setPasswordCharacter(str.constData()[0]); + EchoMode echoMode_ = echoMode(); + if (echoMode_ == Password || echoMode_ == PasswordEchoOnEdit) { + updateSize(); + } emit passwordCharacterChanged(); - d->control->setPasswordCharacter(str.constData()[0]); } /*! @@ -1537,3 +1549,5 @@ QT_END_NAMESPACE +#endif // QT_NO_LINEEDIT + diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativetextinput_p.h --- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -48,6 +48,8 @@ #include #include +#ifndef QT_NO_LINEEDIT + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -263,4 +265,6 @@ QT_END_HEADER +#endif // QT_NO_LINEEDIT + #endif // QDECLARATIVETEXTINPUT_H diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativetextinput_p_p.h --- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -62,6 +62,8 @@ // // We mean it. +#ifndef QT_NO_LINEEDIT + QT_BEGIN_NAMESPACE class QDeclarativeTextInputPrivate : public QDeclarativePaintedItemPrivate @@ -132,5 +134,7 @@ QT_END_NAMESPACE +#endif // QT_NO_LINEEDIT + #endif diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativetranslate.cpp --- a/src/declarative/graphicsitems/qdeclarativetranslate.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativetranslate.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -90,7 +90,7 @@ return; d->x = x; update(); - emit positionChanged(); + emit xChanged(); } /*! @@ -113,24 +113,13 @@ return; d->y = y; update(); - emit positionChanged(); + emit yChanged(); } -/*! - \internal -*/ void QDeclarativeTranslate::applyTo(QMatrix4x4 *matrix) const { Q_D(const QDeclarativeTranslate); matrix->translate(d->x, d->y, 0); } -/*! - \fn QDeclarativeTranslate::positionChanged() - - QDeclarativeTranslate emits this signal when its position changes. - - \sa QDeclarativeTranslate::x, QDeclarativeTranslate::y -*/ - QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativetranslate_p.h --- a/src/declarative/graphicsitems/qdeclarativetranslate_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativetranslate_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -56,8 +56,8 @@ { Q_OBJECT - Q_PROPERTY(qreal x READ x WRITE setX NOTIFY positionChanged) - Q_PROPERTY(qreal y READ y WRITE setY NOTIFY positionChanged) + Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged) + Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged) public: QDeclarativeTranslate(QObject *parent = 0); @@ -72,7 +72,8 @@ void applyTo(QMatrix4x4 *matrix) const; Q_SIGNALS: - void positionChanged(); + void xChanged(); + void yChanged(); private: Q_DECLARE_PRIVATE(QDeclarativeTranslate) diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -78,7 +78,7 @@ static void children_append(QDeclarativeListProperty *prop, QDeclarativeItem *item) { QDeclarative_setParent_noEvent(item, prop->object); - static_cast(prop->data)->children.append(item); + static_cast(prop->data)->children.append(Item(item)); static_cast(prop->data)->itemAppended(); static_cast(prop->data)->emitChildrenChanged(); } @@ -88,12 +88,12 @@ } static QDeclarativeItem *children_at(QDeclarativeListProperty *prop, int index) { - return static_cast(prop->data)->children.at(index); + return static_cast(prop->data)->children.at(index).item; } void itemAppended() { Q_Q(QDeclarativeVisualItemModel); - QDeclarativeVisualItemModelAttached *attached = QDeclarativeVisualItemModelAttached::properties(children.last()); + QDeclarativeVisualItemModelAttached *attached = QDeclarativeVisualItemModelAttached::properties(children.last().item); attached->setIndex(children.count()-1); emit q->itemsInserted(children.count()-1, 1); emit q->countChanged(); @@ -104,12 +104,31 @@ emit q->childrenChanged(); } - QList children; + int indexOf(QDeclarativeItem *item) const { + for (int i = 0; i < children.count(); ++i) + if (children.at(i).item == item) + return i; + return -1; + } + + class Item { + public: + Item(QDeclarativeItem *i) : item(i), ref(0) {} + + void addRef() { ++ref; } + bool deref() { return --ref == 0; } + + QDeclarativeItem *item; + int ref; + }; + + QList children; }; /*! \qmlclass VisualItemModel QDeclarativeVisualItemModel + \ingroup qml-working-with-data \since 4.7 \brief The VisualItemModel allows items to be provided to a view. @@ -182,14 +201,22 @@ QDeclarativeItem *QDeclarativeVisualItemModel::item(int index, bool) { Q_D(QDeclarativeVisualItemModel); - return d->children.at(index); + QDeclarativeVisualItemModelPrivate::Item &item = d->children[index]; + item.addRef(); + return item.item; } QDeclarativeVisualModel::ReleaseFlags QDeclarativeVisualItemModel::release(QDeclarativeItem *item) { - if (item->scene()) - item->scene()->removeItem(item); - QDeclarative_setParent_noEvent(item, this); + Q_D(QDeclarativeVisualItemModel); + int idx = d->indexOf(item); + if (idx >= 0) { + if (d->children[idx].deref()) { + if (item->scene()) + item->scene()->removeItem(item); + QDeclarative_setParent_noEvent(item, this); + } + } return 0; } @@ -208,27 +235,13 @@ Q_D(QDeclarativeVisualItemModel); if (index < 0 || index >= d->children.count()) return QString(); - return QDeclarativeEngine::contextForObject(d->children.at(index))->contextProperty(name).toString(); -} - -QVariant QDeclarativeVisualItemModel::evaluate(int index, const QString &expression, QObject *objectContext) -{ - Q_D(QDeclarativeVisualItemModel); - if (index < 0 || index >= d->children.count()) - return QVariant(); - QDeclarativeContext *ccontext = qmlContext(this); - QDeclarativeContext *ctxt = new QDeclarativeContext(ccontext); - ctxt->setContextObject(d->children.at(index)); - QDeclarativeExpression e(ctxt, objectContext, expression); - QVariant value = e.evaluate(); - delete ctxt; - return value; + return QDeclarativeEngine::contextForObject(d->children.at(index).item)->contextProperty(name).toString(); } int QDeclarativeVisualItemModel::indexOf(QDeclarativeItem *item, QObject *) const { Q_D(const QDeclarativeVisualItemModel); - return d->children.indexOf(item); + return d->indexOf(item); } QDeclarativeVisualItemModelAttached *QDeclarativeVisualItemModel::qmlAttachedProperties(QObject *obj) @@ -418,6 +431,9 @@ int propForRole(int) const; void setValue(int, const QVariant &); + bool hasValue(int id) const { + return m_meta->hasValue(id); + } void ensureProperties(); @@ -496,7 +512,7 @@ QVariant value = model->m_listModelInterface->data(data->m_index, *it); return value; } else if (model->m_roles.count() == 1 && propName == "modelData") { - //for compatability with other lists, assign modelData if there is only a single role + //for compatibility with other lists, assign modelData if there is only a single role QVariant value = model->m_listModelInterface->data(data->m_index, model->m_roles.first()); return value; } @@ -615,6 +631,7 @@ /*! \qmlclass VisualDataModel QDeclarativeVisualDataModel + \ingroup qml-working-with-data \brief The VisualDataModel encapsulates a model and delegate A VisualDataModel encapsulates a model and the delegate that will @@ -697,6 +714,8 @@ QObject::disconnect(d->m_abstractItemModel, SIGNAL(rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)), this, SLOT(_q_rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int))); QObject::disconnect(d->m_abstractItemModel, SIGNAL(modelReset()), this, SLOT(_q_modelReset())); + QObject::disconnect(d->m_abstractItemModel, SIGNAL(layoutChanged()), this, SLOT(_q_layoutChanged())); + d->m_abstractItemModel = 0; } else if (d->m_visualItemModel) { QObject::disconnect(d->m_visualItemModel, SIGNAL(itemsInserted(int,int)), this, SIGNAL(itemsInserted(int,int))); @@ -743,6 +762,7 @@ QObject::connect(d->m_abstractItemModel, SIGNAL(rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int)), this, SLOT(_q_rowsMoved(const QModelIndex&,int,int,const QModelIndex&,int))); QObject::connect(d->m_abstractItemModel, SIGNAL(modelReset()), this, SLOT(_q_modelReset())); + QObject::connect(d->m_abstractItemModel, SIGNAL(layoutChanged()), this, SLOT(_q_layoutChanged())); d->m_metaDataCacheable = true; return; } @@ -948,7 +968,7 @@ Q_ASSERT(p->declarativeData); QDeclarativeData *d = static_cast(p->declarativeData); if (d->ownContext && d->context) - d->context->clearExpressions(); + d->context->clearContext(); if (inPackage) { emit destroyingPackage(qobject_cast(obj)); @@ -1136,38 +1156,6 @@ return val; } -QVariant QDeclarativeVisualDataModel::evaluate(int index, const QString &expression, QObject *objectContext) -{ - Q_D(QDeclarativeVisualDataModel); - if (d->m_visualItemModel) - return d->m_visualItemModel->evaluate(index, expression, objectContext); - - if ((!d->m_listModelInterface && !d->m_abstractItemModel) || !d->m_delegate) - return QVariant(); - - QVariant value; - QObject *nobj = d->m_cache.item(index); - if (nobj) { - QDeclarativeItem *item = qobject_cast(nobj); - if (item) { - QDeclarativeExpression e(qmlContext(item), objectContext, expression); - value = e.evaluate(); - } - } else { - QDeclarativeContext *ccontext = d->m_context; - if (!ccontext) ccontext = qmlContext(this); - QDeclarativeContext *ctxt = new QDeclarativeContext(ccontext); - QDeclarativeVisualDataModelData *data = new QDeclarativeVisualDataModelData(index, this); - ctxt->setContextObject(data); - QDeclarativeExpression e(ctxt, objectContext, expression); - value = e.evaluate(); - delete data; - delete ctxt; - } - - return value; -} - int QDeclarativeVisualDataModel::indexOf(QDeclarativeItem *item, QObject *) const { QVariant val = QDeclarativeEngine::contextForObject(item)->contextProperty(QLatin1String("index")); @@ -1190,11 +1178,13 @@ int role = roles.at(roleIdx); int propId = data->propForRole(role); if (propId != -1) { - if (d->m_listModelInterface) { - data->setValue(propId, d->m_listModelInterface->data(idx, QList() << role).value(role)); - } else if (d->m_abstractItemModel) { - QModelIndex index = d->m_abstractItemModel->index(idx, 0, d->m_root); - data->setValue(propId, d->m_abstractItemModel->data(index, role)); + if (data->hasValue(propId)) { + if (d->m_listModelInterface) { + data->setValue(propId, d->m_listModelInterface->data(idx, QList() << role).value(role)); + } else if (d->m_abstractItemModel) { + QModelIndex index = d->m_abstractItemModel->index(idx, 0, d->m_root); + data->setValue(propId, d->m_abstractItemModel->data(index, role)); + } } } else { QString roleName; @@ -1315,24 +1305,27 @@ void QDeclarativeVisualDataModel::_q_rowsInserted(const QModelIndex &parent, int begin, int end) { - if (!parent.isValid()) + Q_D(QDeclarativeVisualDataModel); + if (parent == d->m_root) _q_itemsInserted(begin, end - begin + 1); } void QDeclarativeVisualDataModel::_q_rowsRemoved(const QModelIndex &parent, int begin, int end) { - if (!parent.isValid()) + Q_D(QDeclarativeVisualDataModel); + if (parent == d->m_root) _q_itemsRemoved(begin, end - begin + 1); } void QDeclarativeVisualDataModel::_q_rowsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) { + Q_D(QDeclarativeVisualDataModel); const int count = sourceEnd - sourceStart + 1; - if (!destinationParent.isValid() && !sourceParent.isValid()) { + if (destinationParent == d->m_root && sourceParent == d->m_root) { _q_itemsMoved(sourceStart, destinationRow, count); - } else if (!sourceParent.isValid()) { + } else if (sourceParent == d->m_root) { _q_itemsRemoved(sourceStart, count); - } else if (!destinationParent.isValid()) { + } else if (destinationParent == d->m_root) { _q_itemsInserted(destinationRow, count); } } @@ -1340,10 +1333,16 @@ void QDeclarativeVisualDataModel::_q_dataChanged(const QModelIndex &begin, const QModelIndex &end) { Q_D(QDeclarativeVisualDataModel); - if (!begin.parent().isValid()) + if (begin.parent() == d->m_root) _q_itemsChanged(begin.row(), end.row() - begin.row() + 1, d->m_roles); } +void QDeclarativeVisualDataModel::_q_layoutChanged() +{ + Q_D(QDeclarativeVisualDataModel); + _q_itemsChanged(0, count(), d->m_roles); +} + void QDeclarativeVisualDataModel::_q_modelReset() { emit modelReset(); diff -r ef0373b55136 -r 758a864f9613 src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -79,7 +79,6 @@ virtual ReleaseFlags release(QDeclarativeItem *item) = 0; virtual bool completePending() const = 0; virtual void completeItem() = 0; - virtual QVariant evaluate(int index, const QString &expression, QObject *objectContext) = 0; virtual QString stringValue(int, const QString &) { return QString(); } virtual int indexOf(QDeclarativeItem *item, QObject *objectContext) const = 0; @@ -122,7 +121,6 @@ virtual bool completePending() const; virtual void completeItem(); virtual QString stringValue(int index, const QString &role); - virtual QVariant evaluate(int index, const QString &expression, QObject *objectContext); virtual int indexOf(QDeclarativeItem *item, QObject *objectContext) const; @@ -177,7 +175,6 @@ bool completePending() const; void completeItem(); virtual QString stringValue(int index, const QString &role); - QVariant evaluate(int index, const QString &expression, QObject *objectContext); int indexOf(QDeclarativeItem *item, QObject *objectContext) const; @@ -197,6 +194,7 @@ void _q_rowsRemoved(const QModelIndex &,int,int); void _q_rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int); void _q_dataChanged(const QModelIndex&,const QModelIndex&); + void _q_layoutChanged(); void _q_modelReset(); void _q_createdPackage(int index, QDeclarativePackage *package); void _q_destroyingPackage(QDeclarativePackage *package); diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/parser/qdeclarativejslexer.cpp --- a/src/declarative/qml/parser/qdeclarativejslexer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -120,7 +120,7 @@ void Lexer::setCode(const QString &c, int lineno) { - errmsg = QString(); + errmsg.clear(); yylineno = lineno; yycolumn = 1; restrKeyword = false; @@ -677,9 +677,9 @@ setDone(Other); } else state = Start; - if (driver) driver->addComment(startpos, tokenLength(), startlineno, startcolumn); + if (driver) driver->addComment(startpos+2, tokenLength()-2, startlineno, startcolumn+2); } else if (current == 0) { - if (driver) driver->addComment(startpos, tokenLength(), startlineno, startcolumn); + if (driver) driver->addComment(startpos+2, tokenLength()-2, startlineno, startcolumn+2); setDone(Eof); } @@ -689,14 +689,14 @@ setDone(Bad); err = UnclosedComment; errmsg = QCoreApplication::translate("QDeclarativeParser", "Unclosed comment at end of file"); - if (driver) driver->addComment(startpos, tokenLength(), startlineno, startcolumn); + if (driver) driver->addComment(startpos+2, tokenLength()-2, startlineno, startcolumn+2); } else if (isLineTerminator()) { shiftWindowsLineBreak(); yylineno++; } else if (current == '*' && next1 == '/') { state = Start; shift(1); - if (driver) driver->addComment(startpos, tokenLength(), startlineno, startcolumn); + if (driver) driver->addComment(startpos+2, tokenLength()-3, startlineno, startcolumn+2); } break; diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativecompiledbindings.cpp --- a/src/declarative/qml/qdeclarativecompiledbindings.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1628,7 +1628,7 @@ /*! Clear the state associated with attempting to compile a specific binding. -This does not clear the global "commited binding" states. +This does not clear the global "committed binding" states. */ void QDeclarativeBindingCompilerPrivate::resetInstanceState() { @@ -1874,7 +1874,7 @@ return false; QDeclarativeImportedNamespace *ns = 0; - if (!engine->importDatabase.resolveType(imports, name.toUtf8(), &attachType, 0, 0, 0, &ns)) + if (!imports.resolveType(name.toUtf8(), &attachType, 0, 0, 0, &ns)) return false; if (ns || !attachType || !attachType->attachedPropertiesType()) return false; diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativecompiler.cpp --- a/src/declarative/qml/qdeclarativecompiler.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativecompiler.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -41,7 +41,6 @@ #include "private/qdeclarativecompiler_p.h" -#include "private/qdeclarativecompositetypedata_p.h" #include "private/qdeclarativeparser_p.h" #include "private/qdeclarativescriptparser_p.h" #include "qdeclarativepropertyvaluesource.h" @@ -240,7 +239,7 @@ if (!ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: color expected")); } break; -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING case QVariant::Date: { bool ok; @@ -262,7 +261,7 @@ if (!ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: datetime expected")); } break; -#endif // QT_NO_TEXTDATE +#endif // QT_NO_DATESTRING case QVariant::Point: case QVariant::PointF: { @@ -416,7 +415,7 @@ instr.storeColor.value = c.rgba(); } break; -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING case QVariant::Date: { QDate d = QDeclarativeStringConverters::dateFromString(string); @@ -450,7 +449,7 @@ instr.storeDateTime.valueIndex = index; } break; -#endif // QT_NO_TEXTDATE +#endif // QT_NO_DATESTRING case QVariant::Point: case QVariant::PointF: { @@ -562,7 +561,7 @@ on a successful compiler. */ bool QDeclarativeCompiler::compile(QDeclarativeEngine *engine, - QDeclarativeCompositeTypeData *unit, + QDeclarativeTypeData *unit, QDeclarativeCompiledData *out) { exceptions.clear(); @@ -573,10 +572,15 @@ output = out; // Compile types - for (int ii = 0; ii < unit->types.count(); ++ii) { - QDeclarativeCompositeTypeData::TypeReference &tref = unit->types[ii]; + const QList &resolvedTypes = unit->resolvedTypes(); + QList referencedTypes = unit->parser().referencedTypes(); + + for (int ii = 0; ii < resolvedTypes.count(); ++ii) { QDeclarativeCompiledData::TypeReference ref; - QDeclarativeScriptParser::TypeReference *parserRef = unit->data.referencedTypes().at(ii); + + const QDeclarativeTypeData::TypeReference &tref = resolvedTypes.at(ii); + QDeclarativeScriptParser::TypeReference *parserRef = referencedTypes.at(ii); + if (tref.type) { ref.type = tref.type; if (!ref.type->isCreatable()) { @@ -585,33 +589,16 @@ err = tr( "Element is not creatable."); COMPILE_EXCEPTION(parserRef->refObjects.first(), err); } - } else if (tref.unit) { - ref.component = tref.unit->toComponent(engine); - - if (ref.component->isError()) { - QDeclarativeError error; - error.setUrl(output->url); - error.setDescription(QLatin1String("Unable to create type ") + - parserRef->name); - if (!parserRef->refObjects.isEmpty()) { - QDeclarativeParser::Object *parserObject = parserRef->refObjects.first(); - error.setLine(parserObject->location.start.line); - error.setColumn(parserObject->location.start.column); - } - - exceptions << error; - exceptions << ref.component->errors(); - reset(out); - return false; - } - ref.ref = tref.unit; + } else if (tref.typeData) { + ref.component = tref.typeData->component(); + ref.ref = tref.typeData; ref.ref->addref(); } ref.className = parserRef->name.toUtf8(); out->types << ref; } - Object *root = unit->data.tree(); + Object *root = unit->parser().tree(); Q_ASSERT(root); this->engine = engine; @@ -664,17 +651,18 @@ QHash importedScripts; QStringList importedScriptIndexes; - for (int ii = 0; ii < unit->scripts.count(); ++ii) { - QString scriptCode = QString::fromUtf8(unit->scripts.at(ii).resource->data); - Object::ScriptBlock::Pragmas pragmas = QDeclarativeScriptParser::extractPragmas(scriptCode); + foreach (const QDeclarativeTypeData::ScriptReference &script, unit->resolvedScripts()) { + QString scriptCode = script.script->scriptSource(); + Object::ScriptBlock::Pragmas pragmas = script.script->pragmas(); + + Q_ASSERT(!importedScripts.contains(script.qualifier)); if (!scriptCode.isEmpty()) { - Object::ScriptBlock &scriptBlock = importedScripts[unit->scripts.at(ii).qualifier]; - - scriptBlock.codes.append(scriptCode); - scriptBlock.lineNumbers.append(1); - scriptBlock.files.append(unit->scripts.at(ii).resource->url); - scriptBlock.pragmas.append(pragmas); + Object::ScriptBlock &scriptBlock = importedScripts[script.qualifier]; + + scriptBlock.code = scriptCode; + scriptBlock.file = script.script->finalUrl().toString(); + scriptBlock.pragmas = pragmas; } } @@ -703,7 +691,7 @@ for (int ii = 0; ii < importedScriptIndexes.count(); ++ii) output->importCache->add(importedScriptIndexes.at(ii), ii); - unit->imports.cache(output->importCache, engine); + unit->imports().populateCache(output->importCache, engine); Q_ASSERT(tree->metatype); @@ -986,7 +974,7 @@ } // Begin the class - if (obj->parserStatusCast != -1) { + if (tr.type && obj->parserStatusCast != -1) { QDeclarativeInstruction begin; begin.type = QDeclarativeInstruction::BeginObject; begin.begin.castValue = obj->parserStatusCast; @@ -1070,6 +1058,7 @@ store.storeSignal.value = output->indexForString(v->value.asScript().trimmed()); store.storeSignal.context = ctxt.stack; + store.storeSignal.name = output->indexForByteArray(prop->name); output->bytecode << store; } @@ -1373,7 +1362,7 @@ return p.name() != 0; } else { int idx = mo->indexOfProperty(prop->name.constData()); - return idx != -1; + return idx != -1 && mo->property(idx).isScriptable(); } } @@ -1402,8 +1391,7 @@ QDeclarativeType *type = 0; QDeclarativeImportedNamespace *typeNamespace = 0; - enginePrivate->importDatabase.resolveType(unit->imports, prop->name, - &type, 0, 0, 0, &typeNamespace); + unit->imports().resolveType(prop->name, &type, 0, 0, 0, &typeNamespace); if (typeNamespace) { // ### We might need to indicate that this property is a namespace @@ -1439,6 +1427,11 @@ if (prop->index != -1) { p = metaObject->property(prop->index); Q_ASSERT(p.name()); + + if (!p.isScriptable()) { + prop->index = -1; + p = QMetaProperty(); + } } } @@ -1511,7 +1504,7 @@ // Setup attached property data QDeclarativeType *type = 0; - enginePrivate->importDatabase.resolveTypeInNamespace(ns, prop->name, &type, 0, 0, 0); + unit->imports().resolveType(ns, prop->name, &type, 0, 0, 0); if (!type || !type->attachedPropertiesType()) COMPILE_EXCEPTION(prop, tr("Non-existent attached object")); @@ -1771,9 +1764,7 @@ Q_ASSERT(prop->index != -1); if (QDeclarativeValueTypeFactory::isValueType(prop->type)) { - QDeclarativeEnginePrivate *ep = - static_cast(QObjectPrivate::get(engine)); - if (prop->type >= 0 /* QVariant == -1 */ && ep->valueTypes[prop->type]) { + if (prop->type >= 0 /* QVariant == -1 */ && enginePrivate->valueTypes[prop->type]) { if (prop->values.count()) { if (prop->values.at(0)->location < prop->value->location) { @@ -1787,7 +1778,7 @@ COMPILE_EXCEPTION(prop, tr( "Invalid property assignment: \"%1\" is a read-only property").arg(QString::fromUtf8(prop->name))); } - COMPILE_CHECK(buildValueTypeProperty(ep->valueTypes[prop->type], + COMPILE_CHECK(buildValueTypeProperty(enginePrivate->valueTypes[prop->type], prop->value, obj, ctxt.incr())); obj->addValueTypeProperty(prop); } else { @@ -1825,6 +1816,8 @@ if (idx == -1) COMPILE_EXCEPTION(prop, tr("Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(prop->name))); QMetaProperty p = type->metaObject()->property(idx); + if (!p.isScriptable()) + COMPILE_EXCEPTION(prop, tr("Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(prop->name))); prop->index = idx; prop->type = p.userType(); prop->isValueTypeSubProperty = true; @@ -2138,8 +2131,7 @@ QString typeName = parts.at(0); QDeclarativeType *type = 0; - enginePrivate->importDatabase.resolveType(unit->imports, typeName.toUtf8(), - &type, 0, 0, 0, 0); + unit->imports().resolveType(typeName.toUtf8(), &type, 0, 0, 0, 0); if (!type || obj->typeName != type->qmlTypeName()) return true; @@ -2166,7 +2158,7 @@ int dot = script.indexOf('.'); if (dot > 0) { QDeclarativeType *type = 0; - enginePrivate->importDatabase.resolveType(unit->imports, script.left(dot), &type, 0, 0, 0, 0); + unit->imports().resolveType(script.left(dot), &type, 0, 0, 0, 0); if (!type) return -1; const QMetaObject *mo = type->metaObject(); @@ -2184,8 +2176,7 @@ const QMetaObject *QDeclarativeCompiler::resolveType(const QByteArray& name) const { QDeclarativeType *qmltype = 0; - if (!enginePrivate->importDatabase.resolveType(unit->imports, name, &qmltype, - 0, 0, 0, 0)) + if (!unit->imports().resolveType(name, &qmltype, 0, 0, 0, 0)) return 0; if (!qmltype) return 0; @@ -2214,10 +2205,11 @@ if (propNames.contains(prop.name)) COMPILE_EXCEPTION(&prop, tr("Duplicate property name")); - if (QString::fromUtf8(prop.name).at(0).isUpper()) + QString propName = QString::fromUtf8(prop.name); + if (propName.at(0).isUpper()) COMPILE_EXCEPTION(&prop, tr("Property names cannot begin with an upper case letter")); - if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(prop.name)) + if (enginePrivate->globalClass->illegalNames().contains(propName)) COMPILE_EXCEPTION(&prop, tr("Illegal property name")); propNames.insert(prop.name); @@ -2227,9 +2219,10 @@ QByteArray name = obj->dynamicSignals.at(ii).name; if (methodNames.contains(name)) COMPILE_EXCEPTION(obj, tr("Duplicate signal name")); - if (QString::fromUtf8(name).at(0).isUpper()) + QString nameStr = QString::fromUtf8(name); + if (nameStr.at(0).isUpper()) COMPILE_EXCEPTION(obj, tr("Signal names cannot begin with an upper case letter")); - if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(name)) + if (enginePrivate->globalClass->illegalNames().contains(nameStr)) COMPILE_EXCEPTION(obj, tr("Illegal signal name")); methodNames.insert(name); } @@ -2237,9 +2230,10 @@ QByteArray name = obj->dynamicSlots.at(ii).name; if (methodNames.contains(name)) COMPILE_EXCEPTION(obj, tr("Duplicate method name")); - if (QString::fromUtf8(name).at(0).isUpper()) + QString nameStr = QString::fromUtf8(name); + if (nameStr.at(0).isUpper()) COMPILE_EXCEPTION(obj, tr("Method names cannot begin with an upper case letter")); - if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(name)) + if (enginePrivate->globalClass->illegalNames().contains(nameStr)) COMPILE_EXCEPTION(obj, tr("Illegal method name")); methodNames.insert(name); } @@ -2340,17 +2334,18 @@ QByteArray customTypeName; QDeclarativeType *qmltype = 0; QUrl url; - if (!enginePrivate->importDatabase.resolveType(unit->imports, p.customType, &qmltype, - &url, 0, 0, 0)) + if (!unit->imports().resolveType(p.customType, &qmltype, &url, 0, 0, 0)) COMPILE_EXCEPTION(&p, tr("Invalid property type")); if (!qmltype) { - QDeclarativeCompositeTypeData *tdata = enginePrivate->typeManager.get(url); + QDeclarativeTypeData *tdata = enginePrivate->typeLoader.get(url); Q_ASSERT(tdata); - Q_ASSERT(tdata->status == QDeclarativeCompositeTypeData::Complete); - - QDeclarativeCompiledData *data = tdata->toCompiledComponent(engine); + Q_ASSERT(tdata->isComplete()); + + QDeclarativeCompiledData *data = tdata->compiledData(); customTypeName = data->root->className(); + data->release(); + tdata->release(); } else { customTypeName = qmltype->typeName(); } @@ -2416,17 +2411,20 @@ builder.addSignal(p.name + "Changed()"); QMetaPropertyBuilder propBuilder = builder.addProperty(p.name, type, builder.methodCount() - 1); - propBuilder.setScriptable(true); propBuilder.setWritable(!readonly); } - if (mode == ResolveAliases) { - for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) { - const Object::DynamicProperty &p = obj->dynamicProperties.at(ii); - - if (p.type == Object::DynamicProperty::Alias) { + for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) { + const Object::DynamicProperty &p = obj->dynamicProperties.at(ii); + + if (p.type == Object::DynamicProperty::Alias) { + if (mode == ResolveAliases) { ((QDeclarativeVMEMetaData *)dynamicData.data())->aliasCount++; compileAlias(builder, dynamicData, obj, p); + } else { + // Need a fake signal so that the metaobject remains consistent across + // the resolve and non-resolve alias runs + builder.addSignal(p.name + "Changed()"); } } } @@ -2582,6 +2580,9 @@ COMPILE_EXCEPTION(prop.defaultValue, tr("Invalid alias location")); QMetaProperty aliasProperty = idObject->metaObject()->property(propIdx); + if (!aliasProperty.isScriptable()) + COMPILE_EXCEPTION(prop.defaultValue, tr("Invalid alias location")); + writable = aliasProperty.isWritable(); if (aliasProperty.isEnumType()) @@ -2618,7 +2619,6 @@ builder.addSignal(prop.name + "Changed()"); QMetaPropertyBuilder propBuilder = builder.addProperty(prop.name, typeName.constData(), builder.methodCount() - 1); - propBuilder.setScriptable(true); propBuilder.setWritable(writable); return true; } @@ -2745,7 +2745,7 @@ expr.context = binding.bindingContext.object; expr.property = binding.property; expr.expression = binding.expression; - expr.imports = unit->imports; + expr.imports = unit->imports(); int index = bindingCompiler.compile(expr, enginePrivate); if (index != -1) { @@ -2765,6 +2765,7 @@ bool isSharable = sharableTest.isSharable(expression); QDeclarativeRewrite::RewriteBinding rewriteBinding; + rewriteBinding.setName('$'+binding.property->name); expression = rewriteBinding(expression); quint32 length = expression.length(); diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativecompiler_p.h --- a/src/declarative/qml/qdeclarativecompiler_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativecompiler_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -56,13 +56,13 @@ #include "qdeclarative.h" #include "qdeclarativeerror.h" #include "private/qdeclarativeinstruction_p.h" -#include "private/qdeclarativecompositetypemanager_p.h" #include "private/qdeclarativeparser_p.h" #include "private/qdeclarativeengine_p.h" #include "private/qbitfield_p.h" #include "private/qdeclarativepropertycache_p.h" #include "private/qdeclarativeintegercache_p.h" #include "private/qdeclarativetypenamecache_p.h" +#include "private/qdeclarativetypeloader_p.h" #include #include @@ -152,7 +152,7 @@ public: QDeclarativeCompiler(); - bool compile(QDeclarativeEngine *, QDeclarativeCompositeTypeData *, QDeclarativeCompiledData *); + bool compile(QDeclarativeEngine *, QDeclarativeTypeData *, QDeclarativeCompiledData *); bool isError() const; QList errors() const; @@ -338,7 +338,7 @@ QDeclarativeEngine *engine; QDeclarativeEnginePrivate *enginePrivate; QDeclarativeParser::Object *unitRoot; - QDeclarativeCompositeTypeData *unit; + QDeclarativeTypeData *unit; }; QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativecomponent.cpp --- a/src/declarative/qml/qdeclarativecomponent.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativecomponent.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -44,7 +44,6 @@ #include "private/qdeclarativecompiler_p.h" #include "private/qdeclarativecontext_p.h" -#include "private/qdeclarativecompositetypedata_p.h" #include "private/qdeclarativeengine_p.h" #include "private/qdeclarativevme_p.h" #include "qdeclarative.h" @@ -54,6 +53,7 @@ #include "private/qdeclarativeglobal_p.h" #include "private/qdeclarativescriptparser_p.h" #include "private/qdeclarativedebugtrace_p.h" +#include "private/qdeclarativeenginedebug_p.h" #include #include @@ -104,6 +104,7 @@ /*! \qmlclass Component QDeclarativeComponent + \ingroup qml-utility-elements \since 4.7 \brief The Component element encapsulates a QML component definition. @@ -115,24 +116,10 @@ a small component within a QML file, or for defining a component that logically belongs with other QML components within a file. - For example, here is a component that is used by multiple \l Loader objects: - - \qml - Item { - Component { - id: redSquare + For example, here is a component that is used by multiple \l Loader objects. + It contains a top level \l Rectangle item: - Rectangle { - color: "red" - width: 10 - height: 10 - } - } - - Loader { sourceComponent: redSquare } - Loader { sourceComponent: redSquare; x: 20 } - } - \endqml + \snippet doc/src/snippets/declarative/component.qml 0 Notice that while a \l Rectangle by itself would be automatically rendered and displayed, this is not the case for the above rectangle @@ -141,12 +128,16 @@ file, and is not loaded until requested (in this case, by the two \l Loader objects). + A Component cannot contain anything other + than an \c id and a single top level item. While the \c id is optional, + the top level item is not; you cannot define an empty component. + The Component element is commonly used to provide graphical components for views. For example, the ListView::delegate property requires a Component to specify how each list item is to be displayed. - Component objects can also be dynamically generated using - \l{Qt::createComponent}{Qt.createComponent()}. + Component objects can also be dynamically created using + \l{QML:Qt::createComponent()}{Qt.createComponent()}. */ /*! @@ -202,10 +193,10 @@ \value Null This QDeclarativeComponent has no data. Call loadUrl() or setData() to add QML content. \value Ready This QDeclarativeComponent is ready and create() may be called. \value Loading This QDeclarativeComponent is loading network data. - \value Error An error has occured. Call errors() to retrieve a list of \{QDeclarativeError}{errors}. + \value Error An error has occurred. Call errors() to retrieve a list of \{QDeclarativeError}{errors}. */ -void QDeclarativeComponentPrivate::typeDataReady() +void QDeclarativeComponentPrivate::typeDataReady(QDeclarativeTypeData *) { Q_Q(QDeclarativeComponent); @@ -217,28 +208,25 @@ emit q->statusChanged(q->status()); } -void QDeclarativeComponentPrivate::updateProgress(qreal p) +void QDeclarativeComponentPrivate::typeDataProgress(QDeclarativeTypeData *, qreal p) { Q_Q(QDeclarativeComponent); progress = p; + emit q->progressChanged(p); } -void QDeclarativeComponentPrivate::fromTypeData(QDeclarativeCompositeTypeData *data) +void QDeclarativeComponentPrivate::fromTypeData(QDeclarativeTypeData *data) { - url = data->imports.baseUrl(); - QDeclarativeCompiledData *c = data->toCompiledComponent(engine); + url = data->finalUrl(); + QDeclarativeCompiledData *c = data->compiledData(); if (!c) { - Q_ASSERT(data->status == QDeclarativeCompositeTypeData::Error); - - state.errors = data->errors; - + Q_ASSERT(data->isError()); + state.errors = data->errors(); } else { - cc = c; - } data->release(); @@ -247,7 +235,7 @@ void QDeclarativeComponentPrivate::clear() { if (typeData) { - typeData->remWaiter(this); + typeData->unregisterCallback(this); typeData->release(); typeData = 0; } @@ -279,7 +267,7 @@ } if (d->typeData) { - d->typeData->remWaiter(d); + d->typeData->unregisterCallback(d); d->typeData->release(); } if (d->cc) @@ -451,19 +439,13 @@ d->url = url; - QDeclarativeCompositeTypeData *typeData = - QDeclarativeEnginePrivate::get(d->engine)->typeManager.getImmediate(data, url); + QDeclarativeTypeData *typeData = QDeclarativeEnginePrivate::get(d->engine)->typeLoader.get(data, url); - if (typeData->status == QDeclarativeCompositeTypeData::Waiting - || typeData->status == QDeclarativeCompositeTypeData::WaitingResources) - { + if (typeData->isCompleteOrError()) { + d->fromTypeData(typeData); + } else { d->typeData = typeData; - d->typeData->addWaiter(d); - - } else { - - d->fromTypeData(typeData); - + d->typeData->registerCallback(d); } d->progress = 1.0; @@ -509,18 +491,15 @@ return; } - QDeclarativeCompositeTypeData *data = - QDeclarativeEnginePrivate::get(d->engine)->typeManager.get(d->url); + QDeclarativeTypeData *data = QDeclarativeEnginePrivate::get(d->engine)->typeLoader.get(d->url); - if (data->status == QDeclarativeCompositeTypeData::Waiting - || data->status == QDeclarativeCompositeTypeData::WaitingResources) - { - d->typeData = data; - d->typeData->addWaiter(d); - d->progress = data->progress; - } else { + if (data->isCompleteOrError()) { d->fromTypeData(data); d->progress = 1.0; + } else { + d->typeData = data; + d->typeData->registerCallback(d); + d->progress = data->progress(); } emit statusChanged(status()); @@ -528,7 +507,7 @@ } /*! - Return the list of errors that occured during the last compile or create + Return the list of errors that occurred during the last compile or create operation. An empty list is returned if isError() is not set. */ QList QDeclarativeComponent::errors() const @@ -607,6 +586,9 @@ the \a parent value. Note that if the returned object is to be displayed, you must provide a valid \a parent value or set the returned object's \l{Item::parent}{parent} property, or else the object will not be visible. + + Dynamically created instances can be deleted with the \c destroy() method. + See \l {Dynamic Object Management in QML} for more information. */ /*! @@ -625,10 +607,11 @@ ctxt = d->engine->rootContext(); if (!ctxt) return QScriptValue(QScriptValue::NullValue); - QObject* ret = create(ctxt); - if (!ret) + QObject* ret = beginCreate(ctxt); + if (!ret) { + completeCreate(); return QScriptValue(QScriptValue::NullValue); - + } if (parent) { ret->setParent(parent); @@ -649,6 +632,7 @@ if (needParent) qWarning("QDeclarativeComponent: Created graphical object was not placed in the graphics scene."); } + completeCreate(); QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(d->engine); QDeclarativeData::get(ret, true)->setImplicitDestructible(); @@ -771,8 +755,11 @@ QObject *rv = begin(ctxt, ep, cc, start, count, &state, bindings); - if (rv && !context->isInternal && ep->isDebugging) - context->asQDeclarativeContextPrivate()->instances.append(rv); + if (ep->isDebugging && rv) { + if (!context->isInternal) + context->asQDeclarativeContextPrivate()->instances.append(rv); + QDeclarativeEngineDebugServer::instance()->objectCreated(engine, rv); + } return rv; } diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativecomponent.h --- a/src/declarative/qml/qdeclarativecomponent.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativecomponent.h Mon Oct 04 01:19:32 2010 +0300 @@ -117,6 +117,7 @@ Q_DISABLE_COPY(QDeclarativeComponent) friend class QDeclarativeVME; friend class QDeclarativeCompositeTypeData; + friend class QDeclarativeTypeData; }; QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativecomponent_p.h --- a/src/declarative/qml/qdeclarativecomponent_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativecomponent_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -56,7 +56,7 @@ #include "qdeclarativecomponent.h" #include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativecompositetypemanager_p.h" +#include "private/qdeclarativetypeloader_p.h" #include "private/qbitfield_p.h" #include "qdeclarativeerror.h" #include "qdeclarative.h" @@ -74,7 +74,7 @@ class QDeclarativeCompiledData; class QDeclarativeComponentAttached; -class QDeclarativeComponentPrivate : public QObjectPrivate +class QDeclarativeComponentPrivate : public QObjectPrivate, public QDeclarativeTypeData::TypeDataCallback { Q_DECLARE_PUBLIC(QDeclarativeComponent) @@ -85,11 +85,11 @@ QObject *beginCreate(QDeclarativeContextData *, const QBitField &); void completeCreate(); - QDeclarativeCompositeTypeData *typeData; - void typeDataReady(); - void updateProgress(qreal); + QDeclarativeTypeData *typeData; + virtual void typeDataReady(QDeclarativeTypeData *); + virtual void typeDataProgress(QDeclarativeTypeData *, qreal); - void fromTypeData(QDeclarativeCompositeTypeData *data); + void fromTypeData(QDeclarativeTypeData *data); QUrl url; qreal progress; diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativecompositetypedata_p.h --- a/src/declarative/qml/qdeclarativecompositetypedata_p.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,161 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QDECLARATIVECOMPOSITETYPEDATA_P_H -#define QDECLARATIVECOMPOSITETYPEDATA_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include "private/qdeclarativeengine_p.h" - -#include - -QT_BEGIN_NAMESPACE - -class QDeclarativeCompositeTypeResource; -class QDeclarativeCompositeTypeData : public QDeclarativeRefCount -{ -public: - QDeclarativeCompositeTypeData(); - virtual ~QDeclarativeCompositeTypeData(); - - enum Status { - Invalid, - Complete, - Error, - Waiting, - WaitingResources - }; - Status status; - enum ErrorType { - NoError, - AccessError, - GeneralError - }; - ErrorType errorType; - - QList errors; - - QDeclarativeImports imports; - - QList dependants; - - // Return a QDeclarativeComponent if the QDeclarativeCompositeTypeData is not in the Waiting - // state. The QDeclarativeComponent is owned by the QDeclarativeCompositeTypeData, so a - // reference should be kept to keep the QDeclarativeComponent alive. - QDeclarativeComponent *toComponent(QDeclarativeEngine *); - // Return a QDeclarativeCompiledData if possible, or 0 if an error - // occurs - QDeclarativeCompiledData *toCompiledComponent(QDeclarativeEngine *); - - struct TypeReference - { - TypeReference(); - - QDeclarativeType *type; - QDeclarativeCompositeTypeData *unit; - }; - - struct ScriptReference - { - ScriptReference(); - - QString qualifier; - QDeclarativeCompositeTypeResource *resource; - }; - - QList types; - QList scripts; - QList resources; - - // Add or remove p as a waiter. When the QDeclarativeCompositeTypeData becomes - // ready, the QDeclarativeComponentPrivate::typeDataReady() method will be invoked on - // p. The waiter is automatically removed when the typeDataReady() method - // is invoked, so there is no need to call remWaiter() in this case. - void addWaiter(QDeclarativeComponentPrivate *p); - void remWaiter(QDeclarativeComponentPrivate *p); - - qreal progress; - -private: - friend class QDeclarativeCompositeTypeManager; - friend class QDeclarativeCompiler; - friend class QDeclarativeDomDocument; - - QDeclarativeScriptParser data; - QList waiters; - QDeclarativeComponent *component; - QDeclarativeCompiledData *compiledComponent; -}; - -class QDeclarativeCompositeTypeResource : public QDeclarativeRefCount -{ -public: - QDeclarativeCompositeTypeResource(); - virtual ~QDeclarativeCompositeTypeResource(); - - enum Status { - Invalid, - Complete, - Error, - Waiting - }; - Status status; - - QList dependants; - - QString url; - QByteArray data; -}; - -QT_END_NAMESPACE - -#endif // QDECLARATIVECOMPOSITETYPEDATA_P_H - diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativecompositetypemanager.cpp --- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,776 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "private/qdeclarativecompositetypemanager_p.h" - -#include "private/qdeclarativecompositetypedata_p.h" -#include "private/qdeclarativescriptparser_p.h" -#include "qdeclarativeengine.h" -#include "private/qdeclarativeengine_p.h" -#include "qdeclarativecomponent.h" -#include "private/qdeclarativecomponent_p.h" -#include "private/qdeclarativecompiler_p.h" - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -QDeclarativeCompositeTypeData::QDeclarativeCompositeTypeData() -: status(Invalid), errorType(NoError), component(0), compiledComponent(0) -{ -} - -QDeclarativeCompositeTypeData::~QDeclarativeCompositeTypeData() -{ - for (int ii = 0; ii < dependants.count(); ++ii) - dependants.at(ii)->release(); - - for (int ii = 0; ii < resources.count(); ++ii) - resources.at(ii)->release(); - - if (compiledComponent) - compiledComponent->release(); - - if (component) - delete component; -} - -QDeclarativeCompositeTypeResource::QDeclarativeCompositeTypeResource() -{ -} - -QDeclarativeCompositeTypeResource::~QDeclarativeCompositeTypeResource() -{ - for (int ii = 0; ii < dependants.count(); ++ii) - dependants.at(ii)->release(); -} - -void QDeclarativeCompositeTypeData::addWaiter(QDeclarativeComponentPrivate *p) -{ - waiters << p; -} - -void QDeclarativeCompositeTypeData::remWaiter(QDeclarativeComponentPrivate *p) -{ - waiters.removeAll(p); -} - -QDeclarativeComponent *QDeclarativeCompositeTypeData::toComponent(QDeclarativeEngine *engine) -{ - if (!component) { - - QDeclarativeCompiledData *cc = toCompiledComponent(engine); - if (cc) { - component = new QDeclarativeComponent(engine, cc, -1, -1, 0); - cc->release(); - } else { - component = new QDeclarativeComponent(engine, 0); - component->d_func()->url = imports.baseUrl(); - component->d_func()->state.errors = errors; - } - - } - - return component; -} - -QDeclarativeCompiledData * -QDeclarativeCompositeTypeData::toCompiledComponent(QDeclarativeEngine *engine) -{ - if (status == Complete && !compiledComponent) { - - // Build script imports - foreach (const QDeclarativeScriptParser::Import &import, data.imports()) { - if (import.type == QDeclarativeScriptParser::Import::Script) { - QString url = imports.baseUrl().resolved(QUrl(import.uri)).toString(); - - ScriptReference ref; - ref.qualifier = import.qualifier; - - for (int ii = 0; ii < resources.count(); ++ii) { - if (resources.at(ii)->url == url) { - ref.resource = resources.at(ii); - break; - } - } - - Q_ASSERT(ref.resource); - - scripts << ref; - } - } - - compiledComponent = new QDeclarativeCompiledData(engine); - compiledComponent->url = imports.baseUrl(); - compiledComponent->name = compiledComponent->url.toString(); - - QDeclarativeCompiler compiler; - if (!compiler.compile(engine, this, compiledComponent)) { - status = Error; - errors = compiler.errors(); - compiledComponent->release(); - compiledComponent = 0; - } - - // Data is no longer needed once we have a compiled component - data.clear(); - } - - if (compiledComponent) - compiledComponent->addref(); - - return compiledComponent; -} - -QDeclarativeCompositeTypeData::TypeReference::TypeReference() -: type(0), unit(0) -{ -} - -QDeclarativeCompositeTypeData::ScriptReference::ScriptReference() -: resource(0) -{ -} - -QDeclarativeCompositeTypeManager::QDeclarativeCompositeTypeManager(QDeclarativeEngine *e) -: engine(e), redirectCount(0) -{ -} - -QDeclarativeCompositeTypeManager::~QDeclarativeCompositeTypeManager() -{ - for (Components::Iterator iter = components.begin(); iter != components.end();) { - (*iter)->release(); - iter = components.erase(iter); - } - for (Resources::Iterator iter = resources.begin(); iter != resources.end();) { - (*iter)->release(); - iter = resources.erase(iter); - } -} - -QDeclarativeCompositeTypeData *QDeclarativeCompositeTypeManager::get(const QUrl &url) -{ - Redirects::Iterator redir = redirects.find(url); - if (redir != redirects.end()) - return get(*redir); - - QDeclarativeCompositeTypeData *unit = components.value(url); - - if (!unit) { - unit = new QDeclarativeCompositeTypeData; - unit->status = QDeclarativeCompositeTypeData::Waiting; - unit->progress = 0.0; - unit->imports.setBaseUrl(url); - components.insert(url, unit); - - loadSource(unit); - } - - unit->addref(); - return unit; -} - -QDeclarativeCompositeTypeData * -QDeclarativeCompositeTypeManager::getImmediate(const QByteArray &data, const QUrl &url) -{ - QDeclarativeCompositeTypeData *unit = new QDeclarativeCompositeTypeData; - unit->status = QDeclarativeCompositeTypeData::Waiting; - unit->imports.setBaseUrl(url); - setData(unit, data, url); - return unit; -} - -void QDeclarativeCompositeTypeManager::clearCache() -{ - for (Components::Iterator iter = components.begin(); iter != components.end();) { - if ((*iter)->status != QDeclarativeCompositeTypeData::Waiting) { - (*iter)->release(); - iter = components.erase(iter); - } else { - ++iter; - } - } - - for (Resources::Iterator iter = resources.begin(); iter != resources.end();) { - if ((*iter)->status != QDeclarativeCompositeTypeResource::Waiting) { - (*iter)->release(); - iter = resources.erase(iter); - } else { - ++iter; - } - } -} - -#define TYPEMANAGER_MAXIMUM_REDIRECT_RECURSION 16 - -void QDeclarativeCompositeTypeManager::replyFinished() -{ - QNetworkReply *reply = static_cast(sender()); - - QDeclarativeCompositeTypeData *unit = components.value(reply->url()); - Q_ASSERT(unit); - - redirectCount++; - if (redirectCount < TYPEMANAGER_MAXIMUM_REDIRECT_RECURSION) { - QVariant redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute); - if (redirect.isValid()) { - QUrl url = reply->url().resolved(redirect.toUrl()); - redirects.insert(reply->url(),url); - unit->imports.setBaseUrl(url); - components.remove(reply->url()); - components.insert(url, unit); - reply->deleteLater(); - reply = engine->networkAccessManager()->get(QNetworkRequest(url)); - QObject::connect(reply, SIGNAL(finished()), - this, SLOT(replyFinished())); - QObject::connect(reply, SIGNAL(downloadProgress(qint64,qint64)), - this, SLOT(requestProgress(qint64,qint64))); - return; - } - } - redirectCount = 0; - - if (reply->error() != QNetworkReply::NoError) { - QString errorDescription; - // ### - Fill in error - errorDescription = QLatin1String("Network error for URL ") + - reply->url().toString(); - - unit->status = QDeclarativeCompositeTypeData::Error; - // ### FIXME - QDeclarativeError error; - error.setDescription(errorDescription); - unit->errorType = QDeclarativeCompositeTypeData::AccessError; - unit->errors << error; - doComplete(unit); - - } else { - QByteArray data = reply->readAll(); - - setData(unit, data, reply->url()); - } - - reply->deleteLater(); -} - -void QDeclarativeCompositeTypeManager::resourceReplyFinished() -{ - QNetworkReply *reply = static_cast(sender()); - - QDeclarativeCompositeTypeResource *resource = resources.value(reply->url()); - Q_ASSERT(resource); - - redirectCount++; - if (redirectCount < TYPEMANAGER_MAXIMUM_REDIRECT_RECURSION) { - QVariant redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute); - if (redirect.isValid()) { - QUrl url = reply->url().resolved(redirect.toUrl()); - redirects.insert(reply->url(),url); - resource->url = url.toString(); - resources.remove(reply->url()); - resources.insert(url, resource); - reply->deleteLater(); - reply = engine->networkAccessManager()->get(QNetworkRequest(url)); - QObject::connect(reply, SIGNAL(finished()), - this, SLOT(resourceReplyFinished())); - return; - } - } - redirectCount = 0; - - if (reply->error() != QNetworkReply::NoError) { - - resource->status = QDeclarativeCompositeTypeResource::Error; - - } else { - - resource->status = QDeclarativeCompositeTypeResource::Complete; - resource->data = reply->readAll(); - - } - - doComplete(resource); - reply->deleteLater(); -} - -void QDeclarativeCompositeTypeManager::loadResource(QDeclarativeCompositeTypeResource *resource) -{ - QUrl url(resource->url); - - QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url); - if (!lf.isEmpty()) { - - QFile file(lf); - if (file.open(QFile::ReadOnly)) { - resource->data = file.readAll(); - resource->status = QDeclarativeCompositeTypeResource::Complete; - } else { - resource->status = QDeclarativeCompositeTypeResource::Error; - } - } else if (url.scheme().isEmpty()) { - - // We can't open this, so just declare as an error - resource->status = QDeclarativeCompositeTypeResource::Error; - } else { - - QNetworkReply *reply = - engine->networkAccessManager()->get(QNetworkRequest(url)); - QObject::connect(reply, SIGNAL(finished()), - this, SLOT(resourceReplyFinished())); - - } -} - -void QDeclarativeCompositeTypeManager::loadSource(QDeclarativeCompositeTypeData *unit) -{ - QUrl url(unit->imports.baseUrl()); - - QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url); - if (!lf.isEmpty()) { - - QFile file(lf); - if (file.open(QFile::ReadOnly)) { - QByteArray data = file.readAll(); - setData(unit, data, url); - return; // success - } - } else if (!url.scheme().isEmpty()) { - QNetworkReply *reply = - engine->networkAccessManager()->get(QNetworkRequest(url)); - QObject::connect(reply, SIGNAL(finished()), - this, SLOT(replyFinished())); - QObject::connect(reply, SIGNAL(downloadProgress(qint64,qint64)), - this, SLOT(requestProgress(qint64,qint64))); - return; // waiting - } - - // error happened - QString errorDescription; - // ### - Fill in error - errorDescription = QLatin1String("File error for URL ") + url.toString(); - unit->status = QDeclarativeCompositeTypeData::Error; - // ### FIXME - QDeclarativeError error; - error.setDescription(errorDescription); - unit->errorType = QDeclarativeCompositeTypeData::AccessError; - unit->errors << error; - doComplete(unit); -} - -void QDeclarativeCompositeTypeManager::requestProgress(qint64 received, qint64 total) -{ - if (total <= 0) - return; - QNetworkReply *reply = static_cast(sender()); - - QDeclarativeCompositeTypeData *unit = components.value(reply->url()); - Q_ASSERT(unit); - - unit->progress = qreal(received)/total; - - foreach (QDeclarativeComponentPrivate *comp, unit->waiters) - comp->updateProgress(unit->progress); -} - -void QDeclarativeCompositeTypeManager::setData(QDeclarativeCompositeTypeData *unit, - const QByteArray &data, - const QUrl &url) -{ - bool ok = true; - if (!unit->data.parse(data, url)) { - ok = false; - unit->errors << unit->data.errors(); - } - - if (ok) { - compile(unit); - } else { - unit->status = QDeclarativeCompositeTypeData::Error; - unit->errorType = QDeclarativeCompositeTypeData::GeneralError; - doComplete(unit); - } -} - -void QDeclarativeCompositeTypeManager::doComplete(QDeclarativeCompositeTypeData *unit) -{ - for (int ii = 0; ii < unit->dependants.count(); ++ii) { - checkComplete(unit->dependants.at(ii)); - unit->dependants.at(ii)->release(); - } - unit->dependants.clear(); - - while(!unit->waiters.isEmpty()) { - QDeclarativeComponentPrivate *p = unit->waiters.takeFirst(); - p->typeDataReady(); - } -} - -void QDeclarativeCompositeTypeManager::doComplete(QDeclarativeCompositeTypeResource *resource) -{ - for (int ii = 0; ii < resource->dependants.count(); ++ii) { - checkComplete(resource->dependants.at(ii)); - resource->dependants.at(ii)->release(); - } - resource->dependants.clear(); -} - -void QDeclarativeCompositeTypeManager::checkComplete(QDeclarativeCompositeTypeData *unit) -{ - if (unit->status != QDeclarativeCompositeTypeData::Waiting - && unit->status != QDeclarativeCompositeTypeData::WaitingResources) - return; - - int waiting = 0; - for (int ii = 0; ii < unit->resources.count(); ++ii) { - QDeclarativeCompositeTypeResource *r = unit->resources.at(ii); - - if (!r) - continue; - - if (r->status == QDeclarativeCompositeTypeResource::Error) { - unit->status = QDeclarativeCompositeTypeData::Error; - QDeclarativeError error; - error.setUrl(unit->imports.baseUrl()); - error.setDescription(tr("Resource %1 unavailable").arg(r->url)); - unit->errors << error; - doComplete(unit); - return; - } else if (r->status == QDeclarativeCompositeTypeResource::Waiting) { - waiting++; - } - } - - if (waiting == 0) { - if (unit->status == QDeclarativeCompositeTypeData::WaitingResources) { - waiting += resolveTypes(unit); - if (unit->status != QDeclarativeCompositeTypeData::Error) { - if (waiting) - unit->status = QDeclarativeCompositeTypeData::Waiting; - } else { - return; - } - } else { - for (int ii = 0; ii < unit->types.count(); ++ii) { - QDeclarativeCompositeTypeData *u = unit->types.at(ii).unit; - - if (!u) - continue; - - if (u->status == QDeclarativeCompositeTypeData::Error) { - unit->status = QDeclarativeCompositeTypeData::Error; - unit->errors = u->errors; - doComplete(unit); - return; - } else if (u->status == QDeclarativeCompositeTypeData::Waiting - || u->status == QDeclarativeCompositeTypeData::WaitingResources) - { - waiting++; - } - } - } - } - - if (!waiting) { - unit->status = QDeclarativeCompositeTypeData::Complete; - doComplete(unit); - } -} - -int QDeclarativeCompositeTypeManager::resolveTypes(QDeclarativeCompositeTypeData *unit) -{ - // not called until all resources are loaded (they include import URLs) - int waiting = 0; - - QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine); - QDeclarativeImportDatabase &importDatabase = ep->importDatabase; - - // For local urls, add an implicit import "." as first (most overridden) lookup. - // This will also trigger the loading of the qmldir and the import of any native - // types from available plugins. - { - QDeclarativeDirComponents qmldircomponentsnetwork; - if (QDeclarativeCompositeTypeResource *resource - = resources.value(unit->imports.baseUrl().resolved(QUrl(QLatin1String("./qmldir"))))) { - QDeclarativeDirParser parser; - parser.setSource(QString::fromUtf8(resource->data)); - parser.parse(); - qmldircomponentsnetwork = parser.components(); - } - - importDatabase.addToImport(&unit->imports, qmldircomponentsnetwork, QLatin1String("."), - QString(), -1, -1, QDeclarativeScriptParser::Import::File, - 0); // error ignored (just means no fallback) - } - - - foreach (QDeclarativeScriptParser::Import imp, unit->data.imports()) { - QDeclarativeDirComponents qmldircomponentsnetwork; - if (imp.type == QDeclarativeScriptParser::Import::Script) - continue; - - if (imp.type == QDeclarativeScriptParser::Import::File && imp.qualifier.isEmpty()) { - QString importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir"))).toString(); - for (int ii = 0; ii < unit->resources.count(); ++ii) { - if (unit->resources.at(ii)->url == importUrl) { - QDeclarativeDirParser parser; - parser.setSource(QString::fromUtf8(unit->resources.at(ii)->data)); - parser.parse(); - qmldircomponentsnetwork = parser.components(); - break; - } - } - } - - - int vmaj = -1; - int vmin = -1; - if (!imp.version.isEmpty()) { - int dot = imp.version.indexOf(QLatin1Char('.')); - if (dot < 0) { - vmaj = imp.version.toInt(); - vmin = 0; - } else { - vmaj = imp.version.left(dot).toInt(); - vmin = imp.version.mid(dot+1).toInt(); - } - } - - QString errorString; - if (!importDatabase.addToImport(&unit->imports, qmldircomponentsnetwork, imp.uri, imp.qualifier, - vmaj, vmin, imp.type, &errorString)) { - QDeclarativeError error; - error.setUrl(unit->imports.baseUrl()); - error.setDescription(errorString); - error.setLine(imp.location.start.line); - error.setColumn(imp.location.start.column); - unit->status = QDeclarativeCompositeTypeData::Error; - unit->errorType = QDeclarativeCompositeTypeData::GeneralError; - unit->errors << error; - doComplete(unit); - return 0; - } - } - - - QList types = unit->data.referencedTypes(); - - for (int ii = 0; ii < types.count(); ++ii) { - QDeclarativeScriptParser::TypeReference *parserRef = types.at(ii); - QByteArray typeName = parserRef->name.toUtf8(); - - QDeclarativeCompositeTypeData::TypeReference ref; - - QUrl url; - int majorVersion; - int minorVersion; - QDeclarativeImportedNamespace *typeNamespace = 0; - QString errorString; - if (!importDatabase.resolveType(unit->imports, typeName, &ref.type, &url, &majorVersion, &minorVersion, - &typeNamespace, &errorString) || typeNamespace) { - // Known to not be a type: - // - known to be a namespace (Namespace {}) - // - type with unknown namespace (UnknownNamespace.SomeType {}) - QDeclarativeError error; - error.setUrl(unit->imports.baseUrl()); - QString userTypeName = QString::fromUtf8(typeName); - userTypeName.replace(QLatin1Char('/'),QLatin1Char('.')); - if (typeNamespace) - error.setDescription(tr("Namespace %1 cannot be used as a type").arg(userTypeName)); - else - error.setDescription(tr("%1 %2").arg(userTypeName).arg(errorString)); - - if (!parserRef->refObjects.isEmpty()) { - QDeclarativeParser::Object *obj = parserRef->refObjects.first(); - error.setLine(obj->location.start.line); - error.setColumn(obj->location.start.column); - } - unit->status = QDeclarativeCompositeTypeData::Error; - unit->errorType = QDeclarativeCompositeTypeData::GeneralError; - unit->errors << error; - doComplete(unit); - return 0; - } - - if (ref.type) { - foreach (QDeclarativeParser::Object *obj, parserRef->refObjects) { - // store namespace for DOM - obj->majorVersion = majorVersion; - obj->minorVersion = minorVersion; - } - unit->types << ref; - continue; - } - - Redirects::Iterator redir = redirects.find(url); - if (redir != redirects.end()) - url = *redir; - - QDeclarativeCompositeTypeData *urlUnit = components.value(url); - - if (!urlUnit) { - urlUnit = new QDeclarativeCompositeTypeData; - urlUnit->status = QDeclarativeCompositeTypeData::Waiting; - urlUnit->imports.setBaseUrl(url); - components.insert(url, urlUnit); - - loadSource(urlUnit); - } - - ref.unit = urlUnit; - switch(urlUnit->status) { - case QDeclarativeCompositeTypeData::Invalid: - case QDeclarativeCompositeTypeData::Error: - unit->status = QDeclarativeCompositeTypeData::Error; - { - QDeclarativeError error; - error.setUrl(unit->imports.baseUrl()); - error.setDescription(tr("Type %1 unavailable").arg(QString::fromUtf8(typeName))); - if (!parserRef->refObjects.isEmpty()) { - QDeclarativeParser::Object *obj = parserRef->refObjects.first(); - error.setLine(obj->location.start.line); - error.setColumn(obj->location.start.column); - } - unit->errors << error; - } - if (urlUnit->errorType != QDeclarativeCompositeTypeData::AccessError) - unit->errors << urlUnit->errors; - doComplete(unit); - return 0; - - case QDeclarativeCompositeTypeData::Complete: - break; - - case QDeclarativeCompositeTypeData::Waiting: - case QDeclarativeCompositeTypeData::WaitingResources: - unit->addref(); - ref.unit->dependants << unit; - waiting++; - break; - } - - unit->types << ref; - } - return waiting; -} - -// ### Check ref counting in here -void QDeclarativeCompositeTypeManager::compile(QDeclarativeCompositeTypeData *unit) -{ - int waiting = 0; - - QList resourceList = unit->data.referencedResources(); - - foreach (QDeclarativeScriptParser::Import imp, unit->data.imports()) { - if (imp.type == QDeclarativeScriptParser::Import::File && imp.qualifier.isEmpty()) { - QUrl importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir"))); - if (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(importUrl).isEmpty()) { - // Import requires remote qmldir - resourceList.prepend(importUrl); - } - } - } - - QUrl importUrl; - if (!unit->imports.baseUrl().scheme().isEmpty()) - importUrl = unit->imports.baseUrl().resolved(QUrl(QLatin1String("qmldir"))); - if (!importUrl.scheme().isEmpty() && QDeclarativeEnginePrivate::urlToLocalFileOrQrc(importUrl).isEmpty()) - resourceList.prepend(importUrl); - - for (int ii = 0; ii < resourceList.count(); ++ii) { - QUrl url = unit->imports.baseUrl().resolved(resourceList.at(ii)); - - QDeclarativeCompositeTypeResource *resource = resources.value(url); - - if (!resource) { - resource = new QDeclarativeCompositeTypeResource; - resource->status = QDeclarativeCompositeTypeResource::Waiting; - resource->url = url.toString(); - resources.insert(url, resource); - - loadResource(resource); - } - - switch(resource->status) { - case QDeclarativeCompositeTypeResource::Invalid: - case QDeclarativeCompositeTypeResource::Error: - unit->status = QDeclarativeCompositeTypeData::Error; - { - QDeclarativeError error; - error.setUrl(unit->imports.baseUrl()); - error.setDescription(tr("Resource %1 unavailable").arg(resource->url)); - unit->errors << error; - } - doComplete(unit); - return; - - case QDeclarativeCompositeTypeData::Complete: - break; - - case QDeclarativeCompositeTypeData::Waiting: - unit->addref(); - resource->dependants << unit; - waiting++; - break; - } - - resource->addref(); - unit->resources << resource; - } - - if (waiting == 0) { - waiting += resolveTypes(unit); - if (unit->status != QDeclarativeCompositeTypeData::Error) { - if (!waiting) { - unit->status = QDeclarativeCompositeTypeData::Complete; - doComplete(unit); - } else { - unit->status = QDeclarativeCompositeTypeData::Waiting; - } - } - } else { - unit->status = QDeclarativeCompositeTypeData::WaitingResources; - } -} - -QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativecompositetypemanager_p.h --- a/src/declarative/qml/qdeclarativecompositetypemanager_p.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,120 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QDECLARATIVECOMPOSITETYPEMANAGER_P_H -#define QDECLARATIVECOMPOSITETYPEMANAGER_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include "private/qdeclarativescriptparser_p.h" -#include "private/qdeclarativerefcount_p.h" -#include "qdeclarativeerror.h" -#include "qdeclarativeengine.h" - -#include - -QT_BEGIN_NAMESPACE - -class QDeclarativeCompiledData; -class QDeclarativeComponentPrivate; -class QDeclarativeComponent; -class QDeclarativeDomDocument; - -class QDeclarativeCompositeTypeData; -class QDeclarativeCompositeTypeResource; - -class QDeclarativeCompositeTypeManager : public QObject -{ - Q_OBJECT -public: - QDeclarativeCompositeTypeManager(QDeclarativeEngine *); - ~QDeclarativeCompositeTypeManager(); - - // Return a QDeclarativeCompositeTypeData for url. The QDeclarativeCompositeTypeData may be - // cached. - QDeclarativeCompositeTypeData *get(const QUrl &url); - // Return a QDeclarativeCompositeTypeData for data, with the provided base url. The - // QDeclarativeCompositeTypeData will not be cached. - QDeclarativeCompositeTypeData *getImmediate(const QByteArray &data, const QUrl &url); - - // Clear cached types. Only types that aren't in the Waiting state will - // be cleared. - void clearCache(); - -private Q_SLOTS: - void replyFinished(); - void resourceReplyFinished(); - void requestProgress(qint64 received, qint64 total); - -private: - void loadSource(QDeclarativeCompositeTypeData *); - void loadResource(QDeclarativeCompositeTypeResource *); - void compile(QDeclarativeCompositeTypeData *); - void setData(QDeclarativeCompositeTypeData *, const QByteArray &, const QUrl &); - - void doComplete(QDeclarativeCompositeTypeData *); - void doComplete(QDeclarativeCompositeTypeResource *); - void checkComplete(QDeclarativeCompositeTypeData *); - int resolveTypes(QDeclarativeCompositeTypeData *); - - QDeclarativeEngine *engine; - typedef QHash Components; - Components components; - typedef QHash Resources; - Resources resources; - typedef QHash Redirects; - Redirects redirects; - int redirectCount; -}; - -QT_END_NAMESPACE - -#endif // QDECLARATIVECOMPOSITETYPEMANAGER_P_H - diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativecontext.cpp --- a/src/declarative/qml/qdeclarativecontext.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativecontext.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -80,10 +80,12 @@ \code QDeclarativeEngine engine; + QStringListModel modelData; QDeclarativeContext *context = new QDeclarativeContext(engine.rootContext()); - context->setContextProperty("myModel", modelData); + context->setContextProperty("myModel", &modelData); - QDeclarativeComponent component(&engine, "ListView { model=myModel }"); + QDeclarativeComponent component(&engine); + component.setData("import Qt 4.7\nListView { model: myModel }", QUrl()); component.create(context); \endcode @@ -104,12 +106,13 @@ ... }; - MyDataSet *myDataSet = new MyDataSet; + MyDataSet myDataSet; QDeclarativeEngine engine; QDeclarativeContext *context = new QDeclarativeContext(engine.rootContext()); - context->setContextObject(myDataSet); + context->setContextObject(&myDataSet); - QDeclarativeComponent component(&engine, "ListView { model=myModel }"); + QDeclarativeComponent component(&engine); + component.setData("import Qt 4.7\nListView { model: myModel }", QUrl()); component.create(context); \endcode @@ -530,8 +533,21 @@ parent = 0; } -void QDeclarativeContextData::clearExpressions() +void QDeclarativeContextData::clearContext() { + if (engine) { + while (componentAttached) { + QDeclarativeComponentAttached *a = componentAttached; + componentAttached = a->next; + if (componentAttached) componentAttached->prev = &componentAttached; + + a->next = 0; + a->prev = 0; + + emit a->destruction(); + } + } + QDeclarativeAbstractExpression *expression = expressions; while (expression) { QDeclarativeAbstractExpression *nextExpression = expression->m_nextExpression; @@ -552,7 +568,7 @@ if (engine) invalidate(); - clearExpressions(); + clearContext(); while (contextObjects) { QDeclarativeData *co = contextObjects; @@ -644,14 +660,12 @@ if (!engine) return; - Q_ASSERT(script.codes.count() == 1); - QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine); QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine); - const QString &code = script.codes.at(0); - const QString &url = script.files.at(0); - const QDeclarativeParser::Object::ScriptBlock::Pragmas &pragmas = script.pragmas.at(0); + const QString &code = script.code; + const QString &url = script.file; + const QDeclarativeParser::Object::ScriptBlock::Pragmas &pragmas = script.pragmas; Q_ASSERT(!url.isEmpty()); diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativecontext_p.h --- a/src/declarative/qml/qdeclarativecontext_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativecontext_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -113,7 +113,7 @@ public: QDeclarativeContextData(); QDeclarativeContextData(QDeclarativeContext *); - void clearExpressions(); + void clearContext(); void destroy(); void invalidate(); diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativedom.cpp --- a/src/declarative/qml/qdeclarativedom.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativedom.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -42,7 +42,6 @@ #include "private/qdeclarativedom_p.h" #include "private/qdeclarativedom_p_p.h" -#include "private/qdeclarativecompositetypedata_p.h" #include "private/qdeclarativecompiler_p.h" #include "private/qdeclarativeengine_p.h" #include "private/qdeclarativescriptparser_p.h" @@ -145,37 +144,23 @@ d->errors.clear(); d->imports.clear(); - QDeclarativeCompiledData *component = new QDeclarativeCompiledData(engine); - QDeclarativeCompiler compiler; - - QDeclarativeCompositeTypeData *td = ((QDeclarativeEnginePrivate *)QDeclarativeEnginePrivate::get(engine))->typeManager.getImmediate(data, url); + QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine); + QDeclarativeTypeData *td = ep->typeLoader.get(data, url, QDeclarativeTypeLoader::PreserveParser); - if(td->status == QDeclarativeCompositeTypeData::Error) { - d->errors = td->errors; + if(td->isError()) { + d->errors = td->errors(); td->release(); - component->release(); return false; - } else if(td->status == QDeclarativeCompositeTypeData::Waiting || - td->status == QDeclarativeCompositeTypeData::WaitingResources) { + } else if(!td->isCompleteOrError()) { QDeclarativeError error; error.setDescription(QLatin1String("QDeclarativeDomDocument supports local types only")); d->errors << error; td->release(); - component->release(); return false; } - compiler.compile(engine, td, component); - - if (compiler.isError()) { - d->errors = compiler.errors(); - td->release(); - component->release(); - return false; - } - - for (int i = 0; i < td->data.imports().size(); ++i) { - QDeclarativeScriptParser::Import parserImport = td->data.imports().at(i); + for (int i = 0; i < td->parser().imports().size(); ++i) { + QDeclarativeScriptParser::Import parserImport = td->parser().imports().at(i); QDeclarativeDomImport domImport; domImport.d->type = static_cast(parserImport.type); domImport.d->uri = parserImport.uri; @@ -184,12 +169,12 @@ d->imports += domImport; } - if (td->data.tree()) { - d->root = td->data.tree(); + if (td->parser().tree()) { + d->root = td->parser().tree(); d->root->addref(); } - component->release(); + td->release(); return true; } diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeengine.cpp --- a/src/declarative/qml/qdeclarativeengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -114,6 +114,7 @@ /*! \qmlclass QtObject QObject + \ingroup qml-utility-elements \since 4.7 \brief The QtObject element is the most basic element in QML. @@ -184,11 +185,13 @@ } /*! -\keyword QmlGlobalQtObject -\qmlclass Qt QDeclarativeEnginePrivate +\qmlclass QML:Qt QDeclarativeEnginePrivate + \ingroup qml-utility-elements \brief The QML global Qt object provides useful enums and functions from Qt. -The \c Qt object provides useful enums and functions from Qt, for use in all QML files. +\keyword QmlGlobalQtObject + +\brief The \c Qt object provides useful enums and functions from Qt, for use in all QML files. The \c Qt object is not a QML element; it cannot be instantiated. It is a global object with enums and functions. To use it, call the members of the global \c Qt object directly. @@ -206,10 +209,9 @@ \section1 Enums -The Qt object contains all enums in the Qt namespace. For example, you can -access the \c AlignLeft member of the \c Qt::AlignmentFlag enum with \c Qt.AlignLeft. +The Qt object contains enums that declared into Qt's Meta-Object System. For example, you can access +the \c Leftbutton member of the \c Qt::MouseButton enum with \c Qt.LeftButton. -For a full list of enums, see the \l{Qt Namespace} documentation. \section1 Types The Qt object also contains helper functions for creating objects of specific @@ -228,7 +230,7 @@ \section1 Date/Time Formatters -The Qt object contains several functions for formatting dates and times. +The Qt object contains several functions for formatting QDateTime, QDate and QTime values. \list \o \l{QML:Qt::formatDateTime}{string Qt.formatDateTime(datetime date, variant format)} @@ -241,7 +243,7 @@ \section1 Dynamic Object Creation The following functions on the global object allow you to dynamically create QML -items from files or strings. See \l{Dynamic Object Management} for an overview +items from files or strings. See \l{Dynamic Object Management in QML} for an overview of their use. \list @@ -257,7 +259,7 @@ objectClass(0), valueTypeClass(0), globalClass(0), cleanup(0), erroredBindings(0), inProgressCreations(0), scriptEngine(this), workerScriptEngine(0), componentAttached(0), inBeginCreate(false), networkAccessManager(0), networkAccessManagerFactory(0), - typeManager(e), importDatabase(e), uniqueId(1) + typeLoader(e), importDatabase(e), uniqueId(1) { if (!qt_QmlQtModule_registered) { qt_QmlQtModule_registered = true; @@ -301,7 +303,9 @@ + QDir::separator() + QLatin1String("OfflineStorage"); #endif +#ifndef QT_NO_XMLSTREAMREADER qt_add_qmlxmlhttprequest(this); +#endif qt_add_qmlsqldatabase(this); // XXX A Multimedia "Qt.Sound" class also needs to be made available, // XXX but we don't want a dependency in that cirection. @@ -329,7 +333,7 @@ qtObject.setProperty(QLatin1String("tint"), newFunction(QDeclarativeEnginePrivate::tint, 2)); } -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING //date/time formatting qtObject.setProperty(QLatin1String("formatDate"),newFunction(QDeclarativeEnginePrivate::formatDate, 2)); qtObject.setProperty(QLatin1String("formatTime"),newFunction(QDeclarativeEnginePrivate::formatTime, 2)); @@ -434,8 +438,6 @@ pss.clear(); } -Q_GLOBAL_STATIC(QDeclarativeEngineDebugServer, qmlEngineDebugServer); - void QDeclarativePrivate::qdeclarativeelement_destructor(QObject *o) { QObjectPrivate *p = QObjectPrivate::get(o); @@ -477,9 +479,8 @@ if (QCoreApplication::instance()->thread() == q->thread() && QDeclarativeEngineDebugServer::isDebuggingEnabled()) { - qmlEngineDebugServer(); isDebugging = true; - QDeclarativeEngineDebugServer::addEngine(q); + QDeclarativeEngineDebugServer::instance()->addEngine(q); } } @@ -543,11 +544,11 @@ { Q_D(QDeclarativeEngine); if (d->isDebugging) - QDeclarativeEngineDebugServer::remEngine(this); + QDeclarativeEngineDebugServer::instance()->remEngine(this); } /*! \fn void QDeclarativeEngine::quit() - This signal is emitted when the QDeclarativeEngine quits. + This signal is emitted when the QML loaded by the engine would like to quit. */ /*! \fn void QDeclarativeEngine::warnings(const QList &warnings) @@ -564,7 +565,7 @@ void QDeclarativeEngine::clearComponentCache() { Q_D(QDeclarativeEngine); - d->typeManager.clearCache(); + d->typeLoader.clearCache(); } /*! @@ -670,7 +671,7 @@ { Q_D(QDeclarativeEngine); QMutexLocker locker(&d->mutex); - d->imageProviders.insert(providerId, provider); + d->imageProviders.insert(providerId, QSharedPointer(provider)); } /*! @@ -680,7 +681,7 @@ { Q_D(const QDeclarativeEngine); QMutexLocker locker(&d->mutex); - return d->imageProviders.value(providerId); + return d->imageProviders.value(providerId).data(); } /*! @@ -694,13 +695,14 @@ { Q_D(QDeclarativeEngine); QMutexLocker locker(&d->mutex); - delete d->imageProviders.take(providerId); + d->imageProviders.take(providerId); } QDeclarativeImageProvider::ImageType QDeclarativeEnginePrivate::getImageProviderType(const QUrl &url) { QMutexLocker locker(&mutex); - QDeclarativeImageProvider *provider = imageProviders.value(url.host()); + QSharedPointer provider = imageProviders.value(url.host()); + locker.unlock(); if (provider) return provider->imageType(); return static_cast(-1); @@ -710,7 +712,8 @@ { QMutexLocker locker(&mutex); QImage image; - QDeclarativeImageProvider *provider = imageProviders.value(url.host()); + QSharedPointer provider = imageProviders.value(url.host()); + locker.unlock(); if (provider) image = provider->requestImage(url.path().mid(1), size, req_size); return image; @@ -720,7 +723,8 @@ { QMutexLocker locker(&mutex); QPixmap pixmap; - QDeclarativeImageProvider *provider = imageProviders.value(url.host()); + QSharedPointer provider = imageProviders.value(url.host()); + locker.unlock(); if (provider) pixmap = provider->requestPixmap(url.path().mid(1), size, req_size); return pixmap; @@ -1104,29 +1108,20 @@ \qmlmethod object Qt::createComponent(url) Returns a \l Component object created using the QML file at the specified \a url, -or \c null if there was an error in creating the component. +or \c null if an empty string was given. + +The returned component's \l Component::status property indicates whether the +component was successfully created. If the status is \c Component.Error, +see \l Component::errorString() for an error description. Call \l {Component::createObject()}{Component.createObject()} on the returned component to create an object instance of the component. -Here is an example. Notice it checks whether the component \l{Component::status}{status} is -\c Component.Ready before calling \l {Component::createObject()}{createObject()} -in case the QML file is loaded over a network and thus is not ready immediately. +For example: -\snippet doc/src/snippets/declarative/componentCreation.js vars -\codeline -\snippet doc/src/snippets/declarative/componentCreation.js func -\snippet doc/src/snippets/declarative/componentCreation.js remote -\snippet doc/src/snippets/declarative/componentCreation.js func-end -\codeline -\snippet doc/src/snippets/declarative/componentCreation.js finishCreation +\snippet doc/src/snippets/declarative/createComponent-simple.qml 0 -If you are certain the QML file to be loaded is a local file, you could omit the \c finishCreation() -function and call \l {Component::createObject()}{createObject()} immediately: - -\snippet doc/src/snippets/declarative/componentCreation.js func -\snippet doc/src/snippets/declarative/componentCreation.js local -\snippet doc/src/snippets/declarative/componentCreation.js func-end +See \l {Dynamic Object Management in QML} for more information on using this function. To create a QML object from an arbitrary string of QML (instead of a file), use \l{QML:Qt::createQmlObject()}{Qt.createQmlObject()}. @@ -1177,6 +1172,8 @@ Note that this function returns immediately, and therefore may not work if the \a qml string loads new components (that is, external QML files that have not yet been loaded). If this is the case, consider using \l{QML:Qt::createComponent()}{Qt.createComponent()} instead. + +See \l {Dynamic Object Management in QML} for more information on using this function. */ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QScriptEngine *engine) @@ -1301,7 +1298,7 @@ \qmlmethod string Qt::formatDate(datetime date, variant format) Returns the string representation of \c date, formatted according to \c format. */ -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING QScriptValue QDeclarativeEnginePrivate::formatDate(QScriptContext*ctxt, QScriptEngine*engine) { int argCount = ctxt->argumentCount(); @@ -1442,7 +1439,7 @@ } return engine->newVariant(qVariantFromValue(date.toString(enumFormat))); } -#endif // QT_NO_TEXTDATE +#endif // QT_NO_DATESTRING /*! \qmlmethod color Qt::rgba(real red, real green, real blue, real alpha) @@ -1719,6 +1716,9 @@ { Q_Q(QDeclarativeEngine); emit q->quit(); + if (q->receivers(SIGNAL(quit())) == 0) { + qWarning("Signal QDeclarativeEngine::quit() emitted, but no receivers connected to handle it."); + } } static void dumpwarning(const QDeclarativeError &error) @@ -2079,7 +2079,7 @@ QByteArray name = data->root->className(); QByteArray ptr = name + '*'; - QByteArray lst = "QDeclarativeListProperty<" + name + ">"; + QByteArray lst = "QDeclarativeListProperty<" + name + '>'; int ptr_type = QMetaType::registerType(ptr.constData(), voidptr_destructor, voidptr_constructor); @@ -2113,7 +2113,7 @@ QObject *QDeclarativeEnginePrivate::toQObject(const QVariant &v, bool *ok) const { int t = v.userType(); - if (m_compositeTypes.contains(t)) { + if (t == QMetaType::QObjectStar || m_compositeTypes.contains(t)) { if (ok) *ok = true; return *(QObject **)(v.constData()); } else { diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeengine_p.h --- a/src/declarative/qml/qdeclarativeengine_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeengine_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -56,7 +56,7 @@ #include "qdeclarativeengine.h" #include "private/qdeclarativeclassfactory_p.h" -#include "private/qdeclarativecompositetypemanager_p.h" +#include "private/qdeclarativetypeloader_p.h" #include "private/qdeclarativeimport_p.h" #include "private/qpodvector_p.h" #include "qdeclarative.h" @@ -232,14 +232,14 @@ mutable QNetworkAccessManager *networkAccessManager; mutable QDeclarativeNetworkAccessManagerFactory *networkAccessManagerFactory; - QHash imageProviders; + QHash > imageProviders; QDeclarativeImageProvider::ImageType getImageProviderType(const QUrl &url); QImage getImageFromProvider(const QUrl &url, QSize *size, const QSize& req_size); QPixmap getPixmapFromProvider(const QUrl &url, QSize *size, const QSize& req_size); mutable QMutex mutex; - QDeclarativeCompositeTypeManager typeManager; + QDeclarativeTypeLoader typeLoader; QDeclarativeImportDatabase importDatabase; QString offlineStoragePath; @@ -304,7 +304,7 @@ static QScriptValue consoleLog(QScriptContext*, QScriptEngine*); static QScriptValue quit(QScriptContext*, QScriptEngine*); -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING static QScriptValue formatDate(QScriptContext*, QScriptEngine*); static QScriptValue formatTime(QScriptContext*, QScriptEngine*); static QScriptValue formatDateTime(QScriptContext*, QScriptEngine*); diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeenginedebug.cpp --- a/src/declarative/qml/qdeclarativeenginedebug.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeenginedebug.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -58,7 +58,13 @@ QT_BEGIN_NAMESPACE -QList QDeclarativeEngineDebugServer::m_engines; +Q_GLOBAL_STATIC(QDeclarativeEngineDebugServer, qmlEngineDebugServer); + +QDeclarativeEngineDebugServer *QDeclarativeEngineDebugServer::instance() +{ + return qmlEngineDebugServer(); +} + QDeclarativeEngineDebugServer::QDeclarativeEngineDebugServer(QObject *parent) : QDeclarativeDebugService(QLatin1String("QDeclarativeEngine"), parent), m_watch(new QDeclarativeWatcher(this)) @@ -182,7 +188,7 @@ } void QDeclarativeEngineDebugServer::buildObjectDump(QDataStream &message, - QObject *object, bool recur) + QObject *object, bool recur, bool dumpProperties) { message << objectData(object); @@ -209,6 +215,8 @@ continue; QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child); if (signal) { + if (!dumpProperties) + continue; QDeclarativeObjectProperty prop; prop.type = QDeclarativeObjectProperty::SignalProperty; prop.hasNotifySignal = false; @@ -229,12 +237,17 @@ fakeProperties << prop; } else { if (recur) - buildObjectDump(message, child, recur); + buildObjectDump(message, child, recur, dumpProperties); else message << objectData(child); } } + if (!dumpProperties) { + message << 0; + return; + } + message << (object->metaObject()->propertyCount() + fakeProperties.count()); for (int ii = 0; ii < object->metaObject()->propertyCount(); ++ii) @@ -257,8 +270,7 @@ QDeclarativeContextData *child = p->childContexts; while (child) { - if (!child->isInternal) - ++count; + ++count; child = child->nextChild; } @@ -266,8 +278,7 @@ child = p->childContexts; while (child) { - if (!child->isInternal) - buildObjectList(message, child->asQDeclarativeContext()); + buildObjectList(message, child->asQDeclarativeContext()); child = child->nextChild; } @@ -372,8 +383,9 @@ int queryId; int objectId; bool recurse; + bool dumpProperties = true; - ds >> queryId >> objectId >> recurse; + ds >> queryId >> objectId >> recurse >> dumpProperties; QObject *object = QDeclarativeDebugService::objectForId(objectId); @@ -382,7 +394,7 @@ rs << QByteArray("FETCH_OBJECT_R") << queryId; if (object) - buildObjectDump(rs, object, recurse); + buildObjectDump(rs, object, recurse, dumpProperties); sendMessage(reply); } else if (type == "WATCH_OBJECT") { @@ -485,24 +497,22 @@ if (object && context) { + QDeclarativeProperty property(object, propertyName, context); if (isLiteralValue) { - QDeclarativeProperty literalProperty(object, propertyName, context); - literalProperty.write(expression); + property.write(expression); + } else if (hasValidSignal(object, propertyName)) { + QDeclarativeExpression *declarativeExpression = new QDeclarativeExpression(context, object, expression.toString()); + QDeclarativePropertyPrivate::setSignalExpression(property, declarativeExpression); + } else if (property.isProperty()) { + QDeclarativeBinding *binding = new QDeclarativeBinding(expression.toString(), object, context); + binding->setTarget(property); + binding->setNotifyOnValueChanged(true); + QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(property, binding); + if (oldBinding) + oldBinding->destroy(); + binding->update(); } else { - if (hasValidSignal(object, propertyName)) { - QDeclarativeProperty property(object, propertyName); - QDeclarativeExpression *declarativeExpression = new QDeclarativeExpression(context, object, expression.toString()); - QDeclarativePropertyPrivate::setSignalExpression(property, declarativeExpression); - } else { - QDeclarativeBinding *binding = new QDeclarativeBinding(expression.toString(), object, context); - QDeclarativeProperty property(object, propertyName, context); - binding->setTarget(property); - binding->setNotifyOnValueChanged(true); - QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(property, binding); - if (oldBinding) - oldBinding->destroy(); - binding->update(); - } + qWarning() << "QDeclarativeEngineDebugServer::setBinding: unable to set property" << propertyName << "on object" << object; } } } @@ -594,4 +604,19 @@ m_engines.removeAll(engine); } +void QDeclarativeEngineDebugServer::objectCreated(QDeclarativeEngine *engine, QObject *object) +{ + Q_ASSERT(engine); + Q_ASSERT(m_engines.contains(engine)); + + int engineId = QDeclarativeDebugService::idForObject(engine); + int objectId = QDeclarativeDebugService::idForObject(object); + + QByteArray reply; + QDataStream rs(&reply, QIODevice::WriteOnly); + + rs << QByteArray("OBJECT_CREATED") << engineId << objectId; + sendMessage(reply); +} + QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeenginedebug_p.h --- a/src/declarative/qml/qdeclarativeenginedebug_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeenginedebug_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -92,8 +92,11 @@ bool hasNotifySignal; }; - static void addEngine(QDeclarativeEngine *); - static void remEngine(QDeclarativeEngine *); + void addEngine(QDeclarativeEngine *); + void remEngine(QDeclarativeEngine *); + void objectCreated(QDeclarativeEngine *, QObject *); + + static QDeclarativeEngineDebugServer *instance(); protected: virtual void messageReceived(const QByteArray &); @@ -103,7 +106,7 @@ private: void buildObjectList(QDataStream &, QDeclarativeContext *); - void buildObjectDump(QDataStream &, QObject *, bool); + void buildObjectDump(QDataStream &, QObject *, bool, bool); QDeclarativeObjectData objectData(QObject *); QDeclarativeObjectProperty propertyData(QObject *, int); QVariant valueContents(const QVariant &defaultValue) const; @@ -111,7 +114,7 @@ void resetBinding(int objectId, const QString &propertyName); void setMethodBody(int objectId, const QString &method, const QString &body); - static QList m_engines; + QList m_engines; QDeclarativeWatcher *m_watch; }; Q_DECLARATIVE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugServer::QDeclarativeObjectData &); diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeerror.cpp --- a/src/declarative/qml/qdeclarativeerror.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeerror.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -250,7 +250,9 @@ if (f.open(QIODevice::ReadOnly)) { QByteArray data = f.readAll(); QTextStream stream(data, QIODevice::ReadOnly); +#ifndef QT_NO_TEXTCODEC stream.setCodec("UTF-8"); +#endif const QString code = stream.readAll(); const QStringList lines = code.split(QLatin1Char('\n')); diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeexpression.cpp --- a/src/declarative/qml/qdeclarativeexpression.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeexpression.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -143,16 +143,12 @@ } else { -#if !defined(Q_OS_SYMBIAN) //XXX Why doesn't this work? if (!dd->cachedPrograms.at(progIdx)) { dd->cachedPrograms[progIdx] = new QScriptProgram(expression, url, line); } expressionFunction = evalInObjectScope(ctxt, me, *dd->cachedPrograms.at(progIdx), &expressionContext); -#else - expressionFunction = evalInObjectScope(ctxt, me, expression, &expressionContext); -#endif expressionFunctionMode = ExplicitContext; expressionFunctionValid = true; @@ -604,6 +600,7 @@ scriptContext->pushScope(ep->globalClass->staticGlobalObject()); QDeclarativeRewrite::RewriteBinding rewriteBinding; + rewriteBinding.setName(name); bool ok = true; const QString code = rewriteBinding(expression, &ok); if (ok) diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeexpression_p.h --- a/src/declarative/qml/qdeclarativeexpression_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeexpression_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -194,6 +194,7 @@ QString url; // This is a QString for a reason. QUrls are slooooooow... int line; + QByteArray name; //function name, hint for the debugger }; QDeclarativeQtScriptExpression::DeleteWatcher::DeleteWatcher(QDeclarativeQtScriptExpression *data) diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeextensionplugin.cpp --- a/src/declarative/qml/qdeclarativeextensionplugin.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeextensionplugin.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -60,7 +60,7 @@ \o Subclass QDeclarativeExtensionPlugin, implement registerTypes() method to register types using qmlRegisterType(), and export the class using the Q_EXPORT_PLUGIN2() macro \o Write an appropriate project file for the plugin - \o Create a \l{The qmldir file}{qmldir file} to describe the plugin + \o Create a \l{Writing a qmldir file}{qmldir file} to describe the plugin \endlist QML extension plugins can be used to provide either application-specific or @@ -79,7 +79,7 @@ \dots To make this class available as a QML type, create a plugin that registers - this type using qmlRegisterType(). For this example the plugin + this type with a specific \l {QML Modules}{module} using qmlRegisterType(). For this example the plugin module will be named \c com.nokia.TimeExample (as defined in the project file further below). @@ -104,7 +104,7 @@ ... \endcode - Finally, a \l{The qmldir file}{qmldir file} is required in the \c com/nokia/TimeExample directory + Finally, a \l{Writing a qmldir file}{qmldir file} is required in the \c com/nokia/TimeExample directory that describes the plugin. This directory includes a \c Clock.qml file that should be bundled with the plugin, so it needs to be specified in the \c qmldir file: diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeimageprovider.cpp --- a/src/declarative/qml/qdeclarativeimageprovider.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeimageprovider.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -59,13 +59,13 @@ \list \o Loaded using QPixmaps rather than actual image files - \o Loaded asynchronously in a separate thread, if imageType() is \l ImageType::Image + \o Loaded asynchronously in a separate thread, if imageType() is \l{QDeclarativeImageProvider::ImageType}{ImageType::Image} \endlist To specify that an image should be loaded by an image provider, use the \bold {"image:"} scheme for the URL source of the image, followed by the identifiers of the image provider and the requested image. For example: - + \qml Image { source: "image://myimageprovider/image.png" } \endqml @@ -83,7 +83,7 @@ and "red", respectively: \snippet examples/declarative/cppextensions/imageprovider/imageprovider-example.qml 0 - + When these images are loaded by QML, it looks for a matching image provider and calls its requestImage() or requestPixmap() method (depending on its imageType()) to load the image. The method is called with the \c id @@ -112,7 +112,7 @@ } \endcode - Now the images can be succesfully loaded in QML: + Now the images can be successfully loaded in QML: \image imageprovider.png @@ -136,7 +136,7 @@ main thread. In this case, if \l {Image::}{asynchronous} is set to \c true, the value is ignored and the image is loaded synchronously. - + \sa QDeclarativeEngine::addImageProvider() */ @@ -161,7 +161,9 @@ } /*! - \internal + Destroys the QDeclarativeImageProvider + + \note The destructor of your derived class need to be thread safe. */ QDeclarativeImageProvider::~QDeclarativeImageProvider() { @@ -212,9 +214,6 @@ In all cases, \a size must be set to the original size of the image. This is used to set the \l {Item::}{width} and \l {Item::}{height} of image elements that should be automatically sized to the loaded image. - - \note this method may be called by multiple threads, so ensure the - implementation of this method is reentrant. */ QPixmap QDeclarativeImageProvider::requestPixmap(const QString &id, QSize *size, const QSize& requestedSize) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeimport.cpp --- a/src/declarative/qml/qdeclarativeimport.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeimport.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -109,6 +109,11 @@ QHash set; }; +/*! +\class QDeclarativeImports +\brief The QDeclarativeImports class encapsulates one QML document's import statements. +\internal +*/ QDeclarativeImports::QDeclarativeImports(const QDeclarativeImports ©) : d(copy.d) { @@ -181,7 +186,7 @@ return cache; } -void QDeclarativeImports::cache(QDeclarativeTypeNameCache *cache, QDeclarativeEngine *engine) const +void QDeclarativeImports::populateCache(QDeclarativeTypeNameCache *cache, QDeclarativeEngine *engine) const { const QDeclarativeImportedNamespace &set = d->unqualifiedset; @@ -201,6 +206,67 @@ cacheForNamespace(engine, set, cache); } + +/*! + \internal + + The given (namespace qualified) \a type is resolved to either + \list + \o a QDeclarativeImportedNamespace stored at \a ns_return, + \o a QDeclarativeType stored at \a type_return, or + \o a component located at \a url_return. + \endlist + + If any return pointer is 0, the corresponding search is not done. + + \sa addImport() +*/ +bool QDeclarativeImports::resolveType(const QByteArray& type, + QDeclarativeType** type_return, QUrl* url_return, int *vmaj, int *vmin, + QDeclarativeImportedNamespace** ns_return, QString *errorString) const +{ + QDeclarativeImportedNamespace* ns = d->findNamespace(QString::fromUtf8(type)); + if (ns) { + if (ns_return) + *ns_return = ns; + return true; + } + if (type_return || url_return) { + if (d->find(type,vmaj,vmin,type_return,url_return, errorString)) { + if (qmlImportTrace()) { + if (type_return && *type_return && url_return && !url_return->isEmpty()) + qDebug().nospace() << "QDeclarativeImports(" << qPrintable(baseUrl().toString()) << ")" << "::resolveType: " + << type << " => " << (*type_return)->typeName() << " " << *url_return; + if (type_return && *type_return) + qDebug().nospace() << "QDeclarativeImports(" << qPrintable(baseUrl().toString()) << ")" << "::resolveType: " + << type << " => " << (*type_return)->typeName(); + if (url_return && !url_return->isEmpty()) + qDebug().nospace() << "QDeclarativeImports(" << qPrintable(baseUrl().toString()) << ")" << "::resolveType: " + << type << " => " << *url_return; + } + return true; + } + } + return false; +} + +/*! + \internal + + Searching \e only in the namespace \a ns (previously returned in a call to + resolveType(), \a type is found and returned to either + a QDeclarativeType stored at \a type_return, or + a component located at \a url_return. + + If either return pointer is 0, the corresponding search is not done. +*/ +bool QDeclarativeImports::resolveType(QDeclarativeImportedNamespace* ns, const QByteArray& type, + QDeclarativeType** type_return, QUrl* url_return, + int *vmaj, int *vmin) const +{ + return ns->find(type,vmaj,vmin,type_return,url_return); +} + bool QDeclarativeImportedNamespace::find_helper(int i, const QByteArray& type, int *vmajor, int *vminor, QDeclarativeType** type_return, QUrl* url_return, QUrl *base, bool *typeRecursionDetected) @@ -280,15 +346,16 @@ } bool QDeclarativeImportsPrivate::importExtension(const QString &absoluteFilePath, const QString &uri, - QDeclarativeImportDatabase *database, - QDeclarativeDirComponents* components, QString *errorString) + QDeclarativeImportDatabase *database, + QDeclarativeDirComponents* components, QString *errorString) { QFile file(absoluteFilePath); QString filecontent; if (file.open(QFile::ReadOnly)) { filecontent = QString::fromUtf8(file.readAll()); if (qmlImportTrace()) - qDebug() << "QDeclarativeImportDatabase::add: loaded" << absoluteFilePath; + qDebug().nospace() << "QDeclarativeImports(" << qPrintable(base.toString()) << "::importExtension: " + << "loaded " << absoluteFilePath; } else { if (errorString) *errorString = QDeclarativeImportDatabase::tr("module \"%1\" definition \"%2\" not readable").arg(uri).arg(absoluteFilePath); @@ -338,7 +405,7 @@ qSort(paths.begin(), paths.end(), greaterThan); // Ensure subdirs preceed their parents. QString stableRelativePath = dir; - foreach( QString path, paths) { + foreach(const QString &path, paths) { if (dir.startsWith(path)) { stableRelativePath = dir.mid(path.length()+1); break; @@ -576,6 +643,10 @@ return false; } +/*! +\class QDeclarativeImportDatabase +\brief The QDeclarativeImportDatabase class manages the QML imports for a QDeclarativeEngine. +*/ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) : engine(e) { @@ -619,75 +690,19 @@ The base URL must already have been set with Import::setBaseUrl(). */ -bool QDeclarativeImportDatabase::addToImport(QDeclarativeImports* imports, - const QDeclarativeDirComponents &qmldircomponentsnetwork, - const QString& uri, const QString& prefix, int vmaj, int vmin, - QDeclarativeScriptParser::Import::Type importType, - QString *errorString) +bool QDeclarativeImports::addImport(QDeclarativeImportDatabase *importDb, + const QString& uri, const QString& prefix, int vmaj, int vmin, + QDeclarativeScriptParser::Import::Type importType, + const QDeclarativeDirComponents &qmldircomponentsnetwork, + QString *errorString) { if (qmlImportTrace()) - qDebug().nospace() << "QDeclarativeImportDatabase::addToImport " << imports << " " << uri << " " - << vmaj << '.' << vmin << " " + qDebug().nospace() << "QDeclarativeImports(" << qPrintable(baseUrl().toString()) << ")" << "::addImport: " + << uri << " " << vmaj << '.' << vmin << " " << (importType==QDeclarativeScriptParser::Import::Library? "Library" : "File") << " as " << prefix; - bool ok = imports->d->add(qmldircomponentsnetwork, uri, prefix, vmaj, vmin, importType, this, errorString); - return ok; -} - -/*! - \internal - - Using the given \a imports, the given (namespace qualified) \a type is resolved to either - a QDeclarativeImportedNamespace stored at \a ns_return, - a QDeclarativeType stored at \a type_return, or - a component located at \a url_return. - - If any return pointer is 0, the corresponding search is not done. - - \sa addToImport() -*/ -bool QDeclarativeImportDatabase::resolveType(const QDeclarativeImports& imports, const QByteArray& type, - QDeclarativeType** type_return, QUrl* url_return, int *vmaj, int *vmin, - QDeclarativeImportedNamespace** ns_return, QString *errorString) const -{ - QDeclarativeImportedNamespace* ns = imports.d->findNamespace(QString::fromUtf8(type)); - if (ns) { - if (ns_return) - *ns_return = ns; - return true; - } - if (type_return || url_return) { - if (imports.d->find(type,vmaj,vmin,type_return,url_return, errorString)) { - if (qmlImportTrace()) { - if (type_return && *type_return && url_return && !url_return->isEmpty()) - qDebug() << "QDeclarativeImportDatabase::resolveType" << type << '=' << (*type_return)->typeName() << *url_return; - if (type_return && *type_return) - qDebug() << "QDeclarativeImportDatabase::resolveType" << type << '=' << (*type_return)->typeName(); - if (url_return && !url_return->isEmpty()) - qDebug() << "QDeclarativeImportDatabase::resolveType" << type << '=' << *url_return; - } - return true; - } - } - return false; -} - -/*! - \internal - - Searching \e only in the namespace \a ns (previously returned in a call to - resolveType(), \a type is found and returned to either - a QDeclarativeType stored at \a type_return, or - a component located at \a url_return. - - If either return pointer is 0, the corresponding search is not done. -*/ -bool QDeclarativeImportDatabase::resolveTypeInNamespace(QDeclarativeImportedNamespace* ns, const QByteArray& type, - QDeclarativeType** type_return, QUrl* url_return, - int *vmaj, int *vmin) const -{ - return ns->find(type,vmaj,vmin,type_return,url_return); + return d->add(qmldircomponentsnetwork, uri, prefix, vmaj, vmin, importType, importDb, errorString); } /*! @@ -834,7 +849,7 @@ void QDeclarativeImportDatabase::addPluginPath(const QString& path) { if (qmlImportTrace()) - qDebug() << "QDeclarativeImportDatabase::addPluginPath" << path; + qDebug().nospace() << "QDeclarativeImportDatabase::addPluginPath: " << path; QUrl url = QUrl(path); if (url.isRelative() || url.scheme() == QLatin1String("file")) { @@ -848,7 +863,7 @@ void QDeclarativeImportDatabase::addImportPath(const QString& path) { if (qmlImportTrace()) - qDebug() << "QDeclarativeImportDatabase::addImportPath" << path; + qDebug().nospace() << "QDeclarativeImportDatabase::addImportPath: " << path; if (path.isEmpty()) return; @@ -882,7 +897,7 @@ bool QDeclarativeImportDatabase::importPlugin(const QString &filePath, const QString &uri, QString *errorString) { if (qmlImportTrace()) - qDebug() << "QDeclarativeImportDatabase::importPlugin" << uri << "from" << filePath; + qDebug().nospace() << "QDeclarativeImportDatabase::importPlugin: " << uri << " from " << filePath; QFileInfo fileInfo(filePath); const QString absoluteFilePath = fileInfo.absoluteFilePath(); diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeimport_p.h --- a/src/declarative/qml/qdeclarativeimport_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeimport_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -65,9 +65,10 @@ class QDeclarativeTypeNameCache; class QDeclarativeEngine; class QDir; - class QDeclarativeImportedNamespace; class QDeclarativeImportsPrivate; +class QDeclarativeImportDatabase; + class QDeclarativeImports { public: @@ -79,7 +80,24 @@ void setBaseUrl(const QUrl &url); QUrl baseUrl() const; - void cache(QDeclarativeTypeNameCache *cache, QDeclarativeEngine *) const; + bool resolveType(const QByteArray& type, + QDeclarativeType** type_return, QUrl* url_return, + int *version_major, int *version_minor, + QDeclarativeImportedNamespace** ns_return, + QString *errorString = 0) const; + bool resolveType(QDeclarativeImportedNamespace*, + const QByteArray& type, + QDeclarativeType** type_return, QUrl* url_return, + int *version_major, int *version_minor) const; + + bool addImport(QDeclarativeImportDatabase *, + const QString& uri, const QString& prefix, int vmaj, int vmin, + QDeclarativeScriptParser::Import::Type importType, + const QDeclarativeDirComponents &qmldircomponentsnetwork, + QString *errorString); + + void populateCache(QDeclarativeTypeNameCache *cache, QDeclarativeEngine *) const; + private: friend class QDeclarativeImportDatabase; QDeclarativeImportsPrivate *d; @@ -102,21 +120,6 @@ void setPluginPathList(const QStringList &paths); void addPluginPath(const QString& path); - - bool addToImport(QDeclarativeImports*, const QDeclarativeDirComponents &qmldircomponentsnetwork, - const QString& uri, const QString& prefix, int vmaj, int vmin, - QDeclarativeScriptParser::Import::Type importType, - QString *errorString); - bool resolveType(const QDeclarativeImports&, const QByteArray& type, - QDeclarativeType** type_return, QUrl* url_return, - int *version_major, int *version_minor, - QDeclarativeImportedNamespace** ns_return, - QString *errorString = 0) const; - bool resolveTypeInNamespace(QDeclarativeImportedNamespace*, const QByteArray& type, - QDeclarativeType** type_return, QUrl* url_return, - int *version_major, int *version_minor ) const; - - private: friend class QDeclarativeImportsPrivate; QString resolvePlugin(const QDir &qmldirPath, const QString &qmldirPluginPath, diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeinfo.cpp --- a/src/declarative/qml/qdeclarativeinfo.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeinfo.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -53,6 +53,7 @@ /*! \fn QDeclarativeInfo qmlInfo(const QObject *object) + \relates QDeclarativeEngine \brief Prints warnings messages that include the file and line number for QML types. diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeinstruction.cpp --- a/src/declarative/qml/qdeclarativeinstruction.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeinstruction.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -218,7 +218,7 @@ qWarning().nospace() << idx << "\t\t" << line << "\t" << "DEFER" << "\t\t\t" << instr->defer.deferCount; break; default: - qWarning().nospace() << idx << "\t\t" << line << "\t" << "XXX UNKOWN INSTRUCTION" << "\t" << instr->type; + qWarning().nospace() << idx << "\t\t" << line << "\t" << "XXX UNKNOWN INSTRUCTION" << "\t" << instr->type; break; } #endif // QT_NO_DEBUG_STREAM diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeinstruction_p.h --- a/src/declarative/qml/qdeclarativeinstruction_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeinstruction_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -292,7 +292,8 @@ struct StoreSignalInstruction { int signalIndex; int value; - int context; + short context; + int name; }; struct AssignSignalObjectInstruction { int signal; diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativelist.h --- a/src/declarative/qml/qdeclarativelist.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativelist.h Mon Oct 04 01:19:32 2010 +0300 @@ -98,16 +98,16 @@ private: static void qlist_append(QDeclarativeListProperty *p, T *v) { - ((QList *)p->data)->append(v); + reinterpret_cast *>(p->data)->append(v); } static int qlist_count(QDeclarativeListProperty *p) { - return ((QList *)p->data)->count(); + return reinterpret_cast *>(p->data)->count(); } static T *qlist_at(QDeclarativeListProperty *p, int idx) { - return ((QList *)p->data)->at(idx); + return reinterpret_cast *>(p->data)->at(idx); } static void qlist_clear(QDeclarativeListProperty *p) { - return ((QList *)p->data)->clear(); + return reinterpret_cast *>(p->data)->clear(); } }; #endif diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativemetatype_p.h --- a/src/declarative/qml/qdeclarativemetatype_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativemetatype_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -149,10 +149,8 @@ private: friend class QDeclarativeTypePrivate; friend struct QDeclarativeMetaTypeData; - //friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterInterface &); - //Q_DECLARATIVE_EXPORT friend int registerType(const QDeclarativePrivate::RegisterType &); Q_DECLARATIVE_EXPORT friend int registerType(const QDeclarativePrivate::RegisterType &); - friend int registerInterface(const QDeclarativePrivate::RegisterInterface &); + Q_DECLARATIVE_EXPORT friend int registerInterface(const QDeclarativePrivate::RegisterInterface &); QDeclarativeType(int, const QDeclarativePrivate::RegisterInterface &); QDeclarativeType(int, const QDeclarativePrivate::RegisterType &); ~QDeclarativeType(); diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeobjectscriptclass.cpp --- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -192,7 +192,7 @@ if (!(hints & ImplicitObject)) { local.coreIndex = -1; lastData = &local; - return QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess; + return QScriptClass::HandlesWriteAccess; } return 0; @@ -625,11 +625,12 @@ char data[4 * sizeof(void *)]; int type; + bool isObjectType; }; } MetaCallArgument::MetaCallArgument() -: type(QVariant::Invalid) +: type(QVariant::Invalid), isObjectType(false) { } @@ -744,12 +745,23 @@ new (&data) QVariant(); type = -1; - QVariant v = QDeclarativeEnginePrivate::get(engine)->scriptValueToVariant(value); + QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(engine); + QVariant v = priv->scriptValueToVariant(value); if (v.userType() == callType) { *((QVariant *)&data) = v; } else if (v.canConvert((QVariant::Type)callType)) { *((QVariant *)&data) = v; ((QVariant *)&data)->convert((QVariant::Type)callType); + } else if (const QMetaObject *mo = priv->rawMetaObjectForType(callType)) { + QObject *obj = priv->toQObject(v); + + if (obj) { + const QMetaObject *objMo = obj->metaObject(); + while (objMo && objMo != mo) objMo = objMo->superClass(); + if (!objMo) obj = 0; + } + + *((QVariant *)&data) = QVariant(callType, &obj); } else { *((QVariant *)&data) = QVariant(callType, (void *)0); } diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeparser_p.h --- a/src/declarative/qml/qdeclarativeparser_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeparser_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -183,10 +183,9 @@ }; Q_DECLARE_FLAGS(Pragmas, Pragma) - QStringList codes; - QStringList files; - QList lineNumbers; - QList pragmas; + QString code; + QString file; + Pragmas pragmas; }; // The bytes to cast instances by to get to the QDeclarativeParserStatus diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeprivate.h --- a/src/declarative/qml/qdeclarativeprivate.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeprivate.h Mon Oct 04 01:19:32 2010 +0300 @@ -105,7 +105,7 @@ template struct StaticCastSelectorClass { - static inline int cast() { return (int)((intptr_t)static_cast((From *)0x10000000)) - 0x10000000; } + static inline int cast() { return int(reinterpret_cast(static_cast(reinterpret_cast(0x10000000)))) - 0x10000000; } }; template @@ -119,7 +119,7 @@ static inline int cast() { - return StaticCastSelectorClass::cast(); + return StaticCastSelectorClass(0)))>::cast(); } }; @@ -132,6 +132,7 @@ template class has_attachedPropertiesMethod { + public: typedef int yes_type; typedef char no_type; @@ -139,7 +140,6 @@ static yes_type check(ReturnType *(*)(QObject *)); static no_type check(...); - public: static bool const value = sizeof(check(&T::qmlAttachedProperties)) == sizeof(yes_type); }; diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeproperty.cpp --- a/src/declarative/qml/qdeclarativeproperty.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeproperty.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -42,7 +42,6 @@ #include "qdeclarativeproperty.h" #include "private/qdeclarativeproperty_p.h" -#include "private/qdeclarativecompositetypedata_p.h" #include "qdeclarative.h" #include "private/qdeclarativebinding_p.h" #include "qdeclarativecontext.h" @@ -640,7 +639,7 @@ is assumed by the caller. \a flags is passed through to the binding and is used for the initial update (when - the binding sets the intial value, it will use these flags for the write). + the binding sets the initial value, it will use these flags for the write). */ QDeclarativeAbstractBinding * QDeclarativePropertyPrivate::setBinding(const QDeclarativeProperty &that, diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativepropertycache.cpp --- a/src/declarative/qml/qdeclarativepropertycache.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativepropertycache.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -134,8 +134,9 @@ void QDeclarativePropertyCache::clear() { - for (int ii = 0; ii < indexCache.count(); ++ii) - indexCache.at(ii)->release(); + for (int ii = 0; ii < indexCache.count(); ++ii) { + if (indexCache.at(ii)) indexCache.at(ii)->release(); + } for (StringCache::ConstIterator iter = stringCache.begin(); iter != stringCache.end(); ++iter) @@ -156,14 +157,27 @@ Q_ASSERT(metaObject); QDeclarativePropertyCache::Data rv; - int idx = metaObject->indexOfProperty(property.toUtf8()); - if (idx != -1) { - rv.load(metaObject->property(idx)); - return rv; + { + const QMetaObject *cmo = metaObject; + while (cmo) { + int idx = metaObject->indexOfProperty(property.toUtf8()); + if (idx != -1) { + QMetaProperty p = metaObject->property(idx); + if (p.isScriptable()) { + rv.load(metaObject->property(idx)); + return rv; + } else { + while (cmo && cmo->propertyOffset() >= idx) + cmo = cmo->superClass(); + } + } else { + cmo = 0; + } + } } int methodCount = metaObject->methodCount(); - for (int ii = methodCount - 1; ii >= 2; --ii) { // >=2 to block the destroyed signal + for (int ii = methodCount - 1; ii >= 3; --ii) { // >=3 to block the destroyed signal and deleteLater() slot QMetaMethod m = metaObject->method(ii); if (m.access() == QMetaMethod::Private) continue; @@ -189,8 +203,9 @@ cache->stringCache = stringCache; cache->identifierCache = identifierCache; - for (int ii = 0; ii < indexCache.count(); ++ii) - indexCache.at(ii)->addref(); + for (int ii = 0; ii < indexCache.count(); ++ii) { + if (indexCache.at(ii)) indexCache.at(ii)->addref(); + } for (StringCache::ConstIterator iter = stringCache.begin(); iter != stringCache.end(); ++iter) (*iter)->addref(); for (IdentifierCache::ConstIterator iter = identifierCache.begin(); iter != identifierCache.end(); ++iter) @@ -210,6 +225,9 @@ indexCache.resize(propCount); for (int ii = propOffset; ii < propCount; ++ii) { QMetaProperty p = metaObject->property(ii); + if (!p.isScriptable()) + continue; + QString propName = QString::fromUtf8(p.name()); RData *data = new RData; @@ -275,6 +293,10 @@ indexCache.resize(propCount); for (int ii = propCount - 1; ii >= 0; --ii) { QMetaProperty p = metaObject->property(ii); + if (!p.isScriptable()) { + indexCache[ii] = 0; + continue; + } QString propName = QString::fromUtf8(p.name()); RData *data = new RData; @@ -294,7 +316,7 @@ } int methodCount = metaObject->methodCount(); - for (int ii = methodCount - 1; ii >= 2; --ii) { // >=2 to block the destroyed signal + for (int ii = methodCount - 1; ii >= 3; --ii) { // >=3 to block the destroyed signal and deleteLater() slot QMetaMethod m = metaObject->method(ii); if (m.access() == QMetaMethod::Private) continue; diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativerewrite.cpp --- a/src/declarative/qml/qdeclarativerewrite.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativerewrite.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -102,7 +102,7 @@ unsigned startOfStatement = node->firstSourceLocation().begin() - _position; unsigned endOfStatement = node->lastSourceLocation().end() - _position; - _writer->replace(startOfStatement, 0, QLatin1String("(function() { ")); + _writer->replace(startOfStatement, 0, QLatin1String("(function ") + QString::fromUtf8(_name) + QLatin1String("() { ")); _writer->replace(endOfStatement, 0, QLatin1String(" })")); if (rewriteDump()) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativerewrite_p.h --- a/src/declarative/qml/qdeclarativerewrite_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativerewrite_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -78,10 +78,14 @@ { unsigned _position; TextWriter *_writer; + QByteArray _name; public: QString operator()(const QString &code, bool *ok = 0); + //name of the function: used for the debugger + void setName(const QByteArray &name) { _name = name; } + protected: using AST::Visitor::visit; diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativescriptparser.cpp --- a/src/declarative/qml/qdeclarativescriptparser.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativescriptparser.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -387,7 +387,6 @@ if (uri.endsWith(QLatin1String(".js"))) { import.type = QDeclarativeScriptParser::Import::Script; - _parser->_refUrls << QUrl(uri); } else { import.type = QDeclarativeScriptParser::Import::File; } @@ -543,7 +542,7 @@ QString typemodifier; if(node->typeModifier) typemodifier = node->typeModifier->asString(); - if (typemodifier == QString()) { + if (typemodifier.isEmpty()) { type = Object::DynamicProperty::Custom; } else if(typemodifier == QLatin1String("list")) { type = Object::DynamicProperty::CustomList; @@ -760,7 +759,7 @@ prop->listValueRange.offset = node->lbracketToken.offset; prop->listValueRange.length = node->rbracketToken.offset + node->rbracketToken.length - node->lbracketToken.offset; - // Store the positions of the comma token too, again for the DOM to be able to retreive it. + // Store the positions of the comma token too, again for the DOM to be able to retrieve it. prop->listCommaPositions = collectCommas(node->members); while (propertyCount--) @@ -831,7 +830,9 @@ _scriptFile = fileName; QTextStream stream(qmldata, QIODevice::ReadOnly); +#ifndef QT_NO_TEXTCODEC stream.setCodec("UTF-8"); +#endif const QString code = stream.readAll(); data = new QDeclarativeScriptParserJsASTData(fileName); @@ -876,11 +877,6 @@ return _refTypes; } -QList QDeclarativeScriptParser::referencedResources() const -{ - return _refUrls; -} - Object *QDeclarativeScriptParser::tree() const { return root; @@ -958,6 +954,217 @@ return rv; } +#define CHECK_LINE if(l.currentLineNo() != startLine) return rv; +#define CHECK_TOKEN(t) if (token != QDeclarativeJSGrammar:: t) return rv; + +static const int uriTokens[] = { + QDeclarativeJSGrammar::T_IDENTIFIER, + QDeclarativeJSGrammar::T_PROPERTY, + QDeclarativeJSGrammar::T_SIGNAL, + QDeclarativeJSGrammar::T_READONLY, + QDeclarativeJSGrammar::T_ON, + QDeclarativeJSGrammar::T_BREAK, + QDeclarativeJSGrammar::T_CASE, + QDeclarativeJSGrammar::T_CATCH, + QDeclarativeJSGrammar::T_CONTINUE, + QDeclarativeJSGrammar::T_DEFAULT, + QDeclarativeJSGrammar::T_DELETE, + QDeclarativeJSGrammar::T_DO, + QDeclarativeJSGrammar::T_ELSE, + QDeclarativeJSGrammar::T_FALSE, + QDeclarativeJSGrammar::T_FINALLY, + QDeclarativeJSGrammar::T_FOR, + QDeclarativeJSGrammar::T_FUNCTION, + QDeclarativeJSGrammar::T_IF, + QDeclarativeJSGrammar::T_IN, + QDeclarativeJSGrammar::T_INSTANCEOF, + QDeclarativeJSGrammar::T_NEW, + QDeclarativeJSGrammar::T_NULL, + QDeclarativeJSGrammar::T_RETURN, + QDeclarativeJSGrammar::T_SWITCH, + QDeclarativeJSGrammar::T_THIS, + QDeclarativeJSGrammar::T_THROW, + QDeclarativeJSGrammar::T_TRUE, + QDeclarativeJSGrammar::T_TRY, + QDeclarativeJSGrammar::T_TYPEOF, + QDeclarativeJSGrammar::T_VAR, + QDeclarativeJSGrammar::T_VOID, + QDeclarativeJSGrammar::T_WHILE, + QDeclarativeJSGrammar::T_CONST, + QDeclarativeJSGrammar::T_DEBUGGER, + QDeclarativeJSGrammar::T_RESERVED_WORD, + QDeclarativeJSGrammar::T_WITH, + + QDeclarativeJSGrammar::EOF_SYMBOL +}; +static inline bool isUriToken(int token) +{ + const int *current = uriTokens; + while (*current != QDeclarativeJSGrammar::EOF_SYMBOL) { + if (*current == token) + return true; + ++current; + } + return false; +} + +QDeclarativeScriptParser::JavaScriptMetaData QDeclarativeScriptParser::extractMetaData(QString &script) +{ + JavaScriptMetaData rv; + + QDeclarativeParser::Object::ScriptBlock::Pragmas &pragmas = rv.pragmas; + + const QString pragma(QLatin1String("pragma")); + const QString js(QLatin1String(".js")); + const QString library(QLatin1String("library")); + + QDeclarativeJS::Lexer l(0); + l.setCode(script, 0); + + int token = l.lex(); + + while (true) { + if (token != QDeclarativeJSGrammar::T_DOT) + return rv; + + int startOffset = l.tokenOffset(); + int startLine = l.currentLineNo(); + + token = l.lex(); + + CHECK_LINE; + + if (token == QDeclarativeJSGrammar::T_IMPORT) { + + // .import as + // .import as + + token = l.lex(); + + CHECK_LINE; + + if (token == QDeclarativeJSGrammar::T_STRING_LITERAL) { + + QString file(l.characterBuffer(), l.characterCount()); + if (!file.endsWith(js)) + return rv; + + token = l.lex(); + + CHECK_TOKEN(T_AS); + CHECK_LINE; + + token = l.lex(); + + CHECK_TOKEN(T_IDENTIFIER); + CHECK_LINE; + + int endOffset = l.tokenLength() + l.tokenOffset(); + + QString importId = script.mid(l.tokenOffset(), l.tokenLength()); + + if (!importId.at(0).isUpper()) + return rv; + + token = l.lex(); + if (l.currentLineNo() == startLine) + return rv; + + replaceWithSpace(script, startOffset, endOffset - startOffset); + + Import import; + import.type = Import::Script; + import.uri = file; + import.qualifier = importId; + + rv.imports << import; + + } else { + // URI + QString uri; + QString version; + + while (true) { + if (!isUriToken(token)) + return rv; + + uri.append(QString(l.characterBuffer(), l.characterCount())); + + token = l.lex(); + CHECK_LINE; + if (token != QDeclarativeJSGrammar::T_DOT) + break; + + uri.append(QLatin1Char('.')); + + token = l.lex(); + CHECK_LINE; + } + + CHECK_TOKEN(T_NUMERIC_LITERAL); + version = script.mid(l.tokenOffset(), l.tokenLength()); + + token = l.lex(); + + CHECK_TOKEN(T_AS); + CHECK_LINE; + + token = l.lex(); + + CHECK_TOKEN(T_IDENTIFIER); + CHECK_LINE; + + int endOffset = l.tokenLength() + l.tokenOffset(); + + QString importId = script.mid(l.tokenOffset(), l.tokenLength()); + + if (!importId.at(0).isUpper()) + return rv; + + token = l.lex(); + if (l.currentLineNo() == startLine) + return rv; + + replaceWithSpace(script, startOffset, endOffset - startOffset); + + Import import; + import.type = Import::Library; + import.uri = uri; + import.version = version; + import.qualifier = importId; + + rv.imports << import; + } + + } else if (token == QDeclarativeJSGrammar::T_IDENTIFIER && + script.mid(l.tokenOffset(), l.tokenLength()) == pragma) { + + token = l.lex(); + + CHECK_TOKEN(T_IDENTIFIER); + CHECK_LINE; + + QString pragmaValue = script.mid(l.tokenOffset(), l.tokenLength()); + int endOffset = l.tokenLength() + l.tokenOffset(); + + if (pragmaValue == QLatin1String("library")) { + pragmas |= QDeclarativeParser::Object::ScriptBlock::Shared; + replaceWithSpace(script, startOffset, endOffset - startOffset); + } else { + return rv; + } + + token = l.lex(); + if (l.currentLineNo() == startLine) + return rv; + + } else { + return rv; + } + } + return rv; +} + void QDeclarativeScriptParser::clear() { if (root) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativescriptparser_p.h --- a/src/declarative/qml/qdeclarativescriptparser_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativescriptparser_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -103,7 +103,6 @@ bool parse(const QByteArray &data, const QUrl &url = QUrl()); QList referencedTypes() const; - QList referencedResources() const; QDeclarativeParser::Object *tree() const; QList imports() const; @@ -112,7 +111,18 @@ QList errors() const; + class JavaScriptMetaData { + public: + JavaScriptMetaData() + : pragmas(QDeclarativeParser::Object::ScriptBlock::None) {} + + QDeclarativeParser::Object::ScriptBlock::Pragmas pragmas; + QList imports; + }; + static QDeclarativeParser::Object::ScriptBlock::Pragmas extractPragmas(QString &); + static JavaScriptMetaData extractMetaData(QString &); + // ### private: TypeReference *findOrCreateType(const QString &name); @@ -127,7 +137,6 @@ QDeclarativeParser::Object *root; QList _imports; QList _refTypes; - QList _refUrls; QString _scriptFile; QDeclarativeScriptParserJsASTData *data; }; diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativestringconverters.cpp --- a/src/declarative/qml/qdeclarativestringconverters.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativestringconverters.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -106,14 +106,14 @@ return QVariant(uint(qRound(s.toDouble(ok)))); case QMetaType::QColor: return QVariant::fromValue(colorFromString(s, ok)); -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING case QMetaType::QDate: return QVariant::fromValue(dateFromString(s, ok)); case QMetaType::QTime: return QVariant::fromValue(timeFromString(s, ok)); case QMetaType::QDateTime: return QVariant::fromValue(dateTimeFromString(s, ok)); -#endif // QT_NO_TEXTDATE +#endif // QT_NO_DATESTRING case QMetaType::QPointF: return QVariant::fromValue(pointFFromString(s, ok)); case QMetaType::QPoint: @@ -152,7 +152,7 @@ } } -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING QDate QDeclarativeStringConverters::dateFromString(const QString &s, bool *ok) { QDate d = QDate::fromString(s, Qt::ISODate); @@ -173,7 +173,7 @@ if (ok) *ok = d.isValid(); return d; } -#endif // QT_NO_TEXTDATE +#endif // QT_NO_DATESTRING //expects input of "x,y" QPointF QDeclarativeStringConverters::pointFFromString(const QString &s, bool *ok) diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativestringconverters_p.h --- a/src/declarative/qml/qdeclarativestringconverters_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativestringconverters_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -73,7 +73,7 @@ QVariant Q_DECLARATIVE_EXPORT variantFromString(const QString &, int preferredType, bool *ok = 0); QColor Q_DECLARATIVE_EXPORT colorFromString(const QString &, bool *ok = 0); -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING QDate Q_DECLARATIVE_EXPORT dateFromString(const QString &, bool *ok = 0); QTime Q_DECLARATIVE_EXPORT timeFromString(const QString &, bool *ok = 0); QDateTime Q_DECLARATIVE_EXPORT dateTimeFromString(const QString &, bool *ok = 0); diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativetypeloader.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/declarative/qml/qdeclarativetypeloader.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1070 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qdeclarativetypeloader_p.h" + +#include +#include +#include + +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +/*! +\class QDeclarativeDataBlob +\brief The QDeclarativeDataBlob encapsulates a data request that can be issued to a QDeclarativeDataLoader. +\internal + +QDeclarativeDataBlob's are loaded by a QDeclarativeDataLoader. The user creates the QDeclarativeDataBlob +and then calls QDeclarativeDataLoader::load() or QDeclarativeDataLoader::loadWithStaticData() to load it. +The QDeclarativeDataLoader invokes callbacks on the QDeclarativeDataBlob as data becomes available. +*/ + +/*! +\enum QDeclarativeDataBlob::Status + +\o Null The blob has not yet been loaded by a QDeclarativeDataLoader +\o Loading The blob is loading network data. The QDeclarativeDataBlob::setData() callback has not yet been +invoked or has not yet returned. +\o WaitingForDependencies The blob is waiting for dependencies to be done before continueing. This status +only occurs after the QDeclarativeDataBlob::setData() callback has been made, and when the blob has outstanding +dependencies. +\o Complete The blob's data has been loaded and all dependencies are done. +\o Error An error has been set on this blob. +*/ + +/*! +\enum QDeclarativeDataBlob::Type +\o QmlFile This is a QDeclarativeTypeData +\o JavaScriptFile This is a QDeclarativeScriptData +\o QmldirFile This is a QDeclarativeQmldirData +*/ + +/*! +Create a new QDeclarativeDataBlob for \a url and of the provided \a type. +*/ +QDeclarativeDataBlob::QDeclarativeDataBlob(const QUrl &url, Type type) +: m_type(type), m_status(Null), m_progress(0), m_url(url), m_finalUrl(url), m_manager(0), + m_redirectCount(0), m_inCallback(false), m_isDone(false) +{ +} + +/*! \internal */ +QDeclarativeDataBlob::~QDeclarativeDataBlob() +{ + Q_ASSERT(m_waitingOnMe.isEmpty()); + + cancelAllWaitingFor(); +} + +/*! +Returns the type provided to the constructor. +*/ +QDeclarativeDataBlob::Type QDeclarativeDataBlob::type() const +{ + return m_type; +} + +/*! +Returns the blob's status. +*/ +QDeclarativeDataBlob::Status QDeclarativeDataBlob::status() const +{ + return m_status; +} + +/*! +Returns true if the status is Null. +*/ +bool QDeclarativeDataBlob::isNull() const +{ + return m_status == Null; +} + +/*! +Returns true if the status is Loading. +*/ +bool QDeclarativeDataBlob::isLoading() const +{ + return m_status == Loading; +} + +/*! +Returns true if the status is WaitingForDependencies. +*/ +bool QDeclarativeDataBlob::isWaiting() const +{ + return m_status == WaitingForDependencies; +} + +/*! +Returns true if the status is Complete. +*/ +bool QDeclarativeDataBlob::isComplete() const +{ + return m_status == Complete; +} + +/*! +Returns true if the status is Error. +*/ +bool QDeclarativeDataBlob::isError() const +{ + return m_status == Error; +} + +/*! +Returns true if the status is Complete or Error. +*/ +bool QDeclarativeDataBlob::isCompleteOrError() const +{ + return isComplete() || isError(); +} + +/*! +Returns the data download progress from 0 to 1. +*/ +qreal QDeclarativeDataBlob::progress() const +{ + return m_progress; +} + +/*! +Returns the blob url passed to the constructor. If a network redirect +happens while fetching the data, this url remains the same. + +\sa finalUrl() +*/ +QUrl QDeclarativeDataBlob::url() const +{ + return m_url; +} + +/*! +Returns the final url of the data. Initially this is the same as +url(), but if a network redirect happens while fetching the data, this url +is updated to reflect the new location. +*/ +QUrl QDeclarativeDataBlob::finalUrl() const +{ + return m_finalUrl; +} + +/*! +Return the errors on this blob. +*/ +QList QDeclarativeDataBlob::errors() const +{ + return m_errors; +} + +/*! +Mark this blob as having \a errors. + +All outstanding dependencies will be cancelled. Requests to add new dependencies +will be ignored. Entry into the Error state is irreversable, although you can change the +specific errors by additional calls to setError. +*/ +void QDeclarativeDataBlob::setError(const QDeclarativeError &errors) +{ + QList l; + l << errors; + setError(l); +} + +/*! +\override +*/ +void QDeclarativeDataBlob::setError(const QList &errors) +{ + m_status = Error; + m_errors = errors; + + cancelAllWaitingFor(); + + if (!m_inCallback) + tryDone(); +} + +/*! +Wait for \a blob to become complete or to error. If \a blob is already +complete or in error, or this blob is already complete, this has no effect. +*/ +void QDeclarativeDataBlob::addDependency(QDeclarativeDataBlob *blob) +{ + Q_ASSERT(status() != Null); + + if (!blob || + blob->status() == Error || blob->status() == Complete || + status() == Error || status() == Complete || + m_waitingFor.contains(blob)) + return; + + blob->addref(); + m_status = WaitingForDependencies; + m_waitingFor.append(blob); + blob->m_waitingOnMe.append(this); +} + +/*! +\fn void QDeclarativeDataBlob::dataReceived(const QByteArray &data) + +Invoked when data for the blob is received. Implementors should use this callback +to determine a blob's dependencies. Within this callback you may call setError() +or addDependency(). +*/ + +/*! +Invoked once data has either been received or a network error occurred, and all +dependencies are complete. + +You can set an error in this method, but you cannot add new dependencies. Implementors +should use this callback to finalize processing of data. + +The default implementation does nothing. +*/ +void QDeclarativeDataBlob::done() +{ +} + +/*! +Invoked if there is a network error while fetching this blob. + +The default implementation sets an appropriate QDeclarativeError. +*/ +void QDeclarativeDataBlob::networkError(QNetworkReply::NetworkError networkError) +{ + Q_UNUSED(networkError); + + QDeclarativeError error; + error.setUrl(m_finalUrl); + + const char *errorString = 0; + switch (networkError) { + default: + errorString = "Network error"; + break; + case QNetworkReply::ConnectionRefusedError: + errorString = "Connection refused"; + break; + case QNetworkReply::RemoteHostClosedError: + errorString = "Remote host closed the connection"; + break; + case QNetworkReply::HostNotFoundError: + errorString = "Host not found"; + break; + case QNetworkReply::TimeoutError: + errorString = "Timeout"; + break; + case QNetworkReply::ProxyConnectionRefusedError: + case QNetworkReply::ProxyConnectionClosedError: + case QNetworkReply::ProxyNotFoundError: + case QNetworkReply::ProxyTimeoutError: + case QNetworkReply::ProxyAuthenticationRequiredError: + case QNetworkReply::UnknownProxyError: + errorString = "Proxy error"; + break; + case QNetworkReply::ContentAccessDenied: + errorString = "Access denied"; + break; + case QNetworkReply::ContentNotFoundError: + errorString = "File not found"; + break; + case QNetworkReply::AuthenticationRequiredError: + errorString = "Authentication required"; + break; + }; + + error.setDescription(QLatin1String(errorString)); + + setError(error); +} + +/*! +Called if \a blob, which was previously waited for, has an error. + +The default implementation does nothing. +*/ +void QDeclarativeDataBlob::dependencyError(QDeclarativeDataBlob *blob) +{ + Q_UNUSED(blob); +} + +/*! +Called if \a blob, which was previously waited for, has completed. + +The default implementation does nothing. +*/ +void QDeclarativeDataBlob::dependencyComplete(QDeclarativeDataBlob *blob) +{ + Q_UNUSED(blob); +} + +/*! +Called when all blobs waited for have completed. This occurs regardless of +whether they are in error, or complete state. + +The default implementation does nothing. +*/ +void QDeclarativeDataBlob::allDependenciesDone() +{ +} + +/*! +Called when the download progress of this blob changes. \a progress goes +from 0 to 1. +*/ +void QDeclarativeDataBlob::downloadProgressChanged(qreal progress) +{ + Q_UNUSED(progress); +} + +void QDeclarativeDataBlob::tryDone() +{ + if (status() != Loading && m_waitingFor.isEmpty() && !m_isDone) { + if (status() != Error) + m_status = Complete; + + m_isDone = true; + done(); + notifyAllWaitingOnMe(); + } +} + +void QDeclarativeDataBlob::cancelAllWaitingFor() +{ + while (m_waitingFor.count()) { + QDeclarativeDataBlob *blob = m_waitingFor.takeLast(); + + Q_ASSERT(blob->m_waitingOnMe.contains(this)); + + blob->m_waitingOnMe.removeOne(this); + + blob->release(); + } +} + +void QDeclarativeDataBlob::notifyAllWaitingOnMe() +{ + while (m_waitingOnMe.count()) { + QDeclarativeDataBlob *blob = m_waitingOnMe.takeLast(); + + Q_ASSERT(blob->m_waitingFor.contains(this)); + + blob->notifyComplete(this); + } +} + +void QDeclarativeDataBlob::notifyComplete(QDeclarativeDataBlob *blob) +{ + Q_ASSERT(m_waitingFor.contains(blob)); + Q_ASSERT(blob->status() == Error || blob->status() == Complete); + + m_inCallback = true; + + if (blob->status() == Error) { + dependencyError(blob); + } else if (blob->status() == Complete) { + dependencyComplete(blob); + } + + m_waitingFor.removeOne(blob); + blob->release(); + + if (!isError() && m_waitingFor.isEmpty()) + allDependenciesDone(); + + m_inCallback = false; + + tryDone(); +} + +/*! +\class QDeclarativeDataLoader +\brief The QDeclarativeDataLoader class abstracts loading files and their dependecies over the network. +\internal + +The QDeclarativeDataLoader class is provided for the exclusive use of the QDeclarativeTypeLoader class. + +Clients create QDeclarativeDataBlob instances and submit them to the QDeclarativeDataLoader class +through the QDeclarativeDataLoader::load() or QDeclarativeDataLoader::loadWithStaticData() methods. +The loader then fetches the data over the network or from the local file system in an efficient way. +QDeclarativeDataBlob is an abstract class, so should always be specialized. + +Once data is received, the QDeclarativeDataBlob::dataReceived() method is invoked on the blob. The +derived class should use this callback to process the received data. Processing of the data can +result in an error being set (QDeclarativeDataBlob::setError()), or one or more dependencies being +created (QDeclarativeDataBlob::addDependency()). Dependencies are other QDeclarativeDataBlob's that +are required before processing can fully complete. + +To complete processing, the QDeclarativeDataBlob::done() callback is invoked. done() is called when +one of these three preconditions are met. + +1. The QDeclarativeDataBlob has no dependencies. +2. The QDeclarativeDataBlob has an error set. +3. All the QDeclarativeDataBlob's dependencies are themselves "done()". + +Thus QDeclarativeDataBlob::done() will always eventually be called, even if the blob has an error set. +*/ + +/*! +Create a new QDeclarativeDataLoader for \a engine. +*/ +QDeclarativeDataLoader::QDeclarativeDataLoader(QDeclarativeEngine *engine) +: m_engine(engine) +{ +} + +/*! \internal */ +QDeclarativeDataLoader::~QDeclarativeDataLoader() +{ + for (NetworkReplies::Iterator iter = m_networkReplies.begin(); iter != m_networkReplies.end(); ++iter) + (*iter)->release(); +} + +/*! +Load the provided \a blob from the network or filesystem. +*/ +void QDeclarativeDataLoader::load(QDeclarativeDataBlob *blob) +{ + Q_ASSERT(blob->status() == QDeclarativeDataBlob::Null); + Q_ASSERT(blob->m_manager == 0); + + blob->m_status = QDeclarativeDataBlob::Loading; + + if (blob->m_url.isEmpty()) { + QDeclarativeError error; + error.setDescription(QLatin1String("Invalid null URL")); + blob->setError(error); + return; + } + + QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(blob->m_url); + + if (!lf.isEmpty()) { + QFile file(lf); + if (file.open(QFile::ReadOnly)) { + QByteArray data = file.readAll(); + + blob->m_progress = 1.; + blob->downloadProgressChanged(1.); + + setData(blob, data); + } else { + blob->networkError(QNetworkReply::ContentNotFoundError); + } + + } else { + + blob->m_manager = this; + QNetworkReply *reply = m_engine->networkAccessManager()->get(QNetworkRequest(blob->m_url)); + QObject::connect(reply, SIGNAL(downloadProgress(qint64,qint64)), + this, SLOT(networkReplyProgress(qint64,qint64))); + QObject::connect(reply, SIGNAL(finished()), + this, SLOT(networkReplyFinished())); + m_networkReplies.insert(reply, blob); + + blob->addref(); + } +} + +#define DATALOADER_MAXIMUM_REDIRECT_RECURSION 16 + +void QDeclarativeDataLoader::networkReplyFinished() +{ + QNetworkReply *reply = static_cast(sender()); + reply->deleteLater(); + + QDeclarativeDataBlob *blob = m_networkReplies.take(reply); + + Q_ASSERT(blob); + + blob->m_redirectCount++; + + if (blob->m_redirectCount < DATALOADER_MAXIMUM_REDIRECT_RECURSION) { + QVariant redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute); + if (redirect.isValid()) { + QUrl url = reply->url().resolved(redirect.toUrl()); + blob->m_finalUrl = url; + + QNetworkReply *reply = m_engine->networkAccessManager()->get(QNetworkRequest(url)); + QObject::connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); + m_networkReplies.insert(reply, blob); + return; + } + } + + if (reply->error()) { + blob->networkError(reply->error()); + } else { + QByteArray data = reply->readAll(); + setData(blob, data); + } + + blob->release(); +} + +void QDeclarativeDataLoader::networkReplyProgress(qint64 bytesReceived, qint64 bytesTotal) +{ + QNetworkReply *reply = static_cast(sender()); + QDeclarativeDataBlob *blob = m_networkReplies.value(reply); + + Q_ASSERT(blob); + + if (bytesTotal != 0) { + blob->m_progress = bytesReceived / bytesTotal; + blob->downloadProgressChanged(blob->m_progress); + } +} + +/*! +Load the provided \a blob with \a data. The blob's URL is not used by the data loader in this case. +*/ +void QDeclarativeDataLoader::loadWithStaticData(QDeclarativeDataBlob *blob, const QByteArray &data) +{ + Q_ASSERT(blob->status() == QDeclarativeDataBlob::Null); + Q_ASSERT(blob->m_manager == 0); + + blob->m_status = QDeclarativeDataBlob::Loading; + + setData(blob, data); +} + +/*! +Return the QDeclarativeEngine associated with this loader +*/ +QDeclarativeEngine *QDeclarativeDataLoader::engine() const +{ + return m_engine; +} + +void QDeclarativeDataLoader::setData(QDeclarativeDataBlob *blob, const QByteArray &data) +{ + blob->m_inCallback = true; + + blob->dataReceived(data); + + if (!blob->isError() && !blob->isWaiting()) + blob->allDependenciesDone(); + + if (blob->status() != QDeclarativeDataBlob::Error) + blob->m_status = QDeclarativeDataBlob::WaitingForDependencies; + + blob->m_inCallback = false; + + blob->tryDone(); +} + +/*! +\class QDeclarativeTypeLoader +*/ +QDeclarativeTypeLoader::QDeclarativeTypeLoader(QDeclarativeEngine *engine) +: QDeclarativeDataLoader(engine) +{ +} + +QDeclarativeTypeLoader::~QDeclarativeTypeLoader() +{ + clearCache(); +} + +/*! +Return a QDeclarativeTypeData for \a url. The QDeclarativeTypeData may be cached. +*/ +QDeclarativeTypeData *QDeclarativeTypeLoader::get(const QUrl &url) +{ + Q_ASSERT(!url.isRelative() && + (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url).isEmpty() || + !QDir::isRelativePath(QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url)))); + + QDeclarativeTypeData *typeData = m_typeCache.value(url); + + if (!typeData) { + typeData = new QDeclarativeTypeData(url, None, this); + m_typeCache.insert(url, typeData); + QDeclarativeDataLoader::load(typeData); + } + + typeData->addref(); + return typeData; +} + +/*! +Return a QDeclarativeTypeData for \a data with the provided base \a url. The +QDeclarativeTypeData will not be cached. +*/ +QDeclarativeTypeData *QDeclarativeTypeLoader::get(const QByteArray &data, const QUrl &url, Options options) +{ + QDeclarativeTypeData *typeData = new QDeclarativeTypeData(url, options, this); + QDeclarativeDataLoader::loadWithStaticData(typeData, data); + return typeData; +} + +/*! +Return a QDeclarativeScriptData for \a url. The QDeclarativeScriptData may be cached. +*/ +QDeclarativeScriptData *QDeclarativeTypeLoader::getScript(const QUrl &url) +{ + Q_ASSERT(!url.isRelative() && + (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url).isEmpty() || + !QDir::isRelativePath(QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url)))); + + QDeclarativeScriptData *scriptData = m_scriptCache.value(url); + + if (!scriptData) { + scriptData = new QDeclarativeScriptData(url); + m_scriptCache.insert(url, scriptData); + QDeclarativeDataLoader::load(scriptData); + } + + scriptData->addref(); + return scriptData; +} + +/*! +Return a QDeclarativeQmldirData for \a url. The QDeclarativeQmldirData may be cached. +*/ +QDeclarativeQmldirData *QDeclarativeTypeLoader::getQmldir(const QUrl &url) +{ + Q_ASSERT(!url.isRelative() && + (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url).isEmpty() || + !QDir::isRelativePath(QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url)))); + + QDeclarativeQmldirData *qmldirData = m_qmldirCache.value(url); + + if (!qmldirData) { + qmldirData = new QDeclarativeQmldirData(url); + m_qmldirCache.insert(url, qmldirData); + QDeclarativeDataLoader::load(qmldirData); + } + + qmldirData->addref(); + return qmldirData; +} + +void QDeclarativeTypeLoader::clearCache() +{ + for (TypeCache::Iterator iter = m_typeCache.begin(); iter != m_typeCache.end(); ++iter) + (*iter)->release(); + for (ScriptCache::Iterator iter = m_scriptCache.begin(); iter != m_scriptCache.end(); ++iter) + (*iter)->release(); + for (QmldirCache::Iterator iter = m_qmldirCache.begin(); iter != m_qmldirCache.end(); ++iter) + (*iter)->release(); + + m_typeCache.clear(); + m_scriptCache.clear(); + m_qmldirCache.clear(); +} + + +QDeclarativeTypeData::QDeclarativeTypeData(const QUrl &url, QDeclarativeTypeLoader::Options options, + QDeclarativeTypeLoader *manager) +: QDeclarativeDataBlob(url, QmlFile), m_options(options), m_typesResolved(false), + m_compiledData(0), m_component(0), m_typeLoader(manager) +{ +} + +QDeclarativeTypeData::~QDeclarativeTypeData() +{ + for (int ii = 0; ii < m_scripts.count(); ++ii) + m_scripts.at(ii).script->release(); + for (int ii = 0; ii < m_qmldirs.count(); ++ii) + m_qmldirs.at(ii)->release(); + for (int ii = 0; ii < m_types.count(); ++ii) + if (m_types.at(ii).typeData) m_types.at(ii).typeData->release(); + if (m_compiledData) + m_compiledData->release(); +} + +QDeclarativeTypeLoader *QDeclarativeTypeData::typeLoader() const +{ + return m_typeLoader; +} + +const QDeclarativeImports &QDeclarativeTypeData::imports() const +{ + return m_imports; +} + +const QDeclarativeScriptParser &QDeclarativeTypeData::parser() const +{ + return scriptParser; +} + +const QList &QDeclarativeTypeData::resolvedTypes() const +{ + return m_types; +} + +const QList &QDeclarativeTypeData::resolvedScripts() const +{ + return m_scripts; +} + +QDeclarativeCompiledData *QDeclarativeTypeData::compiledData() const +{ + if (m_compiledData) + m_compiledData->addref(); + + return m_compiledData; +} + +QDeclarativeComponent *QDeclarativeTypeData::component() const +{ + if (!m_component) { + + if (m_compiledData) { + m_component = new QDeclarativeComponent(typeLoader()->engine(), m_compiledData, -1, -1, 0); + } else { + m_component = new QDeclarativeComponent(typeLoader()->engine()); + QDeclarativeComponentPrivate::get(m_component)->url = finalUrl(); + QDeclarativeComponentPrivate::get(m_component)->state.errors = errors(); + } + + } + + return m_component; +} + +void QDeclarativeTypeData::registerCallback(TypeDataCallback *callback) +{ + Q_ASSERT(!m_callbacks.contains(callback)); + m_callbacks.append(callback); +} + +void QDeclarativeTypeData::unregisterCallback(TypeDataCallback *callback) +{ + Q_ASSERT(m_callbacks.contains(callback)); + m_callbacks.removeOne(callback); + Q_ASSERT(!m_callbacks.contains(callback)); +} + +void QDeclarativeTypeData::done() +{ + addref(); + + // Check all script dependencies for errors + for (int ii = 0; !isError() && ii < m_scripts.count(); ++ii) { + const ScriptReference &script = m_scripts.at(ii); + Q_ASSERT(script.script->isCompleteOrError()); + if (script.script->isError()) { + QList errors = script.script->errors(); + QDeclarativeError error; + error.setUrl(finalUrl()); + error.setLine(script.location.line); + error.setColumn(script.location.column); + error.setDescription(typeLoader()->tr("Script %1 unavailable").arg(script.script->url().toString())); + errors.prepend(error); + setError(errors); + } + } + + // Check all type dependencies for errors + for (int ii = 0; !isError() && ii < m_types.count(); ++ii) { + const TypeReference &type = m_types.at(ii); + Q_ASSERT(!type.typeData || type.typeData->isCompleteOrError()); + if (type.typeData && type.typeData->isError()) { + QString typeName = scriptParser.referencedTypes().at(ii)->name; + + QList errors = type.typeData->errors(); + QDeclarativeError error; + error.setUrl(finalUrl()); + error.setLine(type.location.line); + error.setColumn(type.location.column); + error.setDescription(typeLoader()->tr("Type %1 unavailable").arg(typeName)); + errors.prepend(error); + setError(errors); + } + } + + // Compile component + if (!isError()) + compile(); + + if (!(m_options & QDeclarativeTypeLoader::PreserveParser)) + scriptParser.clear(); + + // Notify callbacks + while (!m_callbacks.isEmpty()) { + TypeDataCallback *callback = m_callbacks.takeFirst(); + callback->typeDataReady(this); + } + + release(); +} + +void QDeclarativeTypeData::dataReceived(const QByteArray &data) +{ + if (!scriptParser.parse(data, finalUrl())) { + setError(scriptParser.errors()); + return; + } + + m_imports.setBaseUrl(finalUrl()); + + foreach (const QDeclarativeScriptParser::Import &import, scriptParser.imports()) { + if (import.type == QDeclarativeScriptParser::Import::File && import.qualifier.isEmpty()) { + QUrl importUrl = finalUrl().resolved(QUrl(import.uri + QLatin1String("/qmldir"))); + if (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(importUrl).isEmpty()) { + QDeclarativeQmldirData *data = typeLoader()->getQmldir(importUrl); + addDependency(data); + m_qmldirs << data; + } + } else if (import.type == QDeclarativeScriptParser::Import::Script) { + QUrl scriptUrl = finalUrl().resolved(QUrl(import.uri)); + QDeclarativeScriptData *data = typeLoader()->getScript(scriptUrl); + addDependency(data); + + ScriptReference ref; + ref.location = import.location.start; + ref.qualifier = import.qualifier; + ref.script = data; + m_scripts << ref; + + } + } + + if (!finalUrl().scheme().isEmpty()) { + QUrl importUrl = finalUrl().resolved(QUrl(QLatin1String("qmldir"))); + if (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(importUrl).isEmpty()) { + QDeclarativeQmldirData *data = typeLoader()->getQmldir(importUrl); + addDependency(data); + m_qmldirs << data; + } + } +} + +void QDeclarativeTypeData::allDependenciesDone() +{ + if (!m_typesResolved) { + resolveTypes(); + m_typesResolved = true; + } +} + +void QDeclarativeTypeData::downloadProgressChanged(qreal p) +{ + for (int ii = 0; ii < m_callbacks.count(); ++ii) { + TypeDataCallback *callback = m_callbacks.at(ii); + callback->typeDataProgress(this, p); + } +} + +void QDeclarativeTypeData::compile() +{ + Q_ASSERT(m_compiledData == 0); + + m_compiledData = new QDeclarativeCompiledData(typeLoader()->engine()); + m_compiledData->url = m_imports.baseUrl(); + m_compiledData->name = m_compiledData->url.toString(); + + QDeclarativeCompiler compiler; + if (!compiler.compile(typeLoader()->engine(), this, m_compiledData)) { + setError(compiler.errors()); + m_compiledData->release(); + m_compiledData = 0; + } +} + +void QDeclarativeTypeData::resolveTypes() +{ + QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(m_typeLoader->engine()); + QDeclarativeImportDatabase *importDatabase = &ep->importDatabase; + + // For local urls, add an implicit import "." as first (most overridden) lookup. + // This will also trigger the loading of the qmldir and the import of any native + // types from available plugins. + if (QDeclarativeQmldirData *qmldir = qmldirForUrl(finalUrl().resolved(QUrl(QLatin1String("./qmldir"))))) { + m_imports.addImport(importDatabase, QLatin1String("."), + QString(), -1, -1, QDeclarativeScriptParser::Import::File, + qmldir->dirComponents(), 0); + } else { + m_imports.addImport(importDatabase, QLatin1String("."), + QString(), -1, -1, QDeclarativeScriptParser::Import::File, + QDeclarativeDirComponents(), 0); + } + + foreach (const QDeclarativeScriptParser::Import &import, scriptParser.imports()) { + QDeclarativeDirComponents qmldircomponentsnetwork; + if (import.type == QDeclarativeScriptParser::Import::Script) + continue; + + if (import.type == QDeclarativeScriptParser::Import::File && import.qualifier.isEmpty()) { + QUrl qmldirUrl = finalUrl().resolved(QUrl(import.uri + QLatin1String("/qmldir"))); + if (QDeclarativeQmldirData *qmldir = qmldirForUrl(qmldirUrl)) + qmldircomponentsnetwork = qmldir->dirComponents(); + } + + int vmaj = -1; + int vmin = -1; + + if (!import.version.isEmpty()) { + int dot = import.version.indexOf(QLatin1Char('.')); + if (dot < 0) { + vmaj = import.version.toInt(); + vmin = 0; + } else { + vmaj = import.version.left(dot).toInt(); + vmin = import.version.mid(dot+1).toInt(); + } + } + + QString errorString; + if (!m_imports.addImport(importDatabase, import.uri, import.qualifier, + vmaj, vmin, import.type, qmldircomponentsnetwork, &errorString)) { + QDeclarativeError error; + error.setUrl(m_imports.baseUrl()); + error.setDescription(errorString); + error.setLine(import.location.start.line); + error.setColumn(import.location.start.column); + + setError(error); + return; + } + } + + foreach (QDeclarativeScriptParser::TypeReference *parserRef, scriptParser.referencedTypes()) { + QByteArray typeName = parserRef->name.toUtf8(); + + TypeReference ref; + + QUrl url; + int majorVersion; + int minorVersion; + QDeclarativeImportedNamespace *typeNamespace = 0; + QString errorString; + + if (!m_imports.resolveType(typeName, &ref.type, &url, &majorVersion, &minorVersion, + &typeNamespace, &errorString) || typeNamespace) { + // Known to not be a type: + // - known to be a namespace (Namespace {}) + // - type with unknown namespace (UnknownNamespace.SomeType {}) + QDeclarativeError error; + error.setUrl(m_imports.baseUrl()); + QString userTypeName = parserRef->name; + userTypeName.replace(QLatin1Char('/'),QLatin1Char('.')); + if (typeNamespace) + error.setDescription(typeLoader()->tr("Namespace %1 cannot be used as a type").arg(userTypeName)); + else + error.setDescription(typeLoader()->tr("%1 %2").arg(userTypeName).arg(errorString)); + + if (!parserRef->refObjects.isEmpty()) { + QDeclarativeParser::Object *obj = parserRef->refObjects.first(); + error.setLine(obj->location.start.line); + error.setColumn(obj->location.start.column); + } + + setError(error); + return; + } + + if (ref.type) { + foreach (QDeclarativeParser::Object *obj, parserRef->refObjects) { + // store namespace for DOM + obj->majorVersion = majorVersion; + obj->minorVersion = minorVersion; + } + } else { + ref.typeData = typeLoader()->get(url); + addDependency(ref.typeData); + } + + if (parserRef->refObjects.count()) + ref.location = parserRef->refObjects.first()->location.start; + + m_types << ref; + } +} + +QDeclarativeQmldirData *QDeclarativeTypeData::qmldirForUrl(const QUrl &url) +{ + for (int ii = 0; ii < m_qmldirs.count(); ++ii) { + if (m_qmldirs.at(ii)->url() == url) + return m_qmldirs.at(ii); + } + return 0; +} + +QDeclarativeScriptData::QDeclarativeScriptData(const QUrl &url) +: QDeclarativeDataBlob(url, JavaScriptFile), m_pragmas(QDeclarativeParser::Object::ScriptBlock::None) +{ +} + +QDeclarativeParser::Object::ScriptBlock::Pragmas QDeclarativeScriptData::pragmas() const +{ + return m_pragmas; +} + +QString QDeclarativeScriptData::scriptSource() const +{ + return m_source; +} + +void QDeclarativeScriptData::dataReceived(const QByteArray &data) +{ + m_source = QString::fromUtf8(data); + m_pragmas = QDeclarativeScriptParser::extractPragmas(m_source); +} + +QDeclarativeQmldirData::QDeclarativeQmldirData(const QUrl &url) +: QDeclarativeDataBlob(url, QmldirFile) +{ +} + +const QDeclarativeDirComponents &QDeclarativeQmldirData::dirComponents() const +{ + return m_components; +} + +void QDeclarativeQmldirData::dataReceived(const QByteArray &data) +{ + QDeclarativeDirParser parser; + parser.setSource(QString::fromUtf8(data)); + parser.parse(); + m_components = parser.components(); +} + +QT_END_NAMESPACE + diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativetypeloader_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/declarative/qml/qdeclarativetypeloader_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,321 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QDECLARATIVETYPELOADER_P_H +#define QDECLARATIVETYPELOADER_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class QDeclarativeScriptData; +class QDeclarativeQmldirData; +class QDeclarativeTypeLoader; +class QDeclarativeCompiledData; +class QDeclarativeComponentPrivate; +class QDeclarativeTypeData; +class QDeclarativeDataLoader; + +class Q_AUTOTEST_EXPORT QDeclarativeDataBlob : public QDeclarativeRefCount +{ +public: + enum Status { + Null, // Prior to QDeclarativeDataLoader::load() + Loading, // Prior to data being received and dataReceived() being called + WaitingForDependencies, // While there are outstanding addDependency()s + Complete, // Finished + Error, // Error + }; + + enum Type { + QmlFile, + JavaScriptFile, + QmldirFile + }; + + QDeclarativeDataBlob(const QUrl &, Type); + virtual ~QDeclarativeDataBlob(); + + Type type() const; + + Status status() const; + bool isNull() const; + bool isLoading() const; + bool isWaiting() const; + bool isComplete() const; + bool isError() const; + bool isCompleteOrError() const; + + qreal progress() const; + + QUrl url() const; + QUrl finalUrl() const; + + QList errors() const; + + void setError(const QDeclarativeError &); + void setError(const QList &errors); + + void addDependency(QDeclarativeDataBlob *); + +protected: + virtual void dataReceived(const QByteArray &) = 0; + + virtual void done(); + virtual void networkError(QNetworkReply::NetworkError); + + virtual void dependencyError(QDeclarativeDataBlob *); + virtual void dependencyComplete(QDeclarativeDataBlob *); + virtual void allDependenciesDone(); + + virtual void downloadProgressChanged(qreal); + +private: + friend class QDeclarativeDataLoader; + void tryDone(); + void cancelAllWaitingFor(); + void notifyAllWaitingOnMe(); + void notifyComplete(QDeclarativeDataBlob *); + + Type m_type; + Status m_status; + qreal m_progress; + + QUrl m_url; + QUrl m_finalUrl; + + // List of QDeclarativeDataBlob's that are waiting for me to complete. + QList m_waitingOnMe; + + // List of QDeclarativeDataBlob's that I am waiting for to complete. + QList m_waitingFor; + + // Manager that is currently fetching data for me + QDeclarativeDataLoader *m_manager; + int m_redirectCount:30; + bool m_inCallback:1; + bool m_isDone:1; + + QList m_errors; +}; + +class Q_AUTOTEST_EXPORT QDeclarativeDataLoader : public QObject +{ + Q_OBJECT +public: + QDeclarativeDataLoader(QDeclarativeEngine *); + ~QDeclarativeDataLoader(); + + void load(QDeclarativeDataBlob *); + void loadWithStaticData(QDeclarativeDataBlob *, const QByteArray &); + + QDeclarativeEngine *engine() const; + +private slots: + void networkReplyFinished(); + void networkReplyProgress(qint64,qint64); + +private: + void setData(QDeclarativeDataBlob *, const QByteArray &); + + QDeclarativeEngine *m_engine; + typedef QHash NetworkReplies; + NetworkReplies m_networkReplies; +}; + + +class Q_AUTOTEST_EXPORT QDeclarativeTypeLoader : public QDeclarativeDataLoader +{ + Q_OBJECT +public: + QDeclarativeTypeLoader(QDeclarativeEngine *); + ~QDeclarativeTypeLoader(); + + enum Option { + None, + PreserveParser + }; + Q_DECLARE_FLAGS(Options, Option) + + QDeclarativeTypeData *get(const QUrl &url); + QDeclarativeTypeData *get(const QByteArray &, const QUrl &url, Options = None); + void clearCache(); + + QDeclarativeScriptData *getScript(const QUrl &); + QDeclarativeQmldirData *getQmldir(const QUrl &); +private: + typedef QHash TypeCache; + typedef QHash ScriptCache; + typedef QHash QmldirCache; + + TypeCache m_typeCache; + ScriptCache m_scriptCache; + QmldirCache m_qmldirCache; +}; + +Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeTypeLoader::Options) + +class Q_AUTOTEST_EXPORT QDeclarativeTypeData : public QDeclarativeDataBlob +{ +public: + struct TypeReference + { + TypeReference() : type(0), typeData(0) {} + + QDeclarativeParser::Location location; + QDeclarativeType *type; + QDeclarativeTypeData *typeData; + }; + + struct ScriptReference + { + ScriptReference() : script(0) {} + + QDeclarativeParser::Location location; + QString qualifier; + QDeclarativeScriptData *script; + }; + + QDeclarativeTypeData(const QUrl &, QDeclarativeTypeLoader::Options, QDeclarativeTypeLoader *); + ~QDeclarativeTypeData(); + + QDeclarativeTypeLoader *typeLoader() const; + + const QDeclarativeImports &imports() const; + const QDeclarativeScriptParser &parser() const; + + const QList &resolvedTypes() const; + const QList &resolvedScripts() const; + + QDeclarativeCompiledData *compiledData() const; + QDeclarativeComponent *component() const; + + // Used by QDeclarativeComponent to get notifications + struct TypeDataCallback { + ~TypeDataCallback() {} + virtual void typeDataProgress(QDeclarativeTypeData *, qreal) {} + virtual void typeDataReady(QDeclarativeTypeData *) {} + }; + void registerCallback(TypeDataCallback *); + void unregisterCallback(TypeDataCallback *); + +protected: + virtual void done(); + virtual void dataReceived(const QByteArray &); + virtual void allDependenciesDone(); + virtual void downloadProgressChanged(qreal); + +private: + void resolveTypes(); + void compile(); + + QDeclarativeTypeLoader::Options m_options; + + QDeclarativeQmldirData *qmldirForUrl(const QUrl &); + + QDeclarativeScriptParser scriptParser; + QDeclarativeImports m_imports; + + QList m_scripts; + QList m_qmldirs; + + QList m_types; + bool m_typesResolved:1; + + QDeclarativeCompiledData *m_compiledData; + mutable QDeclarativeComponent *m_component; + + QList m_callbacks; + + QDeclarativeTypeLoader *m_typeLoader; +}; + +class Q_AUTOTEST_EXPORT QDeclarativeScriptData : public QDeclarativeDataBlob +{ +public: + QDeclarativeScriptData(const QUrl &); + + QDeclarativeParser::Object::ScriptBlock::Pragmas pragmas() const; + QString scriptSource() const; + +protected: + virtual void dataReceived(const QByteArray &); + +private: + QDeclarativeParser::Object::ScriptBlock::Pragmas m_pragmas; + QString m_source; +}; + +class Q_AUTOTEST_EXPORT QDeclarativeQmldirData : public QDeclarativeDataBlob +{ +public: + QDeclarativeQmldirData(const QUrl &); + + const QDeclarativeDirComponents &dirComponents() const; + +protected: + virtual void dataReceived(const QByteArray &); + +private: + QDeclarativeDirComponents m_components; + +}; + +QT_END_NAMESPACE + +#endif // QDECLARATIVETYPELOADER_P_H diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativevaluetypescriptclass.cpp --- a/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -168,7 +168,7 @@ ref->type->read(ref->object, ref->property); QMetaProperty p = ref->type->metaObject()->property(m_lastIndex); - if (p.isEnumType() && (QMetaType::Type)v.type() == QMetaType::QReal) + if (p.isEnumType() && (QMetaType::Type)v.type() == QMetaType::Double) v = v.toInt(); p.write(ref->type, v); ref->type->write(ref->object, ref->property, 0); diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativevme.cpp --- a/src/declarative/qml/qdeclarativevme.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativevme.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -621,14 +621,15 @@ case QDeclarativeInstruction::StoreSignal: { QObject *target = stack.top(); - QObject *context = stack.at(stack.count() - 1 - instr.assignBinding.context); - + QObject *context = stack.at(stack.count() - 1 - instr.storeSignal.context); + QMetaMethod signal = target->metaObject()->method(instr.storeSignal.signalIndex); QDeclarativeBoundSignal *bs = new QDeclarativeBoundSignal(target, signal, target); QDeclarativeExpression *expr = new QDeclarativeExpression(ctxt, context, primitives.at(instr.storeSignal.value)); expr->setSourceLocation(comp->name, instr.line); + static_cast(QObjectPrivate::get(expr))->name = datas.at(instr.storeSignal.name); bs->setExpression(expr); } break; diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativevmemetaobject.cpp --- a/src/declarative/qml/qdeclarativevmemetaobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -707,11 +707,19 @@ void QDeclarativeVMEMetaObject::writeVarProperty(int id, const QVariant &value) { - if (value.userType() == QMetaType::QObjectStar) + bool needActivate = false; + if (value.userType() == QMetaType::QObjectStar) { + QObject *o = qvariant_cast(value); + needActivate = (data[id].dataType() != QMetaType::QObjectStar || data[id].asQObject() != o); data[id].setValue(qvariant_cast(value)); - else + } else { + needActivate = (data[id].dataType() != qMetaTypeId() || + data[id].asQVariant().userType() != value.userType() || + data[id].asQVariant() != value); data[id].setValue(value); - activate(object, methodOffset + id, 0); + } + if (needActivate) + activate(object, methodOffset + id, 0); } void QDeclarativeVMEMetaObject::listChanged(int id) diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativeworkerscript.cpp --- a/src/declarative/qml/qdeclarativeworkerscript.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativeworkerscript.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -514,6 +514,7 @@ /*! \qmlclass WorkerScript QDeclarativeWorkerScript + \ingroup qml-utility-elements \brief The WorkerScript element enables the use of threads in QML. Use WorkerScript to run operations in a new thread. diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativexmlhttprequest.cpp --- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -58,6 +58,8 @@ #include #include +#ifndef QT_NO_XMLSTREAMREADER + // From DOM-Level-3-Core spec // http://www.w3.org/TR/DOM-Level-3-Core/core.html #define INDEX_SIZE_ERR 1 @@ -963,8 +965,9 @@ QScriptValue send(QScriptValue *me, const QByteArray &); QScriptValue abort(QScriptValue *me); - QString responseBody() const; + QString responseBody(); const QByteArray & rawResponseBody() const; + bool receivedXml() const; private slots: void downloadProgress(qint64); void error(QNetworkReply::NetworkError); @@ -987,6 +990,15 @@ HeadersList m_headersList; void fillHeadersList(); + bool m_gotXml; + QByteArray m_mime; + QByteArray m_charset; + QTextCodec *m_textCodec; +#ifndef QT_NO_TEXTCODEC + QTextCodec* findTextCodec() const; +#endif + void readEncoding(); + QScriptValue m_me; // Set to the data object while a send() is ongoing (to access the callback) QScriptValue dispatchCallback(QScriptValue *me); @@ -1004,7 +1016,7 @@ QDeclarativeXMLHttpRequest::QDeclarativeXMLHttpRequest(QNetworkAccessManager *manager) : m_state(Unsent), m_errorFlag(false), m_sendFlag(false), - m_redirectCount(0), m_network(0), m_nam(manager) + m_redirectCount(0), m_gotXml(false), m_textCodec(0), m_network(0), m_nam(manager) { } @@ -1275,6 +1287,7 @@ if (cbv.isError()) printError(cbv); } m_responseEntityBody.append(m_network->readAll()); + readEncoding(); if (xhrDump()) { qWarning().nospace() << "XMLHttpRequest: RESPONSE " << qPrintable(m_url.toString()); @@ -1300,13 +1313,71 @@ } -QString QDeclarativeXMLHttpRequest::responseBody() const +void QDeclarativeXMLHttpRequest::readEncoding() +{ + foreach (const HeaderPair &header, m_headersList) { + if (header.first == "content-type") { + int separatorIdx = header.second.indexOf(';'); + if (separatorIdx == -1) { + m_mime == header.second; + } else { + m_mime = header.second.mid(0, separatorIdx); + int charsetIdx = header.second.indexOf("charset="); + if (charsetIdx != -1) { + charsetIdx += 8; + separatorIdx = header.second.indexOf(';', charsetIdx); + m_charset = header.second.mid(charsetIdx, separatorIdx >= 0 ? separatorIdx : header.second.length()); + } + } + break; + } + } + + if (m_mime.isEmpty() || m_mime == "text/xml" || m_mime == "application/xml" || m_mime.endsWith("+xml")) + m_gotXml = true; +} + +bool QDeclarativeXMLHttpRequest::receivedXml() const +{ + return m_gotXml; +} + + +#ifndef QT_NO_TEXTCODEC +QTextCodec* QDeclarativeXMLHttpRequest::findTextCodec() const { - QXmlStreamReader reader(m_responseEntityBody); - reader.readNext(); - QTextCodec *codec = QTextCodec::codecForName(reader.documentEncoding().toString().toUtf8()); - if (codec) - return codec->toUnicode(m_responseEntityBody); + QTextCodec *codec = 0; + + if (!m_charset.isEmpty()) + codec = QTextCodec::codecForName(m_charset); + + if (!codec && m_gotXml) { + QXmlStreamReader reader(m_responseEntityBody); + reader.readNext(); + codec = QTextCodec::codecForName(reader.documentEncoding().toString().toUtf8()); + } + + if (!codec && m_mime == "text/html") + codec = QTextCodec::codecForHtml(m_responseEntityBody, 0); + + if (!codec) + codec = QTextCodec::codecForUtfText(m_responseEntityBody, 0); + + if (!codec) + codec = QTextCodec::codecForName("UTF-8"); + return codec; +} +#endif + + +QString QDeclarativeXMLHttpRequest::responseBody() +{ +#ifndef QT_NO_TEXTCODEC + if (!m_textCodec) + m_textCodec = findTextCodec(); + if (m_textCodec) + return m_textCodec->toUnicode(m_responseEntityBody); +#endif return QString::fromUtf8(m_responseEntityBody); } @@ -1568,7 +1639,8 @@ if (!request) THROW_REFERENCE("Not an XMLHttpRequest object"); - if (request->readyState() != QDeclarativeXMLHttpRequest::Loading && + if (!request->receivedXml() || + request->readyState() != QDeclarativeXMLHttpRequest::Loading && request->readyState() != QDeclarativeXMLHttpRequest::Done) return engine->nullValue(); else @@ -1662,4 +1734,6 @@ QT_END_NAMESPACE +#endif // QT_NO_XMLSTREAMREADER + #include diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qdeclarativexmlhttprequest_p.h --- a/src/declarative/qml/qdeclarativexmlhttprequest_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qdeclarativexmlhttprequest_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -56,6 +56,8 @@ #include +#ifndef QT_NO_XMLSTREAMREADER + QT_BEGIN_NAMESPACE class QScriptEngine; @@ -63,5 +65,7 @@ QT_END_NAMESPACE +#endif // QT_NO_XMLSTREAMREADER + #endif // QDECLARATIVEXMLHTTPREQUEST_P_H diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qmetaobjectbuilder.cpp --- a/src/declarative/qml/qmetaobjectbuilder.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qmetaobjectbuilder.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -205,7 +205,7 @@ (const QByteArray& _name, const QByteArray& _type, int notifierIdx=-1) : name(_name), type(QMetaObject::normalizedType(_type.constData())), - flags(Readable | Writable), notifySignal(-1) + flags(Readable | Writable | Scriptable), notifySignal(-1) { if (notifierIdx >= 0) { flags |= Notify; @@ -1142,7 +1142,7 @@ if (!parameterNames.isEmpty()) { QByteArray names; bool first = true; - foreach (QByteArray name, parameterNames) { + foreach (const QByteArray &name, parameterNames) { if (first) first = false; else @@ -2187,7 +2187,7 @@ /*! Returns true if the property is scriptable; otherwise returns false. - This default value is false. + This default value is true. \sa setScriptable(), isDesignable(), isStored() */ diff -r ef0373b55136 -r 758a864f9613 src/declarative/qml/qml.pri --- a/src/declarative/qml/qml.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/qml/qml.pri Mon Oct 04 01:19:32 2010 +0300 @@ -24,7 +24,7 @@ $$PWD/qdeclarativestringconverters.cpp \ $$PWD/qdeclarativeclassfactory.cpp \ $$PWD/qdeclarativeparserstatus.cpp \ - $$PWD/qdeclarativecompositetypemanager.cpp \ + $$PWD/qdeclarativetypeloader.cpp \ $$PWD/qdeclarativeinfo.cpp \ $$PWD/qdeclarativeerror.cpp \ $$PWD/qdeclarativescriptparser.cpp \ @@ -94,8 +94,7 @@ $$PWD/qdeclarativeproperty_p.h \ $$PWD/qdeclarativecontext_p.h \ $$PWD/qdeclarativeinclude_p.h \ - $$PWD/qdeclarativecompositetypedata_p.h \ - $$PWD/qdeclarativecompositetypemanager_p.h \ + $$PWD/qdeclarativetypeloader_p.h \ $$PWD/qdeclarativelist.h \ $$PWD/qdeclarativelist_p.h \ $$PWD/qdeclarativedata_p.h \ diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativeanimation.cpp --- a/src/declarative/util/qdeclarativeanimation.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativeanimation.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -74,6 +74,7 @@ /*! \qmlclass Animation QDeclarativeAbstractAnimation + \ingroup qml-animation-transition \since 4.7 \brief The Animation element is the base of all QML animations. @@ -83,11 +84,6 @@ element directly will result in an error. */ -/*! - \class QDeclarativeAbstractAnimation - \internal -*/ - QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(QObject *parent) : QObject(*(new QDeclarativeAbstractAnimationPrivate), parent) { @@ -336,7 +332,7 @@ stopped - either by setting the \c running property to false, or by calling the \c stop() method. - In the following example, the rectangle will spin indefinately. + In the following example, the rectangle will spin indefinitely. \code Rectangle { @@ -554,6 +550,7 @@ /*! \qmlclass PauseAnimation QDeclarativePauseAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The PauseAnimation element provides a pause for an animation. @@ -572,12 +569,6 @@ \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} */ -/*! - \internal - \class QDeclarativePauseAnimation -*/ - - QDeclarativePauseAnimation::QDeclarativePauseAnimation(QObject *parent) : QDeclarativeAbstractAnimation(*(new QDeclarativePauseAnimationPrivate), parent) { @@ -630,6 +621,7 @@ /*! \qmlclass ColorAnimation QDeclarativeColorAnimation + \ingroup qml-animation-transition \since 4.7 \inherits PropertyAnimation \brief The ColorAnimation element animates changes in color values. @@ -645,21 +637,17 @@ Like any other animation element, a ColorAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. - When used in a transition, ColorAnimation will by default animate - all properties of type color that have changed. If a \l{PropertyAnimation::}{property} - or \l{PropertyAnimation::}{properties} are explicitly set for the animation, + For convenience, when a ColorAnimation is used in a \l Transition, it will + animate any \c color properties that have been modified during the state + change. If a \l{PropertyAnimation::}{property} or + \l{PropertyAnimation::}{properties} are explicitly set for the animation, then those are used instead. \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} */ -/*! - \internal - \class QDeclarativeColorAnimation -*/ - QDeclarativeColorAnimation::QDeclarativeColorAnimation(QObject *parent) : QDeclarativePropertyAnimation(parent) { @@ -690,9 +678,12 @@ } \endqml - If this value is not set and the ColorAnimation is defined within - a \l Transition, it defaults to the value defined in the starting - state of the \l Transition. + If the ColorAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the starting state of the + \l Transition, or the current value of the property at the moment the + \l Behavior is triggered. + + \sa {QML Animation} */ QColor QDeclarativeColorAnimation::from() const { @@ -710,9 +701,12 @@ This property holds the color value at which the animation should end. - If this value is not set and the ColorAnimation is defined within - a \l Transition or \l Behavior, it defaults to the value defined in the end - state of the \l Transition or \l Behavior. + If the ColorAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. + + \sa {QML Animation} */ QColor QDeclarativeColorAnimation::to() const { @@ -729,6 +723,7 @@ /*! \qmlclass ScriptAction QDeclarativeScriptAction + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The ScriptAction element allows scripts to be run during an animation. @@ -765,10 +760,6 @@ \sa StateChangeScript */ -/*! - \internal - \class QDeclarativeScriptAction -*/ QDeclarativeScriptAction::QDeclarativeScriptAction(QObject *parent) :QDeclarativeAbstractAnimation(*(new QDeclarativeScriptActionPrivate), parent) { @@ -877,37 +868,50 @@ /*! \qmlclass PropertyAction QDeclarativePropertyAction + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The PropertyAction element allows immediate property changes during animation. - PropertyAction is used to specify an immediate property change - during an animation. The property change is not animated. - - For example, to explicitly set \c {theImage.smooth = true} during a \l Transition: - \code + PropertyAction is used to specify an immediate property change during an + animation. The property change is not animated. + + It is useful for setting non-animated property values during an animation. + + For example, here is a SequentialAnimation that sets the image's + \l {Image::}{smooth} property to \c true, animates the width of the image, + then sets \l {Image::}{smooth} back to \c false: + + \snippet doc/src/snippets/declarative/propertyaction.qml standalone + + PropertyAction is also useful for setting the exact point at which a property + change should occur during a \l Transition. For example, if PropertyChanges + was used in a \l State to rotate an item around a particular + \l {Item::}{transformOrigin}, it might be implemented like this: + + \snippet doc/src/snippets/declarative/propertyaction.qml transition + + However, with this code, the \c transformOrigin is not set until \e after + the animation, as a \l State is taken to define the values at the \e end of + a transition. The animation would rotate at the default \c transformOrigin, + then jump to \c Item.BottomRight. To fix this, insert a PropertyChanges + before the RotationAnimation begins: + + \qml transitions: Transition { - ... - PropertyAction { target: theImage; property: "smooth"; value: true } - ... + SequentialAnimation { + PropertyAction { target: rect; property: "transformOrigin" } + RotationAnimation { ... } + } } - \endcode - - Or, to set \c theWebView.url to the value set for the destination state: - \code - transitions: Transition { - ... - PropertyAction { target: theWebView; property: "url" } - ... - } - \endcode - - - \sa QtDeclarative -*/ -/*! - \internal - \class QDeclarativePropertyAction + \endqml + + This immediately sets the \c transformOrigin property to the value defined + in the end state of the \l Transition (i.e. the value defined in the + PropertyChanges object) so that the rotation animation begins with the + correct transform origin. + + \sa {QML Animation}, QtDeclarative */ QDeclarativePropertyAction::QDeclarativePropertyAction(QObject *parent) : QDeclarativeAbstractAnimation(*(new QDeclarativePropertyActionPrivate), parent) @@ -939,7 +943,7 @@ if (d->target == o) return; d->target = o; - emit targetChanged(d->target, d->propertyName); + emit targetChanged(); } QString QDeclarativePropertyAction::property() const @@ -954,7 +958,7 @@ if (d->propertyName == n) return; d->propertyName = n; - emit targetChanged(d->target, d->propertyName); + emit propertyChanged(); } /*! @@ -1008,7 +1012,11 @@ /*! \qmlproperty any PropertyAction::value This property holds the value to be set on the property. - If not set, then the value defined for the end state of the transition. + + If the PropertyAction is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. */ QVariant QDeclarativePropertyAction::value() const { @@ -1128,6 +1136,7 @@ /*! \qmlclass NumberAnimation QDeclarativeNumberAnimation + \ingroup qml-animation-transition \since 4.7 \inherits PropertyAnimation \brief The NumberAnimation element animates changes in qreal-type values. @@ -1143,7 +1152,7 @@ Like any other animation element, a NumberAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. Note that NumberAnimation may not animate smoothly if there are irregular @@ -1152,12 +1161,6 @@ \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} */ - -/*! - \internal - \class QDeclarativeNumberAnimation -*/ - QDeclarativeNumberAnimation::QDeclarativeNumberAnimation(QObject *parent) : QDeclarativePropertyAnimation(parent) { @@ -1183,7 +1186,7 @@ /*! \qmlproperty real NumberAnimation::from - This property holds the starting number value. + This property holds the starting value for the animation. For example, the following animation is not applied until the \c x value has reached 100: @@ -1198,9 +1201,12 @@ } \endqml - If this value is not set and the NumberAnimation is defined within - a \l Transition, it defaults to the value defined in the start - state of the \l Transition. + If the NumberAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the starting state of the + \l Transition, or the current value of the property at the moment the + \l Behavior is triggered. + + \sa {QML Animation} */ qreal QDeclarativeNumberAnimation::from() const @@ -1216,11 +1222,14 @@ /*! \qmlproperty real NumberAnimation::to - This property holds the ending number value. - - If this value is not set and the NumberAnimation is defined within - a \l Transition or \l Behavior, it defaults to the value defined in the end - state of the \l Transition or \l Behavior. + This property holds the end value for the animation. + + If the NumberAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. + + \sa {QML Animation} */ qreal QDeclarativeNumberAnimation::to() const { @@ -1237,6 +1246,7 @@ /*! \qmlclass Vector3dAnimation QDeclarativeVector3dAnimation + \ingroup qml-animation-transition \since 4.7 \inherits PropertyAnimation \brief The Vector3dAnimation element animates changes in QVector3d values. @@ -1244,14 +1254,13 @@ Vector3dAnimation is a specialized PropertyAnimation that defines an animation to be applied when a Vector3d value changes. + Like any other animation element, a Vector3dAnimation can be applied in a + number of ways, including transitions, behaviors and property value + sources. The \l {QML Animation} documentation shows a variety of methods + for creating animations. + \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} */ - -/*! - \internal - \class QDeclarativeVector3dAnimation -*/ - QDeclarativeVector3dAnimation::QDeclarativeVector3dAnimation(QObject *parent) : QDeclarativePropertyAnimation(parent) { @@ -1267,10 +1276,14 @@ /*! \qmlproperty real Vector3dAnimation::from - This property holds the starting value. - - If this value is not set, it defaults to the value defined in the start - state of the \l Transition. + This property holds the starting value for the animation. + + If the Vector3dAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the starting state of the + \l Transition, or the current value of the property at the moment the + \l Behavior is triggered. + + \sa {QML Animation} */ QVector3D QDeclarativeVector3dAnimation::from() const { @@ -1285,10 +1298,14 @@ /*! \qmlproperty real Vector3dAnimation::to - This property holds the ending value. - - If this value is not set, it defaults to the value defined in the end - state of the \l Transition or \l Behavior. + This property holds the end value for the animation. + + If the Vector3dAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. + + \sa {QML Animation} */ QVector3D QDeclarativeVector3dAnimation::to() const { @@ -1305,6 +1322,7 @@ /*! \qmlclass RotationAnimation QDeclarativeRotationAnimation + \ingroup qml-animation-transition \since 4.7 \inherits PropertyAnimation \brief The RotationAnimation element animates changes in rotation values. @@ -1323,25 +1341,25 @@ \snippet doc/src/snippets/declarative/rotationanimation.qml 0 - Notice the RotationAnimation did not need to set a \l {RotationAnimation::}{target} + Notice the RotationAnimation did not need to set a \l target value. As a convenience, when used in a transition, RotationAnimation will rotate all properties named "rotation" or "angle". You can override this by providing your own properties via \l {PropertyAnimation::properties}{properties} or \l {PropertyAnimation::property}{property}. + Also, note the \l Rectangle will be rotated around its default + \l {Item::}{transformOrigin} (which is \c Item.Center). To use a different + transform origin, set the origin in the PropertyChanges object and apply + the change at the start of the animation using PropertyAction. See the + PropertyAction documentation for more details. + Like any other animation element, a RotationAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} */ - -/*! - \internal - \class QDeclarativeRotationAnimation -*/ - QVariant _q_interpolateShortestRotation(qreal &f, qreal &t, qreal progress) { qreal newt = t; @@ -1394,7 +1412,7 @@ /*! \qmlproperty real RotationAnimation::from - This property holds the starting number value. + This property holds the starting value for the animation. For example, the following animation is not applied until the \c angle value has reached 100: @@ -1409,8 +1427,12 @@ } \endqml - If this value is not set, it defaults to the value defined in the start - state of the \l Transition. + If the RotationAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the starting state of the + \l Transition, or the current value of the property at the moment the + \l Behavior is triggered. + + \sa {QML Animation} */ qreal QDeclarativeRotationAnimation::from() const { @@ -1425,10 +1447,14 @@ /*! \qmlproperty real RotationAnimation::to - This property holds the ending value. - - If this value is not set, it defaults to the value defined in the end - state of the \l Transition or \l Behavior. + This property holds the end value for the animation.. + + If the RotationAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. + + \sa {QML Animation} */ qreal QDeclarativeRotationAnimation::to() const { @@ -1534,6 +1560,7 @@ /*! \qmlclass SequentialAnimation QDeclarativeSequentialAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The SequentialAnimation element allows animations to be run sequentially. @@ -1554,9 +1581,13 @@ Like any other animation element, a SequentialAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. + \note Once an animation has been grouped into a SequentialAnimation or + ParallelAnimation, it cannot be individually started and stopped; the + SequentialAnimation or ParallelAnimation must be started and stopped as a group. + \sa ParallelAnimation, {QML Animation}, {declarative/animation/basics}{Animation basics example} */ @@ -1603,6 +1634,7 @@ /*! \qmlclass ParallelAnimation QDeclarativeParallelAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The ParallelAnimation element allows animations to be run in parallel. @@ -1619,16 +1651,15 @@ Like any other animation element, a ParallelAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. + \note Once an animation has been grouped into a SequentialAnimation or + ParallelAnimation, it cannot be individually started and stopped; the + SequentialAnimation or ParallelAnimation must be started and stopped as a group. + \sa SequentialAnimation, {QML Animation}, {declarative/animation/basics}{Animation basics example} */ -/*! - \internal - \class QDeclarativeParallelAnimation -*/ - QDeclarativeParallelAnimation::QDeclarativeParallelAnimation(QObject *parent) : QDeclarativeAnimationGroup(parent) { @@ -1717,6 +1748,7 @@ /*! \qmlclass PropertyAnimation QDeclarativePropertyAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The PropertyAnimation element animates changes in property values. @@ -1829,8 +1861,14 @@ /*! \qmlproperty real PropertyAnimation::from - This property holds the starting value. - If not set, then the value defined in the start state of the transition. + This property holds the starting value for the animation. + + If the PropertyAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the starting state of the + \l Transition, or the current value of the property at the moment the + \l Behavior is triggered. + + \sa {QML Animation} */ QVariant QDeclarativePropertyAnimation::from() const { @@ -1850,8 +1888,14 @@ /*! \qmlproperty real PropertyAnimation::to - This property holds the ending value. - If not set, then the value defined in the end state of the transition or \l Behavior. + This property holds the end value for the animation. + + If the PropertyAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. + + \sa {QML Animation} */ QVariant QDeclarativePropertyAnimation::to() const { @@ -1929,15 +1973,15 @@ \o \inlineimage qeasingcurve-inquart.png \row \o \c Easing.OutQuart - \o Easing curve for a cubic (t^4) function: decelerating from zero velocity. + \o Easing curve for a quartic (t^4) function: decelerating from zero velocity. \o \inlineimage qeasingcurve-outquart.png \row \o \c Easing.InOutQuart - \o Easing curve for a cubic (t^4) function: acceleration until halfway, then deceleration. + \o Easing curve for a quartic (t^4) function: acceleration until halfway, then deceleration. \o \inlineimage qeasingcurve-inoutquart.png \row \o \c Easing.OutInQuart - \o Easing curve for a cubic (t^4) function: deceleration until halfway, then acceleration. + \o Easing curve for a quartic (t^4) function: deceleration until halfway, then acceleration. \o \inlineimage qeasingcurve-outinquart.png \row \o \c Easing.InQuint @@ -1945,15 +1989,15 @@ \o \inlineimage qeasingcurve-inquint.png \row \o \c Easing.OutQuint - \o Easing curve for a cubic (t^5) function: decelerating from zero velocity. + \o Easing curve for a quintic (t^5) function: decelerating from zero velocity. \o \inlineimage qeasingcurve-outquint.png \row \o \c Easing.InOutQuint - \o Easing curve for a cubic (t^5) function: acceleration until halfway, then deceleration. + \o Easing curve for a quintic (t^5) function: acceleration until halfway, then deceleration. \o \inlineimage qeasingcurve-inoutquint.png \row \o \c Easing.OutInQuint - \o Easing curve for a cubic (t^5) function: deceleration until halfway, then acceleration. + \o Easing curve for a quintic (t^5) function: deceleration until halfway, then acceleration. \o \inlineimage qeasingcurve-outinquint.png \row \o \c Easing.InSine @@ -2096,7 +2140,7 @@ if (d->target == o) return; d->target = o; - emit targetChanged(d->target, d->propertyName); + emit targetChanged(); } QString QDeclarativePropertyAnimation::property() const @@ -2111,7 +2155,7 @@ if (d->propertyName == n) return; d->propertyName = n; - emit targetChanged(d->target, d->propertyName); + emit propertyChanged(); } QString QDeclarativePropertyAnimation::properties() const @@ -2378,18 +2422,20 @@ d->actions = &data->actions; } else { delete data; + d->va->setFromSourcedValue(0); //clear previous data + d->va->setAnimValue(0, QAbstractAnimation::DeleteWhenStopped); //clear previous data d->actions = 0; } } /*! \qmlclass ParentAnimation QDeclarativeParentAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The ParentAnimation element animates changes in parent values. - ParentAnimation defines an animation to applied when a ParentChange - occurs. This allows parent changes to be smoothly animated. + ParentAnimation is used to animate a parent change for an \l Item. For example, the following ParentChange changes \c blueRect to become a child of \c redRect when it is clicked. The inclusion of the @@ -2407,17 +2453,18 @@ to animate the parent change via another item that does not have clipping enabled. Such an item can be set using the \l via property. - By default, when used in a transition, ParentAnimation animates all parent - changes. This can be overriden by setting a specific target item using the + For convenience, when a ParentAnimation is used in a \l Transition, it will + animate any ParentChange that has occurred during the state change. + This can be overridden by setting a specific target item using the \l target property. + Like any other animation element, a ParentAnimation can be applied in a + number of ways, including transitions, behaviors and property value + sources. The \l {QML Animation} documentation shows a variety of methods + for creating animations. + \sa {QML Animation}, {declarative/animation/basics}{Animation basics example} */ - -/*! - \internal - \class QDeclarativeParentAnimation -*/ QDeclarativeParentAnimation::QDeclarativeParentAnimation(QObject *parent) : QDeclarativeAnimationGroup(*(new QDeclarativeParentAnimationPrivate), parent) { @@ -2469,7 +2516,10 @@ \qmlproperty Item ParentAnimation::newParent The new parent to animate to. - If not set, then the parent defined in the end state of the transition. + If the ParentAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. */ QDeclarativeItem *QDeclarativeParentAnimation::newParent() const { @@ -2738,18 +2788,28 @@ /*! \qmlclass AnchorAnimation QDeclarativeAnchorAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The AnchorAnimation element animates changes in anchor values. - AnchorAnimation is used to animate an AnchorChange. It will anchor all - anchor changes specified in a \l State. + AnchorAnimation is used to animate an anchor change. In the following snippet we animate the addition of a right anchor to a \l Rectangle: \snippet doc/src/snippets/declarative/anchoranimation.qml 0 - \sa AnchorChanges + For convenience, when an AnchorAnimation is used in a \l Transition, it will + animate any AnchorChanges that have occurred during the state change. + This can be overridden by setting a specific target item using the + \l target property. + + Like any other animation element, an AnchorAnimation can be applied in a + number of ways, including transitions, behaviors and property value + sources. The \l {QML Animation} documentation shows a variety of methods + for creating animations. + + \sa {QML Animation}, AnchorChanges */ QDeclarativeAnchorAnimation::QDeclarativeAnchorAnimation(QObject *parent) diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativeanimation_p.h --- a/src/declarative/util/qdeclarativeanimation_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativeanimation_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -74,7 +74,7 @@ Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged) Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged) Q_PROPERTY(bool alwaysRunToEnd READ alwaysRunToEnd WRITE setAlwaysRunToEnd NOTIFY alwaysRunToEndChanged) - Q_PROPERTY(int loops READ loops WRITE setLoops NOTIFY loopsChanged) + Q_PROPERTY(int loops READ loops WRITE setLoops NOTIFY loopCountChanged) Q_CLASSINFO("DefaultMethod", "start()") public: @@ -197,7 +197,7 @@ Q_DECLARE_PRIVATE(QDeclarativePropertyAction) Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged) - Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged) + Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged) Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged) Q_PROPERTY(QDeclarativeListProperty targets READ targets) Q_PROPERTY(QDeclarativeListProperty exclude READ exclude) @@ -225,7 +225,8 @@ Q_SIGNALS: void valueChanged(const QVariant &); void propertiesChanged(const QString &); - void targetChanged(QObject *, const QString &); + void targetChanged(); + void propertyChanged(); protected: virtual void transition(QDeclarativeStateActions &actions, @@ -246,7 +247,7 @@ Q_PROPERTY(QVariant to READ to WRITE setTo NOTIFY toChanged) Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged) Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged) - Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged) + Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged) Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged) Q_PROPERTY(QDeclarativeListProperty targets READ targets) Q_PROPERTY(QDeclarativeListProperty exclude READ exclude) @@ -292,15 +293,16 @@ void toChanged(QVariant); void easingChanged(const QEasingCurve &); void propertiesChanged(const QString &); - void targetChanged(QObject *, const QString &); + void targetChanged(); + void propertyChanged(); }; class Q_AUTOTEST_EXPORT QDeclarativeColorAnimation : public QDeclarativePropertyAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation) - Q_PROPERTY(QColor from READ from WRITE setFrom NOTIFY fromChanged) - Q_PROPERTY(QColor to READ to WRITE setTo NOTIFY toChanged) + Q_PROPERTY(QColor from READ from WRITE setFrom) + Q_PROPERTY(QColor to READ to WRITE setTo) public: QDeclarativeColorAnimation(QObject *parent=0); @@ -318,8 +320,8 @@ Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation) - Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged) - Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged) + Q_PROPERTY(qreal from READ from WRITE setFrom) + Q_PROPERTY(qreal to READ to WRITE setTo) public: QDeclarativeNumberAnimation(QObject *parent=0); @@ -343,8 +345,8 @@ Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation) - Q_PROPERTY(QVector3D from READ from WRITE setFrom NOTIFY fromChanged) - Q_PROPERTY(QVector3D to READ to WRITE setTo NOTIFY toChanged) + Q_PROPERTY(QVector3D from READ from WRITE setFrom) + Q_PROPERTY(QVector3D to READ to WRITE setTo) public: QDeclarativeVector3dAnimation(QObject *parent=0); @@ -364,8 +366,8 @@ Q_DECLARE_PRIVATE(QDeclarativeRotationAnimation) Q_ENUMS(RotationDirection) - Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged) - Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged) + Q_PROPERTY(qreal from READ from WRITE setFrom) + Q_PROPERTY(qreal to READ to WRITE setTo) Q_PROPERTY(RotationDirection direction READ direction WRITE setDirection NOTIFY directionChanged) public: diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativebehavior.cpp --- a/src/declarative/util/qdeclarativebehavior.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativebehavior.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -72,6 +72,7 @@ /*! \qmlclass Behavior QDeclarativeBehavior + \ingroup qml-animation-transition \since 4.7 \brief The Behavior element allows you to specify a default animation for a property change. @@ -84,12 +85,15 @@ \snippet doc/src/snippets/declarative/behavior.qml 0 - To run multiple animations within a Behavior, use ParallelAnimation or + Note that a property cannot have more than one assigned Behavior. To provide + multiple animations within a Behavior, use ParallelAnimation or SequentialAnimation. - Note that a property cannot have more than one assigned Behavior. + If a \l{QML States}{state change} has a \l Transition that matches the same property as a + Behavior, the \l Transition animation overrides the Behavior for that + state change. - \sa {Property Behaviors}, {declarative/animation/behaviors}{Behavior example}, QtDeclarative + \sa {QML Animation}, {declarative/animation/behaviors}{Behavior example}, QtDeclarative */ diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativebind.cpp --- a/src/declarative/util/qdeclarativebind.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativebind.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -72,6 +72,7 @@ /*! \qmlclass Binding QDeclarativeBind + \ingroup qml-working-with-data \since 4.7 \brief The Binding element allows arbitrary property bindings to be created. @@ -94,18 +95,7 @@ immediately pushed onto the new target. \sa QtDeclarative - */ -/*! - \internal - \class QDeclarativeBind - \brief The QDeclarativeBind class allows arbitrary property bindings to be created. - - Simple bindings are usually earier to do in-place rather than creating a - QDeclarativeBind item. For that reason, QDeclarativeBind is usually used to transfer property information - from Qml to C++. - - \sa cppqml - */ +*/ QDeclarativeBind::QDeclarativeBind(QObject *parent) : QObject(*(new QDeclarativeBindPrivate), parent) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativeconnections.cpp --- a/src/declarative/util/qdeclarativeconnections.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativeconnections.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -71,6 +71,7 @@ /*! \qmlclass Connections QDeclarativeConnections + \ingroup qml-utility-elements \since 4.7 \brief A Connections element describes generalized connections to signals. @@ -123,13 +124,6 @@ \sa QtDeclarative */ - -/*! - \internal - \class QDeclarativeConnections - \brief The QDeclarativeConnections class describes generalized connections to signals. - -*/ QDeclarativeConnections::QDeclarativeConnections(QObject *parent) : QObject(*(new QDeclarativeConnectionsPrivate), parent) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativefontloader.cpp --- a/src/declarative/util/qdeclarativefontloader.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativefontloader.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -78,6 +78,7 @@ /*! \qmlclass FontLoader QDeclarativeFontLoader + \ingroup qml-utility-elements \since 4.7 \brief The FontLoader element allows fonts to be loaded by name or URL. @@ -129,6 +130,7 @@ d->status = Loading; emit statusChanged(); + emit sourceChanged(); #ifndef QT_NO_LOCALFILE_OPTIMIZED_QML QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url); if (!lf.isEmpty()) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativefontloader_p.h --- a/src/declarative/util/qdeclarativefontloader_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativefontloader_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -82,6 +82,7 @@ void replyFinished(); Q_SIGNALS: + void sourceChanged(); void nameChanged(); void statusChanged(); }; diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativelistmodel.cpp --- a/src/declarative/util/qdeclarativelistmodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativelistmodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -58,9 +58,6 @@ QT_BEGIN_NAMESPACE -#define DATA_ROLE_ID 1 -#define DATA_ROLE_NAME "data" - QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListModelData::instructions() const { return (QDeclarativeListModelParser::ListInstruction *)((char *)this + sizeof(ListModelData)); @@ -68,6 +65,7 @@ /*! \qmlclass ListModel QDeclarativeListModel + \ingroup qml-working-with-data \since 4.7 \brief The ListModel element defines a free-form list data source. @@ -108,9 +106,9 @@ \snippet doc/src/snippets/declarative/listmodel-modify.qml delegate - When creating content dynamically, note that the set of available properties cannot be changed - except by first clearing the model. Whatever properties are first added to the model are then the - only permitted properties in the model until it is cleared. + Note that when creating content dynamically the set of available properties cannot be changed + once set. Whatever properties are first added to the model are the + only permitted properties in the model. \section2 Using threaded list models with WorkerScript @@ -129,7 +127,7 @@ \snippet examples/declarative/threading/threadedlistmodel/dataloader.js 0 - The application's \tt Timer object periodically sends a message to the +working-with-data worker script by calling \l WorkerScript::sendMessage(). When this message is received, \l {WorkerScript::onMessage}{WorkerScript.onMessage()} is invoked in \tt dataloader.js, which appends the current time to the list model. @@ -283,8 +281,7 @@ /*! \qmlmethod ListModel::clear() - Deletes all content from the model. The properties are cleared such that - different properties may be set on subsequent additions. + Deletes all content from the model. \sa append() remove() */ @@ -570,7 +567,7 @@ QList props = node.properties(); for(int jj = 0; jj < props.count(); ++jj) { const QDeclarativeCustomParserProperty &nodeProp = props.at(jj); - if (nodeProp.name() == "") { + if (nodeProp.name().isEmpty()) { error(nodeProp, QDeclarativeListModel::tr("ListElement: cannot contain nested elements")); return false; } @@ -658,7 +655,7 @@ for(int ii = 0; ii < customProps.count(); ++ii) { const QDeclarativeCustomParserProperty &prop = customProps.at(ii); - if(prop.name() != "") { // isn't default property + if(!prop.name().isEmpty()) { // isn't default property error(prop, QDeclarativeListModel::tr("ListModel: undefined property '%1'").arg(QString::fromUtf8(prop.name()))); return QByteArray(); } @@ -770,6 +767,7 @@ /*! \qmlclass ListElement + \ingroup qml-working-with-data \since 4.7 \brief The ListElement element defines a data item in a ListModel. @@ -945,13 +943,14 @@ } NestedListModel::NestedListModel(QDeclarativeListModel *base) - : _root(0), m_listModel(base), _rolesOk(false) + : _root(0), m_ownsRoot(false), m_listModel(base), _rolesOk(false) { } NestedListModel::~NestedListModel() { - delete _root; + if (m_ownsRoot) + delete _root; } QVariant NestedListModel::valueForNode(ModelNode *node, bool *hasNested) const @@ -1051,8 +1050,8 @@ _rolesOk = false; roleStrings.clear(); - delete _root; - _root = 0; + if (_root) + _root->clear(); } void NestedListModel::remove(int index) @@ -1067,8 +1066,10 @@ bool NestedListModel::insert(int index, const QScriptValue& valuemap) { - if (!_root) + if (!_root) { _root = new ModelNode; + m_ownsRoot = true; + } ModelNode *mn = new ModelNode; mn->setObjectValue(valuemap); @@ -1099,8 +1100,10 @@ bool NestedListModel::append(const QScriptValue& valuemap) { - if (!_root) + if (!_root) { _root = new ModelNode; + m_ownsRoot = true; + } ModelNode *mn = new ModelNode; mn->setObjectValue(valuemap); _root->values << qVariantFromValue(mn); @@ -1205,16 +1208,22 @@ ModelNode::~ModelNode() { - qDeleteAll(properties.values()); + clear(); + if (modelCache) { modelCache->m_nested->_root = 0/* ==this */; delete modelCache; modelCache = 0; } + if (objectCache) { delete objectCache; objectCache = 0; } +} +void ModelNode::clear() +{ ModelNode *node; for (int ii = 0; ii < values.count(); ++ii) { node = qvariant_cast(values.at(ii)); if (node) { delete node; node = 0; } } + values.clear(); - if (modelCache) { modelCache->m_nested->_root = 0/* ==this */; delete modelCache; modelCache = 0; } - if (objectCache) { delete objectCache; objectCache = 0; } + qDeleteAll(properties.values()); + properties.clear(); } void ModelNode::setObjectValue(const QScriptValue& valuemap) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativelistmodel_p_p.h --- a/src/declarative/util/qdeclarativelistmodel_p_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativelistmodel_p_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -130,6 +130,7 @@ void checkRoles() const; ModelNode *_root; + bool m_ownsRoot; QDeclarativeListModel *m_listModel; private: @@ -157,6 +158,8 @@ QList values; QHash properties; + void clear(); + QDeclarativeListModel *model(const NestedListModel *model) { if (!modelCache) { modelCache = new QDeclarativeListModel; diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativelistmodelworkeragent.cpp --- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -187,12 +187,17 @@ s->data = data; s->list = m_copy; data.changes.clear(); + + mutex.lock(); QCoreApplication::postEvent(this, s); + syncDone.wait(&mutex); + mutex.unlock(); } bool QDeclarativeListModelWorkerAgent::event(QEvent *e) { if (e->type() == QEvent::User) { + QMutexLocker locker(&mutex); Sync *s = static_cast(e); const QList &changes = s->data.changes; @@ -202,13 +207,18 @@ FlatListModel *orig = m_orig->m_flat; FlatListModel *copy = s->list->m_flat; - if (!orig || !copy) + if (!orig || !copy) { + syncDone.wakeAll(); return QObject::event(e); - + } + orig->m_roles = copy->m_roles; orig->m_strings = copy->m_strings; orig->m_values = copy->m_values; + syncDone.wakeAll(); + locker.unlock(); + for (int ii = 0; ii < changes.count(); ++ii) { const Change &change = changes.at(ii); switch (change.type) { @@ -229,6 +239,8 @@ if (cc) emit m_orig->countChanged(); + } else { + syncDone.wakeAll(); } } diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativelistmodelworkeragent_p.h --- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -57,6 +57,8 @@ #include #include +#include +#include QT_BEGIN_HEADER @@ -142,6 +144,8 @@ QAtomicInt m_ref; QDeclarativeListModel *m_orig; QDeclarativeListModel *m_copy; + QMutex mutex; + QWaitCondition syncDone; }; QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativeopenmetaobject.cpp --- a/src/declarative/util/qdeclarativeopenmetaobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -161,6 +161,12 @@ prop.second = true; } + inline bool hasData(int idx) const { + if (idx >= data.count()) + return false; + return data[idx].second; + } + bool autoCreate; QDeclarativeOpenMetaObject *q; QAbstractDynamicMetaObject *parent; @@ -295,6 +301,12 @@ activate(d->object, id + d->type->d->signalOffset, 0); } +// returns true if this value has been initialized by a call to either value() or setValue() +bool QDeclarativeOpenMetaObject::hasValue(int id) const +{ + return d->hasData(id); +} + void QDeclarativeOpenMetaObject::setCached(bool c) { if (c == d->cacheProperties || !d->type->d->engine) diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativeopenmetaobject_p.h --- a/src/declarative/util/qdeclarativeopenmetaobject_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativeopenmetaobject_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -91,6 +91,7 @@ void setValue(int, const QVariant &); QVariant &operator[](const QByteArray &); QVariant &operator[](int); + bool hasValue(int) const; int count() const; QByteArray name(int) const; diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativepackage.cpp --- a/src/declarative/util/qdeclarativepackage.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativepackage.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -48,6 +48,7 @@ /*! \qmlclass Package QDeclarativePackage + \ingroup qml-working-with-data \brief Package provides a collection of named items. The Package class is used in conjunction with diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativepixmapcache.cpp --- a/src/declarative/util/qdeclarativepixmapcache.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativepixmapcache.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -70,6 +70,16 @@ QT_BEGIN_NAMESPACE +// The cache limit describes the maximum "junk" in the cache. +// These are the same defaults as QPixmapCache +#if defined(Q_OS_SYMBIAN) +static int cache_limit = 1024 * 1024; // 1048 KB cache limit for symbian +#elif defined(Q_WS_QWS) || defined(Q_WS_WINCE) +static int cache_limit = 2048 * 1024; // 2048 KB cache limit for embedded +#else +static int cache_limit = 10240 * 1024; // 10 MB cache limit for desktop +#endif + class QDeclarativePixmapReader; class QDeclarativePixmapData; class QDeclarativePixmapReply : public QObject @@ -145,7 +155,7 @@ private: friend class QDeclarativePixmapReaderThreadObject; void processJobs(); - void processJob(QDeclarativePixmapReply *); + void processJob(QDeclarativePixmapReply *, const QUrl &, const QSize &); void networkRequestDone(QNetworkReply *); QList jobs; @@ -424,23 +434,24 @@ QDeclarativePixmapReply *runningJob = jobs.takeLast(); runningJob->loading = true; + QUrl url = runningJob->data->url; + QSize requestSize = runningJob->data->requestSize; locker.unlock(); - processJob(runningJob); + processJob(runningJob, url, requestSize); locker.relock(); } } } -void QDeclarativePixmapReader::processJob(QDeclarativePixmapReply *runningJob) +void QDeclarativePixmapReader::processJob(QDeclarativePixmapReply *runningJob, const QUrl &url, + const QSize &requestSize) { - QUrl url = runningJob->data->url; - // fetch if (url.scheme() == QLatin1String("image")) { // Use QmlImageProvider QSize readSize; QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine); - QImage image = ep->getImageFromProvider(url, &readSize, runningJob->data->requestSize); + QImage image = ep->getImageFromProvider(url, &readSize, requestSize); QDeclarativePixmapReply::ReadError errorCode = QDeclarativePixmapReply::NoError; QString errorStr; @@ -462,7 +473,7 @@ QFile f(lf); QSize readSize; if (f.open(QIODevice::ReadOnly)) { - if (!readImage(url, &f, &image, &errorStr, &readSize, runningJob->data->requestSize)) + if (!readImage(url, &f, &image, &errorStr, &readSize, requestSize)) errorCode = QDeclarativePixmapReply::Loading; } else { errorStr = QDeclarativePixmap::tr("Cannot open: %1").arg(url.toString()); @@ -515,6 +526,7 @@ mutex.lock(); if (reply->loading) { cancelled.append(reply); + reply->data = 0; // XXX if (threadObject) threadObject->processJobs(); } else { @@ -580,6 +592,8 @@ QHash m_cache; private: + void shrinkCache(int remove); + QDeclarativePixmapData *m_unreferencedPixmaps; QDeclarativePixmapData *m_lastUnreferencedPixmap; @@ -613,7 +627,9 @@ m_unreferencedCost += data->cost(); - if (m_timerId == -1) + shrinkCache(-1); // Shrink the cache incase it has become larger than cache_limit + + if (m_timerId == -1 && m_unreferencedPixmaps) m_timerId = startTimer(CACHE_EXPIRE_TIME * 1000); } @@ -636,11 +652,9 @@ m_unreferencedCost -= data->cost(); } -void QDeclarativePixmapStore::timerEvent(QTimerEvent *) +void QDeclarativePixmapStore::shrinkCache(int remove) { - int removalCost = m_unreferencedCost / CACHE_REMOVAL_FRACTION; - - while (removalCost > 0 && m_lastUnreferencedPixmap) { + while ((remove > 0 || m_unreferencedCost > cache_limit) && m_lastUnreferencedPixmap) { QDeclarativePixmapData *data = m_lastUnreferencedPixmap; Q_ASSERT(data->nextUnreferenced == 0); @@ -649,10 +663,18 @@ data->prevUnreferencedPtr = 0; data->prevUnreferenced = 0; - removalCost -= data->cost(); + remove -= data->cost(); + m_unreferencedCost -= data->cost(); data->removeFromCache(); delete data; } +} + +void QDeclarativePixmapStore::timerEvent(QTimerEvent *) +{ + int removalCost = m_unreferencedCost / CACHE_REMOVAL_FRACTION; + + shrinkCache(removalCost); if (m_unreferencedPixmaps == 0) { killTimer(m_timerId); @@ -702,7 +724,7 @@ int QDeclarativePixmapData::cost() const { - return pixmap.width() * pixmap.height() * pixmap.depth(); + return (pixmap.width() * pixmap.height() * pixmap.depth()) / 8; } void QDeclarativePixmapData::addref() @@ -719,7 +741,6 @@ if (refCount == 0) { if (reply) { - reply->data = 0; reply->reader->cancel(reply); reply = 0; } diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativepropertychanges.cpp --- a/src/declarative/util/qdeclarativepropertychanges.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativepropertychanges.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -61,51 +61,34 @@ /*! \qmlclass PropertyChanges QDeclarativePropertyChanges + \ingroup qml-state-elements \since 4.7 \brief The PropertyChanges element describes new property bindings or values for a state. - PropertyChanges provides a state change that modifies the properties of an item. + PropertyChanges is used to define the property values or bindings in a + \l State. This enables an item's property values to be changed when it + \l {QML States}{changes between states}. - Here is a property change that modifies the text and color of a \l Text element - when it is clicked: + To create a PropertyChanges object, specify the \l target item whose + properties are to be modified, and define the new property values or + bindings. For example: - \qml - Text { - id: myText - width: 100; height: 100 - text: "Hello" - color: "blue" - - states: State { - name: "myState" + \snippet doc/src/snippets/declarative/propertychanges.qml import + \codeline + \snippet doc/src/snippets/declarative/propertychanges.qml 0 - PropertyChanges { - target: myText - text: "Goodbye" - color: "red" - } - } - - MouseArea { anchors.fill: parent; onClicked: myText.state = 'myState' } - } - \endqml - - By default, PropertyChanges will establish new bindings where appropriate. - For example, the following creates a new binding for myItem's \c height property. + When the mouse is pressed, the \l Rectangle changes to the \e resized + state. In this state, the PropertyChanges object sets the rectangle's + color to blue and the \c height value to that of \c container.height. - \qml - PropertyChanges { - target: myItem - height: parent.height - } - \endqml - - If you don't want a binding to be established (and instead just want to assign - the value of the binding at the time the state is entered), - you should set the PropertyChange's \l{PropertyChanges::explicit}{explicit} + Note this automatically binds \c rect.height to \c container.height + in the \e resized state. If a property binding should not be + established, and the height should just be set to the value of + \c container.height at the time of the state change, set the \l explicit property to \c true. - - State-specific script for signal handlers can also be specified: + + A PropertyChanges object can also override the default signal handler + for an object to implement a signal handler specific to the new state: \qml PropertyChanges { @@ -114,47 +97,36 @@ } \endqml - You can reset a property in a state change by assigning \c undefined. In the following - example we reset \c theText's width when we enter state1. This will give the text its - natural width (which is the whole string on one line). + \note PropertyChanges can be used to change anchor margins, but not other anchor + values; use AnchorChanges for this instead. Similarly, to change an \l Item's + \l {Item::}{parent} value, use ParentChanges instead. + - \qml - import Qt 4.7 + \section2 Resetting property values + + The \c undefined value can be used to reset the property value for a state. + In the following example, when \c theText changes to the \e widerText + state, its \c width property is reset, giving the text its natural width + and displaying the whole string on a single line. - Rectangle { - width: 640 - height: 480 - Text { - id: theText - width: 50 - wrapMode: Text.WordWrap - text: "a text string that is longer than 50 pixels" - } + \snippet doc/src/snippets/declarative/propertychanges.qml reset + + + \section2 Immediate property changes in transitions - states: State { - name: "state1" - PropertyChanges { - target: theText - width: undefined - } - } - } - \endqml + When \l Transitions are used to animate state changes, they animate + properties from their values in the current state to those defined in the + new state (as defined by PropertyChanges objects). However, + it is sometimes desirable to set a property value \e immediately during a + \l Transition, without animation; in these cases, the PropertyAction + element can be used to force an immediate property change. - Anchor margins should be changed with PropertyChanges, but other anchor changes or changes to - an Item's parent should be done using the associated change elements - (ParentChange and AnchorChanges, respectively). + See the PropertyAction documentation for more details. \sa {declarative/animation/states}{states example}, {qmlstate}{States}, QtDeclarative */ /*! - \internal - \class QDeclarativePropertyChanges - \brief The QDeclarativePropertyChanges class describes new property values for a state. -*/ - -/*! \qmlproperty Object PropertyChanges::target This property holds the object which contains the properties to be changed. */ @@ -396,12 +368,12 @@ /*! \qmlproperty bool PropertyChanges::restoreEntryValues - - Whether or not the previous values should be restored when - leaving the state. By default, restoreEntryValues is true. - By setting restoreEntryValues to false, you can create a temporary state - that has permanent effects on property values. + This property holds whether the previous values should be restored when + leaving the state. + + The default value is \c true. Setting this value to \c false creates a + temporary state that has permanent effects on property values. */ bool QDeclarativePropertyChanges::restoreEntryValues() const { diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativepropertymap.cpp --- a/src/declarative/util/qdeclarativepropertymap.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativepropertymap.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -104,22 +104,25 @@ The following example shows how you might declare data in C++ and then access it in QML. - Setup in C++: + In the C++ file: \code - //create our data + // create our data QDeclarativePropertyMap ownerData; ownerData.insert("name", QVariant(QString("John Smith"))); ownerData.insert("phone", QVariant(QString("555-5555"))); - //expose it to the UI layer - QDeclarativeContext *ctxt = view->rootContext(); - ctxt->setProperty("owner", &data); + // expose it to the UI layer + QDeclarativeView view; + QDeclarativeContext *ctxt = view.rootContext(); + ctxt->setContextProperty("owner", &ownerData); + + view.setSource(QUrl::fromLocalFile("main.qml")); + view.show(); \endcode - Then, in QML: + Then, in \c main.qml: \code - Text { text: owner.name } - Text { text: owner.phone } + Text { text: owner.name + " " + owner.phone } \endcode The binding is dynamic - whenever a key's value is updated, anything bound to that diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativesmoothedanimation.cpp --- a/src/declarative/util/qdeclarativesmoothedanimation.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -249,6 +249,7 @@ /*! \qmlclass SmoothedAnimation QDeclarativeSmoothedAnimation + \ingroup qml-animation-transition \since 4.7 \inherits NumberAnimation \brief The SmoothedAnimation element allows a property to smoothly track a value. @@ -287,7 +288,7 @@ Like any other animation element, a SmoothedAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. \sa SpringAnimation, NumberAnimation, {QML Animation}, {declarative/animation/basics}{Animation basics example} @@ -375,7 +376,7 @@ \list \o SmoothedAnimation.Eased (default) - the animation will smoothly decelerate, and then reverse direction - \o SmoothedAnimation.Immediate - the animation will immediately begin accelerating in the reverse direction, begining with a velocity of 0 + \o SmoothedAnimation.Immediate - the animation will immediately begin accelerating in the reverse direction, beginning with a velocity of 0 \o SmoothedAnimation.Sync - the property is immediately set to the target value \endlist */ diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativespringanimation.cpp --- a/src/declarative/util/qdeclarativespringanimation.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativespringanimation.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -54,36 +54,32 @@ QT_BEGIN_NAMESPACE - -class QDeclarativeSpringAnimationPrivate : public QDeclarativeAbstractAnimationPrivate +class QDeclarativeSpringAnimationPrivate : public QDeclarativePropertyAnimationPrivate { Q_DECLARE_PUBLIC(QDeclarativeSpringAnimation) public: - QDeclarativeSpringAnimationPrivate() - : currentValue(0), to(0), from(0), maxVelocity(0), lastTime(0) - , mass(1.0), spring(0.), damping(0.), velocity(0), epsilon(0.01) - , modulus(0.0), useMass(false), haveModulus(false), enabled(true) - , fromDefined(false), toDefined(false) - , mode(Track), clock(this) {} + - qreal currentValue; - qreal to; - qreal from; + struct SpringAnimation { + SpringAnimation() + : currentValue(0), to(0), velocity(0){} + qreal currentValue; + qreal to; + qreal velocity; + }; + QHash activeAnimations; + qreal maxVelocity; qreal velocityms; int lastTime; qreal mass; qreal spring; qreal damping; - qreal velocity; qreal epsilon; qreal modulus; bool useMass : 1; bool haveModulus : 1; - bool enabled : 1; - bool fromDefined : 1; - bool toDefined : 1; enum Mode { Track, @@ -92,38 +88,68 @@ }; Mode mode; - void tick(int); + QDeclarativeSpringAnimationPrivate() + : maxVelocity(0), velocityms(0), lastTime(0) + , mass(1.0), spring(0.), damping(0.), epsilon(0.01) + , modulus(0.0), useMass(false), haveModulus(false) + , mode(Track), clock(0) + { } + + void tick(int time); + bool animate(const QDeclarativeProperty &property, SpringAnimation &animation, int elapsed); void updateMode(); - QTickAnimationProxy clock; + typedef QTickAnimationProxy Clock; + Clock *clock; }; void QDeclarativeSpringAnimationPrivate::tick(int time) { if (mode == Track) { - clock.stop(); + clock->stop(); return; } - int elapsed = time - lastTime; if (!elapsed) return; - qreal srcVal = to; + + if (mode == Spring) { + if (elapsed < 16) // capped at 62fps. + return; + int count = elapsed / 16; + lastTime = time - (elapsed - count * 16); + } else { + lastTime = time; + } + + QMutableHashIterator it(activeAnimations); + while (it.hasNext()) { + it.next(); + if (animate(it.key(), it.value(), elapsed)) + it.remove(); + } + + if (activeAnimations.isEmpty()) + clock->stop(); +} + +bool QDeclarativeSpringAnimationPrivate::animate(const QDeclarativeProperty &property, SpringAnimation &animation, int elapsed) +{ + + qreal srcVal = animation.to; bool stop = false; if (haveModulus) { - currentValue = fmod(currentValue, modulus); + animation.currentValue = fmod(animation.currentValue, modulus); srcVal = fmod(srcVal, modulus); } if (mode == Spring) { - if (elapsed < 16) // capped at 62fps. - return; // Real men solve the spring DEs using RK4. // We'll do something much simpler which gives a result that looks fine. int count = elapsed / 16; for (int i = 0; i < count; ++i) { - qreal diff = srcVal - currentValue; + qreal diff = srcVal - animation.currentValue; if (haveModulus && qAbs(diff) > modulus / 2) { if (diff < 0) diff += modulus; @@ -131,32 +157,31 @@ diff -= modulus; } if (useMass) - velocity = velocity + (spring * diff - damping * velocity) / mass; + animation.velocity = animation.velocity + (spring * diff - damping * animation.velocity) / mass; else - velocity = velocity + spring * diff - damping * velocity; + animation.velocity = animation.velocity + spring * diff - damping * animation.velocity; if (maxVelocity > 0.) { // limit velocity - if (velocity > maxVelocity) - velocity = maxVelocity; - else if (velocity < -maxVelocity) - velocity = -maxVelocity; + if (animation.velocity > maxVelocity) + animation.velocity = maxVelocity; + else if (animation.velocity < -maxVelocity) + animation.velocity = -maxVelocity; } - currentValue += velocity * 16.0 / 1000.0; + animation.currentValue += animation.velocity * 16.0 / 1000.0; if (haveModulus) { - currentValue = fmod(currentValue, modulus); - if (currentValue < 0.0) - currentValue += modulus; + animation.currentValue = fmod(animation.currentValue, modulus); + if (animation.currentValue < 0.0) + animation.currentValue += modulus; } } - if (qAbs(velocity) < epsilon && qAbs(srcVal - currentValue) < epsilon) { - velocity = 0.0; - currentValue = srcVal; + if (qAbs(animation.velocity) < epsilon && qAbs(srcVal - animation.currentValue) < epsilon) { + animation.velocity = 0.0; + animation.currentValue = srcVal; stop = true; } - lastTime = time - (elapsed - count * 16); } else { qreal moveBy = elapsed * velocityms; - qreal diff = srcVal - currentValue; + qreal diff = srcVal - animation.currentValue; if (haveModulus && qAbs(diff) > modulus / 2) { if (diff < 0) diff += modulus; @@ -164,33 +189,31 @@ diff -= modulus; } if (diff > 0) { - currentValue += moveBy; + animation.currentValue += moveBy; if (haveModulus) - currentValue = fmod(currentValue, modulus); - if (currentValue > to) { - currentValue = to; + animation.currentValue = fmod(animation.currentValue, modulus); + if (animation.currentValue > animation.to) { + animation.currentValue = animation.to; stop = true; } } else { - currentValue -= moveBy; - if (haveModulus && currentValue < 0.0) - currentValue = fmod(currentValue, modulus) + modulus; - if (currentValue < to) { - currentValue = to; + animation.currentValue -= moveBy; + if (haveModulus && animation.currentValue < 0.0) + animation.currentValue = fmod(animation.currentValue, modulus) + modulus; + if (animation.currentValue < animation.to) { + animation.currentValue = animation.to; stop = true; } } - lastTime = time; } - qreal old_to = to; + qreal old_to = animation.to; - QDeclarativePropertyPrivate::write(defaultProperty, currentValue, + QDeclarativePropertyPrivate::write(property, animation.currentValue, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding); - if (stop && old_to == to) // do not stop if we got restarted - clock.stop(); + return (stop && old_to == animation.to); // do not stop if we got restarted } void QDeclarativeSpringAnimationPrivate::updateMode() @@ -205,6 +228,8 @@ /*! \qmlclass SpringAnimation QDeclarativeSpringAnimation + \ingroup qml-animation-transition + \inherits Animation \since 4.7 \brief The SpringAnimation element allows a property to track a value in a spring-like motion. @@ -223,86 +248,23 @@ Like any other animation element, a SpringAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l PropertyAnimation documentation shows a variety of methods + sources. The \l {QML Animation} documentation shows a variety of methods for creating animations. \sa SmoothedAnimation, {QML Animation}, {declarative/animation/basics}{Animation basics example}, {declarative/toys/clocks}{Clocks example} */ QDeclarativeSpringAnimation::QDeclarativeSpringAnimation(QObject *parent) -: QDeclarativeAbstractAnimation(*(new QDeclarativeSpringAnimationPrivate),parent) +: QDeclarativeNumberAnimation(*(new QDeclarativeSpringAnimationPrivate),parent) { + Q_D(QDeclarativeSpringAnimation); + d->clock = new QDeclarativeSpringAnimationPrivate::Clock(d, this); } QDeclarativeSpringAnimation::~QDeclarativeSpringAnimation() { } -void QDeclarativeSpringAnimation::setTarget(const QDeclarativeProperty &property) -{ - Q_D(QDeclarativeSpringAnimation); - d->defaultProperty = property; - d->currentValue = property.read().toReal(); - if (!d->avoidPropertyValueSourceStart) { - setRunning(true); - } -} - -qreal QDeclarativeSpringAnimation::to() const -{ - Q_D(const QDeclarativeSpringAnimation); - return d->toDefined ? d->to : 0; -} - -/*! - \qmlproperty real SpringAnimation::to - - This property holds the value at which the animation will end. - - If not set, the animation will continue until it reaches the - value that is being tracked. -*/ - -void QDeclarativeSpringAnimation::setTo(qreal value) -{ - Q_D(QDeclarativeSpringAnimation); - if (d->to == value) - return; - - d->to = value; - d->toDefined = true; - d->lastTime = 0; - emit toChanged(value); -} - -qreal QDeclarativeSpringAnimation::from() const -{ - Q_D(const QDeclarativeSpringAnimation); - return d->fromDefined ? d->from : 0; -} - -/*! - \qmlproperty real SpringAnimation::from - - This property holds the value from which the animation will begin. - - If not set, the animation will start whenever the tracked value has - changed, regardless of its value. -*/ - -void QDeclarativeSpringAnimation::setFrom(qreal value) -{ - Q_D(QDeclarativeSpringAnimation); - if (d->from == value) - return; - - d->currentValue = d->from = value; - d->fromDefined = true; - d->lastTime = 0; - emit fromChanged(value); -} - - /*! \qmlproperty real SpringAnimation::velocity @@ -452,17 +414,25 @@ Q_D(QDeclarativeSpringAnimation); Q_UNUSED(direction); - if (d->clock.state() != QAbstractAnimation::Running) + if (d->clock->state() != QAbstractAnimation::Running) { d->lastTime = 0; + } + + QDeclarativeNumberAnimation::transition(actions, modified, direction); + + if (!d->actions) + return; - if (!actions.isEmpty()) { - for (int i = 0; i < actions.size(); ++i) { - if (!d->toDefined) - d->to = actions.at(i).toValue.toReal(); - if (!d->fromDefined) - d->currentValue = actions.at(i).fromValue.toReal(); - if (d->mode != QDeclarativeSpringAnimationPrivate::Track) - modified << d->defaultProperty; + if (!d->actions->isEmpty()) { + for (int i = 0; i < d->actions->size(); ++i) { + const QDeclarativeProperty &property = d->actions->at(i).property; + QDeclarativeSpringAnimationPrivate::SpringAnimation &animation + = d->activeAnimations[property]; + animation.to = d->actions->at(i).toValue.toReal(); + if (d->fromIsDefined) + animation.currentValue = d->actions->at(i).fromValue.toReal(); + else + animation.currentValue = property.read().toReal(); } } } @@ -471,7 +441,7 @@ QAbstractAnimation *QDeclarativeSpringAnimation::qtAnimation() { Q_D(QDeclarativeSpringAnimation); - return &d->clock; + return d->clock; } QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativespringanimation_p.h --- a/src/declarative/util/qdeclarativespringanimation_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativespringanimation_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -54,14 +54,12 @@ QT_MODULE(Declarative) class QDeclarativeSpringAnimationPrivate; -class Q_AUTOTEST_EXPORT QDeclarativeSpringAnimation : public QDeclarativeAbstractAnimation +class Q_AUTOTEST_EXPORT QDeclarativeSpringAnimation : public QDeclarativeNumberAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeSpringAnimation) Q_INTERFACES(QDeclarativePropertyValueSource) - Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged) - Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged) Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity) Q_PROPERTY(qreal spring READ spring WRITE setSpring) Q_PROPERTY(qreal damping READ damping WRITE setDamping) @@ -73,14 +71,6 @@ QDeclarativeSpringAnimation(QObject *parent=0); ~QDeclarativeSpringAnimation(); - virtual void setTarget(const QDeclarativeProperty &); - - qreal to() const; - void setTo(qreal value); - - qreal from() const; - void setFrom(qreal value); - qreal velocity() const; void setVelocity(qreal velocity); @@ -99,9 +89,6 @@ qreal modulus() const; void setModulus(qreal modulus); - bool enabled() const; - void setEnabled(bool enabled); - virtual void transition(QDeclarativeStateActions &actions, QDeclarativeProperties &modified, TransitionDirection direction); @@ -110,8 +97,6 @@ virtual QAbstractAnimation *qtAnimation(); Q_SIGNALS: - void toChanged(qreal); - void fromChanged(qreal); void modulusChanged(); void massChanged(); void syncChanged(); diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativestate.cpp --- a/src/declarative/util/qdeclarativestate.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativestate.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -123,9 +123,6 @@ return false; } -/*! - \internal -*/ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObject *parent) : QObject(dd, parent) { @@ -133,6 +130,7 @@ /*! \qmlclass State QDeclarativeState + \ingroup qml-state-elements \since 4.7 \brief The State element defines configurations of objects and properties. @@ -154,28 +152,15 @@ Notice the default state is referred to using an empty string (""). - States are commonly used together with \l {state-transitions}{Transitions} to provide + States are commonly used together with \l {Transitions} to provide animations when state changes occur. \note Setting the state of an object from within another state of the same object is not allowed. - \sa {declarative/animation/states}{states example}, {qmlstates}{States}, {state-transitions}{Transitions}, QtDeclarative + \sa {declarative/animation/states}{states example}, {qmlstates}{States}, + {qdeclarativeanimation.html#transitions}{QML Transitions}, QtDeclarative */ - -/*! - \internal - \class QDeclarativeState - \brief The QDeclarativeState class allows you to define configurations of objects and properties. - - - QDeclarativeState allows you to specify a state as a set of batched changes from the default - configuration. - - \sa {states-transitions}{States and Transitions} -*/ - - QDeclarativeState::QDeclarativeState(QObject *parent) : QObject(*(new QDeclarativeStatePrivate), parent) { @@ -229,20 +214,7 @@ be applied. For example, the following \l Rectangle changes in and out of the "hidden" state when the \l MouseArea is pressed: - \qml - Rectangle { - id: myRect - width: 100; height: 100 - color: "red" - - MouseArea { id: mouseArea; anchors.fill: parent } - - states: State { - name: "hidden"; when: mouseArea.pressed - PropertyChanges { target: myRect; opacity: 0 } - } - } - \endqml + \snippet doc/src/snippets/declarative/state-when.qml 0 If multiple states in a group have \c when clauses that evaluate to \c true at the same time, the first matching state will be applied. For example, in the following snippet @@ -358,8 +330,10 @@ if (!extends.isEmpty()) { QList states = group->states(); for (int ii = 0; ii < states.count(); ++ii) - if (states.at(ii)->name() == extends) + if (states.at(ii)->name() == extends) { + qmlExecuteDeferred(states.at(ii)); applyList = static_cast(states.at(ii)->d_func())->generateActionList(group); + } } foreach(QDeclarativeStateOperation *op, operations) diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativestategroup.cpp --- a/src/declarative/util/qdeclarativestategroup.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativestategroup.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -88,6 +88,7 @@ /*! \qmlclass StateGroup QDeclarativeStateGroup + \ingroup qml-state-elements \since 4.7 \brief The StateGroup element provides state support for non-Item elements. @@ -112,7 +113,7 @@ } \endqml - \sa {qmlstate}{States} {state-transitions}{Transitions}, {QtDeclarative} + \sa {qmlstate}{States} {Transitions}, {QtDeclarative} */ QDeclarativeStateGroup::QDeclarativeStateGroup(QObject *parent) @@ -204,7 +205,7 @@ } \endqml - \sa {state-transitions}{Transitions} + \sa {Transitions} */ QDeclarativeListProperty QDeclarativeStateGroup::transitionsProperty() { @@ -271,7 +272,7 @@ return; } else if (!d->currentState.isEmpty()) { QString cs = d->currentState; - d->currentState = QString(); + d->currentState.clear(); d->setCurrentStateInternal(cs, true); } } @@ -313,7 +314,7 @@ } } if (revert) { - bool rv = currentState != QString(); + bool rv = !currentState.isEmpty(); q->setState(QString()); return rv; } else { diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativestateoperations.cpp --- a/src/declarative/util/qdeclarativestateoperations.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativestateoperations.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -161,6 +161,7 @@ /*! \preliminary \qmlclass ParentChange QDeclarativeParentChange + \ingroup qml-state-elements \brief The ParentChange element allows you to reparent an Item in a state change. ParentChange reparents an item while preserving its visual appearance (position, size, @@ -589,6 +590,7 @@ /*! \qmlclass StateChangeScript QDeclarativeStateChangeScript + \ingroup qml-state-elements \brief The StateChangeScript element allows you to run a script in a state. A StateChangeScript is run upon entering a state. You can optionally use @@ -693,6 +695,7 @@ /*! \qmlclass AnchorChanges QDeclarativeAnchorChanges + \ingroup qml-state-elements \brief The AnchorChanges element allows you to change the anchors of an item in a state. The AnchorChanges element is used to modify the anchors of an item in a \l State. @@ -1424,6 +1427,7 @@ if (!d->target) return; + //### should this (saving "from" values) be moved to saveCurrentValues()? d->fromX = d->target->x(); d->fromY = d->target->y(); d->fromWidth = d->target->width(); @@ -1483,22 +1487,8 @@ return; QDeclarativeItemPrivate *targetPrivate = QDeclarativeItemPrivate::get(d->target); - //restore previous anchors - if (d->rewindLeft.anchorLine != QDeclarativeAnchorLine::Invalid) - targetPrivate->anchors()->setLeft(d->rewindLeft); - if (d->rewindRight.anchorLine != QDeclarativeAnchorLine::Invalid) - targetPrivate->anchors()->setRight(d->rewindRight); - if (d->rewindHCenter.anchorLine != QDeclarativeAnchorLine::Invalid) - targetPrivate->anchors()->setHorizontalCenter(d->rewindHCenter); - if (d->rewindTop.anchorLine != QDeclarativeAnchorLine::Invalid) - targetPrivate->anchors()->setTop(d->rewindTop); - if (d->rewindBottom.anchorLine != QDeclarativeAnchorLine::Invalid) - targetPrivate->anchors()->setBottom(d->rewindBottom); - if (d->rewindVCenter.anchorLine != QDeclarativeAnchorLine::Invalid) - targetPrivate->anchors()->setVerticalCenter(d->rewindVCenter); - if (d->rewindBaseline.anchorLine != QDeclarativeAnchorLine::Invalid) - targetPrivate->anchors()->setBaseline(d->rewindBaseline); + //restore previous values (but not previous bindings, i.e. anchors) d->target->setX(d->rewindX); d->target->setY(d->rewindY); if (targetPrivate->widthValid) { diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativesystempalette.cpp --- a/src/declarative/util/qdeclarativesystempalette.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativesystempalette.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -58,6 +58,7 @@ /*! \qmlclass SystemPalette QDeclarativeSystemPalette + \ingroup qml-utility-elements \since 4.7 \brief The SystemPalette element provides access to the Qt palettes. diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativetimeline.cpp --- a/src/declarative/util/qdeclarativetimeline.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativetimeline.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -524,7 +524,7 @@ Following operations on \a timeLineValue in this timeline will be scheduled after all the currently scheduled actions on \a syncTo are complete. In - psuedo-code this is equivalent to: + pseudo-code this is equivalent to: \code QDeclarativeTimeLine::pause(timeLineValue, min(0, length_of(syncTo) - length_of(timeLineValue))) \endcode @@ -549,7 +549,7 @@ Synchronize the end point of \a timeLineValue to the endpoint of the longest action cursrently scheduled in the timeline. - In psuedo-code, this is equivalent to: + In pseudo-code, this is equivalent to: \code QDeclarativeTimeLine::pause(timeLineValue, length_of(timeline) - length_of(timeLineValue)) \endcode diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativetimer.cpp --- a/src/declarative/util/qdeclarativetimer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativetimer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -70,14 +70,16 @@ /*! \qmlclass Timer QDeclarativeTimer + \ingroup qml-utility-elements \since 4.7 \brief The Timer item triggers a handler at a specified interval. - A timer can be used to trigger an action either once, or repeatedly + A Timer can be used to trigger an action either once, or repeatedly at a given interval. - Here is a timer that shows the current date and time, and updates - the text every 500 milliseconds: + Here is a Timer that shows the current date and time, and updates + the text every 500 milliseconds. It uses the JavaScript \c Date + object to access the current time. \qml import Qt 4.7 @@ -88,9 +90,7 @@ onTriggered: time.text = Date().toString() } - Text { - id: time - } + Text { id: time } } \endqml diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativetransition.cpp --- a/src/declarative/util/qdeclarativetransition.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativetransition.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -53,6 +53,7 @@ /*! \qmlclass Transition QDeclarativeTransition + \ingroup qml-animation-transition \since 4.7 \brief The Transition element defines animated transitions that occur on state changes. @@ -60,31 +61,42 @@ For example, the following \l Rectangle has two states: the default state, and an added "moved" state. In the "moved state, the rectangle's position changes - to (50, 50). The added \l Transition specifies that when the rectangle + to (50, 50). The added Transition specifies that when the rectangle changes between the default and the "moved" state, any changes to the \c x and \c y properties should be animated, using an \c Easing.InOutQuad. - + \snippet doc/src/snippets/declarative/transition.qml 0 - To specify multiple transitions, specify \l Item::transitions as a list: + Notice the example does not require \l{PropertyAnimation::}{to} and + \l{PropertyAnimation::}{from} values for the NumberAnimation. As a convenience, + these properties are automatically set to the values of \c x and \c y before + and after the state change; the \c from values are provided by + the current values of \c x and \c y, and the \c to values are provided by + the PropertyChanges object. If you wish, you can provide \l{PropertyAnimation::}{to} and + \l{PropertyAnimation::}{from} values anyway to override the default values. + + By default, a Transition's animations are applied for any state change in the + parent item. The Transition \l {Transition::}{from} and \l {Transition::}{to} + values can be set to restrict the animations to only be applied when changing + from one particular state to another. + + To define multiple transitions, specify \l Item::transitions as a list: \qml Item { ... transitions: [ - Transition { ... } + Transition { ... }, Transition { ... } ] } \endqml - \sa {declarative/animation/states}{states example}, {qmlstates}{States}, {state-transitions}{Transitions}, {QtDeclarative} -*/ + If a state change has a Transition that matches the same property as a + \l Behavior, the Transition animation overrides the \l Behavior for that + state change. -/*! - \internal - \class QDeclarativeTransition - \brief The QDeclarativeTransition class allows you to define animated transitions that occur on state changes. + \sa {QML Animation}, {declarative/animation/states}{states example}, {qmlstates}{States}, {QtDeclarative} */ //ParallelAnimationWrapper allows us to do a "callback" when the animation finishes, rather than connecting diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativetransitionmanager.cpp --- a/src/declarative/util/qdeclarativetransitionmanager.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativetransitionmanager.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -176,7 +176,7 @@ if (action.event->isReversable()) { action.event->clearBindings(); action.event->rewind(); - action.event->clearBindings(); + action.event->clearBindings(); //### shouldn't be needed } continue; } diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativeview.cpp --- a/src/declarative/util/qdeclarativeview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativeview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -365,7 +365,7 @@ \value Null This QDeclarativeView has no source set. \value Ready This QDeclarativeView has loaded and created the QML component. \value Loading This QDeclarativeView is loading network data. - \value Error An error has occured. Call errorDescription() to retrieve a description. + \value Error An error has occurred. Call errorDescription() to retrieve a description. */ /*! \enum QDeclarativeView::ResizeMode @@ -391,7 +391,7 @@ } /*! - Return the list of errors that occured during the last compile or create + Return the list of errors that occurred during the last compile or create operation. An empty list is returned if isError() is not set. */ QList QDeclarativeView::errors() const diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qdeclarativexmllistmodel.cpp --- a/src/declarative/util/qdeclarativexmllistmodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -72,6 +72,7 @@ /*! \qmlclass XmlRole QDeclarativeXmlListModelRole + \ingroup qml-working-with-data \since 4.7 \brief The XmlRole element allows you to specify a role for an XmlListModel. @@ -465,8 +466,6 @@ QList roleObjects; static void append_role(QDeclarativeListProperty *list, QDeclarativeXmlListModelRole *role); static void clear_role(QDeclarativeListProperty *list); - static void removeAt_role(QDeclarativeListProperty *list, int i); - static void insert_role(QDeclarativeListProperty *list, int i, QDeclarativeXmlListModelRole *role); QList > data; int redirectCount; }; @@ -499,12 +498,8 @@ } /*! - \class QDeclarativeXmlListModel - \internal -*/ - -/*! \qmlclass XmlListModel QDeclarativeXmlListModel + \ingroup qml-working-with-data \since 4.7 \brief The XmlListModel element is used to specify a model using XPath expressions. @@ -560,7 +555,7 @@ ListView { width: 180; height: 300 model: xmlModel - delegate: Text { text: title + " (" + pubDate + ")" } + delegate: Text { text: title + ": " + pubDate } } \endqml @@ -855,6 +850,12 @@ return d->progress; } +/*! + \qmlmethod void XmlListModel::errorString() + + Returns a string description of the last error that occurred + if \l status is XmlListModel::Error. +*/ QString QDeclarativeXmlListModel::errorString() const { Q_D(const QDeclarativeXmlListModel); diff -r ef0373b55136 -r 758a864f9613 src/declarative/util/qlistmodelinterface.cpp --- a/src/declarative/util/qlistmodelinterface.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/declarative/util/qlistmodelinterface.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -71,7 +71,7 @@ */ /*! \fn QHash QListModelInterface::data(int index, const QList& roles) const - Returns the data at the given \a index for the specifed \a roles. + Returns the data at the given \a index for the specified \a roles. */ /*! \fn bool QListModelInterface::setData(int index, const QHash& values) diff -r ef0373b55136 -r 758a864f9613 src/gui/dialogs/qfiledialog_mac.mm --- a/src/gui/dialogs/qfiledialog_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/dialogs/qfiledialog_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -119,6 +119,7 @@ - (QString)removeExtensions:(const QString &)filter; - (void)createTextField; - (void)createPopUpButton:(const QString &)selectedFilter hideDetails:(BOOL)hideDetails; +- (QStringList)findStrippedFilterWithVisualFilterName:(QString)name; - (void)createAccessory; @end @@ -127,8 +128,6 @@ - (id)initWithAcceptMode:(QT_PREPEND_NAMESPACE(QFileDialog::AcceptMode))acceptMode title:(const QString &)title - nameFilters:(const QStringList &)nameFilters - selectedNameFilter:(const QString &)selectedNameFilter hideNameFilterDetails:(bool)hideNameFilterDetails qDirFilter:(QT_PREPEND_NAMESPACE(QDir::Filters))qDirFilter fileOptions:(QT_PREPEND_NAMESPACE(QFileDialog::Options))fileOptions @@ -158,8 +157,10 @@ mPriv = priv; mLastFilterCheckPath = new QString; mQDirFilterEntryList = new QStringList; - mNameFilterDropDownList = new QStringList(nameFilters); - mSelectedNameFilter = new QStringList(qt_clean_filter_list(selectedNameFilter)); + mNameFilterDropDownList = new QStringList(priv->nameFilters); + QString selectedVisualNameFilter = priv->qFileDialogUi->fileTypeCombo->currentText(); + mSelectedNameFilter = new QStringList([self findStrippedFilterWithVisualFilterName:selectedVisualNameFilter]); + QFileInfo sel(selectFile); if (sel.isDir()){ mCurrentDir = [qt_mac_QStringToNSString(sel.absoluteFilePath()) retain]; @@ -168,8 +169,9 @@ mCurrentDir = [qt_mac_QStringToNSString(sel.absolutePath()) retain]; mCurrentSelection = new QString(sel.absoluteFilePath()); } + [mSavePanel setTitle:qt_mac_QStringToNSString(title)]; - [self createPopUpButton:selectedNameFilter hideDetails:hideNameFilterDetails]; + [self createPopUpButton:selectedVisualNameFilter hideDetails:hideNameFilterDetails]; [self createTextField]; [self createAccessory]; [mSavePanel setAccessoryView:mNameFilterDropDownList->size() > 1 ? mAccessoryView : nil]; @@ -350,7 +352,7 @@ // This mDelegate function is called when the _name_ filter changes. Q_UNUSED(sender); QString selection = mNameFilterDropDownList->value([mPopUpButton indexOfSelectedItem]); - *mSelectedNameFilter = QT_PREPEND_NAMESPACE(qt_clean_filter_list)(selection); + *mSelectedNameFilter = [self findStrippedFilterWithVisualFilterName:selection]; [mSavePanel validateVisibleColumns]; [self updateProperties]; if (mPriv) @@ -499,6 +501,15 @@ } } +- (QStringList) findStrippedFilterWithVisualFilterName:(QString)name +{ + for (int i=0; isize(); ++i) { + if (mNameFilterDropDownList->at(i).startsWith(name)) + return qt_clean_filter_list(mNameFilterDropDownList->at(i)); + } + return QStringList(); +} + - (void)createAccessory { NSRect accessoryRect = { { 0.0, 0.0 }, { 450.0, 33.0 } }; @@ -782,9 +793,11 @@ const QtMacFilterName &fn = fileDialogPrivate->filterInfo.filters.at( fileDialogPrivate->filterInfo.currentSelection); QStringList reg = fn.regexp.split(QLatin1String(";"), QString::SkipEmptyParts); - QString r = reg.first(); - r = r.right(r.length()-1); // Strip the * - base += r; //"." + QString::number(s->menuType); + if (reg.count()) { + QString r = reg.first(); + r = r.right(r.length()-1); // Strip the * + base += r; //"." + QString::number(s->menuType); + } NavDialogSetSaveFileName(p->context, QCFString::toCFStringRef(base)); } #ifdef DEBUG_FILEDIALOG_FILTERS @@ -1037,8 +1050,6 @@ QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = [[QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) alloc] initWithAcceptMode:acceptMode title:q->windowTitle() - nameFilters:q->nameFilters() - selectedNameFilter:q->selectedNameFilter() hideNameFilterDetails:q->testOption(QFileDialog::HideNameFilterDetails) qDirFilter:model->filter() fileOptions:opts diff -r ef0373b55136 -r 758a864f9613 src/gui/dialogs/qfontdialog_mac.mm --- a/src/gui/dialogs/qfontdialog_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/dialogs/qfontdialog_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -131,6 +131,7 @@ - (QFont)qtFont; - (void)finishOffWithCode:(NSInteger)result; - (void)cleanUpAfterMyself; +- (void)setSubwindowStacking; @end static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont) @@ -187,6 +188,12 @@ [cancelButton setTarget:self]; } + mQtFont = new QFont(); + return self; +} + +- (void)setSubwindowStacking +{ #ifdef QT_MAC_USE_COCOA // Stack the native dialog in front of its parent, if any: QFontDialog *q = mPriv->fontDialog(); @@ -199,9 +206,6 @@ } } #endif - - mQtFont = new QFont(); - return self; } - (void)dealloc @@ -610,6 +614,7 @@ [ourPanel setFrame:frameRect display:NO]; [ourPanel center]; } + [del setSubwindowStacking]; NSString *title = @"Select font"; [ourPanel setTitle:title]; } diff -r ef0373b55136 -r 758a864f9613 src/gui/egl/qegl_x11.cpp --- a/src/gui/egl/qegl_x11.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/egl/qegl_x11.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -165,7 +165,7 @@ if (chosenVisualInfo) { // Skip size checks if implementation supports non-matching visual // and config (http://bugreports.qt.nokia.com/browse/QTBUG-9444). - if (QEgl::hasExtension("EGL_NV_post_convert_replication")) + if (QEgl::hasExtension("EGL_NV_post_convert_rounding")) return visualId; int visualRedSize = countBits(chosenVisualInfo->red_mask); diff -r ef0373b55136 -r 758a864f9613 src/gui/embedded/qkbdlinuxinput_qws.cpp --- a/src/gui/embedded/qkbdlinuxinput_qws.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/embedded/qkbdlinuxinput_qws.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -138,7 +138,7 @@ // record the original mode so we can restore it again in the destructor. ::ioctl(m_tty_fd, KDGKBMODE, &m_orig_kbmode); - // setting this tranlation mode is even needed in INPUT mode to prevent + // setting this translation mode is even needed in INPUT mode to prevent // the shell from also interpreting codes, if the process has a tty // attached: e.g. Ctrl+C wouldn't copy, but kill the application. ::ioctl(m_tty_fd, KDSKBMODE, K_MEDIUMRAW); diff -r ef0373b55136 -r 758a864f9613 src/gui/embedded/qkbdqnx_qws.cpp --- a/src/gui/embedded/qkbdqnx_qws.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/embedded/qkbdqnx_qws.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -150,7 +150,7 @@ // figure out whether it's a press bool isPress = packet.data.key_cap & KEY_DOWN; - // figure out wheter the key is still pressed and the key event is repeated + // figure out whether the key is still pressed and the key event is repeated bool isRepeat = packet.data.key_cap & KEY_REPEAT; Qt::Key key = Qt::Key_unknown; diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgraphicsgridlayout.cpp --- a/src/gui/graphicsview/qgraphicsgridlayout.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgraphicsgridlayout.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -641,7 +641,8 @@ Q_D(const QGraphicsGridLayout); qreal left, top, right, bottom; getContentsMargins(&left, &top, &right, &bottom); - return d->engine.sizeHint(d->styleInfo(), which , constraint) + QSizeF(left + right, top + bottom); + const QSizeF extraMargins(left + right, top + bottom); + return d->engine.sizeHint(d->styleInfo(), which , constraint - extraMargins) + extraMargins; } diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgraphicsitem.cpp --- a/src/gui/graphicsview/qgraphicsitem.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgraphicsitem.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1453,9 +1453,10 @@ #ifndef QT_NO_GESTURES if (d_ptr->isObject && !d_ptr->gestureContext.isEmpty()) { QGraphicsObject *o = static_cast(this); - QGestureManager *manager = QGestureManager::instance(); - foreach (Qt::GestureType type, d_ptr->gestureContext.keys()) - manager->cleanupCachedGestures(o, type); + if (QGestureManager *manager = QGestureManager::instance()) { + foreach (Qt::GestureType type, d_ptr->gestureContext.keys()) + manager->cleanupCachedGestures(o, type); + } } #endif @@ -3258,8 +3259,12 @@ QGraphicsItem *p = parent; while (p) { if (p->flags() & QGraphicsItem::ItemIsFocusScope) { + QGraphicsItem *oldFocusScopeItem = p->d_ptr->focusScopeItem; p->d_ptr->focusScopeItem = q_ptr; if (!p->focusItem() && !focusFromShow) { + if (oldFocusScopeItem) + oldFocusScopeItem->d_ptr->focusScopeItemChange(false); + focusScopeItemChange(true); // If you call setFocus on a child of a focus scope that // doesn't currently have a focus item, then stop. return; @@ -3930,7 +3935,7 @@ Returns a list of graphics transforms that currently apply to this item. QGraphicsTransform is for applying and controlling a chain of individual - transformation operations on an item. It's particularily useful in + transformation operations on an item. It's particularly useful in animations, where each transform operation needs to be interpolated independently, or differently. @@ -3957,7 +3962,7 @@ an item, you can call setTransform(). QGraphicsTransform is for applying and controlling a chain of individual - transformation operations on an item. It's particularily useful in + transformation operations on an item. It's particularly useful in animations, where each transform operation needs to be interpolated independently, or differently. @@ -5151,7 +5156,7 @@ The bounding region describes a coarse outline of the item's visual contents. Although it's expensive to calculate, it's also more precise than boundingRect(), and it can help to avoid unnecessary repainting when - an item is updated. This is particularily efficient for thin items (e.g., + an item is updated. This is particularly efficient for thin items (e.g., lines or simple polygons). You can tune the granularity for the bounding region by calling setBoundingRegionGranularity(). The default granularity is 0; in which the item's bounding region is the same as its bounding @@ -5594,6 +5599,7 @@ */ void QGraphicsItemPrivate::focusScopeItemChange(bool isSubFocusItem) { + Q_UNUSED(isSubFocusItem); } /*! @@ -5660,9 +5666,6 @@ return; } - if (d_ptr->discardUpdateRequest()) - return; - if (d_ptr->scene) d_ptr->scene->d_func()->markDirty(this, rect); } @@ -7752,6 +7755,24 @@ } /*! + \property QGraphicsObject::children + \since 4.7 + \internal +*/ + +/*! + \property QGraphicsObject::width + \since 4.7 + \internal +*/ + +/*! + \property QGraphicsObject::height + \since 4.7 + \internal +*/ + +/*! \property QGraphicsObject::parent \brief the parent of the item diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgraphicslayoutitem.cpp --- a/src/gui/graphicsview/qgraphicslayoutitem.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -48,6 +48,7 @@ #include "qgraphicslayoutitem.h" #include "qgraphicslayoutitem_p.h" #include "qwidget.h" +#include "qgraphicswidget.h" #include @@ -139,9 +140,11 @@ if (!sizeHintCacheDirty && cachedConstraint == constraint) return cachedSizeHints; + const bool hasConstraint = constraint.width() >= 0 || constraint.height() >= 0; + for (int i = 0; i < Qt::NSizeHints; ++i) { cachedSizeHints[i] = constraint; - if (userSizeHints) + if (userSizeHints && !hasConstraint) combineSize(cachedSizeHints[i], userSizeHints[i]); } @@ -259,6 +262,52 @@ q->updateGeometry(); } + +bool QGraphicsLayoutItemPrivate::hasHeightForWidth() const +{ + Q_Q(const QGraphicsLayoutItem); + if (isLayout) { + const QGraphicsLayout *l = static_cast(q); + for (int i = l->count() - 1; i >= 0; --i) { + if (QGraphicsLayoutItemPrivate::get(l->itemAt(i))->hasHeightForWidth()) + return true; + } + } else if (QGraphicsItem *item = q->graphicsItem()) { + if (item->isWidget()) { + QGraphicsWidget *w = static_cast(item); + if (w->layout()) { + return QGraphicsLayoutItemPrivate::get(w->layout())->hasHeightForWidth(); + } + } + } + return q->sizePolicy().hasHeightForWidth(); +} + +bool QGraphicsLayoutItemPrivate::hasWidthForHeight() const +{ + // enable this code when we add QSizePolicy::hasWidthForHeight() (For 4.8) +#if 1 + return false; +#else + Q_Q(const QGraphicsLayoutItem); + if (isLayout) { + const QGraphicsLayout *l = static_cast(q); + for (int i = l->count() - 1; i >= 0; --i) { + if (QGraphicsLayoutItemPrivate::get(l->itemAt(i))->hasWidthForHeight()) + return true; + } + } else if (QGraphicsItem *item = q->graphicsItem()) { + if (item->isWidget()) { + QGraphicsWidget *w = static_cast(item); + if (w->layout()) { + return QGraphicsLayoutItemPrivate::get(w->layout())->hasWidthForHeight(); + } + } + } + return q->sizePolicy().hasWidthForHeight(); +#endif +} + /*! \class QGraphicsLayoutItem \brief The QGraphicsLayoutItem class can be inherited to allow your custom diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgraphicslayoutitem_p.h --- a/src/gui/graphicsview/qgraphicslayoutitem_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgraphicslayoutitem_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -65,6 +65,9 @@ public: virtual ~QGraphicsLayoutItemPrivate(); QGraphicsLayoutItemPrivate(QGraphicsLayoutItem *parent, bool isLayout); + static QGraphicsLayoutItemPrivate *get(QGraphicsLayoutItem *q) { return q->d_func();} + static const QGraphicsLayoutItemPrivate *get(const QGraphicsLayoutItem *q) { return q->d_func();} + void init(); QSizeF *effectiveSizeHints(const QSizeF &constraint) const; QGraphicsItem *parentItem() const; @@ -73,6 +76,9 @@ enum SizeComponent { Width, Height }; void setSizeComponent(Qt::SizeHint which, SizeComponent component, qreal value); + bool hasHeightForWidth() const; + bool hasWidthForHeight() const; + QSizePolicy sizePolicy; QGraphicsLayoutItem *parent; diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgraphicslinearlayout.cpp --- a/src/gui/graphicsview/qgraphicslinearlayout.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -528,7 +528,8 @@ Q_D(const QGraphicsLinearLayout); qreal left, top, right, bottom; getContentsMargins(&left, &top, &right, &bottom); - return d->engine.sizeHint(d->styleInfo(), which , constraint) + QSizeF(left + right, top + bottom); + const QSizeF extraMargins(left + right, top + bottom); + return d->engine.sizeHint(d->styleInfo(), which , constraint - extraMargins) + extraMargins; } /*! diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgraphicsscene.cpp --- a/src/gui/graphicsview/qgraphicsscene.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgraphicsscene.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -831,6 +831,11 @@ #endif //QT_NO_IM } + // This handles the case that the item has been removed from the + // scene in response to the FocusOut event. + if (item && item->scene() != q) + item = 0; + if (item) focusItem = item; updateInputMethodSensitivityInViews(); @@ -1069,7 +1074,7 @@ /*! Returns all items for the screen position in \a event. */ -QList QGraphicsScenePrivate::itemsAtPosition(const QPoint &screenPos, +QList QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*screenPos*/, const QPointF &scenePos, QWidget *widget) const { @@ -1078,16 +1083,12 @@ if (!view) return q->items(scenePos, Qt::IntersectsItemShape, Qt::DescendingOrder, QTransform()); - const QRectF pointRect(QPointF(widget->mapFromGlobal(screenPos)), QSizeF(1, 1)); + const QRectF pointRect(scenePos, QSizeF(1, 1)); if (!view->isTransformed()) return q->items(pointRect, Qt::IntersectsItemShape, Qt::DescendingOrder); const QTransform viewTransform = view->viewportTransform(); - if (viewTransform.type() <= QTransform::TxScale) { - return q->items(viewTransform.inverted().mapRect(pointRect), Qt::IntersectsItemShape, - Qt::DescendingOrder, viewTransform); - } - return q->items(viewTransform.inverted().map(pointRect), Qt::IntersectsItemShape, + return q->items(pointRect, Qt::IntersectsItemShape, Qt::DescendingOrder, viewTransform); } @@ -5121,7 +5122,9 @@ q->update(itemBoundingRect.translated(item->d_ptr->sceneTransform.dx(), item->d_ptr->sceneTransform.dy())); } else { - q->update(item->d_ptr->sceneTransform.mapRect(itemBoundingRect)); + QRectF rect = item->d_ptr->sceneTransform.mapRect(itemBoundingRect); + if (!rect.isEmpty()) + q->update(rect); } } else { QRectF dirtyRect; @@ -5735,16 +5738,11 @@ } if (sceneTouchEvent->deviceType() == QTouchEvent::TouchScreen) { - // on touch-screens, combine this touch point with the closest one we find if it - // is a a direct descendent or ancestor ( + // on touch-screens, combine this touch point with the closest one we find int closestTouchPointId = findClosestTouchPointId(touchPoint.scenePos()); QGraphicsItem *closestItem = itemForTouchPointId.value(closestTouchPointId); - if (!item - || (closestItem - && (item->isAncestorOf(closestItem) - || closestItem->isAncestorOf(item)))) { + if (!item || (closestItem && cachedItemsUnderMouse.contains(closestItem))) item = closestItem; - } } if (!item) continue; diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgraphicstransform.cpp --- a/src/gui/graphicsview/qgraphicstransform.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgraphicstransform.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -267,6 +267,7 @@ return; d->xScale = scale; update(); + emit xScaleChanged(); emit scaleChanged(); } @@ -293,6 +294,7 @@ return; d->yScale = scale; update(); + emit yScaleChanged(); emit scaleChanged(); } @@ -319,6 +321,7 @@ return; d->zScale = scale; update(); + emit zScaleChanged(); emit scaleChanged(); } @@ -342,6 +345,27 @@ */ /*! + \fn QGraphicsScale::xScaleChanged() + \since 4.7 + + This signal is emitted whenever the \l xScale property changes. +*/ + +/*! + \fn QGraphicsScale::yScaleChanged() + \since 4.7 + + This signal is emitted whenever the \l yScale property changes. +*/ + +/*! + \fn QGraphicsScale::zScaleChanged() + \since 4.7 + + This signal is emitted whenever the \l zScale property changes. +*/ + +/*! \fn QGraphicsScale::scaleChanged() This signal is emitted whenever the xScale, yScale, or zScale diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgraphicstransform.h --- a/src/gui/graphicsview/qgraphicstransform.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgraphicstransform.h Mon Oct 04 01:19:32 2010 +0300 @@ -85,9 +85,9 @@ Q_OBJECT Q_PROPERTY(QVector3D origin READ origin WRITE setOrigin NOTIFY originChanged) - Q_PROPERTY(qreal xScale READ xScale WRITE setXScale NOTIFY scaleChanged) - Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY scaleChanged) - Q_PROPERTY(qreal zScale READ zScale WRITE setZScale NOTIFY scaleChanged) + Q_PROPERTY(qreal xScale READ xScale WRITE setXScale NOTIFY xScaleChanged) + Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY yScaleChanged) + Q_PROPERTY(qreal zScale READ zScale WRITE setZScale NOTIFY zScaleChanged) public: QGraphicsScale(QObject *parent = 0); ~QGraphicsScale(); @@ -108,6 +108,9 @@ Q_SIGNALS: void originChanged(); + void xScaleChanged(); + void yScaleChanged(); + void zScaleChanged(); void scaleChanged(); private: diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgraphicsview.cpp --- a/src/gui/graphicsview/qgraphicsview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgraphicsview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -2596,9 +2596,11 @@ // Convert scene rects to viewport rects. foreach (const QRectF &rect, rects) { - QRect xrect = transform.mapRect(rect).toRect(); + QRect xrect = transform.mapRect(rect).toAlignedRect(); if (!(d->optimizationFlags & DontAdjustForAntialiasing)) xrect.adjust(-2, -2, 2, 2); + else + xrect.adjust(-1, -1, 1, 1); if (!viewportRect.intersects(xrect)) continue; dirtyViewportRects << xrect; diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgraphicswidget.cpp --- a/src/gui/graphicsview/qgraphicswidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgraphicswidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -385,12 +385,12 @@ if (wd->inSetPos) { //set the new pos d->geom.moveTopLeft(pos()); + emit geometryChanged(); return; } } QSizeF oldSize = size(); QGraphicsLayoutItem::setGeometry(newGeom); - emit geometryChanged(); // Send resize event bool resized = newGeom.size() != oldSize; if (resized) { @@ -403,6 +403,7 @@ emit heightChanged(); QApplication::sendEvent(this, &re); } + emit geometryChanged(); } /*! @@ -936,7 +937,9 @@ QFont QGraphicsWidget::font() const { Q_D(const QGraphicsWidget); - return d->font; + QFont fnt = d->font; + fnt.resolve(fnt.resolve() | d->inheritedFontResolveMask); + return fnt; } void QGraphicsWidget::setFont(const QFont &font) { diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgraphicswidget_p.cpp --- a/src/gui/graphicsview/qgraphicswidget_p.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgraphicswidget_p.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -254,7 +254,10 @@ void QGraphicsWidgetPrivate::resolveFont(uint inheritedMask) { + Q_Q(QGraphicsWidget); inheritedFontResolveMask = inheritedMask; + if (QGraphicsWidget *p = q->parentWidget()) + inheritedFontResolveMask |= p->d_func()->inheritedFontResolveMask; QFont naturalFont = naturalWidgetFont(); QFont resolvedFont = font.resolve(naturalFont); updateFont(resolvedFont); diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgridlayoutengine.cpp --- a/src/gui/graphicsview/qgridlayoutengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgridlayoutengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -250,6 +250,7 @@ sumAvailable = targetSize - totalBox.q_preferredSize; if (sumAvailable > 0.0) { + qreal sumCurrentAvailable = sumAvailable; bool somethingHasAMaximumSize = false; qreal sumPreferredSizes = 0.0; @@ -308,12 +309,12 @@ qreal ultimateFactor = (stretch * ultimateSumPreferredSizes / sumStretches) - (box.q_preferredSize); - qreal transitionalFactor = sumAvailable + qreal transitionalFactor = sumCurrentAvailable * (ultimatePreferredSize - box.q_preferredSize) / (ultimateSumPreferredSizes - sumPreferredSizes); - qreal alpha = qMin(sumAvailable, + qreal alpha = qMin(sumCurrentAvailable, ultimateSumPreferredSizes - sumPreferredSizes); qreal beta = ultimateSumPreferredSizes - sumPreferredSizes; @@ -321,7 +322,7 @@ + ((beta - alpha) * transitionalFactor)) / beta; } sumFactors += factors[i]; - if (desired < sumAvailable) + if (desired < sumCurrentAvailable) somethingHasAMaximumSize = true; newSizes[i] = -1.0; @@ -337,12 +338,12 @@ continue; const QGridLayoutBox &box = boxes.at(start + i); - qreal avail = sumAvailable * factors[i] / sumFactors; + qreal avail = sumCurrentAvailable * factors[i] / sumFactors; if (sizes[i] + avail >= box.q_maximumSize) { newSizes[i] = box.q_maximumSize; - sumAvailable -= box.q_maximumSize - sizes[i]; + sumCurrentAvailable -= box.q_maximumSize - sizes[i]; sumFactors -= factors[i]; - keepGoing = (sumAvailable > 0.0); + keepGoing = (sumCurrentAvailable > 0.0); if (!keepGoing) break; } @@ -352,7 +353,7 @@ for (int i = 0; i < n; ++i) { if (newSizes[i] < 0.0) { qreal delta = (sumFactors == 0.0) ? 0.0 - : sumAvailable * factors[i] / sumFactors; + : sumCurrentAvailable * factors[i] / sumFactors; newSizes[i] = sizes[i] + delta; } } @@ -545,6 +546,24 @@ : sizePolicy.verticalPolicy(); } +/* + returns true if the size policy returns true for either hasHeightForWidth() + or hasWidthForHeight() + */ +bool QGridLayoutItem::hasDynamicConstraint() const +{ + return QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasHeightForWidth() + || QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasWidthForHeight(); +} + +Qt::Orientation QGridLayoutItem::dynamicConstraintOrientation() const +{ + if (QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasHeightForWidth()) + return Qt::Vertical; + else //if (QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasWidthForHeight()) + return Qt::Horizontal; +} + QSizePolicy::ControlTypes QGridLayoutItem::controlTypes(LayoutSide /* side */) const { return q_layoutItem->sizePolicy().controlType(); @@ -613,7 +632,14 @@ qreal cellWidth = width; qreal cellHeight = height; - QSizeF size = effectiveMaxSize().boundedTo(QSizeF(cellWidth, cellHeight)); + QSize constraint; + if (hasDynamicConstraint()) { + if (dynamicConstraintOrientation() == Qt::Vertical) + constraint.setWidth(cellWidth); + else + constraint.setHeight(cellHeight); + } + QSizeF size = effectiveMaxSize(constraint).boundedTo(QSizeF(cellWidth, cellHeight)); width = size.width(); height = size.height(); @@ -675,13 +701,13 @@ Note that effectiveSizeHint does not take sizePolicy into consideration, (since it only evaluates the hints, as the name implies) */ -QSizeF QGridLayoutItem::effectiveMaxSize() const +QSizeF QGridLayoutItem::effectiveMaxSize(const QSizeF &constraint) const { - QSizeF size; + QSizeF size = constraint; bool vGrow = (sizePolicy(Qt::Vertical) & QSizePolicy::GrowFlag) == QSizePolicy::GrowFlag; bool hGrow = (sizePolicy(Qt::Horizontal) & QSizePolicy::GrowFlag) == QSizePolicy::GrowFlag; if (!vGrow || !hGrow) { - QSizeF pref = layoutItem()->effectiveSizeHint(Qt::PreferredSize); + QSizeF pref = layoutItem()->effectiveSizeHint(Qt::PreferredSize, constraint); if (!vGrow) size.setHeight(pref.height()); if (!hGrow) @@ -689,7 +715,7 @@ } if (!size.isValid()) { - QSizeF maxSize = layoutItem()->effectiveSizeHint(Qt::MaximumSize); + QSizeF maxSize = layoutItem()->effectiveSizeHint(Qt::MaximumSize, constraint); if (size.width() == -1) size.setWidth(maxSize.width()); if (size.height() == -1) @@ -1010,6 +1036,7 @@ q_cachedEffectiveLastRows[Ver] = -1; q_cachedDataForStyleInfo.invalidate(); q_cachedSize = QSizeF(); + q_cachedConstraintOrientation = UnknownConstraint; } static void visualRect(QRectF *geom, Qt::LayoutDirection dir, const QRectF &contentsRect) @@ -1074,10 +1101,13 @@ } QSizeF QGridLayoutEngine::sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHint which, - const QSizeF & /* constraint */) const + const QSizeF &constraint) const { ensureColumnAndRowData(styleInfo); + if (hasDynamicConstraint()) + return dynamicallyConstrainedSizeHint(which, constraint); + switch (which) { case Qt::MinimumSize: return QSizeF(q_totalBoxes[Hor].q_minimumSize, q_totalBoxes[Ver].q_minimumSize); @@ -1375,7 +1405,11 @@ box = &multiCell.q_box; multiCell.q_stretch = itemStretch; } - box->combine(item->box(orientation)); + // Items with constraints are not included in the orientation that + // they are constrained (since it depends on the hfw/constraint function). + // They must be combined at a later stage. + if (!item->hasDynamicConstraint() || orientation != item->dynamicConstraintOrientation()) + box->combine(item->box(orientation)); if (effectiveRowSpan == 1) { QSizePolicy::ControlTypes controls = item->controlTypes(top); @@ -1532,6 +1566,138 @@ q_cachedDataForStyleInfo = styleInfo; } +QSizeF QGridLayoutEngine::dynamicallyConstrainedSizeHint(Qt::SizeHint which, + const QSizeF &constraint) const +{ + Q_ASSERT(hasDynamicConstraint()); + if (constraint.width() < 0 && constraint.height() < 0) { + // Process the hfw / wfh items that we did not process in fillRowData() + const Qt::Orientation constraintOrient = constraintOrientation(); + + QGridLayoutRowData rowData = constraintOrient == Qt::Vertical ? q_rowData : q_columnData; + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + if (item->hasDynamicConstraint()) { + QGridLayoutBox box = item->box(constraintOrient); + QGridLayoutBox &rowBox = rowData.boxes[item->firstRow(constraintOrient)]; + rowBox.combine(box); + } + } + + QGridLayoutBox totalBoxes[2]; + if (constraintOrient == Qt::Vertical) { + totalBoxes[Hor] = q_columnData.totalBox(0, columnCount()); + totalBoxes[Ver] = rowData.totalBox(0, rowCount()); + } else { + totalBoxes[Hor] = rowData.totalBox(0, columnCount()); + totalBoxes[Ver] = q_rowData.totalBox(0, rowCount()); + } + return QSizeF(totalBoxes[Hor].q_sizes(which), totalBoxes[Ver].q_sizes(which)); + } + + + Q_ASSERT(constraint.width() >= 0 || constraint.height() >= 0); + q_xx.resize(columnCount()); + q_yy.resize(rowCount()); + q_widths.resize(columnCount()); + q_heights.resize(rowCount()); + q_descents.resize(rowCount()); + + + const Qt::Orientation orientation = constraintOrientation(); + QGridLayoutRowData *colData; + QGridLayoutRowData constrainedRowData; + QGridLayoutBox *totalBox; + qreal *sizes; + qreal *pos; + qreal *descents; + qreal targetSize; + qreal cCount; + qreal rCount; + + if (orientation == Qt::Vertical) { + // height for width + colData = &q_columnData; + totalBox = &q_totalBoxes[Hor]; + sizes = q_widths.data(); + pos = q_xx.data(); + descents = 0; + targetSize = constraint.width(); + cCount = columnCount(); + rCount = rowCount(); + constrainedRowData = q_rowData; + } else { + // width for height + colData = &q_rowData; + totalBox = &q_totalBoxes[Ver]; + sizes = q_heights.data(); + pos = q_yy.data(); + descents = q_descents.data(); + targetSize = constraint.height(); + cCount = rowCount(); + rCount = columnCount(); + constrainedRowData = q_columnData; + } + colData->calculateGeometries(0, cCount, targetSize, pos, sizes, descents, *totalBox); + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + + if (item->hasDynamicConstraint()) { + const qreal size = sizes[item->firstColumn(orientation)]; + QGridLayoutBox box = item->box(orientation, size); + QGridLayoutBox &rowBox = constrainedRowData.boxes[item->firstRow(orientation)]; + rowBox.combine(box); + } + } + const qreal newSize = constrainedRowData.totalBox(0, rCount).q_sizes(which); + + return (orientation == Qt::Vertical) ? QSizeF(targetSize, newSize) : QSizeF(newSize, targetSize); +} + + +/** + returns false if the layout has contradicting constraints (i.e. some items with a horizontal + constraint and other items with a vertical constraint) + */ +bool QGridLayoutEngine::ensureDynamicConstraint() const +{ + if (q_cachedConstraintOrientation == UnknownConstraint) { + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + if (item->hasDynamicConstraint()) { + Qt::Orientation itemConstraintOrientation = item->dynamicConstraintOrientation(); + if (q_cachedConstraintOrientation == UnknownConstraint) { + q_cachedConstraintOrientation = itemConstraintOrientation; + } else if (q_cachedConstraintOrientation != itemConstraintOrientation) { + q_cachedConstraintOrientation = UnfeasibleConstraint; + qWarning("QGridLayoutEngine: Unfeasible, cannot mix horizontal and" + " vertical constraint in the same layout"); + return false; + } + } + } + if (q_cachedConstraintOrientation == UnknownConstraint) + q_cachedConstraintOrientation = NoConstraint; + } + return true; +} + +bool QGridLayoutEngine::hasDynamicConstraint() const +{ + if (!ensureDynamicConstraint()) + return false; + return q_cachedConstraintOrientation != NoConstraint; +} + +/* + * return value is only valid if hasConstraint() returns true + */ +Qt::Orientation QGridLayoutEngine::constraintOrientation() const +{ + (void)ensureDynamicConstraint(); + return (Qt::Orientation)q_cachedConstraintOrientation; +} + void QGridLayoutEngine::ensureGeometries(const QLayoutStyleInfo &styleInfo, const QSizeF &size) const { @@ -1544,10 +1710,74 @@ q_widths.resize(columnCount()); q_heights.resize(rowCount()); q_descents.resize(rowCount()); - q_columnData.calculateGeometries(0, columnCount(), size.width(), q_xx.data(), q_widths.data(), - 0, q_totalBoxes[Hor]); - q_rowData.calculateGeometries(0, rowCount(), size.height(), q_yy.data(), q_heights.data(), - q_descents.data(), q_totalBoxes[Ver]); + + + Qt::Orientation orientation = Qt::Vertical; + if (hasDynamicConstraint()) + orientation = constraintOrientation(); + + /* + In order to do hfw we need to first distribute the columns, then the rows. + In order to do wfh we need to first distribute the rows, then the columns. + + If there is no constraint, the order of distributing the rows or columns first is irrelevant. + We choose horizontal just to keep the same behaviour as before (however, there shouldn't + be any behaviour difference). + */ + + QGridLayoutRowData *colData; + QGridLayoutRowData rowData; + qreal *widths; + qreal *heights; + qreal *xx; + qreal *yy; + qreal *xdescents = 0; + qreal *ydescents = 0; + qreal cCount; + qreal rCount; + QSizeF oSize = size; + if (orientation == Qt::Vertical) { + // height for width + colData = &q_columnData; + rowData = q_rowData; + widths = q_widths.data(); + heights = q_heights.data(); + xx = q_xx.data(); + yy = q_yy.data(); + cCount = columnCount(); + rCount = rowCount(); + ydescents = q_descents.data(); + } else { + // width for height + colData = &q_rowData; + rowData = q_columnData; + widths = q_heights.data(); + heights = q_widths.data(); + xx = q_yy.data(); + yy = q_xx.data(); + cCount = rowCount(); + rCount = columnCount(); + xdescents = q_descents.data(); + oSize.transpose(); + } + + colData->calculateGeometries(0, cCount, oSize.width(), xx, widths, + xdescents, q_totalBoxes[orientation == Qt::Horizontal]); + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + const int col = item->firstColumn(orientation); + const int row = item->firstRow(orientation); + if (item->hasDynamicConstraint()) { + const qreal sz = widths[col]; + QGridLayoutBox box = item->box(orientation, sz); + rowData.boxes[row].combine(box); + } + } + + QGridLayoutBox &totalBox = q_totalBoxes[orientation == Qt::Vertical]; + totalBox = rowData.totalBox(0, rCount); + rowData.calculateGeometries(0, rCount, oSize.height(), yy, heights, + ydescents, totalBox); q_cachedSize = size; } diff -r ef0373b55136 -r 758a864f9613 src/gui/graphicsview/qgridlayoutengine_p.h --- a/src/gui/graphicsview/qgridlayoutengine_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/graphicsview/qgridlayoutengine_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -91,6 +91,14 @@ Bottom }; +enum { + NoConstraint, + HorizontalConstraint, + VerticalConstraint, + UnknownConstraint, // need to update cache + UnfeasibleConstraint // not feasible, it be has some items with Vertical and others with Horizontal constraints +}; + template class QLayoutParameter { @@ -270,6 +278,10 @@ inline void setAlignment(Qt::Alignment alignment) { q_alignment = alignment; } QSizePolicy::Policy sizePolicy(Qt::Orientation orientation) const; + + bool hasDynamicConstraint() const; + Qt::Orientation dynamicConstraintOrientation() const; + QSizePolicy::ControlTypes controlTypes(LayoutSide side) const; QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; QGridLayoutBox box(Qt::Orientation orientation, qreal constraint = -1.0) const; @@ -280,7 +292,7 @@ void setGeometry(const QRectF &rect); void transpose(); void insertOrRemoveRows(int row, int delta, Qt::Orientation orientation = Qt::Vertical); - QSizeF effectiveMaxSize() const; + QSizeF effectiveMaxSize(const QSizeF &constraint) const; #ifdef QT_DEBUG void dump(int indent = 0) const; @@ -372,6 +384,14 @@ int column, int rowSpan, int columnSpan) const; QSizeF sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHint which, const QSizeF &constraint) const; + + // heightForWidth / widthForHeight support + QSizeF dynamicallyConstrainedSizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + bool ensureDynamicConstraint() const; + bool hasDynamicConstraint() const; + Qt::Orientation constraintOrientation() const; + + QSizePolicy::ControlTypes controlTypes(LayoutSide side) const; void transpose(); void setVisualDirection(Qt::LayoutDirection direction); @@ -405,6 +425,7 @@ // Lazily computed from the above user input mutable int q_cachedEffectiveFirstRows[NOrientations]; mutable int q_cachedEffectiveLastRows[NOrientations]; + mutable quint8 q_cachedConstraintOrientation : 2; // Layout item input mutable QLayoutStyleInfo q_cachedDataForStyleInfo; diff -r ef0373b55136 -r 758a864f9613 src/gui/gui.pro --- a/src/gui/gui.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/gui.pro Mon Oct 04 01:19:32 2010 +0300 @@ -77,21 +77,29 @@ DEPLOYMENT = partial_upgrade $$DEPLOYMENT } +neon:*-g++* { + DEFINES += QT_HAVE_NEON + QMAKE_CXXFLAGS *= -mfpu=neon + HEADERS += $$NEON_HEADERS + SOURCES += $$NEON_SOURCES + + DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM + + neon_compiler.commands = $$QMAKE_CXX -c + neon_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + neon_compiler.dependency_type = TYPE_C + neon_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} + neon_compiler.input = DRAWHELPER_NEON_ASM_FILES + neon_compiler.variable_out = OBJECTS + neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN} + silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands + QMAKE_EXTRA_COMPILERS += neon_compiler +} + contains(QMAKE_MAC_XARCH, no) { DEFINES += QT_NO_MAC_XARCH } else { - mmx:DEFINES += QT_HAVE_MMX - 3dnow:DEFINES += QT_HAVE_3DNOW - sse:DEFINES += QT_HAVE_SSE QT_HAVE_MMXEXT - sse2:DEFINES += QT_HAVE_SSE2 - sse3:DEFINES += QT_HAVE_SSE3 - ssse3:DEFINES += QT_HAVE_SSSE3 - sse4_1:DEFINES += QT_HAVE_SSE4_1 - sse4_2:DEFINES += QT_HAVE_SSE4_2 - avx:DEFINES += QT_HAVE_AVX - iwmmxt:DEFINES += QT_HAVE_IWMMXT - - win32-g++*|!win32:!*-icc* { + win32-g++*|!win32:!win32-icc*:!macx-icc* { mmx { mmx_compiler.commands = $$QMAKE_CXX -c -Winline @@ -187,6 +195,25 @@ silent:sse2_compiler.commands = @echo compiling[sse2] ${QMAKE_FILE_IN} && $$sse2_compiler.commands QMAKE_EXTRA_COMPILERS += sse2_compiler } + ssse3 { + ssse3_compiler.commands = $$QMAKE_CXX -c -Winline + + mac { + ssse3_compiler.commands += -Xarch_i386 -mssse3 + ssse3_compiler.commands += -Xarch_x86_64 -mssse3 + } else { + ssse3_compiler.commands += -mssse3 + } + + ssse3_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + ssse3_compiler.dependency_type = TYPE_C + ssse3_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} + ssse3_compiler.input = SSSE3_SOURCES + ssse3_compiler.variable_out = OBJECTS + ssse3_compiler.name = compiling[ssse3] ${QMAKE_FILE_IN} + silent:ssse3_compiler.commands = @echo compiling[ssse3] ${QMAKE_FILE_IN} && $$ssse3_compiler.commands + QMAKE_EXTRA_COMPILERS += ssse3_compiler + } iwmmxt { iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline iwmmxt_compiler.commands += -mcpu=iwmmxt @@ -205,6 +232,7 @@ 3dnow:sse: SOURCES += $$SSE3DNOW_SOURCES sse: SOURCES += $$SSE_SOURCES sse2: SOURCES += $$SSE2_SOURCES + ssse3: SOURCES += $$SSSE3_SOURCES iwmmxt: SOURCES += $$IWMMXT_SOURCES } } diff -r ef0373b55136 -r 758a864f9613 src/gui/image/image.pri --- a/src/gui/image/image.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/image/image.pri Mon Oct 04 01:19:32 2010 +0300 @@ -94,4 +94,6 @@ contains(QT_CONFIG, gif):include($$PWD/qgifhandler.pri) # SIMD +NEON_SOURCES += image/qimage_neon.cpp SSE2_SOURCES += image/qimage_sse2.cpp +SSSE3_SOURCES += image/qimage_ssse3.cpp diff -r ef0373b55136 -r 758a864f9613 src/gui/image/qimage.cpp --- a/src/gui/image/qimage.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/image/qimage.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -3354,7 +3354,7 @@ // first index source, second dest -static const Image_Converter converter_map[QImage::NImageFormats][QImage::NImageFormats] = +static Image_Converter converter_map[QImage::NImageFormats][QImage::NImageFormats] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 @@ -3761,6 +3761,22 @@ inplace_converter_map[QImage::Format_ARGB32][QImage::Format_ARGB32_Premultiplied] = convert_ARGB_to_ARGB_PM_inplace_sse2; } #endif +#ifdef QT_HAVE_SSSE3 + if (features & SSSE3) { + extern void convert_RGB888_to_RGB32_ssse3(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags); + converter_map[QImage::Format_RGB888][QImage::Format_RGB32] = convert_RGB888_to_RGB32_ssse3; + converter_map[QImage::Format_RGB888][QImage::Format_ARGB32] = convert_RGB888_to_RGB32_ssse3; + converter_map[QImage::Format_RGB888][QImage::Format_ARGB32_Premultiplied] = convert_RGB888_to_RGB32_ssse3; + } +#endif +#ifdef QT_HAVE_NEON + if (features & NEON) { + extern void convert_RGB888_to_RGB32_neon(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags); + converter_map[QImage::Format_RGB888][QImage::Format_RGB32] = convert_RGB888_to_RGB32_neon; + converter_map[QImage::Format_RGB888][QImage::Format_ARGB32] = convert_RGB888_to_RGB32_neon; + converter_map[QImage::Format_RGB888][QImage::Format_ARGB32_Premultiplied] = convert_RGB888_to_RGB32_neon; + } +#endif } /*! @@ -4821,7 +4837,7 @@ QIMAGE_SANITYCHECK_MEMORY(res); for (int i = 0; i < d->height; i++) { uint *q = (uint*)res.scanLine(i); - uint *p = (uint*)scanLine(i); + uint *p = (uint*)constScanLine(i); uint *end = p + d->width; while (p < end) { *q = ((*p << 16) & 0xff0000) | ((*p >> 16) & 0xff) | (*p & 0xff00ff00); @@ -4835,7 +4851,7 @@ QIMAGE_SANITYCHECK_MEMORY(res); for (int i = 0; i < d->height; i++) { ushort *q = (ushort*)res.scanLine(i); - const ushort *p = (const ushort*)scanLine(i); + const ushort *p = (const ushort*)constScanLine(i); const ushort *end = p + d->width; while (p < end) { *q = ((*p << 11) & 0xf800) | ((*p >> 11) & 0x1f) | (*p & 0x07e0); @@ -4848,12 +4864,15 @@ res = QImage(d->width, d->height, d->format); QIMAGE_SANITYCHECK_MEMORY(res); for (int i = 0; i < d->height; i++) { - quint8 *p = (quint8*)scanLine(i); + const quint8 *p = constScanLine(i); + quint8 *q = res.scanLine(i); const quint8 *end = p + d->width * sizeof(qargb8565); while (p < end) { - quint16 *q = reinterpret_cast(p + 1); - *q = ((*q << 11) & 0xf800) | ((*q >> 11) & 0x1f) | (*q & 0x07e0); + q[0] = p[0]; + q[1] = (p[1] & 0xe0) | (p[2] >> 3); + q[2] = (p[2] & 0x07) | (p[1] << 3); p += sizeof(qargb8565); + q += sizeof(qargb8565); } } break; @@ -4862,7 +4881,7 @@ QIMAGE_SANITYCHECK_MEMORY(res); for (int i = 0; i < d->height; i++) { qrgb666 *q = reinterpret_cast(res.scanLine(i)); - const qrgb666 *p = reinterpret_cast(scanLine(i)); + const qrgb666 *p = reinterpret_cast(constScanLine(i)); const qrgb666 *end = p + d->width; while (p < end) { const QRgb rgb = quint32(*p++); @@ -4874,12 +4893,15 @@ res = QImage(d->width, d->height, d->format); QIMAGE_SANITYCHECK_MEMORY(res); for (int i = 0; i < d->height; i++) { - qargb6666 *q = reinterpret_cast(res.scanLine(i)); - const qargb6666 *p = reinterpret_cast(scanLine(i)); - const qargb6666 *end = p + d->width; + const quint8 *p = constScanLine(i); + const quint8 *end = p + d->width * sizeof(qargb6666); + quint8 *q = res.scanLine(i); while (p < end) { - const QRgb rgb = quint32(*p++); - *q++ = qRgba(qBlue(rgb), qGreen(rgb), qRed(rgb), qAlpha(rgb)); + q[0] = (p[1] >> 4) | ((p[2] & 0x3) << 4) | (p[0] & 0xc0); + q[1] = (p[1] & 0xf) | (p[0] << 4); + q[2] = (p[2] & 0xfc) | ((p[0] >> 4) & 0x3); + p += sizeof(qargb6666); + q += sizeof(qargb6666); } } break; @@ -4887,11 +4909,11 @@ res = QImage(d->width, d->height, d->format); QIMAGE_SANITYCHECK_MEMORY(res); for (int i = 0; i < d->height; i++) { - ushort *q = (ushort*)res.scanLine(i); - const ushort *p = (const ushort*)scanLine(i); - const ushort *end = p + d->width; + quint16 *q = (quint16*)res.scanLine(i); + const quint16 *p = (const quint16*)constScanLine(i); + const quint16 *end = p + d->width; while (p < end) { - *q = ((*p << 10) & 0x7800) | ((*p >> 10) & 0x1f) | (*p & 0x83e0); + *q = ((*p << 10) & 0x7c00) | ((*p >> 10) & 0x1f) | (*p & 0x3e0); p++; q++; } @@ -4901,12 +4923,15 @@ res = QImage(d->width, d->height, d->format); QIMAGE_SANITYCHECK_MEMORY(res); for (int i = 0; i < d->height; i++) { - quint8 *p = (quint8*)scanLine(i); + const quint8 *p = constScanLine(i); + quint8 *q = res.scanLine(i); const quint8 *end = p + d->width * sizeof(qargb8555); while (p < end) { - quint16 *q = reinterpret_cast(p + 1); - *q = ((*q << 10) & 0x7800) | ((*q >> 10) & 0x1f) | (*q & 0x83e0); + q[0] = p[0]; + q[1] = (p[1] & 0xe0) | (p[2] >> 2); + q[2] = (p[2] & 0x03) | ((p[1] << 2) & 0x7f); p += sizeof(qargb8555); + q += sizeof(qargb8555); } } break; @@ -4914,8 +4939,8 @@ res = QImage(d->width, d->height, d->format); QIMAGE_SANITYCHECK_MEMORY(res); for (int i = 0; i < d->height; i++) { - quint8 *q = reinterpret_cast(res.scanLine(i)); - const quint8 *p = reinterpret_cast(scanLine(i)); + quint8 *q = res.scanLine(i); + const quint8 *p = constScanLine(i); const quint8 *end = p + d->width * sizeof(qrgb888); while (p < end) { q[0] = p[2]; @@ -4927,32 +4952,17 @@ } break; case Format_RGB444: - res = QImage(d->width, d->height, d->format); - QIMAGE_SANITYCHECK_MEMORY(res); - for (int i = 0; i < d->height; i++) { - quint8 *q = reinterpret_cast(res.scanLine(i)); - const quint8 *p = reinterpret_cast(scanLine(i)); - const quint8 *end = p + d->width * sizeof(qrgb444); - while (p < end) { - q[0] = (p[0] & 0xf0) | ((p[1] & 0x0f) << 8); - q[1] = ((p[0] & 0x0f) >> 8) | (p[1] & 0xf0); - q += sizeof(qrgb444); - p += sizeof(qrgb444); - } - } - break; case Format_ARGB4444_Premultiplied: res = QImage(d->width, d->height, d->format); QIMAGE_SANITYCHECK_MEMORY(res); for (int i = 0; i < d->height; i++) { - quint8 *q = reinterpret_cast(res.scanLine(i)); - const quint8 *p = reinterpret_cast(scanLine(i)); - const quint8 *end = p + d->width * sizeof(qargb4444); + quint16 *q = reinterpret_cast(res.scanLine(i)); + const quint16 *p = reinterpret_cast(constScanLine(i)); + const quint16 *end = p + d->width; while (p < end) { - q[0] = (p[0] & 0xf0) | ((p[1] & 0x0f) << 8); - q[1] = ((p[0] & 0x0f) >> 8) | (p[1] & 0xf0); - q += sizeof(qargb4444); - p += sizeof(qargb4444); + *q = (*p & 0xf0f0) | ((*p & 0x0f) << 8) | ((*p & 0xf00) >> 8); + p++; + q++; } } break; diff -r ef0373b55136 -r 758a864f9613 src/gui/image/qimage_neon.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gui/image/qimage_neon.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,114 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +#ifdef QT_HAVE_NEON + +QT_BEGIN_NAMESPACE + +Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_neon(quint32 *dst, const uchar *src, int len) +{ + if (!len) + return; + + const quint32 *const end = dst + len; + + // align dst on 64 bits + const int offsetToAlignOn8Bytes = (reinterpret_cast(dst) >> 2) & 0x1; + for (int i = 0; i < offsetToAlignOn8Bytes; ++i) { + *dst++ = qRgb(src[0], src[1], src[2]); + src += 3; + } + + if ((len - offsetToAlignOn8Bytes) >= 8) { + const quint32 *const simdEnd = end - 7; + register uint8x8_t fullVector asm ("d3") = vdup_n_u8(0xff); + do { +#if Q_BYTE_ORDER == Q_BIG_ENDIAN + asm volatile ( + "vld3.8 { d4, d5, d6 }, [%[SRC]] !\n\t" + "vst4.8 { d3, d4, d5, d6 }, [%[DST],:64] !\n\t" + : [DST]"+r" (dst), [SRC]"+r" (src) + : "w"(fullVector) + : "memory", "d4", "d5", "d6" + ); +#else + asm volatile ( + "vld3.8 { d0, d1, d2 }, [%[SRC]] !\n\t" + "vswp d0, d2\n\t" + "vst4.8 { d0, d1, d2, d3 }, [%[DST],:64] !\n\t" + : [DST]"+r" (dst), [SRC]"+r" (src) + : "w"(fullVector) + : "memory", "d0", "d1", "d2" + ); +#endif + } while (dst < simdEnd); + } + + while (dst != end) { + *dst++ = qRgb(src[0], src[1], src[2]); + src += 3; + } +} + +void convert_RGB888_to_RGB32_neon(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags) +{ + Q_ASSERT(src->format == QImage::Format_RGB888); + Q_ASSERT(dest->format == QImage::Format_RGB32 || dest->format == QImage::Format_ARGB32 || dest->format == QImage::Format_ARGB32_Premultiplied); + Q_ASSERT(src->width == dest->width); + Q_ASSERT(src->height == dest->height); + + const uchar *src_data = (uchar *) src->data; + quint32 *dest_data = (quint32 *) dest->data; + + for (int i = 0; i < src->height; ++i) { + qt_convert_rgb888_to_rgb32_neon(dest_data, src_data, src->width); + src_data += src->bytes_per_line; + dest_data = (quint32 *)((uchar*)dest_data + dest->bytes_per_line); + } +} + +QT_END_NAMESPACE + +#endif // QT_HAVE_NEON diff -r ef0373b55136 -r 758a864f9613 src/gui/image/qimage_ssse3.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gui/image/qimage_ssse3.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,149 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +#ifdef QT_HAVE_SSSE3 + +QT_BEGIN_NAMESPACE + +// Convert a scanline of RGB888 (src) to RGB32 (dst) +// src must be at least len * 3 bytes +// dst must be at least len * 4 bytes +Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_ssse3(quint32 *dst, const uchar *src, int len) +{ + quint32 *const end = dst + len; + + // Prologue, align dst to 16 bytes. The alignement is done on dst because it has 4 store() + // for each 3 load() of src. + const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast(dst) >> 2) & 0x3)) & 0x3; + const int prologLength = qMin(len, offsetToAlignOn16Bytes); + + for (int i = 0; i < prologLength; ++i) { + *dst++ = qRgb(src[0], src[1], src[2]); + src += 3; + } + + // Mask the 4 first colors of the RGB888 vector + const __m128i shuffleMask = _mm_set_epi8(0xff, 9, 10, 11, 0xff, 6, 7, 8, 0xff, 3, 4, 5, 0xff, 0, 1, 2); + + // Mask the 4 last colors of a RGB888 vector with an offset of 1 (so the last 3 bytes are RGB) + const __m128i shuffleMaskEnd = _mm_set_epi8(0xff, 13, 14, 15, 0xff, 10, 11, 12, 0xff, 7, 8, 9, 0xff, 4, 5, 6); + + // Mask to have alpha = 0xff + const __m128i alphaMask = _mm_set1_epi32(0xff000000); + + __m128i *inVectorPtr = (__m128i *)src; + __m128i *dstVectorPtr = (__m128i *)dst; + + const int simdRoundCount = (len - prologLength) / 16; // one iteration in the loop converts 16 pixels + for (int i = 0; i < simdRoundCount; ++i) { + /* + RGB888 has 5 pixels per vector, + 1 byte from the next pixel. The idea here is + to load vectors of RGB888 and use palignr to select a vector out of two vectors. + + After 3 loads of RGB888 and 3 stores of RGB32, we have 4 pixels left in the last + vector of RGB888, we can mask it directly to get a last store or RGB32. After that, + the first next byte is a R, and we can loop for the next 16 pixels. + + The conversion itself is done with a byte permutation (pshufb). + */ + __m128i firstSrcVector = _mm_lddqu_si128(inVectorPtr); + __m128i outputVector = _mm_shuffle_epi8(firstSrcVector, shuffleMask); + _mm_store_si128(dstVectorPtr, _mm_or_si128(outputVector, alphaMask)); + ++inVectorPtr; + ++dstVectorPtr; + + // There are 4 unused bytes left in srcVector, we need to load the next 16 bytes + // and load the next input with palignr + __m128i secondSrcVector = _mm_lddqu_si128(inVectorPtr); + __m128i srcVector = _mm_alignr_epi8(secondSrcVector, firstSrcVector, 12); + outputVector = _mm_shuffle_epi8(srcVector, shuffleMask); + _mm_store_si128(dstVectorPtr, _mm_or_si128(outputVector, alphaMask)); + ++inVectorPtr; + ++dstVectorPtr; + firstSrcVector = secondSrcVector; + + // We now have 8 unused bytes left in firstSrcVector + secondSrcVector = _mm_lddqu_si128(inVectorPtr); + srcVector = _mm_alignr_epi8(secondSrcVector, firstSrcVector, 8); + outputVector = _mm_shuffle_epi8(srcVector, shuffleMask); + _mm_store_si128(dstVectorPtr, _mm_or_si128(outputVector, alphaMask)); + ++inVectorPtr; + ++dstVectorPtr; + + // There are now 12 unused bytes in firstSrcVector. + // We can mask them directly, almost there. + outputVector = _mm_shuffle_epi8(secondSrcVector, shuffleMaskEnd); + _mm_store_si128(dstVectorPtr, _mm_or_si128(outputVector, alphaMask)); + ++dstVectorPtr; + } + src = (uchar *)inVectorPtr; + dst = (quint32 *)dstVectorPtr; + + while (dst != end) { + *dst++ = qRgb(src[0], src[1], src[2]); + src += 3; + } +} + +void convert_RGB888_to_RGB32_ssse3(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags) +{ + Q_ASSERT(src->format == QImage::Format_RGB888); + Q_ASSERT(dest->format == QImage::Format_RGB32 || dest->format == QImage::Format_ARGB32 || dest->format == QImage::Format_ARGB32_Premultiplied); + Q_ASSERT(src->width == dest->width); + Q_ASSERT(src->height == dest->height); + + const uchar *src_data = (uchar *) src->data; + quint32 *dest_data = (quint32 *) dest->data; + + for (int i = 0; i < src->height; ++i) { + qt_convert_rgb888_to_rgb32_ssse3(dest_data, src_data, src->width); + src_data += src->bytes_per_line; + dest_data = (quint32 *)((uchar*)dest_data + dest->bytes_per_line); + } +} + +QT_END_NAMESPACE + +#endif // QT_HAVE_SSSE3 diff -r ef0373b55136 -r 758a864f9613 src/gui/image/qjpeghandler.cpp --- a/src/gui/image/qjpeghandler.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/image/qjpeghandler.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -45,6 +45,7 @@ #include #include #include +#include #include // jpeglib needs this to be pre-included #include @@ -75,6 +76,19 @@ QT_BEGIN_NAMESPACE +void QT_FASTCALL convert_rgb888_to_rgb32_C(quint32 *dst, const uchar *src, int len) +{ + // Expand 24->32 bpp. + for (int i = 0; i < len; ++i) { + *dst++ = qRgb(src[0], src[1], src[2]); + src += 3; + } +} + +typedef void (QT_FASTCALL *Rgb888ToRgb32Converter)(quint32 *dst, const uchar *src, int len); + +static Rgb888ToRgb32Converter rgb888ToRgb32ConverterPtr = convert_rgb888_to_rgb32_C; + struct my_error_mgr : public jpeg_error_mgr { jmp_buf setjmp_buffer; }; @@ -393,13 +407,9 @@ continue; // Haven't reached the starting line yet. if (info->output_components == 3) { - // Expand 24->32 bpp. uchar *in = rows[0] + clip.x() * 3; QRgb *out = (QRgb*)outImage->scanLine(y); - for (int i = 0; i < clip.width(); ++i) { - *out++ = qRgb(in[0], in[1], in[2]); - in += 3; - } + rgb888ToRgb32ConverterPtr(out, in, clip.width()); } else if (info->out_color_space == JCS_CMYK) { // Convert CMYK->RGB. uchar *in = rows[0] + clip.x() * 4; @@ -793,6 +803,22 @@ QJpegHandler::QJpegHandler() : d(new QJpegHandlerPrivate(this)) { + const uint features = qDetectCPUFeatures(); + Q_UNUSED(features); +#if defined(QT_HAVE_NEON) + // from qimage_neon.cpp + Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_neon(quint32 *dst, const uchar *src, int len); + + if (features & NEON) + rgb888ToRgb32ConverterPtr = qt_convert_rgb888_to_rgb32_neon; +#endif // QT_HAVE_NEON +#if defined(QT_HAVE_SSSE3) + // from qimage_ssse3.cpp + Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_ssse3(quint32 *dst, const uchar *src, int len); + + if (features & SSSE3) + rgb888ToRgb32ConverterPtr = qt_convert_rgb888_to_rgb32_ssse3; +#endif // QT_HAVE_SSSE3 } QJpegHandler::~QJpegHandler() diff -r ef0373b55136 -r 758a864f9613 src/gui/image/qpixmap.cpp --- a/src/gui/image/qpixmap.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/image/qpixmap.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -830,15 +830,17 @@ return false; QFileInfo info(fileName); - if (!info.exists()) - return false; - QString key = QLatin1Literal("qt_pixmap") % info.absoluteFilePath() % HexString(info.lastModified().toTime_t()) % HexString(info.size()) % HexString(data ? data->pixelType() : QPixmapData::PixmapType); + // Note: If no extension is provided, we try to match the + // file against known plugin extensions + if (!info.completeSuffix().isEmpty() && !info.exists()) + return false; + if (QPixmapCache::find(key, *this)) return true; diff -r ef0373b55136 -r 758a864f9613 src/gui/image/qpixmap_s60.cpp --- a/src/gui/image/qpixmap_s60.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/image/qpixmap_s60.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -63,6 +63,42 @@ const uchar qt_pixmap_bit_mask[] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }; +static bool cleanup_function_registered = false; +static QS60PixmapData *firstPixmap = 0; + +void qt_symbian_register_pixmap(QS60PixmapData *pd) +{ + if(!cleanup_function_registered) { + qAddPostRoutine(qt_symbian_release_pixmaps); + cleanup_function_registered = true; + } + + pd->next = firstPixmap; + pd->prev = 0; + if (firstPixmap) + firstPixmap->prev = pd; + firstPixmap = pd; +} + +void qt_symbian_unregister_pixmap(QS60PixmapData *pd) +{ + if (pd->next) + pd->next->prev = pd->prev; + if (pd->prev) + pd->prev->next = pd->next; + else + firstPixmap = pd->next; +} + +void qt_symbian_release_pixmaps() +{ + // Scan all QS60PixmapData objects in the system and destroy them. + QS60PixmapData *pd = firstPixmap; + while (pd != 0) { + pd->release(); + pd = pd->next; + } +} /* \class QSymbianFbsClient @@ -356,15 +392,18 @@ cfbsBitmap(0), pengine(0), bytes(0), - formatLocked(false) + formatLocked(false), + next(0), + prev(0) { - + qt_symbian_register_pixmap(this); } QS60PixmapData::~QS60PixmapData() { release(); delete symbianBitmapDataAccess; + qt_symbian_unregister_pixmap(this); } void QS60PixmapData::resize(int width, int height) diff -r ef0373b55136 -r 758a864f9613 src/gui/image/qpixmap_s60_p.h --- a/src/gui/image/qpixmap_s60_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/image/qpixmap_s60_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -63,6 +63,11 @@ class QSymbianBitmapDataAccess; +class QS60PixmapData; +void qt_symbian_register_pixmap(QS60PixmapData *pd); +void qt_symbian_unregister_pixmap(QS60PixmapData *pd); +void qt_symbian_release_pixmaps(); + class QSymbianFbsHeapLock { public: @@ -120,6 +125,13 @@ bool formatLocked; + QS60PixmapData *next; + QS60PixmapData *prev; + + friend void qt_symbian_register_pixmap(QS60PixmapData *pd); + friend void qt_symbian_unregister_pixmap(QS60PixmapData *pd); + friend void qt_symbian_release_pixmaps(); + friend class QPixmap; friend class QS60WindowSurface; friend class QS60PaintEngine; diff -r ef0373b55136 -r 758a864f9613 src/gui/image/qpnghandler.cpp --- a/src/gui/image/qpnghandler.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/image/qpnghandler.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -389,7 +389,7 @@ while (num_text--) { QString key, value; -#if defined(PNG_iTXt_SUPPORTED) +#if defined(PNG_iTXt_SUPPORTED) && !defined(QT_NO_TEXTCODEC) if (text_ptr->lang) { QTextCodec *codec = QTextCodec::codecForName(text_ptr->lang); if (codec) { diff -r ef0373b55136 -r 758a864f9613 src/gui/inputmethod/qcoefepinputcontext_p.h --- a/src/gui/inputmethod/qcoefepinputcontext_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/inputmethod/qcoefepinputcontext_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -66,10 +66,10 @@ QT_BEGIN_NAMESPACE -class QCoeFepInputContext : public QInputContext, - public MCoeFepAwareTextEditor, - public MCoeFepAwareTextEditor_Extension1, - public MObjectProvider +class Q_AUTOTEST_EXPORT QCoeFepInputContext : public QInputContext, + public MCoeFepAwareTextEditor, + public MCoeFepAwareTextEditor_Extension1, + public MObjectProvider { Q_OBJECT @@ -84,6 +84,7 @@ void update(); bool filterEvent(const QEvent *event); + bool symbianFilterEvent(QWidget *keyWidget, const QSymbianEvent *event); void mouseHandler( int x, QMouseEvent *event); bool isComposing() const { return !m_preeditString.isEmpty(); } @@ -151,9 +152,10 @@ int m_inlinePosition; MFepInlineTextFormatRetriever *m_formatRetriever; MFepPointerEventHandlerDuringInlineEdit *m_pointerHandler; - int m_cursorPos; QBasicTimer m_tempPreeditStringTimeout; bool m_hasTempPreeditString; + + friend class tst_QInputContext; }; QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/gui/inputmethod/qcoefepinputcontext_s60.cpp --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -79,7 +80,6 @@ m_inlinePosition(0), m_formatRetriever(0), m_pointerHandler(0), - m_cursorPos(0), m_hasTempPreeditString(false) { m_fepState->SetObjectProvider(this); @@ -237,11 +237,17 @@ break; } + QString widgetText = focusWidget()->inputMethodQuery(Qt::ImSurroundingText).toString(); + int maxLength = focusWidget()->inputMethodQuery(Qt::ImMaximumTextLength).toInt(); + if (!keyEvent->text().isEmpty() && widgetText.size() + m_preeditString.size() >= maxLength) { + // Don't send key events with string content if the widget is "full". + return true; + } + if (keyEvent->type() == QEvent::KeyPress && focusWidget()->inputMethodHints() & Qt::ImhHiddenText && !keyEvent->text().isEmpty()) { // Send some temporary preedit text in order to make text visible for a moment. - m_cursorPos = focusWidget()->inputMethodQuery(Qt::ImCursorPosition).toInt(); m_preeditString = keyEvent->text(); QList attributes; QInputMethodEvent imEvent(m_preeditString, attributes); @@ -282,6 +288,18 @@ return false; } +bool QCoeFepInputContext::symbianFilterEvent(QWidget *keyWidget, const QSymbianEvent *event) +{ + Q_UNUSED(keyWidget); + if (event->type() == QSymbianEvent::CommandEvent) + // A command basically means the same as a button being pushed. With Qt buttons + // that would normally result in a reset of the input method due to the focus change. + // This should also happen for commands. + reset(); + + return false; +} + void QCoeFepInputContext::timerEvent(QTimerEvent *timerEvent) { if (timerEvent->timerId() == m_tempPreeditStringTimeout.timerId()) @@ -297,10 +315,6 @@ return; commitCurrentString(false); - - //update cursor position, now this pre-edit text has been committed. - //this prevents next keypress overwriting it (QTBUG-11673) - m_cursorPos = focusWidget()->inputMethodQuery(Qt::ImCursorPosition).toInt(); } void QCoeFepInputContext::mouseHandler( int x, QMouseEvent *event) @@ -364,10 +378,10 @@ commitTemporaryPreeditString(); - bool numbersOnly = hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly - || hints & ImhDialableCharactersOnly; - bool noOnlys = !(numbersOnly || hints & ImhUppercaseOnly - || hints & ImhLowercaseOnly); + const bool anynumbermodes = hints & (ImhDigitsOnly | ImhFormattedNumbersOnly | ImhDialableCharactersOnly); + const bool anytextmodes = hints & (ImhUppercaseOnly | ImhLowercaseOnly | ImhEmailCharactersOnly | ImhUrlCharactersOnly); + const bool numbersOnly = anynumbermodes && !anytextmodes; + const bool noOnlys = !(hints & ImhExclusiveInputMask); TInt flags; Qt::InputMethodHints oldHints = hints; @@ -379,8 +393,7 @@ } if (!noOnlys) { // Make sure that the preference is within the permitted set. - if (hints & ImhPreferNumbers && !(hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly - || hints & ImhDialableCharactersOnly)) { + if (hints & ImhPreferNumbers && !anynumbermodes) { hints &= ~ImhPreferNumbers; } else if (hints & ImhPreferUppercase && !(hints & ImhUppercaseOnly)) { hints &= ~ImhPreferUppercase; @@ -393,8 +406,7 @@ hints |= ImhPreferLowercase; } else if (hints & ImhUppercaseOnly) { hints |= ImhPreferUppercase; - } else if (hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly - || hints & ImhDialableCharactersOnly) { + } else if (numbersOnly) { hints |= ImhPreferNumbers; } } @@ -408,13 +420,21 @@ m_fepState->SetCurrentInputMode(EAknEditorTextInputMode); } flags = 0; - if (numbersOnly) { + if (noOnlys || (anynumbermodes && anytextmodes)) { + flags = EAknEditorAllInputModes; + } + else if (anynumbermodes) { flags |= EAknEditorNumericInputMode; + if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 + && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly))) { + //workaround - the * key does not launch the symbols menu, making it impossible to use these modes unless text mode is enabled. + flags |= EAknEditorTextInputMode; + } } - if (hints & ImhUppercaseOnly || hints & ImhLowercaseOnly) { + else if (anytextmodes) { flags |= EAknEditorTextInputMode; } - if (flags == 0) { + else { flags = EAknEditorAllInputModes; } m_fepState->SetPermittedInputModes(flags); @@ -461,24 +481,33 @@ if (hints & ImhNoPredictiveText || hints & ImhHiddenText) { flags |= EAknEditorFlagNoT9; } + // if alphanumeric input, or if multiple incompatible number modes are selected; + // then make all symbols available in numeric mode too. + if (!numbersOnly || ((hints & ImhFormattedNumbersOnly) && (hints & ImhDialableCharactersOnly))) + flags |= EAknEditorFlagUseSCTNumericCharmap; m_fepState->SetFlags(flags); ReportAknEdStateEvent(MAknEdStateObserver::EAknEdwinStateFlagsUpdate); - if (hints & ImhFormattedNumbersOnly) { + if (hints & ImhDialableCharactersOnly) { + // This is first, because if (ImhDialableCharactersOnly | ImhFormattedNumbersOnly) + // is specified, this one is more natural (# key enters a #) + flags = EAknEditorStandardNumberModeKeymap; + } else if (hints & ImhFormattedNumbersOnly) { + // # key enters decimal point flags = EAknEditorCalculatorNumberModeKeymap; } else if (hints & ImhDigitsOnly) { + // This is last, because it is most restrictive (# key is inactive) flags = EAknEditorPlainNumberModeKeymap; } else { - // ImhDialableCharactersOnly is the fallback as well, so we don't need to check for - // that flag. flags = EAknEditorStandardNumberModeKeymap; } m_fepState->SetNumericKeymap(static_cast(flags)); - if (hints & ImhEmailCharactersOnly) { + if (hints & ImhUrlCharactersOnly) { + // URL characters is everything except space, so a superset of the other restrictions + m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_URL_SPECIAL_CHARACTER_TABLE_DIALOG); + } else if (hints & ImhEmailCharactersOnly) { m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_EMAIL_ADDR_SPECIAL_CHARACTER_TABLE_DIALOG); - } else if (hints & ImhUrlCharactersOnly) { - m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_URL_SPECIAL_CHARACTER_TABLE_DIALOG); } else { m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG); } @@ -581,8 +610,6 @@ commitTemporaryPreeditString(); - m_cursorPos = w->inputMethodQuery(Qt::ImCursorPosition).toInt(); - QList attributes; m_cursorVisibility = aCursorVisibility ? 1 : 0; @@ -597,9 +624,10 @@ // Let's remove the selected text if aInitialInlineText is empty and there is selected text if (m_preeditString.isEmpty()) { int anchor = w->inputMethodQuery(Qt::ImAnchorPosition).toInt(); - int replacementLength = qAbs(m_cursorPos-anchor); + int cursorPos = w->inputMethodQuery(Qt::ImCursorPosition).toInt(); + int replacementLength = qAbs(cursorPos-anchor); if (replacementLength > 0) { - int replacementStart = m_cursorPos < anchor ? 0 : -replacementLength; + int replacementStart = cursorPos < anchor ? 0 : -replacementLength; QList clearSelectionAttributes; QInputMethodEvent clearSelectionEvent(QLatin1String(""), clearSelectionAttributes); clearSelectionEvent.setCommitString(QLatin1String(""), replacementStart, replacementLength); @@ -632,8 +660,13 @@ m_inlinePosition, m_cursorVisibility, QVariant())); - m_preeditString = qt_TDesC2QString(aNewInlineText); - QInputMethodEvent event(m_preeditString, attributes); + QString newPreeditString = qt_TDesC2QString(aNewInlineText); + QInputMethodEvent event(newPreeditString, attributes); + if (newPreeditString.isEmpty() && m_preeditString.isEmpty()) { + // In Symbian world this means "erase last character". + event.setCommitString(QLatin1String(""), -1, 1); + } + m_preeditString = newPreeditString; sendEvent(event); } @@ -803,25 +836,13 @@ void QCoeFepInputContext::commitCurrentString(bool cancelFepTransaction) { - int longPress = 0; - - if (m_preeditString.size() == 0) { - QWidget *w = focusWidget(); - if (!cancelFepTransaction && w) { - // We must replace the last character only if the input box has already accepted one - if (w->inputMethodQuery(Qt::ImCursorPosition).toInt() != m_cursorPos) - longPress = 1; - } - } - QList attributes; QInputMethodEvent event(QLatin1String(""), attributes); - event.setCommitString(m_preeditString, 0-longPress, longPress); + event.setCommitString(m_preeditString, 0, 0); m_preeditString.clear(); sendEvent(event); m_hasTempPreeditString = false; - longPress = 0; if (cancelFepTransaction) { CCoeFep* fep = CCoeEnv::Static()->Fep(); diff -r ef0373b55136 -r 758a864f9613 src/gui/itemviews/qabstractitemview.cpp --- a/src/gui/itemviews/qabstractitemview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/itemviews/qabstractitemview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -2270,9 +2270,11 @@ } else { d->selectionModel->setCurrentIndex(newCurrent, command); d->pressedPosition = visualRect(newCurrent).center() + d->offset(); - // We copy the same behaviour as for mousePressEvent(). - QRect rect(d->pressedPosition - d->offset(), QSize(1, 1)); - setSelection(rect, command); + if (newCurrent.isValid()) { + // We copy the same behaviour as for mousePressEvent(). + QRect rect(d->pressedPosition - d->offset(), QSize(1, 1)); + setSelection(rect, command); + } } event->accept(); return; diff -r ef0373b55136 -r 758a864f9613 src/gui/itemviews/qlistview.cpp --- a/src/gui/itemviews/qlistview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/itemviews/qlistview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -2782,7 +2782,10 @@ y = info.bounds.y() + info.spacing; items.reserve(rowCount() - hiddenCount()); } else { - const QListViewItem item = items.at(info.first - 1); + int idx = info.first - 1; + while (idx > 0 && !items.at(idx).isValid()) + --idx; + const QListViewItem &item = items.at(idx); x = item.x; y = item.y; if (info.flow == QListView::LeftToRight) @@ -2913,6 +2916,8 @@ else contentsSize.rwidth() += info.spacing; } + if (rect.size().isEmpty()) + return; // resize tree int insertFrom = info.first; if (done || info.first == 0) { diff -r ef0373b55136 -r 758a864f9613 src/gui/itemviews/qsortfilterproxymodel.cpp --- a/src/gui/itemviews/qsortfilterproxymodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -774,7 +774,7 @@ if (model->rowCount(source_parent) == delta_item_count) { // Items were inserted where there were none before. // If it was new rows make sure to create mappings for columns so that a - // valid mapping can be retreived later and vice-versa. + // valid mapping can be retrieved later and vice-versa. QVector &orthogonal_proxy_to_source = (orient == Qt::Horizontal) ? m->source_rows : m->source_columns; QVector &orthogonal_source_to_proxy = (orient == Qt::Horizontal) ? m->proxy_rows : m->proxy_columns; diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qaction_p.h --- a/src/gui/kernel/qaction_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qaction_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -112,11 +112,11 @@ //for soft keys management uint forceEnabledInSoftkeys : 1; uint menuActionSoftkeys : 1; + int iconVisibleInMenu : 3; // Only has values -1, 0, and 1 - QAction::MenuRole menuRole : 3; - QAction::SoftKeyRole softKeyRole : 2; - QAction::Priority priority : 14; - int iconVisibleInMenu : 3; // Only has values -1, 0, and 1 + QAction::MenuRole menuRole; + QAction::SoftKeyRole softKeyRole; + QAction::Priority priority; QList widgets; #ifndef QT_NO_GRAPHICSVIEW diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qapplication.cpp --- a/src/gui/kernel/qapplication.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qapplication.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -474,7 +474,7 @@ static int drag_time = 500; #ifdef Q_OS_SYMBIAN // The screens are a bit too small to for your thumb when using only 4 pixels drag distance. -static int drag_distance = 8; +static int drag_distance = 12; #else static int drag_distance = 4; #endif @@ -1055,6 +1055,18 @@ QApplicationPrivate::is_app_closing = true; QApplicationPrivate::is_app_running = false; + // delete all widgets + if (QWidgetPrivate::allWidgets) { + QWidgetSet *mySet = QWidgetPrivate::allWidgets; + QWidgetPrivate::allWidgets = 0; + for (QWidgetSet::ConstIterator it = mySet->constBegin(); it != mySet->constEnd(); ++it) { + register QWidget *w = *it; + if (!w->parent()) // window + w->destroy(true, true); + } + delete mySet; + } + delete qt_desktopWidget; qt_desktopWidget = 0; @@ -1075,18 +1087,6 @@ delete QWidgetPrivate::mapper; QWidgetPrivate::mapper = 0; - // delete all widgets - if (QWidgetPrivate::allWidgets) { - QWidgetSet *mySet = QWidgetPrivate::allWidgets; - QWidgetPrivate::allWidgets = 0; - for (QWidgetSet::ConstIterator it = mySet->constBegin(); it != mySet->constEnd(); ++it) { - register QWidget *w = *it; - if (!w->parent()) // window - w->destroy(true, true); - } - delete mySet; - } - delete QApplicationPrivate::app_pal; QApplicationPrivate::app_pal = 0; delete QApplicationPrivate::sys_pal; @@ -2540,6 +2540,13 @@ sendSpontaneousEvent(w, &activationChange); } +#ifdef QT_MAC_USE_COCOA + // In case the user clicked on a child window, we need to + // reestablish the stacking order of the window so + // it pops in front of other child windows in cocoa: + qt_cocoaStackChildWindowOnTopOfOtherChildren(window); +#endif + for(int i = 0; i < toBeDeactivated.size(); ++i) { QWidget *w = toBeDeactivated.at(i); sendSpontaneousEvent(w, &windowDeactivate); @@ -5791,10 +5798,12 @@ #ifndef QT_NO_GESTURES QGestureManager* QGestureManager::instance() { - QApplicationPrivate *qAppPriv = QApplicationPrivate::instance(); - if (!qAppPriv->gestureManager) - qAppPriv->gestureManager = new QGestureManager(qApp); - return qAppPriv->gestureManager; + if (QApplicationPrivate *qAppPriv = QApplicationPrivate::instance()) { + if (!qAppPriv->gestureManager) + qAppPriv->gestureManager = new QGestureManager(qApp); + return qAppPriv->gestureManager; + } + return 0; } #endif // QT_NO_GESTURES diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qapplication.h --- a/src/gui/kernel/qapplication.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qapplication.h Mon Oct 04 01:19:32 2010 +0300 @@ -412,6 +412,9 @@ #if defined(QT_RX71_MULTITOUCH) Q_PRIVATE_SLOT(d_func(), void _q_readRX71MultiTouchEvents()) #endif +#if defined(Q_OS_SYMBIAN) + Q_PRIVATE_SLOT(d_func(), void _q_aboutToQuit()) +#endif }; QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qapplication_mac.mm --- a/src/gui/kernel/qapplication_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qapplication_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -737,9 +737,6 @@ */ static void qt_mac_update_child_gl_widgets(QWidget *widget) { - if (widget->isWindow()) - return; - // Update all OpenGL child widgets for the given widget. QList &glWidgets = qt_widget_private(widget)->glWidgets; QList::iterator end = glWidgets.end(); diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qapplication_p.h --- a/src/gui/kernel/qapplication_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qapplication_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -519,6 +519,7 @@ int symbianHandleCommand(const QSymbianEvent *symbianEvent); int symbianResourceChange(const QSymbianEvent *symbianEvent); + void _q_aboutToQuit(); #endif #if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) || defined(Q_WS_MAC) void sendSyntheticEnterLeave(QWidget *widget); @@ -603,7 +604,7 @@ #endif #ifdef Q_OS_SYMBIAN - static QHash scanCodeCache; + QHash scanCodeCache; #endif static QApplicationPrivate *self; diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qapplication_s60.cpp --- a/src/gui/kernel/qapplication_s60.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qapplication_s60.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -87,6 +87,10 @@ #include #include +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS +#include +#endif + QT_BEGIN_NAMESPACE // Goom Events through Window Server @@ -112,6 +116,63 @@ return qt_s60Data(); } +#ifdef Q_WS_S60 +void QS60Data::setStatusPaneAndButtonGroupVisibility(bool statusPaneVisible, bool buttonGroupVisible) +{ + bool buttonGroupVisibilityChanged = false; + if (CEikButtonGroupContainer *const b = buttonGroupContainer()) { + buttonGroupVisibilityChanged = (b->IsVisible() != buttonGroupVisible); + b->MakeVisible(buttonGroupVisible); + } + bool statusPaneVisibilityChanged = false; + if (CEikStatusPane *const s = statusPane()) { + statusPaneVisibilityChanged = (s->IsVisible() != statusPaneVisible); + s->MakeVisible(statusPaneVisible); + } + if (buttonGroupVisibilityChanged || statusPaneVisibilityChanged) { + const QSize size = qt_TRect2QRect(static_cast(S60->appUi())->ClientRect()).size(); + const QSize oldSize; // note that QDesktopWidget::resizeEvent ignores the QResizeEvent contents + QResizeEvent event(size, oldSize); + QApplication::instance()->sendEvent(QApplication::desktop(), &event); + } + if (buttonGroupVisibilityChanged && !statusPaneVisibilityChanged && QApplication::activeWindow()) + // Ensure that control rectangle is updated + static_cast(QApplication::activeWindow()->winId())->handleClientAreaChange(); +} +#endif + +void QS60Data::controlVisibilityChanged(CCoeControl *control, bool visible) +{ + if (QWidgetPrivate::mapper && QWidgetPrivate::mapper->contains(control)) { + QWidget *const widget = QWidgetPrivate::mapper->value(control); + QWidget *const window = widget->window(); + if (QTLWExtra *topData = qt_widget_private(window)->maybeTopData()) { + QWidgetBackingStoreTracker &backingStore = topData->backingStore; + if (visible) { + if (backingStore.data()) { + backingStore.registerWidget(widget); + } else { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdRestoreLayer); +#endif + backingStore.create(window); + backingStore.registerWidget(widget); + qt_widget_private(widget)->invalidateBuffer(widget->rect()); + widget->repaint(); + } + } else { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdDeallocateLayer); +#endif + backingStore.unregisterWidget(widget); + // In order to ensure that any resources used by the window surface + // are immediately freed, we flush the WSERV command buffer. + S60->wsSession().Flush(); + } + } + } +} + bool qt_nograb() // application no-grab option { #if defined(QT_DEBUG) @@ -207,8 +268,6 @@ } -QHash QApplicationPrivate::scanCodeCache; - static Qt::KeyboardModifiers mapToQtModifiers(TUint s60Modifiers) { Qt::KeyboardModifiers result = Qt::NoModifier; @@ -355,7 +414,7 @@ { if (!desktop) { - if (isWindowOwning or !qwidget->parentWidget()) + if (isWindowOwning || !qwidget->parentWidget()) CreateWindowL(S60->windowGroup()); else /** @@ -378,10 +437,42 @@ DrawableWindow()->SetPointerGrab(ETrue); } + +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + if (OwnsWindow()) { + TTfxWindowPurpose windowPurpose(ETfxPurposeNone); + switch (qwidget->windowType()) { + case Qt::Dialog: + windowPurpose = ETfxPurposeDialogWindow; + break; + case Qt::Popup: + windowPurpose = ETfxPurposePopupWindow; + break; + case Qt::Tool: + windowPurpose = ETfxPurposeToolWindow; + break; + case Qt::ToolTip: + windowPurpose = ETfxPurposeToolTipWindow; + break; + case Qt::SplashScreen: + windowPurpose = ETfxPurposeSplashScreenWindow; + break; + default: + windowPurpose = (isWindowOwning || !qwidget->parentWidget()) + ? ETfxPurposeWindow : ETfxPurposeChildWindow; + break; + } + Window().SetPurpose(windowPurpose); + } +#endif } QSymbianControl::~QSymbianControl() { + // Ensure backing store is deleted before the top-level + // window is destroyed + qt_widget_private(qwidget)->topData()->backingStore.destroy(); + if (S60->curWin == this) S60->curWin = 0; if (!QApplicationPrivate::is_app_closing) { @@ -621,251 +712,302 @@ TKeyResponse QSymbianControl::OfferKeyEvent(const TKeyEvent& keyEvent, TEventCode type) { - switch (type) { - //case EEventKeyDown: // <-- Intentionally left out. See below. - case EEventKeyUp: - case EEventKey: - { + /* + S60 has a confusing way of delivering key events. There are three types of + events: EEventKey, EEventKeyDown and EEventKeyUp. When a key is pressed, + EEventKeyDown is first generated, followed by EEventKey. Then, when the key is + released, EEventKeyUp is generated. + However, it is possible that only the EEventKey is generated alone, typically + in relation to virtual keyboards. In that case we need to take care to + generate both press and release events in Qt, since applications expect that. + We do this by having three states for each used scan code, depending on the + events received. See the switch below for what happens in each state + transition. + */ + + if (type != EEventKeyDown) + if (handleVirtualMouse(keyEvent, type) == EKeyWasConsumed) + return EKeyWasConsumed; + + TKeyResponse ret = EKeyWasNotConsumed; +#define GET_RETURN(x) (ret = ((x) == EKeyWasConsumed) ? EKeyWasConsumed : ret) + + // This top level switch corresponds to the states, and the inner switches + // correspond to the transitions. + QS60Data::ScanCodeState &scanCodeState = S60->scanCodeStates[keyEvent.iScanCode]; + switch (scanCodeState) { + case QS60Data::Unpressed: + switch (type) { + case EEventKeyDown: + scanCodeState = QS60Data::KeyDown; + break; + case EEventKey: + GET_RETURN(sendSymbianKeyEvent(keyEvent, QEvent::KeyPress)); + GET_RETURN(sendSymbianKeyEvent(keyEvent, QEvent::KeyRelease)); + break; + case EEventKeyUp: + // No action. + break; + } + break; + case QS60Data::KeyDown: + switch (type) { + case EEventKeyDown: + // This should never happen, just stay in this state to be safe. + break; + case EEventKey: + GET_RETURN(sendSymbianKeyEvent(keyEvent, QEvent::KeyPress)); + scanCodeState = QS60Data::KeyDownAndKey; + break; + case EEventKeyUp: + scanCodeState = QS60Data::Unpressed; + break; + } + break; + case QS60Data::KeyDownAndKey: + switch (type) { + case EEventKeyDown: + // This should never happen, just stay in this state to be safe. + break; + case EEventKey: + GET_RETURN(sendSymbianKeyEvent(keyEvent, QEvent::KeyRelease)); + GET_RETURN(sendSymbianKeyEvent(keyEvent, QEvent::KeyPress)); + break; + case EEventKeyUp: + GET_RETURN(sendSymbianKeyEvent(keyEvent, QEvent::KeyRelease)); + scanCodeState = QS60Data::Unpressed; + break; + } + break; + } + return ret; + +#undef GET_RETURN +} + +TKeyResponse QSymbianControl::sendSymbianKeyEvent(const TKeyEvent &keyEvent, QEvent::Type type) +{ + // Because S60 does not generate keysyms for EKeyEventDown and EKeyEventUp + // events, we need to cache the keysyms from the EKeyEvent events. This is what + // resolveS60ScanCode does. + TUint s60Keysym = QApplicationPrivate::resolveS60ScanCode(keyEvent.iScanCode, + keyEvent.iCode); + int keyCode; + if (s60Keysym == EKeyNull){ //some key events have 0 in iCode, for them iScanCode should be used + keyCode = qt_keymapper_private()->mapS60ScanCodesToQt(keyEvent.iScanCode); + } else if (s60Keysym >= 0x20 && s60Keysym < ENonCharacterKeyBase) { + // Normal characters keys. + keyCode = s60Keysym; + } else { + // Special S60 keys. + keyCode = qt_keymapper_private()->mapS60KeyToQt(s60Keysym); + } + + Qt::KeyboardModifiers mods = mapToQtModifiers(keyEvent.iModifiers); + QKeyEventEx qKeyEvent(type, keyCode, mods, qt_keymapper_private()->translateKeyEvent(keyCode, mods), + (keyEvent.iRepeats != 0), 1, keyEvent.iScanCode, s60Keysym, keyEvent.iModifiers); + QWidget *widget; + widget = QWidget::keyboardGrabber(); + if (!widget) { + if (QApplicationPrivate::popupWidgets != 0) { + widget = QApplication::activePopupWidget()->focusWidget(); + if (!widget) { + widget = QApplication::activePopupWidget(); + } + } else { + widget = QApplicationPrivate::focus_widget; + if (!widget) { + widget = qwidget; + } + } + } + + QEventDispatcherS60 *dispatcher; + // It is theoretically possible for someone to install a different event dispatcher. + if ((dispatcher = qobject_cast(widget->d_func()->threadData->eventDispatcher)) != 0) { + if (dispatcher->excludeUserInputEvents()) { + dispatcher->saveInputEvent(this, widget, new QKeyEventEx(qKeyEvent)); + return EKeyWasConsumed; + } + } + return sendKeyEvent(widget, &qKeyEvent); +} + +TKeyResponse QSymbianControl::handleVirtualMouse(const TKeyEvent& keyEvent,TEventCode type) +{ #ifndef QT_NO_CURSOR - if (S60->mouseInteractionEnabled && S60->virtualMouseRequired) { - //translate keys to pointer - if ((keyEvent.iScanCode >= EStdKeyLeftArrow && keyEvent.iScanCode <= EStdKeyDownArrow) || + if (S60->mouseInteractionEnabled && S60->virtualMouseRequired) { + //translate keys to pointer + if ((keyEvent.iScanCode >= EStdKeyLeftArrow && keyEvent.iScanCode <= EStdKeyDownArrow) || (keyEvent.iScanCode >= EStdKeyDevice10 && keyEvent.iScanCode <= EStdKeyDevice13) || keyEvent.iScanCode == EStdKeyDevice3) { - QPoint pos = QCursor::pos(); - TPointerEvent fakeEvent; - fakeEvent.iType = (TPointerEvent::TType)(-1); - fakeEvent.iModifiers = keyEvent.iModifiers; - TInt x = pos.x(); - TInt y = pos.y(); - if (type == EEventKeyUp) { - S60->virtualMouseAccelTimeout.start(); - switch (keyEvent.iScanCode) { - case EStdKeyLeftArrow: - S60->virtualMousePressedKeys &= ~QS60Data::Left; - break; - case EStdKeyRightArrow: - S60->virtualMousePressedKeys &= ~QS60Data::Right; - break; - case EStdKeyUpArrow: - S60->virtualMousePressedKeys &= ~QS60Data::Up; - break; - case EStdKeyDownArrow: - S60->virtualMousePressedKeys &= ~QS60Data::Down; - break; - // diagonal keys (named aliases don't exist in 3.1 SDK) - case EStdKeyDevice10: - S60->virtualMousePressedKeys &= ~QS60Data::LeftUp; - break; - case EStdKeyDevice11: - S60->virtualMousePressedKeys &= ~QS60Data::RightUp; - break; - case EStdKeyDevice12: - S60->virtualMousePressedKeys &= ~QS60Data::RightDown; - break; - case EStdKeyDevice13: - S60->virtualMousePressedKeys &= ~QS60Data::LeftDown; - break; - case EStdKeyDevice3: //select - if (S60->virtualMousePressedKeys & QS60Data::Select) - fakeEvent.iType = TPointerEvent::EButton1Up; - S60->virtualMousePressedKeys &= ~QS60Data::Select; - break; - } - } - else if (type == EEventKey) { - int dx = 0; - int dy = 0; - if (keyEvent.iScanCode != EStdKeyDevice3) { - m_doubleClickTimer.invalidate(); - //reset mouse accelleration after a short time with no moves - const int maxTimeBetweenKeyEventsMs = 500; - if (S60->virtualMouseAccelTimeout.isValid() && - S60->virtualMouseAccelTimeout.hasExpired(maxTimeBetweenKeyEventsMs)) { - S60->virtualMouseAccelDX = 0; - S60->virtualMouseAccelDY = 0; - } - S60->virtualMouseAccelTimeout.invalidate(); - } - switch (keyEvent.iScanCode) { - case EStdKeyLeftArrow: - S60->virtualMousePressedKeys |= QS60Data::Left; - dx = -1; - fakeEvent.iType = TPointerEvent::EMove; - break; - case EStdKeyRightArrow: - S60->virtualMousePressedKeys |= QS60Data::Right; - dx = 1; - fakeEvent.iType = TPointerEvent::EMove; - break; - case EStdKeyUpArrow: - S60->virtualMousePressedKeys |= QS60Data::Up; - dy = -1; - fakeEvent.iType = TPointerEvent::EMove; - break; - case EStdKeyDownArrow: - S60->virtualMousePressedKeys |= QS60Data::Down; - dy = 1; - fakeEvent.iType = TPointerEvent::EMove; - break; - case EStdKeyDevice10: - S60->virtualMousePressedKeys |= QS60Data::LeftUp; - dx = -1; - dy = -1; - fakeEvent.iType = TPointerEvent::EMove; - break; - case EStdKeyDevice11: - S60->virtualMousePressedKeys |= QS60Data::RightUp; - dx = 1; - dy = -1; - fakeEvent.iType = TPointerEvent::EMove; - break; - case EStdKeyDevice12: - S60->virtualMousePressedKeys |= QS60Data::RightDown; - dx = 1; - dy = 1; - fakeEvent.iType = TPointerEvent::EMove; - break; - case EStdKeyDevice13: - S60->virtualMousePressedKeys |= QS60Data::LeftDown; - dx = -1; - dy = 1; - fakeEvent.iType = TPointerEvent::EMove; - break; - case EStdKeyDevice3: - // Platform bug. If you start pressing several keys simultaneously (for - // example for drag'n'drop), Symbian starts producing spurious up and - // down messages for some keys. Therefore, make sure we have a clean slate - // of pressed keys before starting a new button press. - if (S60->virtualMousePressedKeys & QS60Data::Select) { - return EKeyWasConsumed; - } else { - S60->virtualMousePressedKeys |= QS60Data::Select; - fakeEvent.iType = TPointerEvent::EButton1Down; - if (m_doubleClickTimer.isValid() - && !m_doubleClickTimer.hasExpired(QApplication::doubleClickInterval())) { - fakeEvent.iModifiers |= EModifierDoubleClick; - m_doubleClickTimer.invalidate(); - } else { - m_doubleClickTimer.start(); - } - } - break; - } - if (dx) { - int cdx = S60->virtualMouseAccelDX; - //reset accel on change of sign, else double accel - if (dx * cdx <= 0) - cdx = dx; - else - cdx *= 4; - //cap accelleration - if (dx * cdx > S60->virtualMouseMaxAccel) - cdx = dx * S60->virtualMouseMaxAccel; - //move mouse position - x += cdx; - S60->virtualMouseAccelDX = cdx; - } - - if (dy) { - int cdy = S60->virtualMouseAccelDY; - if (dy * cdy <= 0) - cdy = dy; - else - cdy *= 4; - if (dy * cdy > S60->virtualMouseMaxAccel) - cdy = dy * S60->virtualMouseMaxAccel; - y += cdy; - S60->virtualMouseAccelDY = cdy; - } - } - //clip to screen size (window server allows a sprite hotspot to be outside the screen) - if (x < 0) - x = 0; - else if (x >= S60->screenWidthInPixels) - x = S60->screenWidthInPixels - 1; - if (y < 0) - y = 0; - else if (y >= S60->screenHeightInPixels) - y = S60->screenHeightInPixels - 1; - TPoint epos(x, y); - TPoint cpos = epos - PositionRelativeToScreen(); - fakeEvent.iPosition = cpos; - fakeEvent.iParentPosition = epos; - if(fakeEvent.iType != -1) - HandlePointerEvent(fakeEvent); - return EKeyWasConsumed; - } - } -#endif - // S60 has a confusing way of delivering key events. There are three types of - // events: EKeyEvent, EKeyEventDown and EKeyEventUp. When a key is pressed, the - // two first events are generated. When releasing the key, the last one is - // generated. - // Because S60 does not generate keysyms for EKeyEventDown and EKeyEventUp events, - // we need to do some special tricks to map it to the Qt way. First, we completely - // discard EKeyEventDown events, since they are redundant. Second, since - // EKeyEventUp does not give us a keysym, we need to cache the keysyms from - // the EKeyEvent events. This is what resolveS60ScanCode does. - - - // ### hackish way to send Qt application to background when pressing right softkey - /* - if( keyEvent.iScanCode == EStdKeyDevice1 ) { - S60->window_group->SetOrdinalPosition(-1); - qApp->setActiveWindow(0); - return EKeyWasNotConsumed; - } - */ - - TUint s60Keysym = QApplicationPrivate::resolveS60ScanCode(keyEvent.iScanCode, - keyEvent.iCode); - int keyCode; - if (s60Keysym == EKeyNull){ //some key events have 0 in iCode, for them iScanCode should be used - keyCode = qt_keymapper_private()->mapS60ScanCodesToQt(keyEvent.iScanCode); - } else if (s60Keysym >= 0x20 && s60Keysym < ENonCharacterKeyBase) { - // Normal characters keys. - keyCode = s60Keysym; - } else { - // Special S60 keys. - keyCode = qt_keymapper_private()->mapS60KeyToQt(s60Keysym); - } - - Qt::KeyboardModifiers mods = mapToQtModifiers(keyEvent.iModifiers); - QKeyEventEx qKeyEvent(type == EEventKeyUp ? QEvent::KeyRelease : QEvent::KeyPress, keyCode, - mods, qt_keymapper_private()->translateKeyEvent(keyCode, mods), - (keyEvent.iRepeats != 0), 1, keyEvent.iScanCode, s60Keysym, keyEvent.iModifiers); -// WId wid = reinterpret_cast(keyEvent.Handle())->Child(); -// if (!wid) -// Could happen if window isn't shown yet. -// return EKeyWasNotConsumed; - QWidget *widget; - widget = QWidget::keyboardGrabber(); - if (!widget) { - if (QApplicationPrivate::popupWidgets != 0) { - widget = QApplication::activePopupWidget()->focusWidget(); - if (!widget) { - widget = QApplication::activePopupWidget(); - } - } else { - widget = QApplicationPrivate::focus_widget; - if (!widget) { - widget = qwidget; + QPoint pos = QCursor::pos(); + TPointerEvent fakeEvent; + fakeEvent.iType = (TPointerEvent::TType)(-1); + fakeEvent.iModifiers = keyEvent.iModifiers; + TInt x = pos.x(); + TInt y = pos.y(); + if (type == EEventKeyUp) { + S60->virtualMouseAccelTimeout.start(); + switch (keyEvent.iScanCode) { + case EStdKeyLeftArrow: + S60->virtualMousePressedKeys &= ~QS60Data::Left; + break; + case EStdKeyRightArrow: + S60->virtualMousePressedKeys &= ~QS60Data::Right; + break; + case EStdKeyUpArrow: + S60->virtualMousePressedKeys &= ~QS60Data::Up; + break; + case EStdKeyDownArrow: + S60->virtualMousePressedKeys &= ~QS60Data::Down; + break; + // diagonal keys (named aliases don't exist in 3.1 SDK) + case EStdKeyDevice10: + S60->virtualMousePressedKeys &= ~QS60Data::LeftUp; + break; + case EStdKeyDevice11: + S60->virtualMousePressedKeys &= ~QS60Data::RightUp; + break; + case EStdKeyDevice12: + S60->virtualMousePressedKeys &= ~QS60Data::RightDown; + break; + case EStdKeyDevice13: + S60->virtualMousePressedKeys &= ~QS60Data::LeftDown; + break; + case EStdKeyDevice3: //select + if (S60->virtualMousePressedKeys & QS60Data::Select) + fakeEvent.iType = TPointerEvent::EButton1Up; + S60->virtualMousePressedKeys &= ~QS60Data::Select; + break; } } - } + else if (type == EEventKey) { + int dx = 0; + int dy = 0; + if (keyEvent.iScanCode != EStdKeyDevice3) { + m_doubleClickTimer.invalidate(); + //reset mouse accelleration after a short time with no moves + const int maxTimeBetweenKeyEventsMs = 500; + if (S60->virtualMouseAccelTimeout.isValid() && + S60->virtualMouseAccelTimeout.hasExpired(maxTimeBetweenKeyEventsMs)) { + S60->virtualMouseAccelDX = 0; + S60->virtualMouseAccelDY = 0; + } + S60->virtualMouseAccelTimeout.invalidate(); + } + switch (keyEvent.iScanCode) { + case EStdKeyLeftArrow: + S60->virtualMousePressedKeys |= QS60Data::Left; + dx = -1; + fakeEvent.iType = TPointerEvent::EMove; + break; + case EStdKeyRightArrow: + S60->virtualMousePressedKeys |= QS60Data::Right; + dx = 1; + fakeEvent.iType = TPointerEvent::EMove; + break; + case EStdKeyUpArrow: + S60->virtualMousePressedKeys |= QS60Data::Up; + dy = -1; + fakeEvent.iType = TPointerEvent::EMove; + break; + case EStdKeyDownArrow: + S60->virtualMousePressedKeys |= QS60Data::Down; + dy = 1; + fakeEvent.iType = TPointerEvent::EMove; + break; + case EStdKeyDevice10: + S60->virtualMousePressedKeys |= QS60Data::LeftUp; + dx = -1; + dy = -1; + fakeEvent.iType = TPointerEvent::EMove; + break; + case EStdKeyDevice11: + S60->virtualMousePressedKeys |= QS60Data::RightUp; + dx = 1; + dy = -1; + fakeEvent.iType = TPointerEvent::EMove; + break; + case EStdKeyDevice12: + S60->virtualMousePressedKeys |= QS60Data::RightDown; + dx = 1; + dy = 1; + fakeEvent.iType = TPointerEvent::EMove; + break; + case EStdKeyDevice13: + S60->virtualMousePressedKeys |= QS60Data::LeftDown; + dx = -1; + dy = 1; + fakeEvent.iType = TPointerEvent::EMove; + break; + case EStdKeyDevice3: + // Platform bug. If you start pressing several keys simultaneously (for + // example for drag'n'drop), Symbian starts producing spurious up and + // down messages for some keys. Therefore, make sure we have a clean slate + // of pressed keys before starting a new button press. + if (S60->virtualMousePressedKeys & QS60Data::Select) { + return EKeyWasConsumed; + } else { + S60->virtualMousePressedKeys |= QS60Data::Select; + fakeEvent.iType = TPointerEvent::EButton1Down; + if (m_doubleClickTimer.isValid() + && !m_doubleClickTimer.hasExpired(QApplication::doubleClickInterval())) { + fakeEvent.iModifiers |= EModifierDoubleClick; + m_doubleClickTimer.invalidate(); + } else { + m_doubleClickTimer.start(); + } + } + break; + } + if (dx) { + int cdx = S60->virtualMouseAccelDX; + //reset accel on change of sign, else double accel + if (dx * cdx <= 0) + cdx = dx; + else + cdx *= 4; + //cap accelleration + if (dx * cdx > S60->virtualMouseMaxAccel) + cdx = dx * S60->virtualMouseMaxAccel; + //move mouse position + x += cdx; + S60->virtualMouseAccelDX = cdx; + } - QEventDispatcherS60 *dispatcher; - // It is theoretically possible for someone to install a different event dispatcher. - if ((dispatcher = qobject_cast(widget->d_func()->threadData->eventDispatcher)) != 0) { - if (dispatcher->excludeUserInputEvents()) { - dispatcher->saveInputEvent(this, widget, new QKeyEventEx(qKeyEvent)); - return EKeyWasConsumed; + if (dy) { + int cdy = S60->virtualMouseAccelDY; + if (dy * cdy <= 0) + cdy = dy; + else + cdy *= 4; + if (dy * cdy > S60->virtualMouseMaxAccel) + cdy = dy * S60->virtualMouseMaxAccel; + y += cdy; + S60->virtualMouseAccelDY = cdy; + } } + //clip to screen size (window server allows a sprite hotspot to be outside the screen) + if (x < 0) + x = 0; + else if (x >= S60->screenWidthInPixels) + x = S60->screenWidthInPixels - 1; + if (y < 0) + y = 0; + else if (y >= S60->screenHeightInPixels) + y = S60->screenHeightInPixels - 1; + TPoint epos(x, y); + TPoint cpos = epos - PositionRelativeToScreen(); + fakeEvent.iPosition = cpos; + fakeEvent.iParentPosition = epos; + if(fakeEvent.iType != -1) + HandlePointerEvent(fakeEvent); + return EKeyWasConsumed; } - return sendKeyEvent(widget, &qKeyEvent); } - } +#endif + return EKeyWasNotConsumed; } @@ -963,7 +1105,7 @@ if (QApplicationPrivate::runtime_graphics_system) { QRuntimeWindowSurface *rtSurface = static_cast(qwidget->windowSurface()); - s60Surface = static_cast(rtSurface->m_windowSurface); + s60Surface = static_cast(rtSurface->m_windowSurface.data()); } else #endif s60Surface = static_cast(qwidget->windowSurface()); @@ -971,19 +1113,22 @@ CFbsBitmap *bitmap = s60Surface->symbianBitmap(); CWindowGc &gc = SystemGc(); - switch(qwidget->d_func()->extraData()->nativePaintMode) { + QWExtra::NativePaintMode nativePaintMode = qwidget->d_func()->extraData()->nativePaintMode; + if(qwidget->d_func()->paintOnScreen()) + nativePaintMode = QWExtra::Disable; + + switch(nativePaintMode) { case QWExtra::Disable: // Do nothing break; - case QWExtra::Blit: if (qwidget->d_func()->isOpaque) gc.SetDrawMode(CGraphicsContext::EDrawModeWriteAlpha); gc.BitBlt(controlRect.iTl, bitmap, backingStoreRect); break; - case QWExtra::ZeroFill: - if (Window().DisplayMode() == EColor16MA) { + if (Window().DisplayMode() == EColor16MA + || Window().DisplayMode() == Q_SYMBIAN_ECOLOR16MAP) { gc.SetBrushStyle(CGraphicsContext::ESolidBrush); gc.SetDrawMode(CGraphicsContext::EDrawModeWriteAlpha); gc.SetBrushColor(TRgb::Color16MA(0)); @@ -993,7 +1138,6 @@ gc.Clear(controlRect); }; break; - default: Q_ASSERT(false); } @@ -1096,30 +1240,36 @@ qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle()); #ifdef Q_WS_S60 // If widget is fullscreen/minimized, hide status pane and button container otherwise show them. - CEikStatusPane *statusPane = S60->statusPane(); - CEikButtonGroupContainer *buttonGroup = S60->buttonGroupContainer(); - TBool visible = !(qwidget->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized)); - if (statusPane) - statusPane->MakeVisible(visible); - if (buttonGroup) { - // Visibility - const TBool isFullscreen = qwidget->windowState() & Qt::WindowFullScreen; - const TBool cbaVisibilityHint = qwidget->windowFlags() & Qt::WindowSoftkeysVisibleHint; - buttonGroup->MakeVisible(visible || (isFullscreen && cbaVisibilityHint)); - } + const bool visible = !(qwidget->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized)); + const bool statusPaneVisibility = visible; + const bool isFullscreen = qwidget->windowState() & Qt::WindowFullScreen; + const bool cbaVisibilityHint = qwidget->windowFlags() & Qt::WindowSoftkeysVisibleHint; + const bool buttonGroupVisibility = (visible || (isFullscreen && cbaVisibilityHint)); + S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility); #endif } else if (QApplication::activeWindow() == qwidget->window()) { - if (CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog() || S60->menuBeingConstructed) { - QWidget *fw = QApplication::focusWidget(); - if (fw) { - QFocusEvent event(QEvent::FocusOut, Qt::PopupFocusReason); - QCoreApplication::sendEvent(fw, &event); + bool focusedControlFound = false; + WId winId = 0; + for (QWidget *w = qwidget->parentWidget(); w && (winId = w->internalWinId()); w = w->parentWidget()) { + if (winId->IsFocused() && winId->IsVisible()) { + focusedControlFound = true; + break; + } else if (w->isWindow()) + break; + } + if (!focusedControlFound) { + if (CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog() || S60->menuBeingConstructed) { + QWidget *fw = QApplication::focusWidget(); + if (fw) { + QFocusEvent event(QEvent::FocusOut, Qt::PopupFocusReason); + QCoreApplication::sendEvent(fw, &event); + } + m_symbianPopupIsOpen = true; + return; } - m_symbianPopupIsOpen = true; - return; + + QApplication::setActiveWindow(0); } - - QApplication::setActiveWindow(0); } // else { We don't touch the active window unless we were explicitly activated or deactivated } } @@ -1211,6 +1361,11 @@ } } +bool QSymbianControl::isControlActive() +{ + return IsActivated() ? true : false; +} + /*! \typedef QApplication::QS60MainApplicationFactory \since 4.6 @@ -1261,7 +1416,7 @@ // framework destruction. TTrapHandler *origTrapHandler = User::TrapHandler(); - // The S60 framework has not been initalized. We need to do it. + // The S60 framework has not been initialized. We need to do it. TApaApplicationFactory factory(S60->s60ApplicationFactory ? S60->s60ApplicationFactory : newS60Application); CApaCommandLine* commandLine = 0; @@ -1375,6 +1530,8 @@ S60->avkonComponentsSupportTransparency = (value==1) ? true : false; } } + delete repository; + repository = 0; #endif #ifdef QT_KEYPAD_NAVIGATION @@ -1416,6 +1573,10 @@ systemFont.setFamily(systemFont.defaultFamily()); QApplicationPrivate::setSystemFont(systemFont); +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + QObject::connect(qApp, SIGNAL(aboutToQuit()), qApp, SLOT(_q_aboutToQuit())); +#endif + /* ### Commented out for now as parameter handling not needed in SOS(yet). Code below will break testlib with -o flag int argc = priv->argc; @@ -1439,7 +1600,7 @@ */ // Register WId with the metatype system. This is to enable - // QWidgetPrivate::create_sys to used delayed slot invokation in order + // QWidgetPrivate::create_sys to used delayed slot invocation in order // to destroy WId objects during reparenting. qRegisterMetaType("WId"); } @@ -1505,6 +1666,9 @@ void QApplicationPrivate::enterModal_sys(QWidget *widget) { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdAppModalModeEnter); +#endif if (widget) { static_cast(widget->effectiveWinId())->FadeBehindPopup(ETrue); // Modal partial screen dialogs (like queries) capture pointer events. @@ -1520,6 +1684,9 @@ void QApplicationPrivate::leaveModal_sys(QWidget *widget) { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdAppModalModeExit); +#endif if (widget) { static_cast(widget->effectiveWinId())->FadeBehindPopup(EFalse); // ### FixMe: Add specialized behaviour for fullscreen modal dialogs @@ -1810,27 +1977,10 @@ if (callSymbianEventFilters(symbianEvent)) return 1; const TWsVisibilityChangedEvent *visChangedEvent = event->VisibilityChanged(); - QWidget *w = QWidgetPrivate::mapper->value(control); - QWidget *const window = w->window(); - if (!window->d_func()->maybeTopData()) - break; - QRefCountedWidgetBackingStore &backingStore = window->d_func()->maybeTopData()->backingStore; - if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible) { - backingStore.widgetHidden(w); - // In order to ensure that any resources used by the window surface - // are immediately freed, we flush the WSERV command buffer. - S60->wsSession().Flush(); - } else if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::EPartiallyVisible) { - if (backingStore.data()) { - backingStore.widgetShown(w); - } else { - // Create backing store with an initial reference count of 1 - backingStore.create(window); - backingStore.widgetShown(w); - w->d_func()->invalidateBuffer(w->rect()); - w->repaint(); - } - } + if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible) + S60->controlVisibilityChanged(control, false); + else if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::EPartiallyVisible) + S60->controlVisibilityChanged(control, true); return 1; } break; @@ -1884,13 +2034,6 @@ if (switchToSwRendering) { QRuntimeGraphicsSystem *gs = static_cast(QApplicationPrivate::graphics_system); - - uint memoryUsage = gs->memoryUsage(); - uint memoryForFullscreen = ( S60->screenDepth / 8 ) - * S60->screenWidthInPixels - * S60->screenHeightInPixels; - - S60->memoryLimitForHwRendering = memoryUsage - memoryForFullscreen; gs->setGraphicsSystem(QLatin1String("raster")); } } @@ -1906,8 +2049,7 @@ if(QApplicationPrivate::runtime_graphics_system) { QRuntimeGraphicsSystem *gs = static_cast(QApplicationPrivate::graphics_system); - gs->setGraphicsSystem(QLatin1String("openvg"), S60->memoryLimitForHwRendering); - S60->memoryLimitForHwRendering = 0; + gs->setGraphicsSystem(QLatin1String("openvg")); } #endif break; @@ -2076,13 +2218,18 @@ TUint QApplicationPrivate::resolveS60ScanCode(TInt scanCode, TUint keysym) { + if (!scanCode) + return keysym; + + QApplicationPrivate *d = QApplicationPrivate::instance(); + if (keysym) { // If keysym is specified, cache it. - scanCodeCache.insert(scanCode, keysym); + d->scanCodeCache.insert(scanCode, keysym); return keysym; } else { // If not, retrieve the cached version. - return scanCodeCache[scanCode]; + return d->scanCodeCache[scanCode]; } } @@ -2202,6 +2349,14 @@ #endif // QT_NO_CURSOR +void QApplicationPrivate::_q_aboutToQuit() +{ +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + // Send the shutdown tfx command + S60->wsSession().SendEffectCommand(ETfxCmdAppShutDown); +#endif +} + QS60ThreadLocalData::QS60ThreadLocalData() { CCoeEnv *env = CCoeEnv::Static(); diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qapplication_win.cpp --- a/src/gui/kernel/qapplication_win.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qapplication_win.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -716,8 +716,10 @@ if (QWidget *w = static_cast(o)) qt_set_windows_updateScrollBar(w); } +#ifndef QT_NO_SCROLLBAR if (qobject_cast(widget)) widget->updateGeometry(); +#endif } @@ -1499,6 +1501,7 @@ switch (message) { #ifndef Q_WS_WINCE +#ifndef QT_NO_SESSIONMANAGER case WM_QUERYENDSESSION: { if (sm_smActive) // bogus message from windows RETURN(true); @@ -1531,6 +1534,7 @@ RETURN(0); } +#endif case WM_DISPLAYCHANGE: if (QApplication::type() == QApplication::Tty) break; @@ -2236,6 +2240,7 @@ } break; +#ifndef QT_NO_CONTEXTMENU case WM_CONTEXTMENU: { // it's not VK_APPS or Shift+F10, but a click in the NC area @@ -2264,6 +2269,7 @@ } break; #endif +#endif case WM_IME_STARTCOMPOSITION: case WM_IME_ENDCOMPOSITION: diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qclipboard_x11.cpp --- a/src/gui/kernel/qclipboard_x11.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qclipboard_x11.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -456,7 +456,8 @@ XCheckIfEvent(X11->display, &ev, &qt_init_timestamp_scanner, (XPointer)&data); if (data.timestamp == CurrentTime) { setupOwner(); - int dummy = 0; + // We need this value just for completeness, we don't use it. + long dummy = 0; Window ownerId = owner->internalWinId(); XChangeProperty(X11->display, ownerId, ATOM(CLIP_TEMPORARY), XA_INTEGER, 32, diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qcocoamenuloader_mac.mm --- a/src/gui/kernel/qcocoamenuloader_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qcocoamenuloader_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -255,5 +255,10 @@ qApp->quit(); } } + + - (void)orderFrontCharacterPalette:(id)sender + { + [NSApp orderFrontCharacterPalette:sender]; + } @end #endif // QT_MAC_USE_COCOA diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qcocoamenuloader_mac_p.h --- a/src/gui/kernel/qcocoamenuloader_mac_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qcocoamenuloader_mac_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -88,6 +88,7 @@ - (IBAction)hide:(id)sender; - (IBAction)qtDispatcherToQAction:(id)sender; - (void)qtUpdateMenubar; +- (void)orderFrontCharacterPalette:(id)sender; @end #endif // QT_MAC_USE_COCOA diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qcocoasharedwindowmethods_mac_p.h --- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -58,6 +58,8 @@ extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview.mm extern QPointer qt_button_down; //qapplication_mac.cpp extern const QStringList& qEnabledDraggedTypes(); // qmime_mac.cpp +extern void qt_event_request_window_change(QWidget *); // qapplication_mac.mm +extern void qt_mac_send_posted_gl_updates(QWidget *widget); // qapplication_mac.mm Q_GLOBAL_STATIC(QPointer, currentDragTarget); @@ -227,6 +229,19 @@ [self release]; } +- (void)setInitialFirstResponder:(NSView *)view +{ + // This method is called the first time the window is placed on screen and + // is the earliest point in time we can connect OpenGL contexts to NSViews. + QWidget *qwidget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self]; + if (qwidget) { + qt_event_request_window_change(qwidget); + qt_mac_send_posted_gl_updates(qwidget); + } + + [super setInitialFirstResponder:view]; +} + - (BOOL)makeFirstResponder:(NSResponder *)responder { // For some reason Cocoa wants to flip the first responder diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qcocoawindowdelegate_mac.mm --- a/src/gui/kernel/qcocoawindowdelegate_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -394,5 +394,25 @@ } return NO; } + +- (void)syncContentViewFrame: (NSNotification *)notification +{ + NSView *cView = [notification object]; + if (cView) { + NSWindow *window = [cView window]; + QWidget *qwidget = m_windowHash->value(window); + if (qwidget) { + QWidgetData *widgetData = qt_qwidget_data(qwidget); + NSRect rect = [cView frame]; + const QSize newSize(rect.size.width, rect.size.height); + const QSize &oldSize = widgetData->crect.size(); + if (newSize != oldSize) { + [self syncSizeForWidget:qwidget toSize:newSize fromSize:oldSize]; + } + } + + } +} + @end #endif// QT_MAC_USE_COCOA diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qcocoawindowdelegate_mac_p.h --- a/src/gui/kernel/qcocoawindowdelegate_mac_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qcocoawindowdelegate_mac_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -105,5 +105,6 @@ - (NSSize)closestAcceptableSizeForWidget:(QWidget *)qwidget window:(NSWindow *)window withNewSize:(NSSize)proposedSize; - (QWidget *)qt_qwidgetForWindow:(NSWindow *)window; +- (void)syncContentViewFrame: (NSNotification *)notification; @end #endif diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qdesktopwidget_s60.cpp --- a/src/gui/kernel/qdesktopwidget_s60.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qdesktopwidget_s60.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -103,6 +103,10 @@ rects->resize(QDesktopWidgetPrivate::screenCount); workrects->resize(QDesktopWidgetPrivate::screenCount); + + (*rects)[0].setRect(0, 0, S60->screenWidthInPixels, S60->screenHeightInPixels); + QRect wr = qt_TRect2QRect(static_cast(S60->appUi())->ClientRect()); + (*workrects)[0].setRect(wr.x(), wr.y(), wr.width(), wr.height()); } void QDesktopWidgetPrivate::cleanup() @@ -146,17 +150,23 @@ return this; } -const QRect QDesktopWidget::availableGeometry(int /* screen */) const +const QRect QDesktopWidget::availableGeometry(int screen) const { - TRect clientRect = static_cast(S60->appUi())->ClientRect(); - return qt_TRect2QRect(clientRect); + Q_D(const QDesktopWidget); + if (screen < 0 || screen >= d->screenCount) + screen = d->primaryScreen; + + return d->workrects->at(screen); } -const QRect QDesktopWidget::screenGeometry(int /* screen */) const +const QRect QDesktopWidget::screenGeometry(int screen) const { Q_D(const QDesktopWidget); - return QRect(0, 0, S60->screenWidthInPixels, S60->screenHeightInPixels); - } + if (screen < 0 || screen >= d->screenCount) + screen = d->primaryScreen; + + return d->rects->at(screen); +} int QDesktopWidget::screenNumber(const QWidget * /* widget */) const { diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qevent.cpp --- a/src/gui/kernel/qevent.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qevent.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -3627,7 +3627,7 @@ \brief The QTouchEvent class contains parameters that describe a touch event. \since 4.6 \ingroup events - \ingroup multitouch + \ingroup touch \section1 Enabling Touch Events @@ -3641,7 +3641,7 @@ Similarly to QMouseEvent, Qt automatically grabs each touch point on the first press inside a widget, and the widget will receive all updates for the touch point until it is released. - Note that it is possible for a widget to receive events for multiple touch points, and that + Note that it is possible for a widget to receive events for numerous touch points, and that multiple widgets may be receiving touch events at the same time. \section1 Event Handling @@ -3717,7 +3717,7 @@ \i As mentioned above, enabling touch events means multiple widgets can be receiving touch events simultaneously. Combined with the default QWidget::event() handling for QTouchEvents, - this gives you great flexibility in designing multi-touch user interfaces. Be aware of the + this gives you great flexibility in designing touch user interfaces. Be aware of the implications. For example, it is possible that the user is moving a QSlider with one finger and pressing a QPushButton with another. The signals emitted by these widgets will be interleaved. @@ -3729,7 +3729,7 @@ \i QTouchEvents are not affected by a \l{QWidget::grabMouse()}{mouse grab} or an \l{QApplication::activePopupWidget()}{active pop-up widget}. The behavior of QTouchEvents is - undefined when opening a pop-up or grabbing the mouse while there are multiple active touch + undefined when opening a pop-up or grabbing the mouse while there are more than one active touch points. \endlist @@ -4281,6 +4281,11 @@ QGestureEvent::accept() for each of them, or an event filter consumes the event. + \section1 Further Reading + + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + \sa QGesture, QGestureRecognizer, QWidget::grabGesture(), QGraphicsObject::grabGesture() */ diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qeventdispatcher_mac.mm --- a/src/gui/kernel/qeventdispatcher_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qeventdispatcher_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -785,7 +785,7 @@ // the stacking order of the windows while doing so, we put // up a block that is used in QCocoaWindow and QCocoaPanel: int stackSize = cocoaModalSessionStack.size(); - for (int i=stackSize-1; i>=0; --i) { + for (int i=0; i [window level]) + [window setLevel:levelBeforeEnterModal]; } currentModalSessionCached = info.session; + cleanupModalSessionsNeeded = false; } return currentModalSessionCached; } @@ -881,6 +882,10 @@ for (int i=stackSize-1; i>=0; --i) { QCocoaModalSessionInfo &info = cocoaModalSessionStack[i]; if (info.widget) { + // This session has a widget, and is therefore not marked + // as stopped. So just make it current. There might still be other + // stopped sessions on the stack, but those will be stopped on + // a later "cleanup" call. currentModalSessionCached = info.session; break; } @@ -926,6 +931,7 @@ if (i == stackSize-1) { // The top sessions ended. Interrupt the event dispatcher // to start spinning the correct session immidiatly: + currentModalSessionCached = 0; cleanupModalSessionsNeeded = true; QEventDispatcherMac::instance()->interrupt(); } diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qgesture.cpp --- a/src/gui/kernel/qgesture.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qgesture.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -59,6 +59,9 @@ the QGestureRecognizer object that is registered with the application; see QGestureRecognizer::registerRecognizer(). + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + \section1 Gesture Properties The class has a list of properties that can be queried by the user to get @@ -219,7 +222,10 @@ \image pangesture.png - \sa {Gestures Programming}, QPinchGesture, QSwipeGesture + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + + \sa QPinchGesture, QSwipeGesture */ /*! @@ -306,14 +312,17 @@ \class QPinchGesture \since 4.6 \brief The QPinchGesture class describes a pinch gesture made my the user. - \ingroup multitouch + \ingroup touch \ingroup gestures - A pinch gesture is a form of multitouch user input in which the user typically + A pinch gesture is a form of touch user input in which the user typically touches two points on the input device with a thumb and finger, before moving them closer together or further apart to change the scale factor, zoom, or level of detail of the user interface. + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + \image pinchgesture.png Instead of repeatedly applying the same pinching gesture, the user may @@ -322,7 +331,7 @@ will continue to be delivered to the target object, containing an instance of QPinchGesture in the Qt::GestureUpdated state. - \sa {Gestures Programming}, QPanGesture, QSwipeGesture + \sa QPanGesture, QSwipeGesture */ /*! @@ -389,7 +398,7 @@ \brief the current scale factor The scale factor measures the scale factor associated with the distance - between two of the user's inputs on a multitouch device. + between two of the user's inputs on a touch device. \sa totalScaleFactor, lastScaleFactor */ @@ -572,7 +581,10 @@ \image swipegesture.png - \sa {Gestures Programming}, QPanGesture, QPinchGesture + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + + \sa QPanGesture, QPinchGesture */ /*! @@ -667,7 +679,10 @@ \brief The QTapGesture class describes a tap gesture made by the user. \ingroup gestures - \sa {Gestures Programming}, QPanGesture, QPinchGesture + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + + \sa QPanGesture, QPinchGesture */ /*! @@ -700,7 +715,10 @@ gesture made by the user. \ingroup gestures - \sa {Gestures Programming}, QPanGesture, QPinchGesture + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + + \sa QPanGesture, QPinchGesture */ /*! diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qgesturemanager.cpp --- a/src/gui/kernel/qgesturemanager.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qgesturemanager.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -129,7 +129,12 @@ void QGestureManager::unregisterGestureRecognizer(Qt::GestureType type) { QList list = m_recognizers.values(type); - m_recognizers.remove(type); + while (QGestureRecognizer *recognizer = m_recognizers.take(type)) { + if (!m_obsoleteGestures.contains(recognizer)) { + // inserting even an empty QSet will cause the recognizer to be deleted on destruction of the manager + m_obsoleteGestures.insert(recognizer, QSet()); + } + } foreach (QGesture *g, m_gestureToRecognizer.keys()) { QGestureRecognizer *recognizer = m_gestureToRecognizer.value(g); if (list.contains(recognizer)) { @@ -590,8 +595,9 @@ if (gesture->hasHotSpot()) { // guess the target widget using the hotspot of the gesture QPoint pt = gesture->hotSpot().toPoint(); - if (QWidget *w = qApp->topLevelAt(pt)) { - target = w->childAt(w->mapFromGlobal(pt)); + if (QWidget *topLevel = qApp->topLevelAt(pt)) { + QWidget *child = topLevel->childAt(topLevel->mapFromGlobal(pt)); + target = child ? child : topLevel; } } else { // or use the context of the gesture diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qgesturerecognizer.cpp --- a/src/gui/kernel/qgesturerecognizer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qgesturerecognizer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -62,6 +62,9 @@ need to use this class directly. Instances will be created behind the scenes by the framework. + For an overview of gesture handling in Qt and information on using gestures + in your applications, see the \l{Gestures Programming} document. + \section1 Recognizing Gestures The process of recognizing gestures involves filtering input events sent to specific diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qpalette.cpp --- a/src/gui/kernel/qpalette.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qpalette.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -868,11 +868,21 @@ Returns true (slowly) if this palette is different from \a p; otherwise returns false (usually quickly). + + \note The current ColorGroup is not taken into account when + comparing palettes + + \sa operator==() */ /*! Returns true (usually quickly) if this palette is equal to \a p; otherwise returns false (slowly). + + \note The current ColorGroup is not taken into account when + comparing palettes + + \sa operator!=() */ bool QPalette::operator==(const QPalette &p) const { diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qt_cocoa_helpers_mac.mm --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -685,9 +685,11 @@ unsigned int info = 0; if ([event type] == NSKeyDown) { NSString *characters = [event characters]; - unichar value = [characters characterAtIndex:0]; - qt_keymapper_private()->updateKeyMap(0, key_event, (void *)&value); - info = value; + if ([characters length]) { + unichar value = [characters characterAtIndex:0]; + qt_keymapper_private()->updateKeyMap(0, key_event, (void *)&value); + info = value; + } } // Redirect keys to alien widgets. @@ -1527,6 +1529,22 @@ [theWindow display]; } } + +void qt_cocoaStackChildWindowOnTopOfOtherChildren(QWidget *childWidget) +{ + if (!childWidget) + return; + + QWidget *parent = childWidget->parentWidget(); + if (childWidget->isWindow() && parent) { + if ([[qt_mac_window_for(parent) childWindows] containsObject:qt_mac_window_for(childWidget)]) { + QWidgetPrivate *d = qt_widget_private(childWidget); + d->setSubWindowStacking(false); + d->setSubWindowStacking(true); + } + } +} + #endif // QT_MAC_USE_COCOA QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qt_cocoa_helpers_mac_p.h --- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -148,6 +148,7 @@ // These methods exists only for supporting unified mode. void macDrawRectOnTop(void * /*OSWindowRef */ window); void macSyncDrawingOnFirstInvocation(void * /*OSWindowRef */window); +void qt_cocoaStackChildWindowOnTopOfOtherChildren(QWidget *widget); #endif void qt_mac_menu_collapseSeparators(void * /*NSMenu */ menu, bool collapse); bool qt_dispatchKeyEvent(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEvent); diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qt_s60_p.h --- a/src/gui/kernel/qt_s60_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qt_s60_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -87,7 +87,7 @@ //this macro exists because EColor16MAP enum value doesn't exist in Symbian OS 9.2 #define Q_SYMBIAN_ECOLOR16MAP TDisplayMode(13) -class QS60ThreadLocalData +class Q_AUTOTEST_EXPORT QS60ThreadLocalData { public: QS60ThreadLocalData(); @@ -141,8 +141,15 @@ int supportsPremultipliedAlpha : 1; int avkonComponentsSupportTransparency : 1; int menuBeingConstructed : 1; - int memoryLimitForHwRendering; QApplication::QS60MainApplicationFactory s60ApplicationFactory; // typedef'ed pointer type + + enum ScanCodeState { + Unpressed, + KeyDown, + KeyDownAndKey + }; + QHash scanCodeStates; + static inline void updateScreenSize(); inline RWsSession& wsSession(); static inline RWindowGroup& windowGroup(); @@ -155,14 +162,16 @@ static inline CAknTitlePane* titlePane(); static inline CAknContextPane* contextPane(); static inline CEikButtonGroupContainer* buttonGroupContainer(); + static void setStatusPaneAndButtonGroupVisibility(bool statusPaneVisible, bool buttonGroupVisible); #endif + static void controlVisibilityChanged(CCoeControl *control, bool visible); #ifdef Q_OS_SYMBIAN TTrapHandler *s60InstalledTrapHandler; #endif }; -QS60Data* qGlobalS60Data(); +Q_AUTOTEST_EXPORT QS60Data* qGlobalS60Data(); #define S60 qGlobalS60Data() class QAbstractLongTapObserver @@ -202,6 +211,8 @@ void setFocusSafely(bool focus); + bool isControlActive(); + #ifdef Q_WS_S60 void FadeBehindPopup(bool fade){ popupFader.FadeBehindPopup( this, this, fade); } void HandleStatusPaneSizeChange(); @@ -223,7 +234,9 @@ private: void HandlePointerEvent(const TPointerEvent& aPointerEvent); TKeyResponse OfferKeyEvent(const TKeyEvent& aKeyEvent,TEventCode aType); + TKeyResponse sendSymbianKeyEvent(const TKeyEvent &keyEvent, QEvent::Type type); TKeyResponse sendKeyEvent(QWidget *widget, QKeyEvent *keyEvent); + TKeyResponse handleVirtualMouse(const TKeyEvent& keyEvent,TEventCode type); bool sendMouseEvent(QWidget *widget, QMouseEvent *mEvent); void sendMouseEvent( QWidget *receiver, @@ -236,6 +249,8 @@ #ifdef QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER void translateAdvancedPointerEvent(const TAdvancedPointerEvent *event); #endif + +public: void handleClientAreaChange(); private: @@ -278,7 +293,6 @@ supportsPremultipliedAlpha(0), avkonComponentsSupportTransparency(0), menuBeingConstructed(0), - memoryLimitForHwRendering(0), s60ApplicationFactory(0) #ifdef Q_OS_SYMBIAN ,s60InstalledTrapHandler(0) diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qwidget.cpp --- a/src/gui/kernel/qwidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qwidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -162,41 +162,74 @@ extern bool qt_sendSpontaneousEvent(QObject*, QEvent*); // qapplication.cpp extern QDesktopWidget *qt_desktopWidget; // qapplication.cpp -QRefCountedWidgetBackingStore::QRefCountedWidgetBackingStore() +/*! + \internal + \class QWidgetBackingStoreTracker + \brief Class which allows tracking of which widgets are using a given backing store + + QWidgetBackingStoreTracker is a thin wrapper around a QWidgetBackingStore pointer, + which maintains a list of the QWidgets which are currently using the backing + store. This list is modified via the registerWidget and unregisterWidget functions. + */ + +QWidgetBackingStoreTracker::QWidgetBackingStoreTracker() : m_ptr(0) { } -QRefCountedWidgetBackingStore::~QRefCountedWidgetBackingStore() +QWidgetBackingStoreTracker::~QWidgetBackingStoreTracker() { delete m_ptr; } -void QRefCountedWidgetBackingStore::create(QWidget *widget) +/*! + \internal + Destroy the contained QWidgetBackingStore, if not null, and clear the list of + widgets using the backing store, then create a new QWidgetBackingStore, providing + the QWidget. + */ +void QWidgetBackingStoreTracker::create(QWidget *widget) { destroy(); m_ptr = new QWidgetBackingStore(widget); } -void QRefCountedWidgetBackingStore::destroy() +/*! + \internal + Destroy the contained QWidgetBackingStore, if not null, and clear the list of + widgets using the backing store. + */ +void QWidgetBackingStoreTracker::destroy() { delete m_ptr; m_ptr = 0; - m_visibleWidgets.clear(); -} - -void QRefCountedWidgetBackingStore::widgetShown(QWidget *w) + m_widgets.clear(); +} + +/*! + \internal + Add the widget to the list of widgets currently using the backing store. + If the widget was already in the list, this function is a no-op. + */ +void QWidgetBackingStoreTracker::registerWidget(QWidget *w) { Q_ASSERT(m_ptr); Q_ASSERT(w->internalWinId()); Q_ASSERT(qt_widget_private(w)->maybeBackingStore() == m_ptr); - m_visibleWidgets.insert(w); -} - -void QRefCountedWidgetBackingStore::widgetHidden(QWidget *w) -{ - if (m_visibleWidgets.remove(w) && m_visibleWidgets.isEmpty()) { + m_widgets.insert(w); +} + +/*! + \internal + Remove the widget from the list of widgets currently using the backing store. + If the widget was in the list, and removing it causes the list to be empty, + the backing store is deleted. + If the widget was not in the list, this function is a no-op. + */ +void QWidgetBackingStoreTracker::unregisterWidget(QWidget *w) +{ + if (m_widgets.remove(w) && m_widgets.isEmpty()) { delete m_ptr; m_ptr = 0; } @@ -1241,7 +1274,16 @@ q->setAttribute(Qt::WA_WState_Hidden); //give potential windows a bigger "pre-initial" size; create_sys() will give them a new size later +#ifdef Q_OS_SYMBIAN + if (isGLWidget) { + // Don't waste GPU mem for unnecessary large egl surface + data.crect = QRect(0,0,2,2); + } else { + data.crect = parentWidget ? QRect(0,0,100,30) : QRect(0,0,360,640); + } +#else data.crect = parentWidget ? QRect(0,0,100,30) : QRect(0,0,640,480); +#endif focus_next = focus_prev = q; @@ -4822,6 +4864,8 @@ has been called for the parent do not inherit the parent's layout direction. + This method no longer affects text layout direction since Qt 4.7. + \sa QApplication::layoutDirection */ void QWidget::setLayoutDirection(Qt::LayoutDirection direction) @@ -9924,7 +9968,7 @@ desktopWidget = parent; bool newParent = (parent != parentWidget()) || !wasCreated || desktopWidget; -#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MAC) +#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_OS_SYMBIAN) if (newParent && parent && !desktopWidget) { if (testAttribute(Qt::WA_NativeWindow) && !qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings)) parent->d_func()->enforceNativeChildren(); @@ -10578,7 +10622,7 @@ } case Qt::WA_PaintOnScreen: d->updateIsOpaque(); -#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_MAC) +#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_OS_SYMBIAN) // Recreate the widget if it's already created as an alien widget and // WA_PaintOnScreen is enabled. Paint on screen widgets must have win id. // So must their children. @@ -12045,8 +12089,8 @@ { Q_D(QWidget); if (d->gestureContext.remove(gesture)) { - QGestureManager *manager = QGestureManager::instance(); - manager->cleanupCachedGestures(this, gesture); + if (QGestureManager *manager = QGestureManager::instance()) + manager->cleanupCachedGestures(this, gesture); } } #endif // QT_NO_GESTURES diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qwidget_mac.mm --- a/src/gui/kernel/qwidget_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qwidget_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -2796,10 +2796,14 @@ if (QWidget *parent = q->parentWidget()) { if (parent->testAttribute(Qt::WA_WState_Created)) { - if (set) - [qt_mac_window_for(parent) addChildWindow:qt_mac_window_for(q) ordered:NSWindowAbove]; - else + if (set) { + if (parent->isVisible()) { + NSWindow *childwin = qt_mac_window_for(q); + [qt_mac_window_for(parent) addChildWindow:childwin ordered:NSWindowAbove]; + } + } else { [qt_mac_window_for(parent) removeChildWindow:qt_mac_window_for(q)]; + } } } @@ -2807,10 +2811,12 @@ for (int i=0; iisWindow() && child->testAttribute(Qt::WA_WState_Created) && child->isVisibleTo(q)) { - if (set) - [qt_mac_window_for(q) addChildWindow:qt_mac_window_for(child) ordered:NSWindowAbove]; - else + if (set) { + NSWindow *childwin = qt_mac_window_for(child); + [qt_mac_window_for(q) addChildWindow:childwin ordered:NSWindowAbove]; + } else { [qt_mac_window_for(q) removeChildWindow:qt_mac_window_for(child)]; + } } } } diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qwidget_p.h --- a/src/gui/kernel/qwidget_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qwidget_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -110,18 +110,18 @@ class QStyle; -class Q_AUTOTEST_EXPORT QRefCountedWidgetBackingStore +class Q_AUTOTEST_EXPORT QWidgetBackingStoreTracker { public: - QRefCountedWidgetBackingStore(); - ~QRefCountedWidgetBackingStore(); + QWidgetBackingStoreTracker(); + ~QWidgetBackingStoreTracker(); void create(QWidget *tlw); void destroy(); - void widgetShown(QWidget *w); - void widgetHidden(QWidget *w); + void registerWidget(QWidget *w); + void unregisterWidget(QWidget *w); inline QWidgetBackingStore* data() { @@ -144,11 +144,11 @@ } private: - Q_DISABLE_COPY(QRefCountedWidgetBackingStore) + Q_DISABLE_COPY(QWidgetBackingStoreTracker) private: QWidgetBackingStore* m_ptr; - QSet m_visibleWidgets; + QSet m_widgets; }; struct QTLWExtra { @@ -157,7 +157,7 @@ // Regular pointers (keep them together to avoid gaps on 64 bits architectures). QIcon *icon; // widget icon QPixmap *iconPixmap; - QRefCountedWidgetBackingStore backingStore; + QWidgetBackingStoreTracker backingStore; QWindowSurface *windowSurface; QPainter *sharedPainter; diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qwidget_s60.cpp --- a/src/gui/kernel/qwidget_s60.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qwidget_s60.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -366,7 +366,7 @@ // Symbian windows are always created in an inactive state // We perform this assignment for the case where the window is being re-created - // as aa result of a call to setParent_sys, on either this widget or one of its + // as a result of a call to setParent_sys, on either this widget or one of its // ancestors. extra->activated = 0; @@ -410,7 +410,7 @@ // Symbian windows are always created in an inactive state // We perform this assignment for the case where the window is being re-created - // as aa result of a call to setParent_sys, on either this widget or one of its + // as a result of a call to setParent_sys, on either this widget or one of its // ancestors. extra->activated = 0; @@ -482,14 +482,13 @@ activateSymbianWindow(); QSymbianControl *id = static_cast(q->internalWinId()); + const bool isFullscreen = q->windowState() & Qt::WindowFullScreen; #ifdef Q_WS_S60 // Lazily initialize the S60 screen furniture when the first window is shown. - if (!QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes) + if (q->isWindow() && !QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes) && !S60->buttonGroupContainer() && !S60->statusPane()) { - bool isFullscreen = q->windowState() & Qt::WindowFullScreen; - if (!q->testAttribute(Qt::WA_DontShowOnScreen)) { // Create the status pane and CBA here @@ -504,23 +503,26 @@ // Can't use AppUi directly because it privately inherits from MEikStatusPaneObserver. QSymbianControl *desktopControl = static_cast(QApplication::desktop()->winId()); S60->statusPane()->SetObserver(desktopControl); - - // Hide the status pane if fullscreen OR - // Fill client area if maximized OR - // Put window below status pane unless the window has an explicit position. if (isFullscreen) { - S60->statusPane()->MakeVisible(false); - } else if (q->windowState() & Qt::WindowMaximized) { - TRect r = static_cast(S60->appUi())->ClientRect(); - id->SetExtent(r.iTl, r.Size()); - } else if (!q->testAttribute(Qt::WA_Moved)) { - id->SetPosition(static_cast(S60->appUi())->ClientRect().iTl); + const bool cbaVisible = S60->buttonGroupContainer() && S60->buttonGroupContainer()->IsVisible(); + S60->setStatusPaneAndButtonGroupVisibility(false, cbaVisible); } } } } #endif + // Fill client area if maximized OR + // Put window below status pane unless the window has an explicit position. + if (!isFullscreen) { + if (q->windowState() & Qt::WindowMaximized) { + TRect r = static_cast(S60->appUi())->ClientRect(); + id->SetExtent(r.iTl, r.Size()); + } else if (!q->testAttribute(Qt::WA_Moved)) { + id->SetPosition(static_cast(S60->appUi())->ClientRect().iTl); + } + } + id->MakeVisible(true); if(q->isWindow()) @@ -684,6 +686,12 @@ QSymbianControl *old_winid = static_cast(wasCreated ? data.winid : 0); if ((q->windowType() == Qt::Desktop)) old_winid = 0; + + // old_winid may not have received a 'not visible' visibility + // changed event before being destroyed; make sure that it is + // removed from the backing store's list of visible windows. + S60->controlVisibilityChanged(old_winid, false); + setWinId(0); // hide and reparent our own window away. Otherwise we might get @@ -948,7 +956,10 @@ Q_Q(QWidget); if (q->testAttribute(Qt::WA_WState_Created) && q->windowType() != Qt::Desktop) { RWindow *rwindow = static_cast(q->effectiveWinId()->DrawableWindow()); - rwindow->EnableAdvancedPointers(); + QSymbianControl *window = static_cast(q->effectiveWinId()); + //Enabling advanced pointer events for controls that already have active windows causes a panic. + if (!window->isControlActive()) + rwindow->EnableAdvancedPointers(); } #endif } @@ -1113,15 +1124,10 @@ // The window decoration visibility has to be changed before doing actual window state // change since in that order the availableGeometry will return directly the right size and // we will avoid unnecessarty redraws - CEikStatusPane *statusPane = S60->statusPane(); - CEikButtonGroupContainer *buttonGroup = S60->buttonGroupContainer(); - TBool visible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized)); - if (statusPane) - statusPane->MakeVisible(visible); - if (buttonGroup) { - // Visibility - buttonGroup->MakeVisible(visible || (isFullscreen && cbaRequested)); - } + const bool visible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized)); + const bool statusPaneVisibility = visible; + const bool buttonGroupVisibility = (visible || (isFullscreen && cbaRequested)); + S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility); #endif // Q_WS_S60 // Ensure the initial size is valid, since we store it as normalGeometry below. @@ -1133,8 +1139,10 @@ const bool cbaVisibilityHint = windowFlags() & Qt::WindowSoftkeysVisibleHint; if (newstate & Qt::WindowFullScreen && !cbaVisibilityHint) { + setAttribute(Qt::WA_OutsideWSRange, false); window->SetExtentToWholeScreen(); } else if (newstate & Qt::WindowMaximized || ((newstate & Qt::WindowFullScreen) && cbaVisibilityHint)) { + setAttribute(Qt::WA_OutsideWSRange, false); TRect maxExtent = qt_QRect2TRect(qApp->desktop()->availableGeometry(this)); window->SetExtent(maxExtent.iTl, maxExtent.Size()); } else { @@ -1143,7 +1151,7 @@ // accurate because it did not consider the status pane. This means that when returning // normal mode after showing the status pane, the geometry would overlap so we should // move it if it never had an explicit position. - if (!wasMoved && statusPane && visible) { + if (!wasMoved && S60->statusPane() && visible) { TPoint tl = static_cast(S60->appUi())->ClientRect().iTl; normalGeometry.setTopLeft(QPoint(tl.iX, tl.iY)); } diff -r ef0373b55136 -r 758a864f9613 src/gui/kernel/qwidget_win.cpp --- a/src/gui/kernel/qwidget_win.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/kernel/qwidget_win.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -166,7 +166,7 @@ qt_tablet_widget = new QWidget(0); qt_tablet_widget->createWinId(); qt_tablet_widget->setObjectName(QLatin1String("Qt internal tablet widget")); - // We dont need this internal widget to appear in QApplication::topLevelWidgets() + // We don't need this internal widget to appear in QApplication::topLevelWidgets() if (QWidgetPrivate::allWidgets) QWidgetPrivate::allWidgets->remove(qt_tablet_widget); LOGCONTEXT lcMine; @@ -1547,7 +1547,7 @@ { if (data.window_flags & Qt::MSWindowsFixedSizeDialogHint) return false; - // if the user explicitely asked for the maximize button, we try to add + // if the user explicitly asked for the maximize button, we try to add // it even if the window has fixed size. if (data.window_flags & Qt::CustomizeWindowHint && data.window_flags & Qt::WindowMaximizeButtonHint) diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/painting.pri --- a/src/gui/painting/painting.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/painting.pri Mon Oct 04 01:19:32 2010 +0300 @@ -212,6 +212,7 @@ SSE3DNOW_SOURCES += painting/qdrawhelper_sse3dnow.cpp SSE_SOURCES += painting/qdrawhelper_sse.cpp SSE2_SOURCES += painting/qdrawhelper_sse2.cpp + SSSE3_SOURCES += painting/qdrawhelper_ssse3.cpp IWMMXT_SOURCES += painting/qdrawhelper_iwmmxt.cpp } @@ -246,23 +247,8 @@ QMAKE_CXXFLAGS.ARMCC *= -O3 } -neon:*-g++* { - DEFINES += QT_HAVE_NEON - HEADERS += painting/qdrawhelper_neon_p.h - SOURCES += painting/qdrawhelper_neon.cpp - QMAKE_CXXFLAGS *= -mfpu=neon - - DRAWHELPER_NEON_ASM_FILES = ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S - - neon_compiler.commands = $$QMAKE_CXX -c - neon_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - neon_compiler.dependency_type = TYPE_C - neon_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} - neon_compiler.input = DRAWHELPER_NEON_ASM_FILES - neon_compiler.variable_out = OBJECTS - neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN} - silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands - QMAKE_EXTRA_COMPILERS += neon_compiler -} +NEON_SOURCES += painting/qdrawhelper_neon.cpp +NEON_HEADERS += painting/qdrawhelper_neon_p.h +NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S include($$PWD/../../3rdparty/zlib_dependency.pri) diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qbackingstore.cpp --- a/src/gui/painting/qbackingstore.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qbackingstore.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -352,7 +352,7 @@ // Always flush repainted areas. dirtyOnScreen += toClean; -#ifdef Q_WS_QWS +#if defined(Q_WS_QWS) && !defined(Q_BACKINGSTORE_SUBSURFACES) toClean.translate(tlwOffset); #endif @@ -1294,7 +1294,12 @@ #ifdef Q_BACKINGSTORE_SUBSURFACES QWindowSurface *subSurface = w->windowSurface(); BeginPaintInfo beginPaintInfo; - beginPaint(toBePainted, w, subSurface, &beginPaintInfo, false); + + QPoint off = w->mapTo(tlw, QPoint()); + toBePainted.translate(off); + beginPaint(toBePainted, w, subSurface, &beginPaintInfo, true); + toBePainted.translate(-off); + if (beginPaintInfo.nothingToPaint) continue; diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qblendfunctions.cpp --- a/src/gui/painting/qblendfunctions.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qblendfunctions.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -254,10 +254,10 @@ } } -static void qt_blend_rgb16_on_rgb16(uchar *dst, int dbpl, - const uchar *src, int sbpl, - int w, int h, - int const_alpha) +void qt_blend_rgb16_on_rgb16(uchar *dst, int dbpl, + const uchar *src, int sbpl, + int w, int h, + int const_alpha) { #ifdef QT_DEBUG_DRAW printf("qt_blend_rgb16_on_rgb16: dst=(%p, %d), src=(%p, %d), dim=(%d, %d) alpha=%d\n", diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper.cpp --- a/src/gui/painting/qdrawhelper.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawhelper.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -46,7 +46,6 @@ #include #include #include -#include #include QT_BEGIN_NAMESPACE @@ -656,6 +655,46 @@ return buffer; } +/** \internal + interpolate 4 argb pixels with the distx and disty factor. + distx and disty bust be between 0 and 16 + */ +static inline uint interpolate_4_pixels_16(uint tl, uint tr, uint bl, uint br, int distx, int disty, int idistx, int idisty) +{ + uint tlrb = ((tl & 0x00ff00ff) * idistx * idisty); + uint tlag = (((tl & 0xff00ff00) >> 8) * idistx * idisty); + uint trrb = ((tr & 0x00ff00ff) * distx * idisty); + uint trag = (((tr & 0xff00ff00) >> 8) * distx * idisty); + uint blrb = ((bl & 0x00ff00ff) * idistx * disty); + uint blag = (((bl & 0xff00ff00) >> 8) * idistx * disty); + uint brrb = ((br & 0x00ff00ff) * distx * disty); + uint brag = (((br & 0xff00ff00) >> 8) * distx * disty); + return (((tlrb + trrb + blrb + brrb) >> 8) & 0x00ff00ff) | ((tlag + trag + blag + brag) & 0xff00ff00); +} + + +template +Q_STATIC_TEMPLATE_FUNCTION inline void fetchTransformedBilinear_pixelBounds(int max, int l1, int l2, int &v1, int &v2) +{ + if (blendType == BlendTransformedBilinearTiled) { + v1 %= max; + if (v1 < 0) v1 += max; + v2 = v1 + 1; + v2 %= max; + } else { + if (v1 < l1) { + v2 = v1 = l1; + } else if (v1 >= l2) { + v2 = v1 = l2; + } else { + v2 = v1 + 1; + } + } + + Q_ASSERT(v1 >= 0 && v1 < max); + Q_ASSERT(v2 >= 0 && v2 < max); +} + template /* blendType = BlendTransformedBilinear or BlendTransformedBilinearTiled */ Q_STATIC_TEMPLATE_FUNCTION const uint * QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Operator *, const QSpanData *data, @@ -676,8 +715,8 @@ int image_x1 = data->texture.x1; int image_y1 = data->texture.y1; - int image_x2 = data->texture.x2; - int image_y2 = data->texture.y2; + int image_x2 = data->texture.x2 - 1; + int image_y2 = data->texture.y2 - 1; const qreal cx = x + 0.5; const qreal cy = y + 0.5; @@ -696,64 +735,230 @@ fx -= half_point; fy -= half_point; - while (b < end) { - int x1 = (fx >> 16); - int x2; + + if (fdy == 0) { //simple scale, no rotation int y1 = (fy >> 16); int y2; - - if (blendType == BlendTransformedBilinearTiled) { - x1 %= image_width; - if (x1 < 0) x1 += image_width; - x2 = x1 + 1; - x2 %= image_width; - - y1 %= image_height; - if (y1 < 0) y1 += image_height; - y2 = y1 + 1; - y2 %= image_height; - } else { - if (x1 < image_x1) { - x2 = x1 = image_x1; - } else if (x1 >= image_x2 - 1) { - x2 = x1 = image_x2 - 1; + fetchTransformedBilinear_pixelBounds(image_height, image_y1, image_y2, y1, y2); + const uchar *s1 = data->texture.scanLine(y1); + const uchar *s2 = data->texture.scanLine(y2); + + if (fdx <= fixed_scale && fdx > 0) { // scale up on X + int disty = (fy & 0x0000ffff) >> 8; + int idisty = 256 - disty; + int x = fx >> 16; + + // The idea is first to do the interpolation between the row s1 and the row s2 + // into an intermediate buffer, then we interpolate between two pixel of this buffer. + + // intermediate_buffer[0] is a buffer of red-blue component of the pixel, in the form 0x00RR00BB + // intermediate_buffer[1] is the alpha-green component of the pixel, in the form 0x00AA00GG + quint32 intermediate_buffer[2][buffer_size + 2]; + // count is the size used in the intermediate_buffer. + int count = qCeil(length * data->m11) + 2; //+1 for the last pixel to interpolate with, and +1 for rounding errors. + Q_ASSERT(count <= buffer_size + 2); //length is supposed to be <= buffer_size and data->m11 < 1 in this case + int f = 0; + int lim = count; + if (blendType == BlendTransformedBilinearTiled) { + x %= image_width; + if (x < 0) x += image_width; } else { - x2 = x1 + 1; + lim = qMin(count, image_x2-x+1); + if (x < image_x1) { + Q_ASSERT(x <= image_x2); + uint t = fetch(s1, image_x1, data->texture.colorTable); + uint b = fetch(s2, image_x1, data->texture.colorTable); + quint32 rb = (((t & 0xff00ff) * idisty + (b & 0xff00ff) * disty) >> 8) & 0xff00ff; + quint32 ag = ((((t>>8) & 0xff00ff) * idisty + ((b>>8) & 0xff00ff) * disty) >> 8) & 0xff00ff; + do { + intermediate_buffer[0][f] = rb; + intermediate_buffer[1][f] = ag; + f++; + x++; + } while (x < image_x1 && f < lim); + } + } + +#if defined(QT_ALWAYS_HAVE_SSE2) + if (blendType != BlendTransformedBilinearTiled && + (format == QImage::Format_ARGB32_Premultiplied || format == QImage::Format_RGB32)) { + + const __m128i disty_ = _mm_set1_epi16(disty); + const __m128i idisty_ = _mm_set1_epi16(idisty); + const __m128i colorMask = _mm_set1_epi32(0x00ff00ff); + + lim -= 3; + for (; f < lim; x += 4, f += 4) { + // Load 4 pixels from s1, and split the alpha-green and red-blue component + __m128i top = _mm_loadu_si128((__m128i*)((const uint *)(s1)+x)); + __m128i topAG = _mm_srli_epi16(top, 8); + __m128i topRB = _mm_and_si128(top, colorMask); + // Multiplies each colour component by idisty + topAG = _mm_mullo_epi16 (topAG, idisty_); + topRB = _mm_mullo_epi16 (topRB, idisty_); + + // Same for the s2 vector + __m128i bottom = _mm_loadu_si128((__m128i*)((const uint *)(s2)+x)); + __m128i bottomAG = _mm_srli_epi16(bottom, 8); + __m128i bottomRB = _mm_and_si128(bottom, colorMask); + bottomAG = _mm_mullo_epi16 (bottomAG, disty_); + bottomRB = _mm_mullo_epi16 (bottomRB, disty_); + + // Add the values, and shift to only keep 8 significant bits per colors + __m128i rAG =_mm_add_epi16(topAG, bottomAG); + rAG = _mm_srli_epi16(rAG, 8); + _mm_storeu_si128((__m128i*)(&intermediate_buffer[1][f]), rAG); + __m128i rRB =_mm_add_epi16(topRB, bottomRB); + rRB = _mm_srli_epi16(rRB, 8); + _mm_storeu_si128((__m128i*)(&intermediate_buffer[0][f]), rRB); + } + } +#endif + for (; f < count; f++) { // Same as above but without sse2 + if (blendType == BlendTransformedBilinearTiled) { + if (x >= image_width) x -= image_width; + } else { + x = qMin(x, image_x2); + } + + uint t = fetch(s1, x, data->texture.colorTable); + uint b = fetch(s2, x, data->texture.colorTable); + + intermediate_buffer[0][f] = (((t & 0xff00ff) * idisty + (b & 0xff00ff) * disty) >> 8) & 0xff00ff; + intermediate_buffer[1][f] = ((((t>>8) & 0xff00ff) * idisty + ((b>>8) & 0xff00ff) * disty) >> 8) & 0xff00ff; + x++; } - if (y1 < image_y1) { - y2 = y1 = image_y1; - } else if (y1 >= image_y2 - 1) { - y2 = y1 = image_y2 - 1; - } else { - y2 = y1 + 1; + // Now interpolate the values from the intermediate_buffer to get the final result. + fx &= fixed_scale - 1; + Q_ASSERT((fx >> 16) == 0); + while (b < end) { + register int x1 = (fx >> 16); + register int x2 = x1 + 1; + Q_ASSERT(x1 >= 0); + Q_ASSERT(x2 < count); + + register int distx = (fx & 0x0000ffff) >> 8; + register int idistx = 256 - distx; + int rb = ((intermediate_buffer[0][x1] * idistx + intermediate_buffer[0][x2] * distx) >> 8) & 0xff00ff; + int ag = (intermediate_buffer[1][x1] * idistx + intermediate_buffer[1][x2] * distx) & 0xff00ff00; + *b = rb | ag; + b++; + fx += fdx; + } + } else if ((fdx < 0 && fdx > -(fixed_scale / 8)) || fabs(data->m22) < (1./8.)) { // scale up more than 8x + int y1 = (fy >> 16); + int y2; + fetchTransformedBilinear_pixelBounds(image_height, image_y1, image_y2, y1, y2); + const uchar *s1 = data->texture.scanLine(y1); + const uchar *s2 = data->texture.scanLine(y2); + int disty = (fy & 0x0000ffff) >> 8; + int idisty = 256 - disty; + while (b < end) { + int x1 = (fx >> 16); + int x2; + fetchTransformedBilinear_pixelBounds(image_width, image_x1, image_x2, x1, x2); + uint tl = fetch(s1, x1, data->texture.colorTable); + uint tr = fetch(s1, x2, data->texture.colorTable); + uint bl = fetch(s2, x1, data->texture.colorTable); + uint br = fetch(s2, x2, data->texture.colorTable); + + int distx = (fx & 0x0000ffff) >> 8; + int idistx = 256 - distx; + + uint xtop = INTERPOLATE_PIXEL_256(tl, idistx, tr, distx); + uint xbot = INTERPOLATE_PIXEL_256(bl, idistx, br, distx); + *b = INTERPOLATE_PIXEL_256(xtop, idisty, xbot, disty); + + fx += fdx; + ++b; + } + } else { //scale down + int y1 = (fy >> 16); + int y2; + fetchTransformedBilinear_pixelBounds(image_height, image_y1, image_y2, y1, y2); + const uchar *s1 = data->texture.scanLine(y1); + const uchar *s2 = data->texture.scanLine(y2); + int disty = (fy & 0x0000ffff) >> 12; + int idisty = 16 - disty; + while (b < end) { + int x1 = (fx >> 16); + int x2; + fetchTransformedBilinear_pixelBounds(image_width, image_x1, image_x2, x1, x2); + uint tl = fetch(s1, x1, data->texture.colorTable); + uint tr = fetch(s1, x2, data->texture.colorTable); + uint bl = fetch(s2, x1, data->texture.colorTable); + uint br = fetch(s2, x2, data->texture.colorTable); + int distx = (fx & 0x0000ffff) >> 12; + int idistx = 16 - distx; + *b = interpolate_4_pixels_16(tl, tr, bl, br, distx, disty, idistx, idisty); + fx += fdx; + ++b; } } - - Q_ASSERT(x1 >= 0 && x1 < image_width); - Q_ASSERT(x2 >= 0 && x2 < image_width); - Q_ASSERT(y1 >= 0 && y1 < image_height); - Q_ASSERT(y2 >= 0 && y2 < image_height); - - const uchar *s1 = data->texture.scanLine(y1); - const uchar *s2 = data->texture.scanLine(y2); - - uint tl = fetch(s1, x1, data->texture.colorTable); - uint tr = fetch(s1, x2, data->texture.colorTable); - uint bl = fetch(s2, x1, data->texture.colorTable); - uint br = fetch(s2, x2, data->texture.colorTable); - - int distx = (fx & 0x0000ffff) >> 8; - int disty = (fy & 0x0000ffff) >> 8; - int idistx = 256 - distx; - int idisty = 256 - disty; - - uint xtop = INTERPOLATE_PIXEL_256(tl, idistx, tr, distx); - uint xbot = INTERPOLATE_PIXEL_256(bl, idistx, br, distx); - *b = INTERPOLATE_PIXEL_256(xtop, idisty, xbot, disty); - - fx += fdx; - fy += fdy; - ++b; + } else { //rotation + if (fabs(data->m11) > 8 || fabs(data->m22) > 8) { + //if we are zooming more than 8 times, we use 8bit precision for the position. + while (b < end) { + int x1 = (fx >> 16); + int x2; + int y1 = (fy >> 16); + int y2; + + fetchTransformedBilinear_pixelBounds(image_width, image_x1, image_x2, x1, x2); + fetchTransformedBilinear_pixelBounds(image_height, image_y1, image_y2, y1, y2); + + const uchar *s1 = data->texture.scanLine(y1); + const uchar *s2 = data->texture.scanLine(y2); + + uint tl = fetch(s1, x1, data->texture.colorTable); + uint tr = fetch(s1, x2, data->texture.colorTable); + uint bl = fetch(s2, x1, data->texture.colorTable); + uint br = fetch(s2, x2, data->texture.colorTable); + + int distx = (fx & 0x0000ffff) >> 8; + int disty = (fy & 0x0000ffff) >> 8; + int idistx = 256 - distx; + int idisty = 256 - disty; + + uint xtop = INTERPOLATE_PIXEL_256(tl, idistx, tr, distx); + uint xbot = INTERPOLATE_PIXEL_256(bl, idistx, br, distx); + *b = INTERPOLATE_PIXEL_256(xtop, idisty, xbot, disty); + + fx += fdx; + fy += fdy; + ++b; + } + } else { + //we are zooming less than 8x, use 4bit precision + while (b < end) { + int x1 = (fx >> 16); + int x2; + int y1 = (fy >> 16); + int y2; + + fetchTransformedBilinear_pixelBounds(image_width, image_x1, image_x2, x1, x2); + fetchTransformedBilinear_pixelBounds(image_height, image_y1, image_y2, y1, y2); + + const uchar *s1 = data->texture.scanLine(y1); + const uchar *s2 = data->texture.scanLine(y2); + + uint tl = fetch(s1, x1, data->texture.colorTable); + uint tr = fetch(s1, x2, data->texture.colorTable); + uint bl = fetch(s2, x1, data->texture.colorTable); + uint br = fetch(s2, x2, data->texture.colorTable); + + int distx = (fx & 0x0000ffff) >> 12; + int disty = (fy & 0x0000ffff) >> 12; + int idistx = 16 - distx; + int idisty = 16 - disty; + + *b = interpolate_4_pixels_16(tl, tr, bl, br, distx, disty, idistx, idisty); + + fx += fdx; + fy += fdy; + ++b; + } + } } } else { const qreal fdx = data->m11; @@ -779,37 +984,8 @@ int idistx = 256 - distx; int idisty = 256 - disty; - if (blendType == BlendTransformedBilinearTiled) { - x1 %= image_width; - if (x1 < 0) x1 += image_width; - x2 = x1 + 1; - x2 %= image_width; - - y1 %= image_height; - if (y1 < 0) y1 += image_height; - y2 = y1 + 1; - y2 %= image_height; - } else { - if (x1 < 0) { - x2 = x1 = 0; - } else if (x1 >= image_width - 1) { - x2 = x1 = image_width - 1; - } else { - x2 = x1 + 1; - } - if (y1 < 0) { - y2 = y1 = 0; - } else if (y1 >= image_height - 1) { - y2 = y1 = image_height - 1; - } else { - y2 = y1 + 1; - } - } - - Q_ASSERT(x1 >= 0 && x1 < image_width); - Q_ASSERT(x2 >= 0 && x2 < image_width); - Q_ASSERT(y1 >= 0 && y1 < image_height); - Q_ASSERT(y2 >= 0 && y2 < image_height); + fetchTransformedBilinear_pixelBounds(image_width, image_x1, image_x2, x1, x2); + fetchTransformedBilinear_pixelBounds(image_height, image_y1, image_y2, y1, y2); const uchar *s1 = data->texture.scanLine(y1); const uchar *s2 = data->texture.scanLine(y2); @@ -1309,12 +1485,12 @@ }\ } -static void QT_FASTCALL comp_func_solid_Clear(uint *dest, int length, uint, uint const_alpha) +void QT_FASTCALL comp_func_solid_Clear(uint *dest, int length, uint, uint const_alpha) { comp_func_Clear_impl(dest, length, const_alpha); } -static void QT_FASTCALL comp_func_Clear(uint *dest, const uint *, int length, uint const_alpha) +void QT_FASTCALL comp_func_Clear(uint *dest, const uint *, int length, uint const_alpha) { comp_func_Clear_impl(dest, length, const_alpha); } @@ -1323,7 +1499,7 @@ result = s dest = s * ca + d * cia */ -static void QT_FASTCALL comp_func_solid_Source(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_Source(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) { QT_MEMFILL_UINT(dest, length, color); @@ -1338,7 +1514,7 @@ } } -static void QT_FASTCALL comp_func_Source(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_Source(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) { ::memcpy(dest, src, length * sizeof(uint)); @@ -1352,11 +1528,11 @@ } } -static void QT_FASTCALL comp_func_solid_Destination(uint *, int, uint, uint) -{ -} - -static void QT_FASTCALL comp_func_Destination(uint *, const uint *, int, uint) +void QT_FASTCALL comp_func_solid_Destination(uint *, int, uint, uint) +{ +} + +void QT_FASTCALL comp_func_Destination(uint *, const uint *, int, uint) { } @@ -1366,7 +1542,7 @@ = s * ca + d * (sia * ca + cia) = s * ca + d * (1 - sa*ca) */ -static void QT_FASTCALL comp_func_solid_SourceOver(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_SourceOver(uint *dest, int length, uint color, uint const_alpha) { if ((const_alpha & qAlpha(color)) == 255) { QT_MEMFILL_UINT(dest, length, color); @@ -1381,7 +1557,7 @@ } } -static void QT_FASTCALL comp_func_SourceOver(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_SourceOver(uint *dest, const uint *src, int length, uint const_alpha) { PRELOAD_INIT2(dest, src) if (const_alpha == 255) { @@ -1407,7 +1583,7 @@ dest = (d + s * dia) * ca + d * cia = d + s * dia * ca */ -static void QT_FASTCALL comp_func_solid_DestinationOver(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_DestinationOver(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha != 255) color = BYTE_MUL(color, const_alpha); @@ -1419,7 +1595,7 @@ } } -static void QT_FASTCALL comp_func_DestinationOver(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_DestinationOver(uint *dest, const uint *src, int length, uint const_alpha) { PRELOAD_INIT2(dest, src) if (const_alpha == 255) { @@ -1442,7 +1618,7 @@ result = s * da dest = s * da * ca + d * cia */ -static void QT_FASTCALL comp_func_solid_SourceIn(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_SourceIn(uint *dest, int length, uint color, uint const_alpha) { PRELOAD_INIT(dest) if (const_alpha == 255) { @@ -1461,7 +1637,7 @@ } } -static void QT_FASTCALL comp_func_SourceIn(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_SourceIn(uint *dest, const uint *src, int length, uint const_alpha) { PRELOAD_INIT2(dest, src) if (const_alpha == 255) { @@ -1485,7 +1661,7 @@ dest = d * sa * ca + d * cia = d * (sa * ca + cia) */ -static void QT_FASTCALL comp_func_solid_DestinationIn(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_DestinationIn(uint *dest, int length, uint color, uint const_alpha) { uint a = qAlpha(color); if (const_alpha != 255) { @@ -1498,7 +1674,7 @@ } } -static void QT_FASTCALL comp_func_DestinationIn(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_DestinationIn(uint *dest, const uint *src, int length, uint const_alpha) { PRELOAD_INIT2(dest, src) if (const_alpha == 255) { @@ -1521,7 +1697,7 @@ dest = s * dia * ca + d * cia */ -static void QT_FASTCALL comp_func_solid_SourceOut(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_SourceOut(uint *dest, int length, uint color, uint const_alpha) { PRELOAD_INIT(dest) if (const_alpha == 255) { @@ -1540,7 +1716,7 @@ } } -static void QT_FASTCALL comp_func_SourceOut(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_SourceOut(uint *dest, const uint *src, int length, uint const_alpha) { PRELOAD_INIT2(dest, src) if (const_alpha == 255) { @@ -1564,7 +1740,7 @@ dest = d * sia * ca + d * cia = d * (sia * ca + cia) */ -static void QT_FASTCALL comp_func_solid_DestinationOut(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_DestinationOut(uint *dest, int length, uint color, uint const_alpha) { uint a = qAlpha(~color); if (const_alpha != 255) @@ -1576,7 +1752,7 @@ } } -static void QT_FASTCALL comp_func_DestinationOut(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_DestinationOut(uint *dest, const uint *src, int length, uint const_alpha) { PRELOAD_INIT2(dest, src) if (const_alpha == 255) { @@ -1600,7 +1776,7 @@ = s*ca * da + d * (sia*ca + cia) = s*ca * da + d * (1 - sa*ca) */ -static void QT_FASTCALL comp_func_solid_SourceAtop(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_SourceAtop(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha != 255) { color = BYTE_MUL(color, const_alpha); @@ -1613,7 +1789,7 @@ } } -static void QT_FASTCALL comp_func_SourceAtop(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_SourceAtop(uint *dest, const uint *src, int length, uint const_alpha) { PRELOAD_INIT2(dest, src) if (const_alpha == 255) { @@ -1638,7 +1814,7 @@ dest = d*sa*ca + s*dia*ca + d *cia = s*ca * dia + d * (sa*ca + cia) */ -static void QT_FASTCALL comp_func_solid_DestinationAtop(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_DestinationAtop(uint *dest, int length, uint color, uint const_alpha) { uint a = qAlpha(color); if (const_alpha != 255) { @@ -1653,7 +1829,7 @@ } } -static void QT_FASTCALL comp_func_DestinationAtop(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_DestinationAtop(uint *dest, const uint *src, int length, uint const_alpha) { PRELOAD_INIT2(dest, src) if (const_alpha == 255) { @@ -1681,7 +1857,7 @@ = s*ca * dia + d * (sia*ca + cia) = s*ca * dia + d * (1 - sa*ca) */ -static void QT_FASTCALL comp_func_solid_XOR(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_XOR(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha != 255) color = BYTE_MUL(color, const_alpha); @@ -1695,7 +1871,7 @@ } } -static void QT_FASTCALL comp_func_XOR(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_XOR(uint *dest, const uint *src, int length, uint const_alpha) { PRELOAD_INIT2(dest, src) if (const_alpha == 255) { @@ -1715,11 +1891,6 @@ } } -static const uint AMASK = 0xff000000; -static const uint RMASK = 0x00ff0000; -static const uint GMASK = 0x0000ff00; -static const uint BMASK = 0x000000ff; - struct QFullCoverage { inline void store(uint *dest, const uint src) const { @@ -1762,14 +1933,12 @@ for (int i = 0; i < length; ++i) { PRELOAD_COND(dest) uint d = dest[i]; -#define MIX(mask) (qMin(((qint64(s)&mask) + (qint64(d)&mask)), qint64(mask))) - d = (MIX(AMASK) | MIX(RMASK) | MIX(GMASK) | MIX(BMASK)); -#undef MIX + d = comp_func_Plus_one_pixel(d, s); coverage.store(&dest[i], d); } } -static void QT_FASTCALL comp_func_solid_Plus(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_Plus(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_Plus_impl(dest, length, color, QFullCoverage()); @@ -1786,15 +1955,13 @@ uint d = dest[i]; uint s = src[i]; -#define MIX(mask) (qMin(((qint64(s)&mask) + (qint64(d)&mask)), qint64(mask))) - d = (MIX(AMASK) | MIX(RMASK) | MIX(GMASK) | MIX(BMASK)); -#undef MIX + d = comp_func_Plus_one_pixel(d, s); coverage.store(&dest[i], d); } } -static void QT_FASTCALL comp_func_Plus(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_Plus(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_Plus_impl(dest, src, length, QFullCoverage()); @@ -1835,7 +2002,7 @@ } } -static void QT_FASTCALL comp_func_solid_Multiply(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_Multiply(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_Multiply_impl(dest, length, color, QFullCoverage()); @@ -1866,7 +2033,7 @@ } } -static void QT_FASTCALL comp_func_Multiply(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_Multiply(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_Multiply_impl(dest, src, length, QFullCoverage()); @@ -1903,7 +2070,7 @@ } } -static void QT_FASTCALL comp_func_solid_Screen(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_Screen(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_Screen_impl(dest, length, color, QFullCoverage()); @@ -1934,7 +2101,7 @@ } } -static void QT_FASTCALL comp_func_Screen(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_Screen(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_Screen_impl(dest, src, length, QFullCoverage()); @@ -1982,7 +2149,7 @@ } } -static void QT_FASTCALL comp_func_solid_Overlay(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_Overlay(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_Overlay_impl(dest, length, color, QFullCoverage()); @@ -2013,7 +2180,7 @@ } } -static void QT_FASTCALL comp_func_Overlay(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_Overlay(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_Overlay_impl(dest, src, length, QFullCoverage()); @@ -2055,7 +2222,7 @@ } } -static void QT_FASTCALL comp_func_solid_Darken(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_Darken(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_Darken_impl(dest, length, color, QFullCoverage()); @@ -2086,7 +2253,7 @@ } } -static void QT_FASTCALL comp_func_Darken(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_Darken(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_Darken_impl(dest, src, length, QFullCoverage()); @@ -2128,7 +2295,7 @@ } } -static void QT_FASTCALL comp_func_solid_Lighten(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_Lighten(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_Lighten_impl(dest, length, color, QFullCoverage()); @@ -2159,7 +2326,7 @@ } } -static void QT_FASTCALL comp_func_Lighten(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_Lighten(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_Lighten_impl(dest, src, length, QFullCoverage()); @@ -2211,7 +2378,7 @@ } } -static void QT_FASTCALL comp_func_solid_ColorDodge(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_ColorDodge(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_ColorDodge_impl(dest, length, color, QFullCoverage()); @@ -2242,7 +2409,7 @@ } } -static void QT_FASTCALL comp_func_ColorDodge(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_ColorDodge(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_ColorDodge_impl(dest, src, length, QFullCoverage()); @@ -2294,7 +2461,7 @@ } } -static void QT_FASTCALL comp_func_solid_ColorBurn(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_ColorBurn(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_ColorBurn_impl(dest, length, color, QFullCoverage()); @@ -2325,7 +2492,7 @@ } } -static void QT_FASTCALL comp_func_ColorBurn(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_ColorBurn(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_ColorBurn_impl(dest, src, length, QFullCoverage()); @@ -2374,7 +2541,7 @@ } } -static void QT_FASTCALL comp_func_solid_HardLight(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_HardLight(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_HardLight_impl(dest, length, color, QFullCoverage()); @@ -2405,7 +2572,7 @@ } } -static void QT_FASTCALL comp_func_HardLight(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_HardLight(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_HardLight_impl(dest, src, length, QFullCoverage()); @@ -2465,7 +2632,7 @@ } } -static void QT_FASTCALL comp_func_solid_SoftLight(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_SoftLight(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_SoftLight_impl(dest, length, color, QFullCoverage()); @@ -2496,7 +2663,7 @@ } } -static void QT_FASTCALL comp_func_SoftLight(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_SoftLight(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_SoftLight_impl(dest, src, length, QFullCoverage()); @@ -2538,7 +2705,7 @@ } } -static void QT_FASTCALL comp_func_solid_Difference(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_Difference(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_Difference_impl(dest, length, color, QFullCoverage()); @@ -2569,7 +2736,7 @@ } } -static void QT_FASTCALL comp_func_Difference(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_Difference(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_Difference_impl(dest, src, length, QFullCoverage()); @@ -2605,7 +2772,7 @@ } } -static void QT_FASTCALL comp_func_solid_Exclusion(uint *dest, int length, uint color, uint const_alpha) +void QT_FASTCALL comp_func_solid_Exclusion(uint *dest, int length, uint color, uint const_alpha) { if (const_alpha == 255) comp_func_solid_Exclusion_impl(dest, length, color, QFullCoverage()); @@ -2636,7 +2803,7 @@ } } -static void QT_FASTCALL comp_func_Exclusion(uint *dest, const uint *src, int length, uint const_alpha) +void QT_FASTCALL comp_func_Exclusion(uint *dest, const uint *src, int length, uint const_alpha) { if (const_alpha == 255) comp_func_Exclusion_impl(dest, src, length, QFullCoverage()); @@ -2649,30 +2816,30 @@ # pragma pop #endif -static void QT_FASTCALL rasterop_solid_SourceOrDestination(uint *dest, - int length, - uint color, - uint const_alpha) +void QT_FASTCALL rasterop_solid_SourceOrDestination(uint *dest, + int length, + uint color, + uint const_alpha) { Q_UNUSED(const_alpha); while (length--) *dest++ |= color; } -static void QT_FASTCALL rasterop_SourceOrDestination(uint *dest, - const uint *src, - int length, - uint const_alpha) +void QT_FASTCALL rasterop_SourceOrDestination(uint *dest, + const uint *src, + int length, + uint const_alpha) { Q_UNUSED(const_alpha); while (length--) *dest++ |= *src++; } -static void QT_FASTCALL rasterop_solid_SourceAndDestination(uint *dest, - int length, - uint color, - uint const_alpha) +void QT_FASTCALL rasterop_solid_SourceAndDestination(uint *dest, + int length, + uint color, + uint const_alpha) { Q_UNUSED(const_alpha); color |= 0xff000000; @@ -2680,10 +2847,10 @@ *dest++ &= color; } -static void QT_FASTCALL rasterop_SourceAndDestination(uint *dest, - const uint *src, - int length, - uint const_alpha) +void QT_FASTCALL rasterop_SourceAndDestination(uint *dest, + const uint *src, + int length, + uint const_alpha) { Q_UNUSED(const_alpha); while (length--) { @@ -2692,10 +2859,10 @@ } } -static void QT_FASTCALL rasterop_solid_SourceXorDestination(uint *dest, - int length, - uint color, - uint const_alpha) +void QT_FASTCALL rasterop_solid_SourceXorDestination(uint *dest, + int length, + uint color, + uint const_alpha) { Q_UNUSED(const_alpha); color &= 0x00ffffff; @@ -2703,10 +2870,10 @@ *dest++ ^= color; } -static void QT_FASTCALL rasterop_SourceXorDestination(uint *dest, - const uint *src, - int length, - uint const_alpha) +void QT_FASTCALL rasterop_SourceXorDestination(uint *dest, + const uint *src, + int length, + uint const_alpha) { Q_UNUSED(const_alpha); while (length--) { @@ -2715,10 +2882,10 @@ } } -static void QT_FASTCALL rasterop_solid_NotSourceAndNotDestination(uint *dest, - int length, - uint color, - uint const_alpha) +void QT_FASTCALL rasterop_solid_NotSourceAndNotDestination(uint *dest, + int length, + uint color, + uint const_alpha) { Q_UNUSED(const_alpha); color = ~color; @@ -2728,10 +2895,10 @@ } } -static void QT_FASTCALL rasterop_NotSourceAndNotDestination(uint *dest, - const uint *src, - int length, - uint const_alpha) +void QT_FASTCALL rasterop_NotSourceAndNotDestination(uint *dest, + const uint *src, + int length, + uint const_alpha) { Q_UNUSED(const_alpha); while (length--) { @@ -2740,10 +2907,10 @@ } } -static void QT_FASTCALL rasterop_solid_NotSourceOrNotDestination(uint *dest, - int length, - uint color, - uint const_alpha) +void QT_FASTCALL rasterop_solid_NotSourceOrNotDestination(uint *dest, + int length, + uint color, + uint const_alpha) { Q_UNUSED(const_alpha); color = ~color | 0xff000000; @@ -2753,10 +2920,10 @@ } } -static void QT_FASTCALL rasterop_NotSourceOrNotDestination(uint *dest, - const uint *src, - int length, - uint const_alpha) +void QT_FASTCALL rasterop_NotSourceOrNotDestination(uint *dest, + const uint *src, + int length, + uint const_alpha) { Q_UNUSED(const_alpha); while (length--) { @@ -2765,10 +2932,10 @@ } } -static void QT_FASTCALL rasterop_solid_NotSourceXorDestination(uint *dest, - int length, - uint color, - uint const_alpha) +void QT_FASTCALL rasterop_solid_NotSourceXorDestination(uint *dest, + int length, + uint color, + uint const_alpha) { Q_UNUSED(const_alpha); color = ~color & 0x00ffffff; @@ -2778,10 +2945,10 @@ } } -static void QT_FASTCALL rasterop_NotSourceXorDestination(uint *dest, - const uint *src, - int length, - uint const_alpha) +void QT_FASTCALL rasterop_NotSourceXorDestination(uint *dest, + const uint *src, + int length, + uint const_alpha) { Q_UNUSED(const_alpha); while (length--) { @@ -2790,25 +2957,25 @@ } } -static void QT_FASTCALL rasterop_solid_NotSource(uint *dest, int length, - uint color, uint const_alpha) +void QT_FASTCALL rasterop_solid_NotSource(uint *dest, int length, + uint color, uint const_alpha) { Q_UNUSED(const_alpha); qt_memfill(dest, ~color | 0xff000000, length); } -static void QT_FASTCALL rasterop_NotSource(uint *dest, const uint *src, - int length, uint const_alpha) +void QT_FASTCALL rasterop_NotSource(uint *dest, const uint *src, + int length, uint const_alpha) { Q_UNUSED(const_alpha); while (length--) *dest++ = ~(*src++) | 0xff000000; } -static void QT_FASTCALL rasterop_solid_NotSourceAndDestination(uint *dest, - int length, - uint color, - uint const_alpha) +void QT_FASTCALL rasterop_solid_NotSourceAndDestination(uint *dest, + int length, + uint color, + uint const_alpha) { Q_UNUSED(const_alpha); color = ~color | 0xff000000; @@ -2818,10 +2985,10 @@ } } -static void QT_FASTCALL rasterop_NotSourceAndDestination(uint *dest, - const uint *src, - int length, - uint const_alpha) +void QT_FASTCALL rasterop_NotSourceAndDestination(uint *dest, + const uint *src, + int length, + uint const_alpha) { Q_UNUSED(const_alpha); while (length--) { @@ -2830,10 +2997,10 @@ } } -static void QT_FASTCALL rasterop_solid_SourceAndNotDestination(uint *dest, - int length, - uint color, - uint const_alpha) +void QT_FASTCALL rasterop_solid_SourceAndNotDestination(uint *dest, + int length, + uint color, + uint const_alpha) { Q_UNUSED(const_alpha); while (length--) { @@ -2842,10 +3009,10 @@ } } -static void QT_FASTCALL rasterop_SourceAndNotDestination(uint *dest, - const uint *src, - int length, - uint const_alpha) +void QT_FASTCALL rasterop_SourceAndNotDestination(uint *dest, + const uint *src, + int length, + uint const_alpha) { Q_UNUSED(const_alpha); while (length--) { @@ -5168,239 +5335,6 @@ blend_tiled_generic(count, spans, userData); } - -template /* blendType must be either BlendTransformedBilinear or BlendTransformedBilinearTiled */ -Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_argb(int count, const QSpan *spans, void *userData) -{ - QSpanData *data = reinterpret_cast(userData); - if (data->texture.format != QImage::Format_ARGB32_Premultiplied - && data->texture.format != QImage::Format_RGB32) { - blend_src_generic(count, spans, userData); - return; - } - - CompositionFunction func = functionForMode[data->rasterBuffer->compositionMode]; - uint buffer[buffer_size]; - - const int image_x1 = data->texture.x1; - const int image_y1 = data->texture.y1; - const int image_x2 = data->texture.x2; - const int image_y2 = data->texture.y2; - const int image_width = data->texture.width; - const int image_height = data->texture.height; - const int scanline_offset = data->texture.bytesPerLine / 4; - - if (data->fast_matrix) { - // The increment pr x in the scanline - int fdx = (int)(data->m11 * fixed_scale); - int fdy = (int)(data->m12 * fixed_scale); - - while (count--) { - void *t = data->rasterBuffer->scanLine(spans->y); - - uint *target = ((uint *)t) + spans->x; - uint *image_bits = (uint *)data->texture.imageData; - - const qreal cx = spans->x + 0.5; - const qreal cy = spans->y + 0.5; - - int x = int((data->m21 * cy - + data->m11 * cx + data->dx) * fixed_scale) - half_point; - int y = int((data->m22 * cy - + data->m12 * cx + data->dy) * fixed_scale) - half_point; - - int length = spans->len; - const int coverage = (data->texture.const_alpha * spans->coverage) >> 8; - while (length) { - int l = qMin(length, buffer_size); - const uint *end = buffer + l; - uint *b = buffer; - while (b < end) { - int x1 = (x >> 16); - int x2; - int y1 = (y >> 16); - int y2; - - if (blendType == BlendTransformedBilinearTiled) { - x1 %= image_width; - if (x1 < 0) x1 += image_width; - x2 = x1 + 1; - x2 %= image_width; - - y1 %= image_height; - if (y1 < 0) y1 += image_height; - y2 = y1 + 1; - y2 %= image_height; - - Q_ASSERT(x1 >= 0 && x1 < image_width); - Q_ASSERT(x2 >= 0 && x2 < image_width); - Q_ASSERT(y1 >= 0 && y1 < image_height); - Q_ASSERT(y2 >= 0 && y2 < image_height); - } else { - if (x1 < image_x1) { - x2 = x1 = image_x1; - } else if (x1 >= image_x2 - 1) { - x2 = x1 = image_x2 - 1; - } else { - x2 = x1 + 1; - } - if (y1 < image_y1) { - y2 = y1 = image_y1; - } else if (y1 >= image_y2 - 1) { - y2 = y1 = image_y2 - 1; - } else { - y2 = y1 + 1; - } - } - - int y1_offset = y1 * scanline_offset; - int y2_offset = y2 * scanline_offset; - -#if defined(Q_IRIX_GCC3_3_WORKAROUND) - uint tl = gccBug(image_bits[y1_offset + x1]); - uint tr = gccBug(image_bits[y1_offset + x2]); - uint bl = gccBug(image_bits[y2_offset + x1]); - uint br = gccBug(image_bits[y2_offset + x2]); -#else - uint tl = image_bits[y1_offset + x1]; - uint tr = image_bits[y1_offset + x2]; - uint bl = image_bits[y2_offset + x1]; - uint br = image_bits[y2_offset + x2]; -#endif - - int distx = (x & 0x0000ffff) >> 8; - int disty = (y & 0x0000ffff) >> 8; - int idistx = 256 - distx; - int idisty = 256 - disty; - - uint xtop = INTERPOLATE_PIXEL_256(tl, idistx, tr, distx); - uint xbot = INTERPOLATE_PIXEL_256(bl, idistx, br, distx); - *b = INTERPOLATE_PIXEL_256(xtop, idisty, xbot, disty); - ++b; - - x += fdx; - y += fdy; - } - if (spanMethod == RegularSpans) - func(target, buffer, l, coverage); - else - drawBufferSpan(data, buffer, buffer_size, - spans->x + spans->len - length, - spans->y, l, coverage); - target += l; - length -= l; - } - ++spans; - } - } else { - const qreal fdx = data->m11; - const qreal fdy = data->m12; - const qreal fdw = data->m13; - - while (count--) { - void *t = data->rasterBuffer->scanLine(spans->y); - - uint *target = ((uint *)t) + spans->x; - uint *image_bits = (uint *)data->texture.imageData; - - const qreal cx = spans->x + 0.5; - const qreal cy = spans->y + 0.5; - - qreal x = data->m21 * cy + data->m11 * cx + data->dx; - qreal y = data->m22 * cy + data->m12 * cx + data->dy; - qreal w = data->m23 * cy + data->m13 * cx + data->m33; - - int length = spans->len; - const int coverage = (data->texture.const_alpha * spans->coverage) >> 8; - while (length) { - int l = qMin(length, buffer_size); - const uint *end = buffer + l; - uint *b = buffer; - while (b < end) { - const qreal iw = w == 0 ? 1 : 1 / w; - const qreal px = x * iw - 0.5; - const qreal py = y * iw - 0.5; - - int x1 = int(px) - (px < 0); - int x2; - int y1 = int(py) - (py < 0); - int y2; - - int distx = int((px - x1) * 256); - int disty = int((py - y1) * 256); - int idistx = 256 - distx; - int idisty = 256 - disty; - - if (blendType == BlendTransformedBilinearTiled) { - x1 %= image_width; - if (x1 < 0) x1 += image_width; - x2 = x1 + 1; - x2 %= image_width; - - y1 %= image_height; - if (y1 < 0) y1 += image_height; - y2 = y1 + 1; - y2 %= image_height; - - Q_ASSERT(x1 >= 0 && x1 < image_width); - Q_ASSERT(x2 >= 0 && x2 < image_width); - Q_ASSERT(y1 >= 0 && y1 < image_height); - Q_ASSERT(y2 >= 0 && y2 < image_height); - } else { - if (x1 < image_x1) { - x2 = x1 = image_x1; - } else if (x1 >= image_x2 - 1) { - x2 = x1 = image_x2 - 1; - } else { - x2 = x1 + 1; - } - if (y1 < image_y1) { - y2 = y1 = image_y1; - } else if (y1 >= image_y2 - 1) { - y2 = y1 = image_y2 - 1; - } else { - y2 = y1 + 1; - } - } - - int y1_offset = y1 * scanline_offset; - int y2_offset = y2 * scanline_offset; - -#if defined(Q_IRIX_GCC3_3_WORKAROUND) - uint tl = gccBug(image_bits[y1_offset + x1]); - uint tr = gccBug(image_bits[y1_offset + x2]); - uint bl = gccBug(image_bits[y2_offset + x1]); - uint br = gccBug(image_bits[y2_offset + x2]); -#else - uint tl = image_bits[y1_offset + x1]; - uint tr = image_bits[y1_offset + x2]; - uint bl = image_bits[y2_offset + x1]; - uint br = image_bits[y2_offset + x2]; -#endif - - uint xtop = INTERPOLATE_PIXEL_256(tl, idistx, tr, distx); - uint xbot = INTERPOLATE_PIXEL_256(bl, idistx, br, distx); - *b = INTERPOLATE_PIXEL_256(xtop, idisty, xbot, disty); - ++b; - - x += fdx; - y += fdy; - w += fdw; - } - if (spanMethod == RegularSpans) - func(target, buffer, l, coverage); - else - drawBufferSpan(data, buffer, buffer_size, - spans->x + spans->len - length, - spans->y, l, coverage); - target += l; - length -= l; - } - ++spans; - } - } -} - template Q_STATIC_TEMPLATE_FUNCTION void blendTransformedBilinear(int count, const QSpan *spans, void *userData) @@ -6651,7 +6585,7 @@ SPANFUNC_POINTER(blend_src_generic, RegularSpans), // Indexed8 SPANFUNC_POINTER(blend_src_generic, RegularSpans), // RGB32 SPANFUNC_POINTER(blend_src_generic, RegularSpans), // ARGB32 - blend_transformed_bilinear_argb, // ARGB32_Premultiplied + SPANFUNC_POINTER(blend_src_generic, RegularSpans), // ARGB32_Premultiplied blend_transformed_bilinear_rgb565, blend_transformed_bilinear_argb8565, blend_transformed_bilinear_rgb666, @@ -6670,7 +6604,7 @@ SPANFUNC_POINTER(blend_src_generic, RegularSpans), // Indexed8 SPANFUNC_POINTER(blend_src_generic, RegularSpans), // RGB32 SPANFUNC_POINTER(blend_src_generic, RegularSpans), // ARGB32 - blend_transformed_bilinear_argb, // ARGB32_Premultiplied + SPANFUNC_POINTER(blend_src_generic, RegularSpans), // ARGB32_Premultiplied SPANFUNC_POINTER(blend_src_generic, RegularSpans), // RGB16 SPANFUNC_POINTER(blend_src_generic, RegularSpans), // ARGB8565_Premultiplied SPANFUNC_POINTER(blend_src_generic, RegularSpans), // RGB666 @@ -6769,7 +6703,7 @@ blend_src_generic, // Indexed8 blend_src_generic, // RGB32 blend_src_generic, // ARGB32 - blend_transformed_bilinear_argb, // ARGB32_Premultiplied + blend_src_generic, // ARGB32_Premultiplied blend_src_generic, // RGB16 blend_src_generic, // ARGB8565_Premultiplied blend_src_generic, // RGB666 @@ -6788,7 +6722,7 @@ blend_src_generic, // Indexed8 blend_src_generic, // RGB32 blend_src_generic, // ARGB32 - blend_transformed_bilinear_argb, // ARGB32_Premultiplied + blend_src_generic, // ARGB32_Premultiplied blend_src_generic, // RGB16 blend_src_generic, // ARGB8565_Premultiplied blend_src_generic, // RGB666 @@ -7775,6 +7709,7 @@ #ifdef QT_HAVE_MMX if (features & MMX) { functionForModeAsm = qt_functionForMode_MMX; + functionForModeSolidAsm = qt_functionForModeSolid_MMX; qDrawHelper[QImage::Format_ARGB32_Premultiplied].blendColor = qt_blend_color_argb_mmx; #ifdef QT_HAVE_3DNOW @@ -7804,6 +7739,55 @@ #ifdef QT_HAVE_SSE if (features & SSE) { + extern void qt_blend_rgb32_on_rgb32_sse(uchar *destPixels, int dbpl, + const uchar *srcPixels, int sbpl, + int w, int h, + int const_alpha); + extern void qt_blend_argb32_on_argb32_sse(uchar *destPixels, int dbpl, + const uchar *srcPixels, int sbpl, + int w, int h, + int const_alpha); + + qBlendFunctions[QImage::Format_RGB32][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse; + qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse; + qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse; + qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse; + } +#endif // SSE + +#ifdef QT_HAVE_SSE2 + if (features & SSE2) { + extern void qt_blend_rgb32_on_rgb32_sse2(uchar *destPixels, int dbpl, + const uchar *srcPixels, int sbpl, + int w, int h, + int const_alpha); + extern void qt_blend_argb32_on_argb32_sse2(uchar *destPixels, int dbpl, + const uchar *srcPixels, int sbpl, + int w, int h, + int const_alpha); + + qBlendFunctions[QImage::Format_RGB32][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse2; + qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse2; + qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2; + qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2; + } + +#ifdef QT_HAVE_SSSE3 + if (features & SSSE3) { + extern void qt_blend_argb32_on_argb32_ssse3(uchar *destPixels, int dbpl, + const uchar *srcPixels, int sbpl, + int w, int h, + int const_alpha); + + qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3; + qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3; + } +#endif // SSSE3 + +#endif // SSE2 + +#ifdef QT_HAVE_SSE + if (features & SSE) { functionForModeAsm = qt_functionForMode_SSE; functionForModeSolidAsm = qt_functionForModeSolid_SSE; qDrawHelper[QImage::Format_ARGB32_Premultiplied].blendColor = qt_blend_color_argb_sse; @@ -7819,47 +7803,27 @@ #ifdef QT_HAVE_SSE2 if (features & SSE2) { extern void QT_FASTCALL comp_func_SourceOver_sse2(uint *destPixels, - const uint *srcPixels, - int length, - uint const_alpha); + const uint *srcPixels, + int length, + uint const_alpha); extern void QT_FASTCALL comp_func_solid_SourceOver_sse2(uint *destPixels, int length, uint color, uint const_alpha); + extern void QT_FASTCALL comp_func_Plus_sse2(uint *dst, const uint *src, int length, uint const_alpha); + extern void QT_FASTCALL comp_func_Source_sse2(uint *dst, const uint *src, int length, uint const_alpha); functionForModeAsm[0] = comp_func_SourceOver_sse2; + functionForModeAsm[QPainter::CompositionMode_Source] = comp_func_Source_sse2; + functionForModeAsm[QPainter::CompositionMode_Plus] = comp_func_Plus_sse2; functionForModeSolidAsm[0] = comp_func_solid_SourceOver_sse2; - - extern void qt_blend_rgb32_on_rgb32_sse2(uchar *destPixels, int dbpl, - const uchar *srcPixels, int sbpl, - int w, int h, - int const_alpha); - extern void qt_blend_argb32_on_argb32_sse2(uchar *destPixels, int dbpl, - const uchar *srcPixels, int sbpl, - int w, int h, - int const_alpha); - - qBlendFunctions[QImage::Format_RGB32][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse2; - qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse2; - qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2; - qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2; - } else + } #endif - { - extern void qt_blend_rgb32_on_rgb32_sse(uchar *destPixels, int dbpl, - const uchar *srcPixels, int sbpl, - int w, int h, - int const_alpha); - extern void qt_blend_argb32_on_argb32_sse(uchar *destPixels, int dbpl, - const uchar *srcPixels, int sbpl, - int w, int h, - int const_alpha); - - - qBlendFunctions[QImage::Format_RGB32][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse; - qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse; - qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse; - qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse; - } -} -#endif // SSE + } +#elif defined(QT_HAVE_SSE2) + // this is the special case when SSE2 is usable but MMX/SSE is not usable (e.g.: Windows x64 + visual studio) + if (features & SSE2) { + functionForModeAsm = qt_functionForMode_onlySSE2; + functionForModeSolidAsm = qt_functionForModeSolid_onlySSE2; + } +#endif #ifdef QT_HAVE_IWMMXT if (features & IWMMXT) { @@ -7889,6 +7853,7 @@ qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_neon; qBlendFunctions[QImage::Format_RGB16][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_rgb16_neon; qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB16] = qt_blend_rgb16_on_argb32_neon; + qBlendFunctions[QImage::Format_RGB16][QImage::Format_RGB16] = qt_blend_rgb16_on_rgb16_neon; qScaleFunctions[QImage::Format_RGB16][QImage::Format_ARGB32_Premultiplied] = qt_scale_image_argb32_on_rgb16_neon; qScaleFunctions[QImage::Format_RGB16][QImage::Format_RGB16] = qt_scale_image_rgb16_on_rgb16_neon; @@ -7900,11 +7865,13 @@ functionForMode_C[QPainter::CompositionMode_SourceOver] = qt_blend_argb32_on_argb32_scanline_neon; functionForModeSolid_C[QPainter::CompositionMode_SourceOver] = comp_func_solid_SourceOver_neon; + functionForMode_C[QPainter::CompositionMode_Plus] = comp_func_Plus_neon; destFetchProc[QImage::Format_RGB16] = qt_destFetchRGB16_neon; destStoreProc[QImage::Format_RGB16] = qt_destStoreRGB16_neon; qMemRotateFunctions[QImage::Format_RGB16][0] = qt_memrotate90_16_neon; qMemRotateFunctions[QImage::Format_RGB16][2] = qt_memrotate270_16_neon; + qt_memfill32 = qt_memfill32_neon; } #endif @@ -7919,17 +7886,8 @@ functionForModeSolid = functionForModeSolidAsm; } - if (functionForModeAsm) { - const int destinationMode = QPainter::CompositionMode_Destination; - functionForModeAsm[destinationMode] = functionForMode_C[destinationMode]; - - // use the default qdrawhelper implementation for the - // extended composition modes - for (int mode = 12; mode < numCompositionFunctions; ++mode) - functionForModeAsm[mode] = functionForMode_C[mode]; - + if (functionForModeAsm) functionForMode = functionForModeAsm; - } qt_build_pow_tables(); } diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper_iwmmxt.cpp --- a/src/gui/painting/qdrawhelper_iwmmxt.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawhelper_iwmmxt.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -106,14 +106,35 @@ comp_func_DestinationOver, comp_func_Clear, comp_func_Source, - 0, + comp_func_Destination, comp_func_SourceIn, comp_func_DestinationIn, comp_func_SourceOut, comp_func_DestinationOut, comp_func_SourceAtop, comp_func_DestinationAtop, - comp_func_XOR + comp_func_XOR, + comp_func_Plus, + comp_func_Multiply, + comp_func_Screen, + comp_func_Overlay, + comp_func_Darken, + comp_func_Lighten, + comp_func_ColorDodge, + comp_func_ColorBurn, + comp_func_HardLight, + comp_func_SoftLight, + comp_func_Difference, + comp_func_Exclusion, + rasterop_SourceOrDestination, + rasterop_SourceAndDestination, + rasterop_SourceXorDestination, + rasterop_NotSourceAndNotDestination, + rasterop_NotSourceOrNotDestination, + rasterop_NotSourceXorDestination, + rasterop_NotSource, + rasterop_NotSourceAndDestination, + rasterop_SourceAndNotDestination }; void qt_blend_color_argb_iwmmxt(int count, const QSpan *spans, void *userData) diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper_mmx.cpp --- a/src/gui/painting/qdrawhelper_mmx.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawhelper_mmx.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -77,7 +77,7 @@ comp_func_DestinationOver, comp_func_Clear, comp_func_Source, - 0, + comp_func_Destination, comp_func_SourceIn, comp_func_DestinationIn, comp_func_SourceOut, @@ -85,6 +85,27 @@ comp_func_SourceAtop, comp_func_DestinationAtop, comp_func_XOR, + comp_func_Plus, + comp_func_Multiply, + comp_func_Screen, + comp_func_Overlay, + comp_func_Darken, + comp_func_Lighten, + comp_func_ColorDodge, + comp_func_ColorBurn, + comp_func_HardLight, + comp_func_SoftLight, + comp_func_Difference, + comp_func_Exclusion, + rasterop_SourceOrDestination, + rasterop_SourceAndDestination, + rasterop_SourceXorDestination, + rasterop_NotSourceAndNotDestination, + rasterop_NotSourceOrNotDestination, + rasterop_NotSourceXorDestination, + rasterop_NotSource, + rasterop_NotSourceAndDestination, + rasterop_SourceAndNotDestination }; void qt_blend_color_argb_mmx(int count, const QSpan *spans, void *userData) diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper_mmx3dnow.cpp --- a/src/gui/painting/qdrawhelper_mmx3dnow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawhelper_mmx3dnow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -85,14 +85,35 @@ comp_func_DestinationOver, comp_func_Clear, comp_func_Source, - 0, + comp_func_Destination, comp_func_SourceIn, comp_func_DestinationIn, comp_func_SourceOut, comp_func_DestinationOut, comp_func_SourceAtop, comp_func_DestinationAtop, - comp_func_XOR + comp_func_XOR, + comp_func_Plus, + comp_func_Multiply, + comp_func_Screen, + comp_func_Overlay, + comp_func_Darken, + comp_func_Lighten, + comp_func_ColorDodge, + comp_func_ColorBurn, + comp_func_HardLight, + comp_func_SoftLight, + comp_func_Difference, + comp_func_Exclusion, + rasterop_SourceOrDestination, + rasterop_SourceAndDestination, + rasterop_SourceXorDestination, + rasterop_NotSourceAndNotDestination, + rasterop_NotSourceOrNotDestination, + rasterop_NotSourceXorDestination, + rasterop_NotSource, + rasterop_NotSourceAndDestination, + rasterop_SourceAndNotDestination }; void qt_blend_color_argb_mmx3dnow(int count, const QSpan *spans, void *userData) diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper_neon.cpp --- a/src/gui/painting/qdrawhelper_neon.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawhelper_neon.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -51,6 +51,44 @@ QT_BEGIN_NAMESPACE +void qt_memfill32_neon(quint32 *dest, quint32 value, int count) +{ + const int epilogueSize = count % 16; + if (count >= 16) { + quint32 *const neonEnd = dest + count - epilogueSize; + register uint32x4_t valueVector1 asm ("q0") = vdupq_n_u32(value); + register uint32x4_t valueVector2 asm ("q1") = valueVector1; + while (dest != neonEnd) { + asm volatile ( + "vst2.32 { d0, d1, d2, d3 }, [%[DST]] !\n\t" + "vst2.32 { d0, d1, d2, d3 }, [%[DST]] !\n\t" + : [DST]"+r" (dest) + : [VALUE1]"w"(valueVector1), [VALUE2]"w"(valueVector2) + : "memory" + ); + } + } + + switch (epilogueSize) + { + case 15: *dest++ = value; + case 14: *dest++ = value; + case 13: *dest++ = value; + case 12: *dest++ = value; + case 11: *dest++ = value; + case 10: *dest++ = value; + case 9: *dest++ = value; + case 8: *dest++ = value; + case 7: *dest++ = value; + case 6: *dest++ = value; + case 5: *dest++ = value; + case 4: *dest++ = value; + case 3: *dest++ = value; + case 2: *dest++ = value; + case 1: *dest++ = value; + } +} + static inline uint16x8_t qvdiv_255_u16(uint16x8_t x, uint16x8_t half) { // result = (x + (x >> 8) + 0x80) >> 8 @@ -129,6 +167,14 @@ const uint32_t *dst, const uint32_t *src); +extern "C" void +pixman_composite_src_0565_0565_asm_neon (int32_t w, + int32_t h, + uint16_t *dst, + int32_t dst_stride, + uint16_t *src, + int32_t src_stride); + // qblendfunctions.cpp void qt_blend_argb32_on_rgb16_const_alpha(uchar *destPixels, int dbpl, const uchar *srcPixels, int sbpl, @@ -162,6 +208,96 @@ pixman_composite_src_0565_8888_asm_neon(w, h, dst, dbpl, src, sbpl); } +// qblendfunctions.cpp +void qt_blend_rgb16_on_rgb16(uchar *dst, int dbpl, + const uchar *src, int sbpl, + int w, int h, + int const_alpha); + +template +static inline void scanLineBlit16(quint16 *dst, quint16 *src, int dstride) +{ + if (N >= 2) { + ((quint32 *)dst)[0] = ((quint32 *)src)[0]; + __builtin_prefetch(dst + dstride, 1, 0); + } + for (int i = 1; i < N/2; ++i) + ((quint32 *)dst)[i] = ((quint32 *)src)[i]; + if (N & 1) + dst[N-1] = src[N-1]; +} + +template +static inline void blockBlit16(quint16 *dst, quint16 *src, int dstride, int sstride, int h) +{ + union { + quintptr address; + quint16 *pointer; + } u; + + u.pointer = dst; + + if (u.address & 2) { + while (h--) { + // align dst + dst[0] = src[0]; + if (Width > 1) + scanLineBlit16(dst + 1, src + 1, dstride); + dst += dstride; + src += sstride; + } + } else { + while (h--) { + scanLineBlit16(dst, src, dstride); + + dst += dstride; + src += sstride; + } + } +} + +void qt_blend_rgb16_on_rgb16_neon(uchar *destPixels, int dbpl, + const uchar *srcPixels, int sbpl, + int w, int h, + int const_alpha) +{ + // testing show that the default memcpy is faster for widths 150 and up + if (const_alpha != 256 || w >= 150) { + qt_blend_rgb16_on_rgb16(destPixels, dbpl, srcPixels, sbpl, w, h, const_alpha); + return; + } + + int dstride = dbpl / 2; + int sstride = sbpl / 2; + + quint16 *dst = (quint16 *) destPixels; + quint16 *src = (quint16 *) srcPixels; + + switch (w) { +#define BLOCKBLIT(n) case n: blockBlit16(dst, src, dstride, sstride, h); return; + BLOCKBLIT(1); + BLOCKBLIT(2); + BLOCKBLIT(3); + BLOCKBLIT(4); + BLOCKBLIT(5); + BLOCKBLIT(6); + BLOCKBLIT(7); + BLOCKBLIT(8); + BLOCKBLIT(9); + BLOCKBLIT(10); + BLOCKBLIT(11); + BLOCKBLIT(12); + BLOCKBLIT(13); + BLOCKBLIT(14); + BLOCKBLIT(15); +#undef BLOCKBLIT + default: + break; + } + + pixman_composite_src_0565_0565_asm_neon (w, h, dst, dstride, src, sstride); +} + extern "C" void blend_8_pixels_argb32_on_rgb16_neon(quint16 *dst, const quint32 *src, int const_alpha); void qt_blend_argb32_on_rgb16_neon(uchar *destPixels, int dbpl, @@ -622,6 +758,61 @@ } } +void QT_FASTCALL comp_func_Plus_neon(uint *dst, const uint *src, int length, uint const_alpha) +{ + if (const_alpha == 255) { + uint *const end = dst + length; + uint *const neonEnd = end - 3; + + while (dst < neonEnd) { + asm volatile ( + "vld2.8 { d0, d1 }, [%[SRC]] !\n\t" + "vld2.8 { d2, d3 }, [%[DST]]\n\t" + "vqadd.u8 q0, q0, q1\n\t" + "vst2.8 { d0, d1 }, [%[DST]] !\n\t" + : [DST]"+r" (dst), [SRC]"+r" (src) + : + : "memory", "d0", "d1", "d2", "d3", "q0", "q1" + ); + } + + while (dst != end) { + *dst = comp_func_Plus_one_pixel(*dst, *src); + ++dst; + ++src; + } + } else { + int x = 0; + const int one_minus_const_alpha = 255 - const_alpha; + const uint16x8_t constAlphaVector = vdupq_n_u16(const_alpha); + const uint16x8_t oneMinusconstAlphaVector = vdupq_n_u16(one_minus_const_alpha); + + const uint16x8_t half = vdupq_n_u16(0x80); + for (; x < length - 3; x += 4) { + const uint32x4_t src32 = vld1q_u32((uint32_t *)&src[x]); + const uint8x16_t src8 = vreinterpretq_u8_u32(src32); + uint8x16_t dst8 = vld1q_u8((uint8_t *)&dst[x]); + uint8x16_t result = vqaddq_u8(dst8, src8); + + uint16x8_t result_low = vmovl_u8(vget_low_u8(result)); + uint16x8_t result_high = vmovl_u8(vget_high_u8(result)); + + uint16x8_t dst_low = vmovl_u8(vget_low_u8(dst8)); + uint16x8_t dst_high = vmovl_u8(vget_high_u8(dst8)); + + result_low = qvinterpolate_pixel_255(result_low, constAlphaVector, dst_low, oneMinusconstAlphaVector, half); + result_high = qvinterpolate_pixel_255(result_high, constAlphaVector, dst_high, oneMinusconstAlphaVector, half); + + const uint32x2_t result32_low = vreinterpret_u32_u8(vmovn_u16(result_low)); + const uint32x2_t result32_high = vreinterpret_u32_u8(vmovn_u16(result_high)); + vst1q_u32((uint32_t *)&dst[x], vcombine_u32(result32_low, result32_high)); + } + + for (; x < length; ++x) + dst[x] = comp_func_Plus_one_pixel_const_alpha(dst[x], src[x], const_alpha, one_minus_const_alpha); + } +} + static const int tileSize = 32; extern "C" void qt_rotate90_16_neon(quint16 *dst, const quint16 *src, int sstride, int dstride, int count); diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper_neon_p.h --- a/src/gui/painting/qdrawhelper_neon_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawhelper_neon_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -84,6 +84,11 @@ int w, int h, int const_alpha); +void qt_blend_rgb16_on_rgb16_neon(uchar *destPixels, int dbpl, + const uchar *srcPixels, int sbpl, + int w, int h, + int const_alpha); + void qt_alphamapblit_quint16_neon(QRasterBuffer *rasterBuffer, int x, int y, quint32 color, const uchar *bitmap, @@ -120,6 +125,7 @@ const QTransform &targetRectTransform, int const_alpha); +void qt_memfill32_neon(quint32 *dest, quint32 value, int count); void qt_memrotate90_16_neon(const uchar *srcPixels, int w, int h, int sbpl, uchar *destPixels, int dbpl); void qt_memrotate270_16_neon(const uchar *srcPixels, int w, int h, int sbpl, uchar *destPixels, int dbpl); @@ -131,6 +137,7 @@ int x, int y, const uint *buffer, int length); void QT_FASTCALL comp_func_solid_SourceOver_neon(uint *destPixels, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_Plus_neon(uint *dst, const uint *src, int length, uint const_alpha); #endif // QT_HAVE_NEON diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper_p.h --- a/src/gui/painting/qdrawhelper_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawhelper_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -62,6 +62,7 @@ #define QT_FT_END_HEADER #endif #include "private/qrasterdefs_p.h" +#include #ifdef Q_WS_QWS #include "QtGui/qscreen_qws.h" @@ -69,13 +70,6 @@ QT_BEGIN_NAMESPACE -#if defined(Q_OS_MAC) && (defined(__ppc__) || defined(__ppc64__)) -#undef QT_HAVE_MMX -#undef QT_HAVE_SSE -#undef QT_HAVE_SSE2 -#undef QT_HAVE_3DNOW -#endif - #if defined(Q_CC_MSVC) && _MSCVER <= 1300 && !defined(Q_CC_INTEL) #define Q_STATIC_TEMPLATE_SPECIALIZATION static #else @@ -91,6 +85,11 @@ # define Q_STATIC_INLINE_FUNCTION static inline #endif +static const uint AMASK = 0xff000000; +static const uint RMASK = 0x00ff0000; +static const uint GMASK = 0x0000ff00; +static const uint BMASK = 0x000000ff; + /******************************************************************************* * QSpan * @@ -309,18 +308,61 @@ void adjustSpanMethods(); }; +#if defined(Q_CC_RVCT) +# pragma push +# pragma arm +#endif +Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) { + uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b; + t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8; + t &= 0xff00ff; -Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16(uint x, uint a) { - a += 1; - uint t = (((x & 0x07e0)*a) >> 8) & 0x07e0; - t |= (((x & 0xf81f)*(a>>2)) >> 6) & 0xf81f; - return t; + x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b; + x = (x + ((x >> 8) & 0xff00ff) + 0x800080); + x &= 0xff00ff00; + x |= t; + return x; +} +#if defined(Q_CC_RVCT) +# pragma pop +#endif + +#if QT_POINTER_SIZE == 8 // 64-bit versions + +Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) { + quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ff) * a; + t += (((quint64(y)) | ((quint64(y)) << 24)) & 0x00ff00ff00ff00ff) * b; + t >>= 8; + t &= 0x00ff00ff00ff00ff; + return (uint(t)) | (uint(t >> 24)); } -Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16_32(uint x, uint a) { - uint t = (((x & 0xf81f07e0) >> 5)*a) & 0xf81f07e0; - t |= (((x & 0x07e0f81f)*a) >> 5) & 0x07e0f81f; - return t; +Q_STATIC_INLINE_FUNCTION uint BYTE_MUL(uint x, uint a) { + quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ff) * a; + t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080) >> 8; + t &= 0x00ff00ff00ff00ff; + return (uint(t)) | (uint(t >> 24)); +} + +Q_STATIC_INLINE_FUNCTION uint PREMUL(uint x) { + uint a = x >> 24; + quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ff) * a; + t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080) >> 8; + t &= 0x000000ff00ff00ff; + return (uint(t)) | (uint(t >> 24)) | (a << 24); +} + +#else // 32-bit versions + +Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) { + uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b; + t >>= 8; + t &= 0xff00ff; + + x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b; + x &= 0xff00ff00; + x |= t; + return x; } #if defined(Q_CC_RVCT) @@ -354,6 +396,21 @@ x |= t | (a << 24); return x; } +#endif + + +Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16(uint x, uint a) { + a += 1; + uint t = (((x & 0x07e0)*a) >> 8) & 0x07e0; + t |= (((x & 0xf81f)*(a>>2)) >> 6) & 0xf81f; + return t; +} + +Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16_32(uint x, uint a) { + uint t = (((x & 0xf81f07e0) >> 5)*a) & 0xf81f07e0; + t |= (((x & 0x07e0f81f)*a) >> 5) & 0x07e0f81f; + return t; +} #define INV_PREMUL(p) \ (qAlpha(p) == 0 ? 0 : \ @@ -1842,70 +1899,6 @@ return (b << 3) | (b >> 2); } -#if 1 -Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) { - uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b; - t >>= 8; - t &= 0xff00ff; - - x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b; - x &= 0xff00ff00; - x |= t; - return x; -} - -#if defined(Q_CC_RVCT) -# pragma push -# pragma arm -#endif -Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) { - uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b; - t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8; - t &= 0xff00ff; - - x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b; - x = (x + ((x >> 8) & 0xff00ff) + 0x800080); - x &= 0xff00ff00; - x |= t; - return x; -} -#if defined(Q_CC_RVCT) -# pragma pop -#endif -#else -// possible implementation for 64 bit -Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) { - ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a; - t += (((ulong(y)) | ((ulong(y)) << 24)) & 0x00ff00ff00ff00ff) * b; - t >>= 8; - t &= 0x00ff00ff00ff00ff; - return (uint(t)) | (uint(t >> 24)); -} - -Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) { - ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a; - t += (((ulong(y)) | ((ulong(y)) << 24)) & 0x00ff00ff00ff00ff) * b; - t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080); - t &= 0x00ff00ff00ff00ff; - return (uint(t)) | (uint(t >> 24)); -} - -Q_STATIC_INLINE_FUNCTION uint BYTE_MUL(uint x, uint a) { - ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a; - t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080); - t &= 0x00ff00ff00ff00ff; - return (uint(t)) | (uint(t >> 24)); -} - -Q_STATIC_INLINE_FUNCTION uint PREMUL(uint x) { - uint a = x >> 24; - ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a; - t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080); - t &= 0x00ff00ff00ff00ff; - return (uint(t)) | (uint(t >> 24)) | 0xff000000; -} -#endif - const uint qt_bayer_matrix[16][16] = { { 0x1, 0xc0, 0x30, 0xf0, 0xc, 0xcc, 0x3c, 0xfc, 0x3, 0xc3, 0x33, 0xf3, 0xf, 0xcf, 0x3f, 0xff}, @@ -1945,6 +1938,100 @@ ((((argb >> 24) * alpha) >> 8) << 24) | (argb & 0x00ffffff) +#if QT_POINTER_SIZE == 8 // 64-bit versions +#define AMIX(mask) (qMin(((qint64(s)&mask) + (qint64(d)&mask)), qint64(mask))) +#define MIX(mask) (qMin(((qint64(s)&mask) + (qint64(d)&mask)), qint64(mask))) +#else // 32 bits +// The mask for alpha can overflow over 32 bits +#define AMIX(mask) quint32(qMin(((qint64(s)&mask) + (qint64(d)&mask)), qint64(mask))) +#define MIX(mask) (qMin(((quint32(s)&mask) + (quint32(d)&mask)), quint32(mask))) +#endif + +inline int comp_func_Plus_one_pixel_const_alpha(uint d, const uint s, const uint const_alpha, const uint one_minus_const_alpha) +{ + const int result = (AMIX(AMASK) | MIX(RMASK) | MIX(GMASK) | MIX(BMASK)); + return INTERPOLATE_PIXEL_255(result, const_alpha, d, one_minus_const_alpha); +} + +inline int comp_func_Plus_one_pixel(uint d, const uint s) +{ + const int result = (AMIX(AMASK) | MIX(RMASK) | MIX(GMASK) | MIX(BMASK)); + return result; +} + +#undef MIX +#undef AMIX + +// prototypes of all the composition functions +void QT_FASTCALL comp_func_SourceOver(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_DestinationOver(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_Clear(uint *dest, const uint *, int length, uint const_alpha); +void QT_FASTCALL comp_func_Source(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_Destination(uint *, const uint *, int, uint); +void QT_FASTCALL comp_func_SourceIn(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_DestinationIn(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_SourceOut(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_DestinationOut(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_SourceAtop(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_DestinationAtop(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_XOR(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_Plus(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_Multiply(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_Screen(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_Overlay(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_Darken(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_Lighten(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_ColorDodge(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_ColorBurn(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_HardLight(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_SoftLight(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_Difference(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL comp_func_Exclusion(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL rasterop_SourceOrDestination(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL rasterop_SourceAndDestination(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL rasterop_SourceXorDestination(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL rasterop_NotSourceAndNotDestination(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL rasterop_NotSourceOrNotDestination(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL rasterop_NotSourceXorDestination(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL rasterop_NotSource(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL rasterop_NotSourceAndDestination(uint *dest, const uint *src, int length, uint const_alpha); +void QT_FASTCALL rasterop_SourceAndNotDestination(uint *dest, const uint *src, int length, uint const_alpha); + +// prototypes of all the solid composition functions +void QT_FASTCALL comp_func_solid_SourceOver(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_DestinationOver(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_Clear(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_Source(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_Destination(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_SourceIn(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_DestinationIn(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_SourceOut(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_DestinationOut(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_SourceAtop(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_DestinationAtop(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_XOR(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_Plus(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_Multiply(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_Screen(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_Overlay(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_Darken(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_Lighten(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_ColorDodge(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_ColorBurn(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_HardLight(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_SoftLight(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_Difference(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL comp_func_solid_Exclusion(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL rasterop_solid_SourceOrDestination(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL rasterop_solid_SourceAndDestination(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL rasterop_solid_SourceXorDestination(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL rasterop_solid_NotSourceAndNotDestination(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL rasterop_solid_NotSourceOrNotDestination(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL rasterop_solid_NotSourceXorDestination(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL rasterop_solid_NotSource(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL rasterop_solid_NotSourceAndDestination(uint *dest, int length, uint color, uint const_alpha); +void QT_FASTCALL rasterop_solid_SourceAndNotDestination(uint *dest, int length, uint color, uint const_alpha); + QT_END_NAMESPACE #endif // QDRAWHELPER_P_H diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper_sse.cpp --- a/src/gui/painting/qdrawhelper_sse.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawhelper_sse.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -77,14 +77,35 @@ comp_func_DestinationOver, comp_func_Clear, comp_func_Source, - 0, + comp_func_Destination, comp_func_SourceIn, comp_func_DestinationIn, comp_func_SourceOut, comp_func_DestinationOut, comp_func_SourceAtop, comp_func_DestinationAtop, - comp_func_XOR + comp_func_XOR, + comp_func_Plus, + comp_func_Multiply, + comp_func_Screen, + comp_func_Overlay, + comp_func_Darken, + comp_func_Lighten, + comp_func_ColorDodge, + comp_func_ColorBurn, + comp_func_HardLight, + comp_func_SoftLight, + comp_func_Difference, + comp_func_Exclusion, + rasterop_SourceOrDestination, + rasterop_SourceAndDestination, + rasterop_SourceXorDestination, + rasterop_NotSourceAndNotDestination, + rasterop_NotSourceOrNotDestination, + rasterop_NotSourceXorDestination, + rasterop_NotSource, + rasterop_NotSourceAndDestination, + rasterop_SourceAndNotDestination }; void qt_blend_color_argb_sse(int count, const QSpan *spans, void *userData) diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper_sse2.cpp --- a/src/gui/painting/qdrawhelper_sse2.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawhelper_sse2.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -43,7 +43,6 @@ #ifdef QT_HAVE_SSE2 -#include #include #include @@ -112,9 +111,7 @@ int x = 0; // First, align dest to 16 bytes: - const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast(dst) >> 2) & 0x3)) & 0x3; - const int prologLength = qMin(w, offsetToAlignOn16Bytes); - for (; x < prologLength; ++x) { + ALIGNMENT_PROLOGUE_16BYTES(dst, x, w) { quint32 s = src[x]; s = BYTE_MUL(s, const_alpha); dst[x] = INTERPOLATE_PIXEL_255(src[x], const_alpha, dst[x], one_minus_const_alpha); @@ -145,7 +142,6 @@ void QT_FASTCALL comp_func_SourceOver_sse2(uint *destPixels, const uint *srcPixels, int length, uint const_alpha) { - Q_ASSERT(const_alpha >= 0); Q_ASSERT(const_alpha < 256); const quint32 *src = (const quint32 *) srcPixels; @@ -164,6 +160,85 @@ } } +void QT_FASTCALL comp_func_Plus_sse2(uint *dst, const uint *src, int length, uint const_alpha) +{ + int x = 0; + + if (const_alpha == 255) { + // 1) Prologue: align destination on 16 bytes + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) + dst[x] = comp_func_Plus_one_pixel(dst[x], src[x]); + + // 2) composition with SSE2 + for (; x < length - 3; x += 4) { + const __m128i srcVector = _mm_loadu_si128((__m128i *)&src[x]); + const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); + + const __m128i result = _mm_adds_epu8(srcVector, dstVector); + _mm_store_si128((__m128i *)&dst[x], result); + } + + // 3) Epilogue: + for (; x < length; ++x) + dst[x] = comp_func_Plus_one_pixel(dst[x], src[x]); + } else { + const int one_minus_const_alpha = 255 - const_alpha; + const __m128i constAlphaVector = _mm_set1_epi16(const_alpha); + const __m128i oneMinusConstAlpha = _mm_set1_epi16(one_minus_const_alpha); + + // 1) Prologue: align destination on 16 bytes + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) + dst[x] = comp_func_Plus_one_pixel_const_alpha(dst[x], src[x], const_alpha, one_minus_const_alpha); + + const __m128i half = _mm_set1_epi16(0x80); + const __m128i colorMask = _mm_set1_epi32(0x00ff00ff); + // 2) composition with SSE2 + for (; x < length - 3; x += 4) { + const __m128i srcVector = _mm_loadu_si128((__m128i *)&src[x]); + const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); + + __m128i result = _mm_adds_epu8(srcVector, dstVector); + INTERPOLATE_PIXEL_255_SSE2(result, result, dstVector, constAlphaVector, oneMinusConstAlpha, colorMask, half) + _mm_store_si128((__m128i *)&dst[x], result); + } + + // 3) Epilogue: + for (; x < length; ++x) + dst[x] = comp_func_Plus_one_pixel_const_alpha(dst[x], src[x], const_alpha, one_minus_const_alpha); + } +} + +void QT_FASTCALL comp_func_Source_sse2(uint *dst, const uint *src, int length, uint const_alpha) +{ + if (const_alpha == 255) { + ::memcpy(dst, src, length * sizeof(uint)); + } else { + const int ialpha = 255 - const_alpha; + + int x = 0; + + // 1) prologue, align on 16 bytes + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) + dst[x] = INTERPOLATE_PIXEL_255(src[x], const_alpha, dst[x], ialpha); + + // 2) interpolate pixels with SSE2 + const __m128i half = _mm_set1_epi16(0x80); + const __m128i colorMask = _mm_set1_epi32(0x00ff00ff); + const __m128i constAlphaVector = _mm_set1_epi16(const_alpha); + const __m128i oneMinusConstAlpha = _mm_set1_epi16(ialpha); + for (; x < length - 3; x += 4) { + const __m128i srcVector = _mm_loadu_si128((__m128i *)&src[x]); + __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); + INTERPOLATE_PIXEL_255_SSE2(dstVector, srcVector, dstVector, constAlphaVector, oneMinusConstAlpha, colorMask, half) + _mm_store_si128((__m128i *)&dst[x], dstVector); + } + + // 3) Epilogue + for (; x < length; ++x) + dst[x] = INTERPOLATE_PIXEL_255(src[x], const_alpha, dst[x], ialpha); + } +} + void qt_memfill32_sse2(quint32 *dest, quint32 value, int count) { if (count < 7) { @@ -236,6 +311,78 @@ } } +CompositionFunctionSolid qt_functionForModeSolid_onlySSE2[numCompositionFunctions] = { + comp_func_solid_SourceOver_sse2, + comp_func_solid_DestinationOver, + comp_func_solid_Clear, + comp_func_solid_Source, + comp_func_solid_Destination, + comp_func_solid_SourceIn, + comp_func_solid_DestinationIn, + comp_func_solid_SourceOut, + comp_func_solid_DestinationOut, + comp_func_solid_SourceAtop, + comp_func_solid_DestinationAtop, + comp_func_solid_XOR, + comp_func_solid_Plus, + comp_func_solid_Multiply, + comp_func_solid_Screen, + comp_func_solid_Overlay, + comp_func_solid_Darken, + comp_func_solid_Lighten, + comp_func_solid_ColorDodge, + comp_func_solid_ColorBurn, + comp_func_solid_HardLight, + comp_func_solid_SoftLight, + comp_func_solid_Difference, + comp_func_solid_Exclusion, + rasterop_solid_SourceOrDestination, + rasterop_solid_SourceAndDestination, + rasterop_solid_SourceXorDestination, + rasterop_solid_NotSourceAndNotDestination, + rasterop_solid_NotSourceOrNotDestination, + rasterop_solid_NotSourceXorDestination, + rasterop_solid_NotSource, + rasterop_solid_NotSourceAndDestination, + rasterop_solid_SourceAndNotDestination +}; + +CompositionFunction qt_functionForMode_onlySSE2[numCompositionFunctions] = { + comp_func_SourceOver_sse2, + comp_func_DestinationOver, + comp_func_Clear, + comp_func_Source_sse2, + comp_func_Destination, + comp_func_SourceIn, + comp_func_DestinationIn, + comp_func_SourceOut, + comp_func_DestinationOut, + comp_func_SourceAtop, + comp_func_DestinationAtop, + comp_func_XOR, + comp_func_Plus_sse2, + comp_func_Multiply, + comp_func_Screen, + comp_func_Overlay, + comp_func_Darken, + comp_func_Lighten, + comp_func_ColorDodge, + comp_func_ColorBurn, + comp_func_HardLight, + comp_func_SoftLight, + comp_func_Difference, + comp_func_Exclusion, + rasterop_SourceOrDestination, + rasterop_SourceAndDestination, + rasterop_SourceXorDestination, + rasterop_NotSourceAndNotDestination, + rasterop_NotSourceOrNotDestination, + rasterop_NotSourceXorDestination, + rasterop_NotSource, + rasterop_NotSourceAndDestination, + rasterop_SourceAndNotDestination +}; + void qt_memfill16_sse2(quint16 *dest, quint16 value, int count) { if (count < 3) { diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper_sse3dnow.cpp --- a/src/gui/painting/qdrawhelper_sse3dnow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawhelper_sse3dnow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -85,14 +85,35 @@ comp_func_DestinationOver, comp_func_Clear, comp_func_Source, - 0, + comp_func_Destination, comp_func_SourceIn, comp_func_DestinationIn, comp_func_SourceOut, comp_func_DestinationOut, comp_func_SourceAtop, comp_func_DestinationAtop, - comp_func_XOR + comp_func_XOR, + comp_func_Plus, + comp_func_Multiply, + comp_func_Screen, + comp_func_Overlay, + comp_func_Darken, + comp_func_Lighten, + comp_func_ColorDodge, + comp_func_ColorBurn, + comp_func_HardLight, + comp_func_SoftLight, + comp_func_Difference, + comp_func_Exclusion, + rasterop_SourceOrDestination, + rasterop_SourceAndDestination, + rasterop_SourceXorDestination, + rasterop_NotSourceAndNotDestination, + rasterop_NotSourceOrNotDestination, + rasterop_NotSourceXorDestination, + rasterop_NotSource, + rasterop_NotSourceAndDestination, + rasterop_SourceAndNotDestination }; void qt_blend_color_argb_sse3dnow(int count, const QSpan *spans, void *userData) diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper_ssse3.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gui/painting/qdrawhelper_ssse3.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,252 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#ifdef QT_HAVE_SSSE3 + +#include + +QT_BEGIN_NAMESPACE + +inline static void blend_pixel(quint32 &dst, const quint32 src) +{ + if (src >= 0xff000000) + dst = src; + else if (src != 0) + dst = src + BYTE_MUL(dst, qAlpha(~src)); +} + + +/* The instruction palignr uses direct arguments, so we have to generate the code fo the different + shift (4, 8, 12). Checking the alignment inside the loop is unfortunatelly way too slow. + */ +#define BLENDING_LOOP(palignrOffset, length)\ + for (; x < length-3; x += 4) { \ + const __m128i srcVectorLastLoaded = _mm_load_si128((__m128i *)&src[x - minusOffsetToAlignSrcOn16Bytes + 4]);\ + const __m128i srcVector = _mm_alignr_epi8(srcVectorLastLoaded, srcVectorPrevLoaded, palignrOffset); \ + const __m128i srcVectorAlpha = _mm_and_si128(srcVector, alphaMask); \ + if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, alphaMask)) == 0xffff) { \ + _mm_store_si128((__m128i *)&dst[x], srcVector); \ + } else if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, nullVector)) != 0xffff) { \ + __m128i alphaChannel = _mm_shuffle_epi8(srcVector, alphaShuffleMask); \ + alphaChannel = _mm_sub_epi16(one, alphaChannel); \ + const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); \ + __m128i destMultipliedByOneMinusAlpha; \ + BYTE_MUL_SSE2(destMultipliedByOneMinusAlpha, dstVector, alphaChannel, colorMask, half); \ + const __m128i result = _mm_add_epi8(srcVector, destMultipliedByOneMinusAlpha); \ + _mm_store_si128((__m128i *)&dst[x], result); \ + } \ + srcVectorPrevLoaded = srcVectorLastLoaded;\ + } + + +#define BLEND_SOURCE_OVER_ARGB32_FIRST_ROW_SSSE3(dst, src, length, nullVector, half, one, colorMask, alphaMask) { \ + int x = 0; \ +\ + /* First, get dst aligned. */ \ + const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast(dst) >> 2) & 0x3)) & 0x3;\ + const int prologLength = qMin(length, offsetToAlignOn16Bytes);\ +\ + for (; x < prologLength; ++x) {\ + blend_pixel(dst[x], src[x]); \ + } \ +\ + const int minusOffsetToAlignSrcOn16Bytes = (reinterpret_cast(&(src[x])) >> 2) & 0x3;\ +\ + if (!minusOffsetToAlignSrcOn16Bytes) {\ + /* src is aligned, usual algorithm but with aligned operations.\ + See the SSE2 version for more documentation on the algorithm itself. */\ + const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\ + for (; x < length-3; x += 4) { \ + const __m128i srcVector = _mm_load_si128((__m128i *)&src[x]); \ + const __m128i srcVectorAlpha = _mm_and_si128(srcVector, alphaMask); \ + if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, alphaMask)) == 0xffff) { \ + _mm_store_si128((__m128i *)&dst[x], srcVector); \ + } else if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, nullVector)) != 0xffff) { \ + __m128i alphaChannel = _mm_shuffle_epi8(srcVector, alphaShuffleMask); \ + alphaChannel = _mm_sub_epi16(one, alphaChannel); \ + const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); \ + __m128i destMultipliedByOneMinusAlpha; \ + BYTE_MUL_SSE2(destMultipliedByOneMinusAlpha, dstVector, alphaChannel, colorMask, half); \ + const __m128i result = _mm_add_epi8(srcVector, destMultipliedByOneMinusAlpha); \ + _mm_store_si128((__m128i *)&dst[x], result); \ + } \ + } /* end for() */\ + } else if ((length - x) >= 8) {\ + /* We are at the first line, so "x - minusOffsetToAlignSrcOn16Bytes" could go before src, and\ + generate an invalid access. */\ +\ + /* We use two vectors to extract the src: prevLoaded for the first pixels, lastLoaded for the current pixels. */\ + __m128i srcVectorPrevLoaded;\ + if (minusOffsetToAlignSrcOn16Bytes > prologLength) {\ + /* We go forward 4 pixels to avoid reading before src. */\ + for (; x < prologLength + 4; ++x)\ + blend_pixel(dst[x], src[x]); \ + }\ + srcVectorPrevLoaded = _mm_load_si128((__m128i *)&src[x - minusOffsetToAlignSrcOn16Bytes]);\ + const int palignrOffset = minusOffsetToAlignSrcOn16Bytes << 2;\ +\ + const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\ + switch (palignrOffset) {\ + case 4:\ + BLENDING_LOOP(4, length)\ + break;\ + case 8:\ + BLENDING_LOOP(8, length)\ + break;\ + case 12:\ + BLENDING_LOOP(12, length)\ + break;\ + }\ + }\ + for (; x < length; ++x) \ + blend_pixel(dst[x], src[x]); \ +} + +// Basically blend src over dst with the const alpha defined as constAlphaVector. +// nullVector, half, one, colorMask are constant accross the whole image/texture, and should be defined as: +//const __m128i nullVector = _mm_set1_epi32(0); +//const __m128i half = _mm_set1_epi16(0x80); +//const __m128i one = _mm_set1_epi16(0xff); +//const __m128i colorMask = _mm_set1_epi32(0x00ff00ff); +//const __m128i alphaMask = _mm_set1_epi32(0xff000000); +// +// The computation being done is: +// result = s + d * (1-alpha) +// with shortcuts if fully opaque or fully transparent. +#define BLEND_SOURCE_OVER_ARGB32_MAIN_SSSE3(dst, src, length, nullVector, half, one, colorMask, alphaMask) { \ + int x = 0; \ +\ + /* First, get dst aligned. */ \ + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) { \ + blend_pixel(dst[x], src[x]); \ + } \ +\ + const int minusOffsetToAlignSrcOn16Bytes = (reinterpret_cast(&(src[x])) >> 2) & 0x3;\ +\ + if (!minusOffsetToAlignSrcOn16Bytes) {\ + /* src is aligned, usual algorithm but with aligned operations.\ + See the SSE2 version for more documentation on the algorithm itself. */\ + const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\ + for (; x < length-3; x += 4) { \ + const __m128i srcVector = _mm_load_si128((__m128i *)&src[x]); \ + const __m128i srcVectorAlpha = _mm_and_si128(srcVector, alphaMask); \ + if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, alphaMask)) == 0xffff) { \ + _mm_store_si128((__m128i *)&dst[x], srcVector); \ + } else if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, nullVector)) != 0xffff) { \ + __m128i alphaChannel = _mm_shuffle_epi8(srcVector, alphaShuffleMask); \ + alphaChannel = _mm_sub_epi16(one, alphaChannel); \ + const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); \ + __m128i destMultipliedByOneMinusAlpha; \ + BYTE_MUL_SSE2(destMultipliedByOneMinusAlpha, dstVector, alphaChannel, colorMask, half); \ + const __m128i result = _mm_add_epi8(srcVector, destMultipliedByOneMinusAlpha); \ + _mm_store_si128((__m128i *)&dst[x], result); \ + } \ + } /* end for() */\ + } else if ((length - x) >= 8) {\ + /* We use two vectors to extract the src: prevLoaded for the first pixels, lastLoaded for the current pixels. */\ + __m128i srcVectorPrevLoaded = _mm_load_si128((__m128i *)&src[x - minusOffsetToAlignSrcOn16Bytes]);\ + const int palignrOffset = minusOffsetToAlignSrcOn16Bytes << 2;\ +\ + const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\ + switch (palignrOffset) {\ + case 4:\ + BLENDING_LOOP(4, length)\ + break;\ + case 8:\ + BLENDING_LOOP(8, length)\ + break;\ + case 12:\ + BLENDING_LOOP(12, length)\ + break;\ + }\ + }\ + for (; x < length; ++x) \ + blend_pixel(dst[x], src[x]); \ +} + +void qt_blend_argb32_on_argb32_ssse3(uchar *destPixels, int dbpl, + const uchar *srcPixels, int sbpl, + int w, int h, + int const_alpha) +{ + const quint32 *src = (const quint32 *) srcPixels; + quint32 *dst = (quint32 *) destPixels; + if (const_alpha == 256) { + const __m128i alphaMask = _mm_set1_epi32(0xff000000); + const __m128i nullVector = _mm_setzero_si128(); + const __m128i half = _mm_set1_epi16(0x80); + const __m128i one = _mm_set1_epi16(0xff); + const __m128i colorMask = _mm_set1_epi32(0x00ff00ff); + + // We have to unrol the first row in order to deal with the load on unaligned data + // prior to the src pointer. + BLEND_SOURCE_OVER_ARGB32_FIRST_ROW_SSSE3(dst, src, w, nullVector, half, one, colorMask, alphaMask); + dst = (quint32 *)(((uchar *) dst) + dbpl); + src = (const quint32 *)(((const uchar *) src) + sbpl); + + for (int y = 1; y < h; ++y) { + BLEND_SOURCE_OVER_ARGB32_MAIN_SSSE3(dst, src, w, nullVector, half, one, colorMask, alphaMask); + dst = (quint32 *)(((uchar *) dst) + dbpl); + src = (const quint32 *)(((const uchar *) src) + sbpl); + } + } else if (const_alpha != 0) { + // dest = (s + d * sia) * ca + d * cia + // = s * ca + d * (sia * ca + cia) + // = s * ca + d * (1 - sa*ca) + const_alpha = (const_alpha * 255) >> 8; + const __m128i nullVector = _mm_setzero_si128(); + const __m128i half = _mm_set1_epi16(0x80); + const __m128i one = _mm_set1_epi16(0xff); + const __m128i colorMask = _mm_set1_epi32(0x00ff00ff); + const __m128i constAlphaVector = _mm_set1_epi16(const_alpha); + for (int y = 0; y < h; ++y) { + BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2(dst, src, w, nullVector, half, one, colorMask, constAlphaVector) + dst = (quint32 *)(((uchar *) dst) + dbpl); + src = (const quint32 *)(((const uchar *) src) + sbpl); + } + } +} + +QT_END_NAMESPACE + +#endif // QT_HAVE_SSSE3 diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawhelper_x86_p.h --- a/src/gui/painting/qdrawhelper_x86_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawhelper_x86_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -122,6 +122,9 @@ const uchar *srcPixels, int sbpl, int w, int h, int const_alpha); + +extern CompositionFunction qt_functionForMode_onlySSE2[]; +extern CompositionFunctionSolid qt_functionForModeSolid_onlySSE2[]; #endif // QT_HAVE_SSE2 #ifdef QT_HAVE_IWMMXT diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qdrawingprimitive_sse2_p.h --- a/src/gui/painting/qdrawingprimitive_sse2_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qdrawingprimitive_sse2_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -143,9 +143,7 @@ int x = 0; \ \ /* First, get dst aligned. */ \ - const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast(dst) >> 2) & 0x3)) & 0x3;\ - const int prologLength = qMin(length, offsetToAlignOn16Bytes);\ - for (; x < prologLength; ++x) { \ + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) { \ uint s = src[x]; \ if (s >= 0xff000000) \ dst[x] = s; \ @@ -202,9 +200,7 @@ { \ int x = 0; \ \ - const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast(dst) >> 2) & 0x3)) & 0x3;\ - const int prologLength = qMin(length, offsetToAlignOn16Bytes);\ - for (; x < prologLength; ++x) { \ + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) { \ quint32 s = src[x]; \ if (s != 0) { \ s = BYTE_MUL(s, const_alpha); \ diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qgraphicssystem_runtime.cpp --- a/src/gui/painting/qgraphicssystem_runtime.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qgraphicssystem_runtime.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -53,10 +53,8 @@ static int qt_pixmap_serial = 0; #define READBACK(f) \ - m_graphicsSystem->decreaseMemoryUsage(memoryUsage()); \ f \ - readBackInfo(); \ - m_graphicsSystem->increaseMemoryUsage(memoryUsage()); \ + readBackInfo(); class QDeferredGraphicsSystemChange : public QObject @@ -252,16 +250,8 @@ return m_data; } -uint QRuntimePixmapData::memoryUsage() const -{ - if(is_null || d == 0) - return 0; - return w * h * (d / 8); -} - - QRuntimeWindowSurface::QRuntimeWindowSurface(const QRuntimeGraphicsSystem *gs, QWidget *window) - : QWindowSurface(window), m_windowSurface(0), m_pendingWindowSurface(0), m_graphicsSystem(gs) + : QWindowSurface(window), m_graphicsSystem(gs) { } @@ -269,7 +259,6 @@ QRuntimeWindowSurface::~QRuntimeWindowSurface() { m_graphicsSystem->removeWindowSurface(this); - delete m_windowSurface; } QPaintDevice *QRuntimeWindowSurface::paintDevice() @@ -288,16 +277,13 @@ #ifdef QT_DEBUG qDebug() << "QRuntimeWindowSurface::flush() - destroy pending window surface"; #endif - delete m_pendingWindowSurface; - m_pendingWindowSurface = 0; + m_pendingWindowSurface.reset(); } } void QRuntimeWindowSurface::setGeometry(const QRect &rect) { - m_graphicsSystem->decreaseMemoryUsage(memoryUsage()); m_windowSurface->setGeometry(rect); - m_graphicsSystem->increaseMemoryUsage(memoryUsage()); } bool QRuntimeWindowSurface::scroll(const QRegion &area, int dx, int dy) @@ -330,27 +316,21 @@ return m_windowSurface->offset(widget); } -uint QRuntimeWindowSurface::memoryUsage() const -{ - QPaintDevice *pdev = m_windowSurface->paintDevice(); - if (pdev && pdev->depth() != 0) - return pdev->width() * pdev->height() * (pdev->depth()/8); - - return 0; -} - QRuntimeGraphicsSystem::QRuntimeGraphicsSystem() - : m_memoryUsage(0), m_windowSurfaceDestroyPolicy(DestroyImmediately), - m_graphicsSystem(0), m_graphicsSystemChangeMemoryLimit(0) + : m_windowSurfaceDestroyPolicy(DestroyImmediately), + m_graphicsSystem(0) { QApplicationPrivate::graphics_system_name = QLatin1String("runtime"); QApplicationPrivate::runtime_graphics_system = true; +#ifdef QT_DEFAULT_RUNTIME_SYSTEM + m_graphicsSystemName = QLatin1String(QT_DEFAULT_RUNTIME_SYSTEM); + if (m_graphicsSystemName.isNull()) +#endif + m_graphicsSystemName = QLatin1String("raster"); + #ifdef Q_OS_SYMBIAN - m_graphicsSystemName = QLatin1String("openvg"); m_windowSurfaceDestroyPolicy = DestroyAfterFirstFlush; -#else - m_graphicsSystemName = QLatin1String("raster"); #endif m_graphicsSystem = QGraphicsSystemFactory::create(m_graphicsSystemName); @@ -373,51 +353,30 @@ { Q_ASSERT(m_graphicsSystem); QRuntimeWindowSurface *rtSurface = new QRuntimeWindowSurface(this, widget); - rtSurface->m_windowSurface = m_graphicsSystem->createWindowSurface(widget); + rtSurface->m_windowSurface.reset(m_graphicsSystem->createWindowSurface(widget)); widget->setWindowSurface(rtSurface); m_windowSurfaces << rtSurface; - increaseMemoryUsage(rtSurface->memoryUsage()); return rtSurface; } -/*! - Sets graphics system when resource memory consumption is under /a memoryUsageLimit. -*/ -void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name, uint memoryUsageLimit) -{ -#ifdef QT_DEBUG - qDebug() << "QRuntimeGraphicsSystem::setGraphicsSystem( "<< name <<", " << memoryUsageLimit << ")"; - qDebug() << " current approximated graphics system memory usage " << memoryUsage() << " bytes"; -#endif - if (memoryUsage() >= memoryUsageLimit) { - m_graphicsSystemChangeMemoryLimit = memoryUsageLimit; - m_pendingGraphicsSystemName = name; - } else { - setGraphicsSystem(name); - } -} - void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) { if (m_graphicsSystemName == name) return; #ifdef QT_DEBUG qDebug() << "QRuntimeGraphicsSystem::setGraphicsSystem( " << name << " )"; - qDebug() << " current approximated graphics system memory usage "<< memoryUsage() << " bytes"; #endif - delete m_graphicsSystem; + QGraphicsSystem *oldSystem = m_graphicsSystem; m_graphicsSystem = QGraphicsSystemFactory::create(name); m_graphicsSystemName = name; Q_ASSERT(m_graphicsSystem); - m_graphicsSystemChangeMemoryLimit = 0; m_pendingGraphicsSystemName = QString(); for (int i = 0; i < m_pixmapDatas.size(); ++i) { QRuntimePixmapData *proxy = m_pixmapDatas.at(i); QPixmapData *newData = m_graphicsSystem->createPixmapData(proxy->m_data); - // ### TODO Optimize. Openvg and s60raster graphics systems could switch internal ARGB32_PRE QImage buffers. newData->fromImage(proxy->m_data->toImage(), Qt::NoOpaqueDetection); delete proxy->m_data; proxy->m_data = newData; @@ -428,58 +387,26 @@ QRuntimeWindowSurface *proxy = m_windowSurfaces.at(i); QWidget *widget = proxy->m_windowSurface->window(); - if(m_windowSurfaceDestroyPolicy == DestroyImmediately) { - delete proxy->m_windowSurface; - proxy->m_pendingWindowSurface = 0; - } else { - proxy->m_pendingWindowSurface = proxy->m_windowSurface; - } + if(m_windowSurfaceDestroyPolicy == DestroyAfterFirstFlush) + proxy->m_pendingWindowSurface.reset(proxy->m_windowSurface.take()); - proxy->m_windowSurface = m_graphicsSystem->createWindowSurface(widget); + proxy->m_windowSurface.reset(m_graphicsSystem->createWindowSurface(widget)); qt_widget_private(widget)->invalidateBuffer(widget->rect()); } + + delete oldSystem; } void QRuntimeGraphicsSystem::removePixmapData(QRuntimePixmapData *pixmapData) const { int index = m_pixmapDatas.lastIndexOf(pixmapData); m_pixmapDatas.removeAt(index); - decreaseMemoryUsage(pixmapData->memoryUsage(), true); } void QRuntimeGraphicsSystem::removeWindowSurface(QRuntimeWindowSurface *windowSurface) const { int index = m_windowSurfaces.lastIndexOf(windowSurface); m_windowSurfaces.removeAt(index); - decreaseMemoryUsage(windowSurface->memoryUsage(), true); -} - -void QRuntimeGraphicsSystem::increaseMemoryUsage(uint amount) const -{ - m_memoryUsage += amount; - - if (m_graphicsSystemChangeMemoryLimit && - m_memoryUsage < m_graphicsSystemChangeMemoryLimit) { - - QRuntimeGraphicsSystem *gs = const_cast(this); - QDeferredGraphicsSystemChange *deferredChange = - new QDeferredGraphicsSystemChange(gs, m_pendingGraphicsSystemName); - deferredChange->launch(); - } -} - -void QRuntimeGraphicsSystem::decreaseMemoryUsage(uint amount, bool persistent) const -{ - m_memoryUsage -= amount; - - if (persistent && m_graphicsSystemChangeMemoryLimit && - m_memoryUsage < m_graphicsSystemChangeMemoryLimit) { - - QRuntimeGraphicsSystem *gs = const_cast(this); - QDeferredGraphicsSystemChange *deferredChange = - new QDeferredGraphicsSystemChange(gs, m_pendingGraphicsSystemName); - deferredChange->launch(); - } } #include "qgraphicssystem_runtime.moc" diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qgraphicssystem_runtime_p.h --- a/src/gui/painting/qgraphicssystem_runtime_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qgraphicssystem_runtime_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -104,8 +104,6 @@ virtual QPixmapData *runtimeData() const; - virtual uint memoryUsage() const; - private: const QRuntimeGraphicsSystem *m_graphicsSystem; @@ -131,10 +129,8 @@ virtual QPoint offset(const QWidget *widget) const; - virtual uint memoryUsage() const; - - QWindowSurface *m_windowSurface; - QWindowSurface *m_pendingWindowSurface; + QScopedPointer m_windowSurface; + QScopedPointer m_pendingWindowSurface; private: const QRuntimeGraphicsSystem *m_graphicsSystem; @@ -159,7 +155,6 @@ void removePixmapData(QRuntimePixmapData *pixmapData) const; void removeWindowSurface(QRuntimeWindowSurface *windowSurface) const; - void setGraphicsSystem(const QString &name, uint memoryUsageLimit); void setGraphicsSystem(const QString &name); QString graphicsSystemName() const { return m_graphicsSystemName; } @@ -170,22 +165,14 @@ int windowSurfaceDestroyPolicy() const { return m_windowSurfaceDestroyPolicy; } - uint memoryUsage() const { return m_memoryUsage; } private: - - void increaseMemoryUsage(uint amount) const; - void decreaseMemoryUsage(uint amount, bool persistent = false) const; - -private: - mutable uint m_memoryUsage; int m_windowSurfaceDestroyPolicy; QGraphicsSystem *m_graphicsSystem; mutable QList m_pixmapDatas; mutable QList m_windowSurfaces; QString m_graphicsSystemName; - uint m_graphicsSystemChangeMemoryLimit; QString m_pendingGraphicsSystemName; friend class QRuntimePixmapData; diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qgrayraster.c --- a/src/gui/painting/qgrayraster.c Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qgrayraster.c Mon Oct 04 01:19:32 2010 +0300 @@ -956,53 +956,49 @@ const QT_FT_Vector* control2, const QT_FT_Vector* to ) { - TPos dx, dy, da, db; int top, level; int* levels; QT_FT_Vector* arc; + int mid_x = ( DOWNSCALE( ras.x ) + to->x + + 3 * (control1->x + control2->x ) ) / 8; + int mid_y = ( DOWNSCALE( ras.y ) + to->y + + 3 * (control1->y + control2->y ) ) / 8; + TPos dx = DOWNSCALE( ras.x ) + to->x - ( mid_x << 1 ); + TPos dy = DOWNSCALE( ras.y ) + to->y - ( mid_y << 1 ); - dx = DOWNSCALE( ras.x ) + to->x - ( control1->x << 1 ); if ( dx < 0 ) dx = -dx; - dy = DOWNSCALE( ras.y ) + to->y - ( control1->y << 1 ); if ( dy < 0 ) dy = -dy; if ( dx < dy ) dx = dy; - da = dx; - - dx = DOWNSCALE( ras.x ) + to->x - 3 * ( control1->x + control2->x ); - if ( dx < 0 ) - dx = -dx; - dy = DOWNSCALE( ras.y ) + to->y - 3 * ( control1->x + control2->y ); - if ( dy < 0 ) - dy = -dy; - if ( dx < dy ) - dx = dy; - db = dx; level = 1; - da = da / ras.cubic_level; - db = db / ras.conic_level; - while ( da > 0 || db > 0 ) + dx /= ras.cubic_level; + while ( dx > 0 ) { - da >>= 2; - db >>= 3; + dx >>= 2; level++; } if ( level <= 1 ) { - TPos to_x, to_y, mid_x, mid_y; + TPos to_x, to_y; to_x = UPSCALE( to->x ); to_y = UPSCALE( to->y ); + + /* Recalculation of midpoint is needed only if */ + /* UPSCALE and DOWNSCALE have any effect. */ + +#if ( PIXEL_BITS != 6 ) mid_x = ( ras.x + to_x + 3 * UPSCALE( control1->x + control2->x ) ) / 8; mid_y = ( ras.y + to_y + 3 * UPSCALE( control1->y + control2->y ) ) / 8; +#endif gray_render_line( RAS_VAR_ mid_x, mid_y ); gray_render_line( RAS_VAR_ to_x, to_y ); @@ -1359,10 +1355,6 @@ /* */ /* outline :: A pointer to the source target. */ /* */ - /* func_interface :: A table of `emitters', i.e,. function pointers */ - /* called during decomposition to indicate path */ - /* operations. */ - /* */ /* user :: A typeless pointer which is passed to each */ /* emitter during the decomposition. It can be */ /* used to store the state during the */ @@ -1373,15 +1365,10 @@ /* */ static int QT_FT_Outline_Decompose( const QT_FT_Outline* outline, - const QT_FT_Outline_Funcs* func_interface, void* user ) { #undef SCALED -#if 0 -#define SCALED( x ) ( ( (x) << shift ) - delta ) -#else #define SCALED( x ) (x) -#endif QT_FT_Vector v_last; QT_FT_Vector v_control; @@ -1396,12 +1383,6 @@ int error; char tag; /* current point's state */ -#if 0 - int shift = func_interface->shift; - TPos delta = func_interface->delta; -#endif - - first = 0; for ( n = 0; n < outline->n_contours; n++ ) @@ -1455,7 +1436,7 @@ tags--; } - error = func_interface->move_to( &v_start, user ); + error = gray_move_to( &v_start, user ); if ( error ) goto Exit; @@ -1475,7 +1456,7 @@ vec.x = SCALED( point->x ); vec.y = SCALED( point->y ); - error = func_interface->line_to( &vec, user ); + error = gray_line_to( &vec, user ); if ( error ) goto Exit; continue; @@ -1502,7 +1483,7 @@ if ( tag == QT_FT_CURVE_TAG_ON ) { - error = func_interface->conic_to( &v_control, &vec, + error = gray_conic_to( &v_control, &vec, user ); if ( error ) goto Exit; @@ -1515,7 +1496,7 @@ v_middle.x = ( v_control.x + vec.x ) / 2; v_middle.y = ( v_control.y + vec.y ) / 2; - error = func_interface->conic_to( &v_control, &v_middle, + error = gray_conic_to( &v_control, &v_middle, user ); if ( error ) goto Exit; @@ -1524,7 +1505,7 @@ goto Do_Conic; } - error = func_interface->conic_to( &v_control, &v_start, + error = gray_conic_to( &v_control, &v_start, user ); goto Close; } @@ -1555,20 +1536,20 @@ vec.x = SCALED( point->x ); vec.y = SCALED( point->y ); - error = func_interface->cubic_to( &vec1, &vec2, &vec, user ); + error = gray_cubic_to( &vec1, &vec2, &vec, user ); if ( error ) goto Exit; continue; } - error = func_interface->cubic_to( &vec1, &vec2, &v_start, user ); + error = gray_cubic_to( &vec1, &vec2, &v_start, user ); goto Close; } } } /* close the contour with a line segment */ - error = func_interface->line_to( &v_start, user ); + error = gray_line_to( &v_start, user ); Close: if ( error ) @@ -1596,22 +1577,11 @@ static int gray_convert_glyph_inner( RAS_ARG ) { - static - const QT_FT_Outline_Funcs func_interface = - { - (QT_FT_Outline_MoveTo_Func) gray_move_to, - (QT_FT_Outline_LineTo_Func) gray_line_to, - (QT_FT_Outline_ConicTo_Func)gray_conic_to, - (QT_FT_Outline_CubicTo_Func)gray_cubic_to, - 0, - 0 - }; - volatile int error = 0; if ( qt_ft_setjmp( ras.jump_buffer ) == 0 ) { - error = QT_FT_Outline_Decompose( &ras.outline, &func_interface, &ras ); + error = QT_FT_Outline_Decompose( &ras.outline, &ras ); gray_record_cell( RAS_VAR ); } else diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qpaintengine_x11.cpp --- a/src/gui/painting/qpaintengine_x11.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qpaintengine_x11.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1916,6 +1916,8 @@ int sh = qRound(sr.height()); QPixmap pixmap = qt_toX11Pixmap(px); + if(pixmap.isNull()) + return; if ((d->xinfo && d->xinfo->screen() != pixmap.x11Info().screen()) || (pixmap.x11Info().screen() != DefaultScreen(X11->display))) { diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qpaintengineex.cpp --- a/src/gui/painting/qpaintengineex.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qpaintengineex.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -831,7 +831,7 @@ int point_count = 0; x.points[0] = qt_curves_for_arc(r, 0, -360, x.points + 1, &point_count); - QVectorPath vp((qreal *) pts, 13, qpaintengineex_ellipse_types, QVectorPath::EllipseHint); + QVectorPath vp((qreal *) pts, point_count, qpaintengineex_ellipse_types, QVectorPath::EllipseHint); draw(vp); } diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qpainter.cpp --- a/src/gui/painting/qpainter.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qpainter.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -90,6 +90,15 @@ const QRectF &_r, int tf, const QTextOption *option, const QString& str, QRectF *brect, int tabstops, int* tabarray, int tabarraylen, QPainter *painter); +static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QFontEngine *fe, + QTextCharFormat::UnderlineStyle underlineStyle, + const QTextItem::RenderFlags flags, qreal width, + const QTextCharFormat &charFormat); +// Helper function to calculate left most position, width and flags for decoration drawing +static void drawDecorationForGlyphs(QPainter *painter, const glyph_t *glyphArray, + const QFixedPoint *positions, int glyphCount, + QFontEngine *fontEngine, const QFont &font, + const QTextCharFormat &charFormat); static inline QGradient::CoordinateMode coordinateMode(const QBrush &brush) { @@ -687,9 +696,9 @@ skip = false; - QBrush penBrush = s->pen.brush(); - Qt::BrushStyle brushStyle = s->brush.style(); - Qt::BrushStyle penBrushStyle = penBrush.style(); + QBrush penBrush = (qpen_style(s->pen) == Qt::NoPen) ? QBrush(Qt::NoBrush) : qpen_brush(s->pen); + Qt::BrushStyle brushStyle = qbrush_style(s->brush); + Qt::BrushStyle penBrushStyle = qbrush_style(penBrush); alpha = (penBrushStyle != Qt::NoBrush && (penBrushStyle < Qt::LinearGradientPattern && penBrush.color().alpha() != 255) && !penBrush.isOpaque()) @@ -5853,10 +5862,14 @@ return; } - if (d->extended->type() == QPaintEngine::OpenGL2 && !staticText_d->untransformedCoordinates) { + bool paintEngineSupportsTransformations = d->extended->type() == QPaintEngine::OpenGL2 + || d->extended->type() == QPaintEngine::OpenVG + || d->extended->type() == QPaintEngine::OpenGL; + + if (paintEngineSupportsTransformations && !staticText_d->untransformedCoordinates) { staticText_d->untransformedCoordinates = true; staticText_d->needsRelayout = true; - } else if (d->extended->type() != QPaintEngine::OpenGL2 && staticText_d->untransformedCoordinates) { + } else if (!paintEngineSupportsTransformations && staticText_d->untransformedCoordinates) { staticText_d->untransformedCoordinates = false; staticText_d->needsRelayout = true; } @@ -5895,7 +5908,7 @@ // Recreate the layout of the static text because the matrix or font has changed if (staticTextNeedsReinit) - staticText_d->init(); + staticText_d->init(); if (transformedPosition != staticText_d->position) { // Translate to actual position QFixed fx = QFixed::fromReal(transformedPosition.x()); @@ -5923,6 +5936,10 @@ currentColor = item->color; } d->extended->drawStaticTextItem(item); + + drawDecorationForGlyphs(this, item->glyphs, item->glyphPositions, + item->numGlyphs, item->fontEngine, staticText_d->font, + QTextCharFormat()); } if (currentColor != oldPen.color()) setPen(oldPen); @@ -6290,14 +6307,14 @@ return pixmap; } -static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QTextItemInt &ti) -{ - QTextCharFormat::UnderlineStyle underlineStyle = ti.underlineStyle; +static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QFontEngine *fe, + QTextCharFormat::UnderlineStyle underlineStyle, + const QTextItem::RenderFlags flags, qreal width, + const QTextCharFormat &charFormat) +{ if (underlineStyle == QTextCharFormat::NoUnderline - && !(ti.flags & (QTextItem::StrikeOut | QTextItem::Overline))) - return; - - QFontEngine *fe = ti.fontEngine; + && !(flags & (QTextItem::StrikeOut | QTextItem::Overline))) + return; const QPen oldPen = painter->pen(); const QBrush oldBrush = painter->brush(); @@ -6307,7 +6324,7 @@ pen.setWidthF(fe->lineThickness().toReal()); pen.setCapStyle(Qt::FlatCap); - QLineF line(pos.x(), pos.y(), pos.x() + ti.width.toReal(), pos.y()); + QLineF line(pos.x(), pos.y(), pos.x() + width, pos.y()); const qreal underlineOffset = fe->underlinePosition().toReal(); // deliberately ceil the offset to avoid the underline coming too close to @@ -6322,21 +6339,21 @@ painter->save(); painter->translate(0, pos.y() + 1); - QColor uc = ti.charFormat.underlineColor(); + QColor uc = charFormat.underlineColor(); if (uc.isValid()) pen.setColor(uc); // Adapt wave to underlineOffset or pen width, whatever is larger, to make it work on all platforms const QPixmap wave = generateWavyPixmap(qMax(underlineOffset, pen.widthF()), pen); - const int descent = (int) ti.descent.toReal(); + const int descent = (int) fe->descent().toReal(); painter->setBrushOrigin(painter->brushOrigin().x(), 0); - painter->fillRect(pos.x(), 0, qCeil(ti.width.toReal()), qMin(wave.height(), descent), wave); + painter->fillRect(pos.x(), 0, qCeil(width), qMin(wave.height(), descent), wave); painter->restore(); } else if (underlineStyle != QTextCharFormat::NoUnderline) { QLineF underLine(line.x1(), underlinePos, line.x2(), underlinePos); - QColor uc = ti.charFormat.underlineColor(); + QColor uc = charFormat.underlineColor(); if (uc.isValid()) pen.setColor(uc); @@ -6348,14 +6365,14 @@ pen.setStyle(Qt::SolidLine); pen.setColor(oldPen.color()); - if (ti.flags & QTextItem::StrikeOut) { + if (flags & QTextItem::StrikeOut) { QLineF strikeOutLine = line; strikeOutLine.translate(0., - fe->ascent().toReal() / 3.); painter->setPen(pen); painter->drawLine(strikeOutLine); } - if (ti.flags & QTextItem::Overline) { + if (flags & QTextItem::Overline) { QLineF overLine = line; overLine.translate(0., - fe->ascent().toReal()); painter->setPen(pen); @@ -6366,6 +6383,50 @@ painter->setBrush(oldBrush); } +static void drawDecorationForGlyphs(QPainter *painter, const glyph_t *glyphArray, + const QFixedPoint *positions, int glyphCount, + QFontEngine *fontEngine, const QFont &font, + const QTextCharFormat &charFormat) +{ + if (!(font.underline() || font.strikeOut() || font.overline())) + return; + + QFixed leftMost; + QFixed rightMost; + QFixed baseLine; + for (int i=0; iboundingBox(glyphArray[i]); + if (i == 0 || leftMost > positions[i].x) + leftMost = positions[i].x; + + // We don't support glyphs that do not share a common baseline. If this turns out to + // be a relevant use case, then we need to find clusters of glyphs that share a baseline + // and do a drawTextItemDecorations call per cluster. + if (i == 0 || baseLine < positions[i].y) + baseLine = positions[i].y; + + // We use the advance rather than the actual bounds to match the algorithm in drawText() + if (i == 0 || rightMost < positions[i].x + gm.xoff) + rightMost = positions[i].x + gm.xoff; + } + + QFixed width = rightMost - leftMost; + QTextItem::RenderFlags flags = 0; + + if (font.underline()) + flags |= QTextItem::Underline; + if (font.overline()) + flags |= QTextItem::Overline; + if (font.strikeOut()) + flags |= QTextItem::StrikeOut; + + drawTextItemDecoration(painter, QPointF(leftMost.toReal(), baseLine.toReal()), + fontEngine, + font.underline() ? QTextCharFormat::SingleUnderline + : QTextCharFormat::NoUnderline, flags, + width.toReal(), charFormat); +} + void QPainter::drawTextItem(const QPointF &p, const QTextItem &_ti) { #ifdef QT_DEBUG_DRAW @@ -6496,7 +6557,8 @@ else d->engine->drawTextItem(p, ti); } - drawTextItemDecoration(this, p, ti); + drawTextItemDecoration(this, p, ti.fontEngine, ti.underlineStyle, ti.flags, ti.width.toReal(), + ti.charFormat); if (d->state->renderHints != oldRenderHints) { d->state->renderHints = oldRenderHints; @@ -8966,7 +9028,7 @@ { Q_D(QPainter); - if (!d->engine) + if (!d->engine || pixmap.isNull()) return; #ifndef QT_NO_DEBUG diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qwindowsurface_qws.cpp --- a/src/gui/painting/qwindowsurface_qws.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qwindowsurface_qws.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -882,7 +882,11 @@ const QVector rects = rgn.rects(); const QColor blank = Qt::transparent; for (QVector::const_iterator it = rects.begin(); it != rects.end(); ++it) { - p.fillRect(*it, blank); + QRect r = *it; +#ifdef Q_BACKINGSTORE_SUBSURFACES + r.translate(painterOffset()); +#endif + p.fillRect(r, blank); } } QWSWindowSurface::beginPaint(rgn); diff -r ef0373b55136 -r 758a864f9613 src/gui/painting/qwindowsurface_s60.cpp --- a/src/gui/painting/qwindowsurface_s60.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/painting/qwindowsurface_s60.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -67,15 +67,13 @@ TDisplayMode mode = S60->screenDevice()->DisplayMode(); bool isOpaque = qt_widget_private(widget)->isOpaque; - if (mode == EColor16MA && isOpaque) { - mode = EColor16MU; // Faster since 16MU -> 16MA is typically accelerated - } else if (mode == EColor16MU && !isOpaque) { + if (isOpaque) { + mode = EColor16MU; + } else { if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_3) - mode = Q_SYMBIAN_ECOLOR16MAP; // Symbian^3 has hw support for ARGB32_PRE + mode = Q_SYMBIAN_ECOLOR16MAP; // Symbian^3 WServ has support for ARGB32_PRE else mode = EColor16MA; // Symbian prior to Symbian^3 sw accelerates EColor16MA - } else if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_3 && !isOpaque) { - mode = Q_SYMBIAN_ECOLOR16MAP; // Symbian^3 has hw support for ARGB32_PRE } // We create empty CFbsBitmap here -> it will be resized in setGeometry diff -r ef0373b55136 -r 758a864f9613 src/gui/s60framework/qs60mainapplication.cpp --- a/src/gui/s60framework/qs60mainapplication.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/s60framework/qs60mainapplication.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -136,16 +136,25 @@ return KNullDesC(); } +/*! + \internal +*/ void QS60MainApplication::PreDocConstructL() { QS60MainApplicationBase::PreDocConstructL(); } +/*! + \internal +*/ CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const { return QS60MainApplicationBase::OpenIniFileLC(aFs); } +/*! + \internal +*/ void QS60MainApplication::NewAppServerL(CApaAppServer *&aAppServer) { QS60MainApplicationBase::NewAppServerL(aAppServer); diff -r ef0373b55136 -r 758a864f9613 src/gui/s60framework/qs60mainappui.cpp --- a/src/gui/s60framework/qs60mainappui.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/s60framework/qs60mainappui.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -281,76 +281,121 @@ } } +/*! + \internal +*/ void QS60MainAppUi::Exit() { QS60MainAppUiBase::Exit(); } +/*! + \internal +*/ void QS60MainAppUi::SetFadedL(TBool aFaded) { QS60MainAppUiBase::SetFadedL(aFaded); } +/*! + \internal +*/ TRect QS60MainAppUi::ApplicationRect() const { return QS60MainAppUiBase::ApplicationRect(); } +/*! + \internal +*/ void QS60MainAppUi::HandleScreenDeviceChangedL() { QS60MainAppUiBase::HandleScreenDeviceChangedL(); } +/*! + \internal +*/ void QS60MainAppUi::HandleApplicationSpecificEventL(TInt aType, const TWsEvent &aEvent) { QS60MainAppUiBase::HandleApplicationSpecificEventL(aType, aEvent); } +/*! + \internal +*/ TTypeUid::Ptr QS60MainAppUi::MopSupplyObject(TTypeUid aId) { return QS60MainAppUiBase::MopSupplyObject(aId); } +/*! + \internal +*/ void QS60MainAppUi::ProcessCommandL(TInt aCommand) { QS60MainAppUiBase::ProcessCommandL(aCommand); } +/*! + \internal +*/ TErrorHandlerResponse QS60MainAppUi::HandleError (TInt aError, const SExtendedError &aExtErr, TDes &aErrorText, TDes &aContextText) { return QS60MainAppUiBase::HandleError(aError, aExtErr, aErrorText, aContextText); } +/*! + \internal +*/ void QS60MainAppUi::HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactivated, const TVwsViewId &aNewlyActivatedViewId) { QS60MainAppUiBase::HandleViewDeactivation(aViewIdToBeDeactivated, aNewlyActivatedViewId); } +/*! + \internal +*/ void QS60MainAppUi::PrepareToExit() { QS60MainAppUiBase::PrepareToExit(); } +/*! + \internal +*/ void QS60MainAppUi::HandleTouchPaneSizeChange() { QS60MainAppUiBase::HandleTouchPaneSizeChange(); } +/*! + \internal +*/ void QS60MainAppUi::HandleSystemEventL(const TWsEvent &aEvent) { QS60MainAppUiBase::HandleSystemEventL(aEvent); } +/*! + \internal +*/ void QS60MainAppUi::Reserved_MtsmPosition() { QS60MainAppUiBase::Reserved_MtsmPosition(); } +/*! + \internal +*/ void QS60MainAppUi::Reserved_MtsmObject() { QS60MainAppUiBase::Reserved_MtsmObject(); } +/*! + \internal +*/ void QS60MainAppUi::HandleForegroundEventL(TBool aForeground) { QS60MainAppUiBase::HandleForegroundEventL(aForeground); diff -r ef0373b55136 -r 758a864f9613 src/gui/s60framework/qs60maindocument.cpp --- a/src/gui/s60framework/qs60maindocument.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/s60framework/qs60maindocument.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -105,11 +105,17 @@ return (static_cast (new(ELeave)QS60MainAppUi)); } +/*! + \internal + */ CFileStore *QS60MainDocument::OpenFileL(TBool aDoOpen, const TDesC &aFilename, RFs &aFs) { return QS60MainDocumentBase::OpenFileL(aDoOpen, aFilename, aFs); } +/*! + \internal + */ void QS60MainDocument::OpenFileL(CFileStore *&aFileStore, RFile &aFile) { QS60MainDocumentBase::OpenFileL(aFileStore, aFile); diff -r ef0373b55136 -r 758a864f9613 src/gui/styles/qcleanlooksstyle.cpp --- a/src/gui/styles/qcleanlooksstyle.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/styles/qcleanlooksstyle.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -2157,7 +2157,7 @@ } if (button->features & QStyleOptionButton::HasMenu) - ir = ir.adjusted(0, 0, -pixelMetric(PM_MenuButtonIndicator, button, widget), 0); + ir = ir.adjusted(0, 0, -proxy()->pixelMetric(PM_MenuButtonIndicator, button, widget), 0); proxy()->drawItemText(painter, ir, tf, button->palette, (button->state & State_Enabled), button->text, QPalette::ButtonText); } @@ -4014,8 +4014,8 @@ switch (subControl) { case SC_SliderHandle: { if (slider->orientation == Qt::Horizontal) { - rect.setHeight(pixelMetric(PM_SliderThickness)); - rect.setWidth(pixelMetric(PM_SliderLength)); + rect.setHeight(proxy()->pixelMetric(PM_SliderThickness)); + rect.setWidth(proxy()->pixelMetric(PM_SliderLength)); int centerY = slider->rect.center().y() - rect.height() / 2; if (slider->tickPosition & QSlider::TicksAbove) centerY += tickSize; @@ -4023,8 +4023,8 @@ centerY -= tickSize; rect.moveTop(centerY); } else { - rect.setWidth(pixelMetric(PM_SliderThickness)); - rect.setHeight(pixelMetric(PM_SliderLength)); + rect.setWidth(proxy()->pixelMetric(PM_SliderThickness)); + rect.setHeight(proxy()->pixelMetric(PM_SliderLength)); int centerX = slider->rect.center().x() - rect.width() / 2; if (slider->tickPosition & QSlider::TicksAbove) centerX += tickSize; diff -r ef0373b55136 -r 758a864f9613 src/gui/styles/qgtkstyle.cpp --- a/src/gui/styles/qgtkstyle.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/styles/qgtkstyle.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -836,7 +836,10 @@ case PE_PanelItemViewItem: if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast(option)) { - if (vopt->backgroundBrush.style() != Qt::NoBrush) { + uint resolve_mask = vopt->palette.resolve(); + if (vopt->backgroundBrush.style() != Qt::NoBrush + || (resolve_mask & (1 << QPalette::Base))) + { QPointF oldBO = painter->brushOrigin(); painter->setBrushOrigin(vopt->rect.topLeft()); painter->fillRect(vopt->rect, vopt->backgroundBrush); diff -r ef0373b55136 -r 758a864f9613 src/gui/styles/qmacstyle_mac.h --- a/src/gui/styles/qmacstyle_mac.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/styles/qmacstyle_mac.h Mon Oct 04 01:19:32 2010 +0300 @@ -60,6 +60,8 @@ #define Q_GUI_EXPORT_STYLE_MAC Q_GUI_EXPORT #endif +class QPushButton; +class QStyleOptionButton; class QMacStylePrivate; class Q_GUI_EXPORT_STYLE_MAC QMacStyle : public QWindowsStyle { @@ -133,6 +135,8 @@ Q_DISABLE_COPY(QMacStyle) QMacStylePrivate *d; + + friend bool qt_mac_buttonIsRenderedFlat(const QPushButton *pushButton, const QStyleOptionButton *option); }; #endif // Q_WS_MAC diff -r ef0373b55136 -r 758a864f9613 src/gui/styles/qmacstyle_mac.mm --- a/src/gui/styles/qmacstyle_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/styles/qmacstyle_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -1059,6 +1059,16 @@ } } +bool qt_mac_buttonIsRenderedFlat(const QPushButton *pushButton, const QStyleOptionButton *option) +{ + QMacStyle *macStyle = qobject_cast(pushButton->style()); + if (!macStyle) + return false; + HIThemeButtonDrawInfo bdi; + macStyle->d->initHIThemePushButton(option, pushButton, kThemeStateActive, &bdi); + return bdi.kind == kThemeBevelButton; +} + /** Creates a HIThemeButtonDrawInfo structure that specifies the correct button kind and other details to use for drawing the given combobox. Which button @@ -1430,6 +1440,9 @@ bool QMacStylePrivate::animatable(QMacStylePrivate::Animates as, const QWidget *w) const { + if (!w) + return false; + if (as == AquaPushButton) { QPushButton *pb = const_cast(static_cast(w)); if (w->window()->isActiveWindow() && pb && !mouseDown) { diff -r ef0373b55136 -r 758a864f9613 src/gui/styles/qmacstyle_mac_p.h --- a/src/gui/styles/qmacstyle_mac_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/styles/qmacstyle_mac_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -150,6 +150,8 @@ return sizes[controlSize]; \ } while (0) +bool qt_mac_buttonIsRenderedFlat(const QPushButton *pushButton, const QStyleOptionButton *option); + class QMacStylePrivate : public QObject { Q_OBJECT diff -r ef0373b55136 -r 758a864f9613 src/gui/styles/qs60style.cpp --- a/src/gui/styles/qs60style.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/styles/qs60style.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -154,6 +154,9 @@ { clearCaches(); //deletes also background image deleteThemePalette(); +#ifdef Q_WS_S60 + removeAnimations(); +#endif } void QS60StylePrivate::drawSkinElement(SkinElements element, QPainter *painter, @@ -1097,8 +1100,7 @@ } State mflags = bflags; if (toolBtn->state & State_Sunken) { - if (toolBtn->activeSubControls & SC_ToolButton) - bflags |= State_Sunken; + bflags |= State_Sunken; mflags |= State_Sunken; } @@ -1114,11 +1116,6 @@ if (bflags & (State_Sunken | State_On | State_Raised | State_Enabled)) { tool.rect = button.unite(menuRect); tool.state = bflags; - const QToolButton *toolButtonWidget = qobject_cast(widget); - const QS60StylePrivate::SkinElements element = - ((toolButtonWidget && toolButtonWidget->isDown()) || (option->state & State_Sunken)) ? - QS60StylePrivate::SE_ToolBarButtonPressed : QS60StylePrivate::SE_ToolBarButton; - QS60StylePrivate::drawSkinElement(element, painter, tool.rect, flags); drawPrimitive(PE_PanelButtonTool, &tool, painter, widget); } if (toolBtn->subControls & SC_ToolButtonMenu) { @@ -2174,9 +2171,12 @@ case PE_PanelButtonBevel: case PE_FrameButtonBevel: if (QS60StylePrivate::canDrawThemeBackground(option->palette.base(), widget)) { - const bool isPressed = option->state & State_Sunken; - const QS60StylePrivate::SkinElements skinElement = - isPressed ? QS60StylePrivate::SE_ButtonPressed : QS60StylePrivate::SE_ButtonNormal; + const bool isPressed = (option->state & State_Sunken) || (option->state & State_On); + QS60StylePrivate::SkinElements skinElement; + if (element == PE_PanelButtonTool) + skinElement = isPressed ? QS60StylePrivate::SE_ToolBarButtonPressed : QS60StylePrivate::SE_ToolBarButton; + else + skinElement = isPressed ? QS60StylePrivate::SE_ButtonPressed : QS60StylePrivate::SE_ButtonNormal; QS60StylePrivate::drawSkinElement(skinElement, painter, option->rect, flags); } else { commonStyleDraws = true; @@ -2340,16 +2340,20 @@ tableView = true; QS60StylePrivate::SkinElements element; + bool themeGraphicDefined = false; QRect elementRect = option->rect; //draw item is drawn as pressed, if it already has focus. if (isPressed && (hasFocus || isSelected)) { + themeGraphicDefined = true; element = tableView ? QS60StylePrivate::SE_TableItemPressed : QS60StylePrivate::SE_ListItemPressed; } else if (hasFocus || (isSelected && selectionBehavior != QAbstractItemView::SelectItems)) { element = QS60StylePrivate::SE_ListHighlight; elementRect = highlightRect; + themeGraphicDefined = true; } - QS60StylePrivate::drawSkinElement(element, painter, elementRect, flags); + if (themeGraphicDefined) + QS60StylePrivate::drawSkinElement(element, painter, elementRect, flags); } else { QCommonStyle::drawPrimitive(element, option, painter, widget); } diff -r ef0373b55136 -r 758a864f9613 src/gui/styles/qs60style_p.h --- a/src/gui/styles/qs60style_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/styles/qs60style_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -571,6 +571,7 @@ void startAnimation(QS60StyleEnums::SkinParts animation); void stopAnimation(QS60StyleEnums::SkinParts animation); static QS60StyleAnimation* animationDefinition(QS60StyleEnums::SkinParts part); + static void removeAnimations(); #endif diff -r ef0373b55136 -r 758a864f9613 src/gui/styles/qs60style_s60.cpp --- a/src/gui/styles/qs60style_s60.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/styles/qs60style_s60.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1152,6 +1152,12 @@ setActiveLayout(); } +void QS60StylePrivate::removeAnimations() +{ + //currently only one animation in the list. + m_animations()->removeFirst(); +} + QColor QS60StylePrivate::s60Color(QS60StyleEnums::ColorLists list, int index, const QStyleOption *option) { diff -r ef0373b55136 -r 758a864f9613 src/gui/styles/qstyle.cpp --- a/src/gui/styles/qstyle.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/styles/qstyle.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -325,7 +325,7 @@ control over size of header items and row and column sizes. \sa QStyleOption, QStylePainter, {Styles Example}, - {Styles & Style Aware Widgets}, QStyledItemDelegate + {Styles and Style Aware Widgets}, QStyledItemDelegate */ /*! diff -r ef0373b55136 -r 758a864f9613 src/gui/styles/qstylesheetstyle.cpp --- a/src/gui/styles/qstylesheetstyle.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/styles/qstylesheetstyle.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -4094,7 +4094,7 @@ if (pe1 != PseudoElement_None) { QRenderRule subRule = renderRule(w, opt, pe1); if (subRule.bg != 0 || subRule.hasDrawable()) { - //We test subRule.bg dirrectly because hasBackground() would return false for background:none. + //We test subRule.bg directly because hasBackground() would return false for background:none. //But we still don't want the default drawning in that case (example for QScrollBar::add-page) (task 198926) subRule.drawRule(p, opt->rect); } else if (fallback) { @@ -4283,6 +4283,13 @@ } break; + case PE_FrameMenu: + if (rule.hasDrawable()) { + // Drawn by PE_PanelMenu + return; + } + break; + case PE_PanelMenuBar: if (rule.hasDrawable()) { // Drawn by PE_Widget diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qfont_s60.cpp --- a/src/gui/text/qfont_s60.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qfont_s60.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -40,15 +40,26 @@ ****************************************************************************/ #include "qfont.h" +#include "qfont_p.h" #include #include #include "qmutex.h" QT_BEGIN_NAMESPACE -#if 1 #ifdef QT_NO_FREETYPE Q_GLOBAL_STATIC(QMutex, lastResortFamilyMutex); +Q_GLOBAL_STATIC_WITH_INITIALIZER(QStringList, fontFamiliesOnFontServer, { + QSymbianFbsHeapLock lock(QSymbianFbsHeapLock::Unlock); + const int numTypeFaces = S60->screenDevice()->NumTypefaces(); + for (int i = 0; i < numTypeFaces; i++) { + TTypefaceSupport typefaceSupport; + S60->screenDevice()->TypefaceSupport(typefaceSupport, i); + const QString familyName((const QChar *)typefaceSupport.iTypeface.iName.Ptr(), typefaceSupport.iTypeface.iName.Length()); + x->append(familyName); + } + lock.relock(); +}); #endif // QT_NO_FREETYPE QString QFont::lastResortFamily() const @@ -70,7 +81,7 @@ lock.relock(); } return family; -#else +#else // QT_NO_FREETYPE // For the FreeType case we just hard code the face name, since otherwise on // East Asian systems we may get a name for a stroke based (non-ttf) font. @@ -82,15 +93,24 @@ return QLatin1String(isJapaneseOrChineseSystem?"Heisei Kaku Gothic S60":"Series 60 Sans"); #endif // QT_NO_FREETYPE } -#else // 0 -QString QFont::lastResortFamily() const -{ - return QLatin1String("Series 60 Sans"); -} -#endif // 0 QString QFont::defaultFamily() const { +#ifdef QT_NO_FREETYPE + switch(d->request.styleHint) { + case QFont::SansSerif: { + static const char* const preferredSansSerif[] = {"Nokia Sans S60", "Series 60 Sans"}; + for (int i = 0; i < sizeof preferredSansSerif / sizeof preferredSansSerif[0]; ++i) { + const QString sansSerif = QLatin1String(preferredSansSerif[i]); + if (fontFamiliesOnFontServer()->contains(sansSerif)) + return sansSerif; + } + } + // No break. Intentional fall through. + default: + return lastResortFamily(); + } +#endif // QT_NO_FREETYPE return lastResortFamily(); } diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qfontengine.cpp --- a/src/gui/text/qfontengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qfontengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -874,8 +874,8 @@ enum { Invalid, + AppleRoman, Symbol, - AppleRoman, Unicode11, Unicode, MicrosoftUnicode, @@ -939,7 +939,7 @@ return 0; resolveTable: - *isSymbolFont = (score == Symbol); + *isSymbolFont = (symbolTable > -1); unsigned int unicode_table = qFromBigEndian(maps + 8*tableToUse + 4); @@ -1093,6 +1093,18 @@ return *qt_grayPalette(); } +QFixed QFontEngine::lastRightBearing(const QGlyphLayout &glyphs, bool round) +{ + if (glyphs.numGlyphs >= 1) { + glyph_t glyph = glyphs.glyphs[glyphs.numGlyphs - 1]; + glyph_metrics_t gi = boundingBox(glyph); + if (gi.isValid()) + return round ? QFixed(qRound(gi.xoff - gi.x - gi.width)) + : QFixed(gi.xoff - gi.x - gi.width); + } + return 0; +} + // ------------------------------------------------------------------ // The box font engine // ------------------------------------------------------------------ diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qfontengine_ft.cpp --- a/src/gui/text/qfontengine_ft.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qfontengine_ft.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -94,6 +94,13 @@ #define Y_SIZE(face,i) ((face)->available_sizes[i].height << 6) #endif +/* FreeType 2.1.10 starts to provide FT_GlyphSlot_Embolden */ +#if (FREETYPE_MAJOR*10000+FREETYPE_MINOR*100+FREETYPE_PATCH) >= 20110 +#define Q_FT_GLYPHSLOT_EMBOLDEN(slot) FT_GlyphSlot_Embolden(slot) +#else +#define Q_FT_GLYPHSLOT_EMBOLDEN(slot) +#endif + #define FLOOR(x) ((x) & -64) #define CEIL(x) (((x)+63) & -64) #define TRUNC(x) ((x) >> 6) @@ -794,7 +801,7 @@ } FT_GlyphSlot slot = face->glyph; - if (embolden) FT_GlyphSlot_Embolden(slot); + if (embolden) Q_FT_GLYPHSLOT_EMBOLDEN(slot); int left = slot->metrics.horiBearingX; int right = slot->metrics.horiBearingX + slot->metrics.width; int top = slot->metrics.horiBearingY; @@ -940,7 +947,7 @@ return 0; FT_GlyphSlot slot = face->glyph; - if (embolden) FT_GlyphSlot_Embolden(slot); + if (embolden) Q_FT_GLYPHSLOT_EMBOLDEN(slot); FT_Library library = qt_getFreetype(); info.xOff = TRUNC(ROUND(slot->advance.x)); @@ -1558,8 +1565,6 @@ FT_Face face = freetype->face; for ( int i = 0; i < len; ++i ) { unsigned int uc = getChar(str, i, len); - if (mirrored) - uc = QChar::mirroredChar(uc); glyphs->glyphs[glyph_pos] = uc < QFreetypeFace::cmapCacheSize ? freetype->cmapCache[uc] : 0; if ( !glyphs->glyphs[glyph_pos] ) { glyph_t glyph; diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qfontengine_mac.mm --- a/src/gui/text/qfontengine_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qfontengine_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -349,11 +349,32 @@ int *nglyphs, QTextEngine::ShaperFlags flags) const { *nglyphs = len; + QCFType cfstring; + QVarLengthArray cgGlyphs(len); CTFontGetGlyphsForCharacters(ctfont, (const UniChar*)str, cgGlyphs.data(), len); - for (int i = 0; i < len; ++i) - glyphs->glyphs[i] = cgGlyphs[i]; + for (int i = 0; i < len; ++i) { + if (cgGlyphs[i]) { + glyphs->glyphs[i] = cgGlyphs[i]; + } else { + if (!cfstring) + cfstring = CFStringCreateWithCharactersNoCopy(0, reinterpret_cast(str), len, kCFAllocatorNull); + QCFType substituteFont = CTFontCreateForString(ctfont, cfstring, CFRangeMake(i, 1)); + CGGlyph substituteGlyph = 0; + CTFontGetGlyphsForCharacters(substituteFont, (const UniChar*)str + i, &substituteGlyph, 1); + if (substituteGlyph) { + const uint fontIndex = (fontIndexForFont(substituteFont) << 24); + glyphs->glyphs[i] = substituteGlyph | fontIndex; + if (!(flags & QTextEngine::GlyphIndicesOnly)) { + CGSize advance; + CTFontGetAdvancesForGlyphs(substituteFont, kCTFontHorizontalOrientation, &substituteGlyph, &advance, 1); + glyphs->advances_x[i] = QFixed::fromReal(advance.width); + glyphs->advances_y[i] = QFixed::fromReal(advance.height); + } + } + } + } if (flags & QTextEngine::GlyphIndicesOnly) return true; @@ -362,9 +383,14 @@ CTFontGetAdvancesForGlyphs(ctfont, kCTFontHorizontalOrientation, cgGlyphs.data(), advances.data(), len); for (int i = 0; i < len; ++i) { + if (glyphs->glyphs[i] & 0xff000000) + continue; glyphs->advances_x[i] = QFixed::fromReal(advances[i].width); glyphs->advances_y[i] = QFixed::fromReal(advances[i].height); - if (fontDef.styleStrategy & QFont::ForceIntegerMetrics) { + } + + if (fontDef.styleStrategy & QFont::ForceIntegerMetrics) { + for (int i = 0; i < len; ++i) { glyphs->advances_x[i] = glyphs->advances_x[i].round(); glyphs->advances_y[i] = glyphs->advances_y[i].round(); } @@ -429,12 +455,13 @@ glyph_metrics_t QCoreTextFontEngine::boundingBox(const QGlyphLayout &glyphs) { QFixed w; + bool round = fontDef.styleStrategy & QFont::ForceIntegerMetrics; + for (int i = 0; i < glyphs.numGlyphs; ++i) { - w += (fontDef.styleStrategy & QFont::ForceIntegerMetrics) - ? glyphs.effectiveAdvance(i).round() - : glyphs.effectiveAdvance(i); + w += round ? glyphs.effectiveAdvance(i).round() + : glyphs.effectiveAdvance(i); } - return glyph_metrics_t(0, -(ascent()), w, ascent()+descent(), w, 0); + return glyph_metrics_t(0, -(ascent()), w - lastRightBearing(glyphs, round), ascent()+descent(), w, 0); } glyph_metrics_t QCoreTextFontEngine::boundingBox(glyph_t glyph) { @@ -1454,12 +1481,12 @@ glyph_metrics_t QFontEngineMac::boundingBox(const QGlyphLayout &glyphs) { QFixed w; + bool round = fontDef.styleStrategy & QFont::ForceIntegerMetrics; for (int i = 0; i < glyphs.numGlyphs; ++i) { - w += (fontDef.styleStrategy & QFont::ForceIntegerMetrics) - ? glyphs.effectiveAdvance(i).round() - : glyphs.effectiveAdvance(i); + w += round ? glyphs.effectiveAdvance(i).round() + : glyphs.effectiveAdvance(i); } - return glyph_metrics_t(0, -(ascent()), w, ascent()+descent(), w, 0); + return glyph_metrics_t(0, -(ascent()), w - lastRightBearing(glyphs, round), ascent()+descent(), w, 0); } glyph_metrics_t QFontEngineMac::boundingBox(glyph_t glyph) diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qfontengine_p.h --- a/src/gui/text/qfontengine_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qfontengine_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -253,6 +253,7 @@ protected: static const QVector &grayPalette(); + QFixed lastRightBearing(const QGlyphLayout &glyphs, bool round = false); private: struct GlyphCacheEntry { diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qfontengine_qpf.cpp --- a/src/gui/text/qfontengine_qpf.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qfontengine_qpf.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -578,8 +578,6 @@ if (symbol) { for (int i = 0; i < len; ++i) { unsigned int uc = getChar(str, i, len); - if (mirrored) - uc = QChar::mirroredChar(uc); glyphs->glyphs[glyph_pos] = getTrueTypeGlyphIndex(cmap, uc); if(!glyphs->glyphs[glyph_pos] && uc < 0x100) glyphs->glyphs[glyph_pos] = getTrueTypeGlyphIndex(cmap, uc + 0xf000); diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qfontengine_qws.cpp --- a/src/gui/text/qfontengine_qws.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qfontengine_qws.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -557,7 +557,7 @@ QFixed w = 0; for (int i = 0; i < glyphs.numGlyphs; ++i) w += glyphs.effectiveAdvance(i); - return glyph_metrics_t(0, -ascent(), w, ascent()+descent()+1, w, 0); + return glyph_metrics_t(0, -ascent(), w - lastRightBearing(glyphs), ascent()+descent()+1, w, 0); } glyph_metrics_t QFontEngineQPF1::boundingBox(glyph_t glyph) diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qfontengine_s60.cpp --- a/src/gui/text/qfontengine_s60.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qfontengine_s60.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -166,6 +166,11 @@ return reinterpret_cast(m_cmapTable.constData()); } +bool QSymbianTypeFaceExtras::isSymbolCMap() const +{ + return m_symbolCMap; +} + CFont *QSymbianTypeFaceExtras::fontOwner() const { return m_cFont; @@ -256,7 +261,7 @@ for (int i = 0; i < len; ++i) { const unsigned int uc = getChar(characters, i, len); *g++ = QFontEngine::getTrueTypeGlyphIndex(cmap, - isRtl ? QChar::mirroredChar(uc) : uc); + (isRtl && !m_extras->isSymbolCMap()) ? QChar::mirroredChar(uc) : uc); } glyphs->numGlyphs = g - glyphs->glyphs; @@ -345,7 +350,7 @@ for (int i = 0; i < glyphs.numGlyphs; ++i) w += glyphs.effectiveAdvance(i); - return glyph_metrics_t(0, -ascent(), w, ascent()+descent()+1, w, 0); + return glyph_metrics_t(0, -ascent(), w - lastRightBearing(glyphs), ascent()+descent()+1, w, 0); } glyph_metrics_t QFontEngineS60::boundingBox_const(glyph_t glyph) const @@ -374,7 +379,10 @@ QFixed QFontEngineS60::ascent() const { - return m_originalFont->FontMaxAscent(); + // Workaround for QTBUG-8013 + // Stroke based fonts may return an incorrect FontMaxAscent of 0. + const QFixed ascent = m_originalFont->FontMaxAscent(); + return (ascent > 0) ? ascent : QFixed::fromReal(m_originalFontSizeInPixels) - descent(); } QFixed QFontEngineS60::descent() const diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qfontengine_s60_p.h --- a/src/gui/text/qfontengine_s60_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qfontengine_s60_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -83,6 +83,7 @@ bool getSfntTableData(uint tag, uchar *buffer, uint *length) const; const uchar *cmap() const; CFont *fontOwner() const; + bool isSymbolCMap() const; private: CFont* m_cFont; diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qfontengine_win.cpp --- a/src/gui/text/qfontengine_win.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qfontengine_win.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -487,7 +487,7 @@ for (int i = 0; i < glyphs.numGlyphs; ++i) w += glyphs.effectiveAdvance(i); - return glyph_metrics_t(0, -tm.tmAscent, w, tm.tmHeight, w, 0); + return glyph_metrics_t(0, -tm.tmAscent, w - lastRightBearing(glyphs), tm.tmHeight, w, 0); } #ifndef Q_WS_WINCE diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qstatictext.cpp --- a/src/gui/text/qstatictext.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qstatictext.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -109,10 +109,18 @@ QPainter::drawStaticText() and can change from call to call with a minimal impact on performance. - QStaticText will attempt to guess the format of the input text using Qt::mightBeRichText(). - To force QStaticText to display its contents as either plain text or rich text, use the - function QStaticText::setTextFormat() and pass in, respectively, Qt::PlainText and - Qt::RichText. + For extra convenience, it is possible to apply formatting to the text using the HTML subset + supported by QTextDocument. QStaticText will attempt to guess the format of the input text using + Qt::mightBeRichText(), and interpret it as rich text if this function returns true. To force + QStaticText to display its contents as either plain text or rich text, use the function + QStaticText::setTextFormat() and pass in, respectively, Qt::PlainText and Qt::RichText. + + QStaticText can only represent text, so only HTML tags which alter the layout or appearance of + the text will be respected. Adding an image to the input HTML, for instance, will cause the + image to be included as part of the layout, affecting the positions of the text glyphs, but it + will not be displayed. The result will be an empty area the size of the image in the output. + Similarly, using tables will cause the text to be laid out in table format, but the borders + will not be drawn. If it's the first time the static text is drawn, or if the static text, or the painter's font has been altered since the last time it was drawn, the text's layout has to be @@ -392,9 +400,9 @@ QStaticTextPrivate::QStaticTextPrivate(const QStaticTextPrivate &other) : text(other.text), font(other.font), textWidth(other.textWidth), matrix(other.matrix), - items(0), itemCount(0), glyphPool(0), positionPool(0), charPool(0), needsRelayout(true), - useBackendOptimizations(other.useBackendOptimizations), textFormat(other.textFormat), - untransformedCoordinates(other.untransformedCoordinates) + items(0), itemCount(0), glyphPool(0), positionPool(0), charPool(0), textOption(other.textOption), + needsRelayout(true), useBackendOptimizations(other.useBackendOptimizations), + textFormat(other.textFormat), untransformedCoordinates(other.untransformedCoordinates) { } @@ -472,7 +480,12 @@ memcpy(charsDestination, ti.chars, sizeof(QChar) * currentItem.numChars); m_items.append(currentItem); - } + } + + virtual void drawPolygon(const QPointF *, int , PolygonDrawMode ) + { + /* intentionally empty */ + } virtual bool begin(QPaintDevice *) { return true; } virtual bool end() { return true; } diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qtextcontrol.cpp --- a/src/gui/text/qtextcontrol.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qtextcontrol.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1101,14 +1101,6 @@ } } break; - case QEvent::LayoutDirectionChange: { - if (contextWidget) { - QTextOption opt = document()->defaultTextOption(); - opt.setTextDirection(contextWidget->layoutDirection()); - document()->setDefaultTextOption(opt); - } - } - // FALL THROUGH default: break; } diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qtextengine.cpp --- a/src/gui/text/qtextengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qtextengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -923,6 +923,13 @@ si.width += glyphs.advances_x[i]; } +static inline bool hasCaseChange(const QScriptItem &si) +{ + return si.analysis.flags == QScriptAnalysis::SmallCaps || + si.analysis.flags == QScriptAnalysis::Uppercase || + si.analysis.flags == QScriptAnalysis::Lowercase; +} + #if defined(Q_WS_WINCE) //TODO // set the glyph attributes heuristically. Assumes a 1 to 1 relationship between chars and glyphs // and no reordering. @@ -1050,14 +1057,15 @@ if (option.useDesignMetrics()) flags |= DesignMetrics; - attributes(); // pre-initialize char attributes + // pre-initialize char attributes + if (! attributes()) + return; const int len = length(item); int num_glyphs = length(item); const QChar *str = layoutData->string.unicode() + si.position; ushort upperCased[256]; - if (si.analysis.flags == QScriptAnalysis::SmallCaps || si.analysis.flags == QScriptAnalysis::Uppercase - || si.analysis.flags == QScriptAnalysis::Lowercase) { + if (hasCaseChange(si)) { ushort *uc = upperCased; if (len > 256) uc = new ushort[len]; @@ -1071,7 +1079,14 @@ } while (true) { - ensureSpace(num_glyphs); + if (! ensureSpace(num_glyphs)) { + // If str is converted to uppercase/lowercase form with a new buffer, + // we need to delete that buffer before return for error + const ushort *uc = reinterpret_cast(str); + if (hasCaseChange(si) && uc != upperCased) + delete [] uc; + return; + } num_glyphs = layoutData->glyphLayout.numGlyphs - layoutData->used; QGlyphLayout g = availableGlyphs(&si); @@ -1092,9 +1107,7 @@ layoutData->used += si.num_glyphs; const ushort *uc = reinterpret_cast(str); - if ((si.analysis.flags == QScriptAnalysis::SmallCaps || si.analysis.flags == QScriptAnalysis::Uppercase - || si.analysis.flags == QScriptAnalysis::Lowercase) - && uc != upperCased) + if (hasCaseChange(si) && uc != upperCased) delete [] uc; } #endif @@ -1133,8 +1146,7 @@ entire_shaper_item.item.bidiLevel = si.analysis.bidiLevel; HB_UChar16 upperCased[256]; // XXX what about making this 4096, so we don't have to extend it ever. - if (si.analysis.flags == QScriptAnalysis::SmallCaps || si.analysis.flags == QScriptAnalysis::Uppercase - || si.analysis.flags == QScriptAnalysis::Lowercase) { + if (hasCaseChange(si)) { HB_UChar16 *uc = upperCased; if (entire_shaper_item.item.length > 256) uc = new HB_UChar16[entire_shaper_item.item.length]; @@ -1156,17 +1168,24 @@ entire_shaper_item.shaperFlags |= HB_ShaperFlag_UseDesignMetrics; entire_shaper_item.num_glyphs = qMax(layoutData->glyphLayout.numGlyphs - layoutData->used, int(entire_shaper_item.item.length)); - ensureSpace(entire_shaper_item.num_glyphs); + if (! ensureSpace(entire_shaper_item.num_glyphs)) { + if (hasCaseChange(si)) + delete [] const_cast(entire_shaper_item.string); + return; + } QGlyphLayout initialGlyphs = availableGlyphs(&si).mid(0, entire_shaper_item.num_glyphs); if (!stringToGlyphs(&entire_shaper_item, &initialGlyphs, font)) { - ensureSpace(entire_shaper_item.num_glyphs); + if (! ensureSpace(entire_shaper_item.num_glyphs)) { + if (hasCaseChange(si)) + delete [] const_cast(entire_shaper_item.string); + return; + } initialGlyphs = availableGlyphs(&si).mid(0, entire_shaper_item.num_glyphs); if (!stringToGlyphs(&entire_shaper_item, &initialGlyphs, font)) { // ############ if this happens there's a bug in the fontengine - if ((si.analysis.flags == QScriptAnalysis::SmallCaps || si.analysis.flags == QScriptAnalysis::Uppercase - || si.analysis.flags == QScriptAnalysis::Lowercase) && entire_shaper_item.string != upperCased) + if (hasCaseChange(si) && entire_shaper_item.string != upperCased) delete [] const_cast(entire_shaper_item.string); return; } @@ -1231,7 +1250,11 @@ remaining_glyphs -= shaper_item.initialGlyphCount; do { - ensureSpace(glyph_pos + shaper_item.num_glyphs + remaining_glyphs); + if (! ensureSpace(glyph_pos + shaper_item.num_glyphs + remaining_glyphs)) { + if (hasCaseChange(si)) + delete [] const_cast(entire_shaper_item.string); + return; + } const QGlyphLayout g = availableGlyphs(&si).mid(glyph_pos); moveGlyphData(g.mid(shaper_item.num_glyphs), g.mid(shaper_item.initialGlyphCount), remaining_glyphs); @@ -1271,8 +1294,7 @@ layoutData->used += si.num_glyphs; - if ((si.analysis.flags == QScriptAnalysis::SmallCaps || si.analysis.flags == QScriptAnalysis::Uppercase) - && entire_shaper_item.string != upperCased) + if (hasCaseChange(si) && entire_shaper_item.string != upperCased) delete [] const_cast(entire_shaper_item.string); } @@ -1317,7 +1339,8 @@ return (HB_CharAttributes *) layoutData->memory; itemize(); - ensureSpace(layoutData->string.length()); + if (! ensureSpace(layoutData->string.length())) + return NULL; QVarLengthArray hbScriptItems(layoutData->items.size()); @@ -1538,14 +1561,19 @@ int QTextEngine::findItem(int strPos) const { itemize(); - - // ##### use binary search - int item; - for (item = layoutData->items.size()-1; item > 0; --item) { - if (layoutData->items[item].position <= strPos) - break; + int left = 0; + int right = layoutData->items.size()-1; + while(left <= right) { + int middle = ((right-left)/2)+left; + if (strPos > layoutData->items[middle].position) + left = middle+1; + else if(strPos < layoutData->items[middle].position) + right = middle-1; + else { + return middle; + } } - return item; + return right; } QFixed QTextEngine::width(int from, int len) const @@ -1618,7 +1646,6 @@ for (int i = 0; i < layoutData->items.size(); i++) { const QScriptItem *si = layoutData->items.constData() + i; - QFontEngine *fe = fontEngine(*si); int pos = si->position; int ilen = length(i); @@ -1648,6 +1675,7 @@ while (charFrom < ilen && logClusters[charFrom] == glyphStart) charFrom++; if (charFrom < ilen) { + QFontEngine *fe = fontEngine(*si); glyphStart = logClusters[charFrom]; int charEnd = from + len - 1 - pos; if (charEnd >= ilen) @@ -1666,11 +1694,6 @@ gm.yoff += m.yoff; } } - - glyph_t glyph = glyphs.glyphs[logClusters[ilen - 1]]; - glyph_metrics_t gi = fe->boundingBox(glyph); - if (gi.isValid()) - gm.width -= qRound(gi.xoff - gi.x - gi.width); } } return gm; @@ -1864,7 +1887,10 @@ // don't include trailing white spaces when doing justification int line_length = line.length; - const HB_CharAttributes *a = attributes()+line.from; + const HB_CharAttributes *a = attributes(); + if (! a) + return; + a += line.from; while (line_length && a[line_length-1].whiteSpace) --line_length; // subtract one char more, as we can't justfy after the last character @@ -2045,7 +2071,7 @@ memory_on_stack = false; used = 0; hasBidi = false; - inLayout = false; + layoutState = LayoutEmpty; haveCharAttributes = false; logClustersPtr = 0; available_glyphs = 0; @@ -2079,7 +2105,7 @@ } used = 0; hasBidi = false; - inLayout = false; + layoutState = LayoutEmpty; haveCharAttributes = false; } @@ -2090,12 +2116,12 @@ memory = 0; } -void QTextEngine::LayoutData::reallocate(int totalGlyphs) +bool QTextEngine::LayoutData::reallocate(int totalGlyphs) { Q_ASSERT(totalGlyphs >= glyphLayout.numGlyphs); if (memory_on_stack && available_glyphs >= totalGlyphs) { glyphLayout.grow(glyphLayout.data(), totalGlyphs); - return; + return true; } int space_charAttributes = sizeof(HB_CharAttributes)*string.length()/sizeof(void*) + 1; @@ -2103,11 +2129,21 @@ int space_glyphs = QGlyphLayout::spaceNeededForGlyphLayout(totalGlyphs)/sizeof(void*) + 2; int newAllocated = space_charAttributes + space_glyphs + space_logClusters; - Q_ASSERT(newAllocated >= allocated); + // These values can be negative if the length of string/glyphs causes overflow, + // we can't layout such a long string all at once, so return false here to + // indicate there is a failure + if (space_charAttributes < 0 || space_logClusters < 0 || space_glyphs < 0 || newAllocated < allocated) { + layoutState = LayoutFailed; + return false; + } + void **newMem = memory; newMem = (void **)::realloc(memory_on_stack ? 0 : memory, newAllocated*sizeof(void *)); - Q_CHECK_PTR(newMem); - if (memory_on_stack && newMem) + if (!newMem) { + layoutState = LayoutFailed; + return false; + } + if (memory_on_stack) memcpy(newMem, memory, allocated*sizeof(void *)); memory = newMem; memory_on_stack = false; @@ -2124,6 +2160,7 @@ glyphLayout.grow(reinterpret_cast(m), totalGlyphs); allocated = newAllocated; + return true; } // grow to the new size, copying the existing data to the new layout @@ -2155,7 +2192,7 @@ } else { layoutData->used = 0; layoutData->hasBidi = false; - layoutData->inLayout = false; + layoutData->layoutState = LayoutEmpty; layoutData->haveCharAttributes = false; } for (int i = 0; i < lines.size(); ++i) { @@ -2226,6 +2263,9 @@ case ',': case '?': case '!': + case '@': + case '#': + case '$': case ':': case ';': case '-': @@ -2246,6 +2286,7 @@ case '*': case '\'': case '"': + case '`': case '~': case '|': return true; @@ -2314,6 +2355,9 @@ shape(i); HB_CharAttributes *attributes = const_cast(this->attributes()); + if (!attributes) + return QString(); + unsigned short *logClusters = this->logClusters(&si); QGlyphLayout glyphs = shapedGlyphs(&si); @@ -2385,6 +2429,8 @@ return QString(); const HB_CharAttributes *attributes = this->attributes(); + if (!attributes) + return QString(); if (mode == Qt::ElideRight) { QFixed currentWidth; diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qtextengine_p.h --- a/src/gui/text/qtextengine_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qtextengine_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -416,6 +416,11 @@ class Q_GUI_EXPORT QTextEngine { public: + enum LayoutState { + LayoutEmpty, + InLayout, + LayoutFailed, + }; struct LayoutData { LayoutData(const QString &str, void **stack_memory, int mem_size); LayoutData(); @@ -428,11 +433,11 @@ QGlyphLayout glyphLayout; mutable int used; uint hasBidi : 1; - uint inLayout : 1; + uint layoutState : 2; uint memory_on_stack : 1; bool haveCharAttributes; QString string; - void reallocate(int totalGlyphs); + bool reallocate(int totalGlyphs); }; QTextEngine(LayoutData *data); @@ -520,9 +525,10 @@ return layoutData->glyphLayout.mid(si->glyph_data_offset, si->num_glyphs); } - inline void ensureSpace(int nGlyphs) const { + inline bool ensureSpace(int nGlyphs) const { if (layoutData->glyphLayout.numGlyphs - layoutData->used < nGlyphs) - layoutData->reallocate((((layoutData->used + nGlyphs)*3/2 + 15) >> 4) << 4); + return layoutData->reallocate((((layoutData->used + nGlyphs)*3/2 + 15) >> 4) << 4); + return true; } void freeMemory(); diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qtextlayout.cpp --- a/src/gui/text/qtextlayout.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qtextlayout.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -74,6 +74,8 @@ int pos = line.length; const HB_CharAttributes *attributes = eng->attributes(); + if (!attributes) + return QFixed(); while (pos > 0 && attributes[line.from + pos - 1].whiteSpace) --pos; return eng->width(line.from + pos, line.length - pos); @@ -601,7 +603,7 @@ void QTextLayout::beginLayout() { #ifndef QT_NO_DEBUG - if (d->layoutData && d->layoutData->inLayout) { + if (d->layoutData && d->layoutData->layoutState == QTextEngine::InLayout) { qWarning("QTextLayout::beginLayout: Called while already doing layout"); return; } @@ -609,7 +611,7 @@ d->invalidate(); d->clearLineData(); d->itemize(); - d->layoutData->inLayout = true; + d->layoutData->layoutState = QTextEngine::InLayout; } /*! @@ -618,7 +620,7 @@ void QTextLayout::endLayout() { #ifndef QT_NO_DEBUG - if (!d->layoutData || !d->layoutData->inLayout) { + if (!d->layoutData || d->layoutData->layoutState == QTextEngine::LayoutEmpty) { qWarning("QTextLayout::endLayout: Called without beginLayout()"); return; } @@ -627,7 +629,7 @@ if (l && d->lines.at(l-1).length < 0) { QTextLine(l-1, d).setNumColumns(INT_MAX); } - d->layoutData->inLayout = false; + d->layoutData->layoutState = QTextEngine::LayoutEmpty; if (!d->cacheGlyphs) d->freeMemory(); } @@ -757,11 +759,14 @@ QTextLine QTextLayout::createLine() { #ifndef QT_NO_DEBUG - if (!d->layoutData || !d->layoutData->inLayout) { + if (!d->layoutData || d->layoutData->layoutState == QTextEngine::LayoutEmpty) { qWarning("QTextLayout::createLine: Called without layouting"); return QTextLine(); } #endif + if (d->layoutData->layoutState == QTextEngine::LayoutFailed) + return QTextLine(); + int l = d->lines.size(); if (l && d->lines.at(l-1).length < 0) { QTextLine(l-1, d).setNumColumns(INT_MAX); @@ -1212,7 +1217,7 @@ bool hasText = (selection.format.foreground().style() != Qt::NoBrush); bool hasBackground= (selection.format.background().style() != Qt::NoBrush); - + if (hasBackground) { selection.format.setProperty(ObjectSelectionBrush, selection.format.property(QTextFormat::BackgroundBrush)); // don't just clear the property, set an empty brush that overrides a potential @@ -1704,14 +1709,18 @@ return glyphs.glyphs[logClusters[currentPosition - 1]]; } + inline void adjustRightBearing(glyph_t glyph) + { + qreal rb; + fontEngine->getGlyphBearings(glyph, 0, &rb); + rightBearing = qMin(QFixed(), QFixed::fromReal(rb)); + } + inline void adjustRightBearing() { if (currentPosition <= 0) return; - - qreal rb; - fontEngine->getGlyphBearings(currentGlyph(), 0, &rb); - rightBearing = qMin(QFixed(), QFixed::fromReal(rb)); + adjustRightBearing(currentGlyph()); } inline void resetRightBearing() @@ -1722,7 +1731,7 @@ }; inline bool LineBreakHelper::checkFullOtherwiseExtend(QScriptLine &line) -{ +{ LB_DEBUG("possible break width %f, spacew=%f", tmpData.textWidth.toReal(), spaceData.textWidth.toReal()); QFixed newWidth = calculateNewWidth(line); @@ -1788,19 +1797,31 @@ bool breakany = (wrapMode == QTextOption::WrapAnywhere); lbh.manualWrap = (wrapMode == QTextOption::ManualWrap || wrapMode == QTextOption::NoWrap); - // #### binary search! int item = -1; - int newItem; - for (newItem = eng->layoutData->items.size()-1; newItem > 0; --newItem) { - if (eng->layoutData->items[newItem].position <= line.from) + int newItem = -1; + int left = 0; + int right = eng->layoutData->items.size()-1; + while(left <= right) { + int middle = ((right-left)/2)+left; + if (line.from > eng->layoutData->items[middle].position) + left = middle+1; + else if(line.from < eng->layoutData->items[middle].position) + right = middle-1; + else { + newItem = middle; break; + } } + if (newItem == -1) + newItem = right; LB_DEBUG("from: %d: item=%d, total %d, width available %f", line.from, newItem, eng->layoutData->items.size(), line.width.toReal()); Qt::Alignment alignment = eng->option.alignment(); const HB_CharAttributes *attributes = eng->attributes(); + if (!attributes) + return; lbh.currentPosition = line.from; int end = 0; lbh.logClusters = eng->layoutData->logClustersPtr; @@ -1814,6 +1835,8 @@ if (!current.num_glyphs) { eng->shape(item); attributes = eng->attributes(); + if (!attributes) + return; lbh.logClusters = eng->layoutData->logClustersPtr; } lbh.currentPosition = qMax(line.from, current.position); @@ -1892,6 +1915,9 @@ } else { lbh.whiteSpaceOrObject = false; bool sb_or_ws = false; + glyph_t previousGlyph = 0; + if (lbh.currentPosition > 0 && lbh.logClusters[lbh.currentPosition - 1] line.width) +#endif lbh.adjustRightBearing(); if (lbh.checkFullOtherwiseExtend(line)) { + // we are too wide, fix right bearing + if (rightBearing <= 0) + lbh.rightBearing = rightBearing; // take from cache + else if (previousGlyph > 0) + lbh.adjustRightBearing(previousGlyph); if (!breakany) { line.textWidth += lbh.softHyphenWidth; } @@ -1951,7 +1985,7 @@ } LB_DEBUG("reached end of line"); lbh.checkFullOtherwiseExtend(line); -found: +found: if (lbh.rightBearing > 0 && !lbh.whiteSpaceOrObject) // If right bearing has not yet been adjusted lbh.adjustRightBearing(); line.textAdvance = line.textWidth; diff -r ef0373b55136 -r 758a864f9613 src/gui/text/qtextobject.cpp --- a/src/gui/text/qtextobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/text/qtextobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1156,6 +1156,10 @@ if (dir != Qt::LayoutDirectionAuto) return dir; + dir = p->defaultTextOption.textDirection(); + if (dir != Qt::LayoutDirectionAuto) + return dir; + const QString buffer = p->buffer(); const int pos = position(); diff -r ef0373b55136 -r 758a864f9613 src/gui/util/qcompleter.cpp --- a/src/gui/util/qcompleter.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/util/qcompleter.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -921,10 +921,12 @@ void QCompleterPrivate::_q_fileSystemModelDirectoryLoaded(const QString &path) { Q_Q(QCompleter); +#ifndef QT_NO_LINEEDIT QLineEdit *lineEdit = qobject_cast(widget); //the path given by QFileSystemModel does not end with / if (lineEdit && !lineEdit->text().isEmpty() && !q->completionPrefix().isEmpty() && q->completionPrefix() != path + QLatin1Char('/')) q->complete(); +#endif } /*! diff -r ef0373b55136 -r 758a864f9613 src/gui/util/qdesktopservices_s60.cpp --- a/src/gui/util/qdesktopservices_s60.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/util/qdesktopservices_s60.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -223,6 +223,7 @@ TApaTask task = taskList.FindApp(KUidBrowser); if (task.Exists()){ // Switch to existing browser instance + task.BringToForeground(); HBufC8* param8 = HBufC8::NewLC(buf16->Length()); param8->Des().Append(buf16->Des()); task.SendMessage(TUid::Uid( 0 ), *param8); // Uid is not used diff -r ef0373b55136 -r 758a864f9613 src/gui/util/qdesktopservices_x11.cpp --- a/src/gui/util/qdesktopservices_x11.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/util/qdesktopservices_x11.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -71,10 +71,12 @@ if (launch(url, QLatin1String("xdg-open"))) return true; - if (X11->desktopEnvironment == DE_GNOME && launch(url, QLatin1String("gnome-open"))) { + // Use the X11->desktopEnvironment value if X11 is non-NULL, + // otherwise just attempt to launch command regardless of the desktop environment + if ((!X11 || (X11 && X11->desktopEnvironment == DE_GNOME)) && launch(url, QLatin1String("gnome-open"))) { return true; } else { - if (X11->desktopEnvironment == DE_KDE && launch(url, QLatin1String("kfmclient exec"))) + if ((!X11 || (X11 && X11->desktopEnvironment == DE_KDE)) && launch(url, QLatin1String("kfmclient exec"))) return true; } @@ -104,10 +106,12 @@ if (launch(url, QString::fromLocal8Bit(getenv("BROWSER")))) return true; - if (X11->desktopEnvironment == DE_GNOME && launch(url, QLatin1String("gnome-open"))) { + // Use the X11->desktopEnvironment value if X11 is non-NULL, + // otherwise just attempt to launch command regardless of the desktop environment + if ((!X11 || (X11 && X11->desktopEnvironment == DE_GNOME)) && launch(url, QLatin1String("gnome-open"))) { return true; } else { - if (X11->desktopEnvironment == DE_KDE && launch(url, QLatin1String("kfmclient openURL"))) + if ((!X11 || (X11 && X11->desktopEnvironment == DE_KDE)) && launch(url, QLatin1String("kfmclient openURL"))) return true; } diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qcocoamenu_mac.mm --- a/src/gui/widgets/qcocoamenu_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qcocoamenu_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -188,6 +188,18 @@ return NO; } +- (NSInteger)indexOfItemWithTarget:(id)anObject andAction:(SEL)actionSelector +{ + NSInteger index = [super indexOfItemWithTarget:anObject andAction:actionSelector]; + static SEL selForOFCP = NSSelectorFromString(@"orderFrontCharacterPalette:"); + if (index == -1 && selForOFCP == actionSelector) { + // Check if the 'orderFrontCharacterPalette' SEL exists for QCocoaMenuLoader object + QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *loader = [NSApp QT_MANGLE_NAMESPACE(qt_qcocoamenuLoader)]; + return [super indexOfItemWithTarget:loader andAction:actionSelector]; + } + return index; +} + @end QT_BEGIN_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qcocoamenu_mac_p.h --- a/src/gui/widgets/qcocoamenu_mac_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qcocoamenu_mac_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -76,6 +76,7 @@ } - (id)initWithQMenu:(QMenu*)menu; - (BOOL)menuHasKeyEquivalent:(NSMenu *)menu forEvent:(NSEvent *)event target:(id *)target action:(SEL *)action; +- (NSInteger)indexOfItemWithTarget:(id)anObject andAction:(SEL)actionSelector; @end #endif diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qcombobox.cpp --- a/src/gui/widgets/qcombobox.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qcombobox.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -910,7 +910,7 @@ interaction. The highlighted() signal is emitted when the user highlights an item in the combobox popup list. All three signals exist in two versions, one with a QString argument and one with an - \c int argument. If the user selectes or highlights a pixmap, only + \c int argument. If the user selects or highlights a pixmap, only the \c int signals are emitted. Whenever the text of an editable combobox is changed the editTextChanged() signal is emitted. diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qcommandlinkbutton.cpp --- a/src/gui/widgets/qcommandlinkbutton.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qcommandlinkbutton.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -349,7 +349,7 @@ QStyleOptionButton option; initStyleOption(&option); - //Enable command link appearence on Vista + //Enable command link appearance on Vista option.features |= QStyleOptionButton::CommandLinkButton; option.text = QString(); option.icon = QIcon(); //we draw this ourselves diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qdatetimeedit.cpp --- a/src/gui/widgets/qdatetimeedit.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qdatetimeedit.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -248,7 +248,7 @@ /*! \property QDateTimeEdit::date - \brief the QDate that is set in the QDateTimeEdit + \brief the QDate that is set in the widget By default, this property contains a date that refers to January 1, 2000. @@ -279,7 +279,7 @@ /*! \property QDateTimeEdit::time - \brief the QTime that is set in the QDateTimeEdit + \brief the QTime that is set in the widget By default, this property contains a time of 00:00:00 and 0 milliseconds. @@ -754,6 +754,7 @@ Sets the given \a calendarWidget as the widget to be used for the calendar pop-up. The editor does not automatically take ownership of the calendar widget. + \note calendarPopup must be set to true before setting the calendar widget. \sa calendarPopup */ void QDateTimeEdit::setCalendarWidget(QCalendarWidget *calendarWidget) @@ -1554,13 +1555,6 @@ { } -/*! - \property QTimeEdit::time - \brief the QTime that is shown in the widget - - By default, this property contains a time of 00:00:00 and 0 milliseconds. -*/ - /*! \class QDateEdit @@ -1615,13 +1609,6 @@ { } -/*! - \property QDateEdit::date - \brief the QDate that is shown in the widget - - By default, this property contains a date referring to January 1, 2000. -*/ - // --- QDateTimeEditPrivate --- diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qdatetimeedit.h --- a/src/gui/widgets/qdatetimeedit.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qdatetimeedit.h Mon Oct 04 01:19:32 2010 +0300 @@ -206,7 +206,6 @@ class Q_GUI_EXPORT QTimeEdit : public QDateTimeEdit { Q_OBJECT - Q_PROPERTY(QTime time READ time WRITE setTime NOTIFY timeChanged USER true) public: QTimeEdit(QWidget *parent = 0); QTimeEdit(const QTime &time, QWidget *parent = 0); @@ -215,7 +214,6 @@ class Q_GUI_EXPORT QDateEdit : public QDateTimeEdit { Q_OBJECT - Q_PROPERTY(QDate date READ date WRITE setDate NOTIFY dateChanged USER true) public: QDateEdit(QWidget *parent = 0); QDateEdit(const QDate &date, QWidget *parent = 0); diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qlinecontrol.cpp --- a/src/gui/widgets/qlinecontrol.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qlinecontrol.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -419,7 +419,7 @@ int c = m_cursor; // cursor position after insertion of commit string - if (event->replacementStart() == 0) + if (event->replacementStart() <= 0) c += event->commitString().length() + qMin(-event->replacementStart(), event->replacementLength()); m_cursor += event->replacementStart(); diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qlineedit.cpp --- a/src/gui/widgets/qlineedit.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qlineedit.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1949,7 +1949,8 @@ if (d->control->hasSelectedText() || (d->cursorVisible && !d->control->inputMask().isEmpty() && !d->control->isReadOnly())){ flags |= QLineControl::DrawSelections; // Palette only used for selections/mask and may not be in sync - if(d->control->palette() != pal) + if (d->control->palette() != pal + || d->control->palette().currentColorGroup() != pal.currentColorGroup()) d->control->setPalette(pal); } diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qmainwindowlayout.cpp --- a/src/gui/widgets/qmainwindowlayout.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qmainwindowlayout.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -943,7 +943,7 @@ #ifdef Q_WS_MAC if (layoutState.mainWindow->unifiedTitleAndToolBarOnMac()) { // If we hit this case, someone has pressed the "toolbar button" which will - // toggle the unified toolbar visiblity, because that's what the user wants. + // toggle the unified toolbar visibility, because that's what the user wants. // We might be in a situation where someone has hidden all the toolbars // beforehand (maybe in construction), but now they've hit this button and // and are expecting the items to show. What do we do? diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qmainwindowlayout_mac.mm --- a/src/gui/widgets/qmainwindowlayout_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qmainwindowlayout_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -48,6 +48,7 @@ #include #else #include +#import #endif QT_BEGIN_NAMESPACE @@ -337,6 +338,17 @@ #endif layoutState.mainWindow->setUpdatesEnabled(false); // reduces a little bit of flicker, not all though +#if defined(QT_MAC_USE_COCOA) + QMacCocoaAutoReleasePool pool; + NSView *cView = [qt_mac_window_for(layoutState.mainWindow) contentView]; + if (useMacToolbar) { + [cView setPostsFrameChangedNotifications:YES]; + [[NSNotificationCenter defaultCenter] addObserver: [QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] + selector: @selector(syncContentViewFrame:) + name: NSViewFrameDidChangeNotification + object: cView]; + } +#endif if (!useMacToolbar) { macWindowToolbarShow(layoutState.mainWindow, false); // Move everything out of the HIToolbar into the main toolbar. @@ -356,6 +368,14 @@ } syncUnifiedToolbarVisibility(); } +#if defined(QT_MAC_USE_COCOA) + if (!useMacToolbar) { + [cView setPostsFrameChangedNotifications:NO]; + [[NSNotificationCenter defaultCenter] removeObserver: [QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] + name: NSViewFrameDidChangeNotification + object: cView]; + } +#endif layoutState.mainWindow->setUpdatesEnabled(true); } diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qmenu.cpp --- a/src/gui/widgets/qmenu.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qmenu.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -262,7 +262,7 @@ const int deskFw = style->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, &opt, q); const int tearoffHeight = tearoff ? style->pixelMetric(QStyle::PM_MenuTearoffHeight, &opt, q) : 0; - //for compatability now - will have to refactor this away.. + //for compatibility now - will have to refactor this away tabWidth = 0; maxIconWidth = 0; hasCheckableItems = false; @@ -1154,7 +1154,7 @@ bool QMenuPrivate::hasMouseMoved(const QPoint &globalPos) { - //determines if the mouse has moved (ie its intial position has + //determines if the mouse has moved (ie its initial position has //changed by more than QApplication::startDragDistance() //or if there were at least 6 mouse motions) return motions > 6 || diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qmenubar.cpp --- a/src/gui/widgets/qmenubar.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qmenubar.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -102,7 +102,7 @@ QStylePainter p(this); QStyleOptionToolButton opt; initStyleOption(&opt); - // We do not need to draw both extention arrows + // We do not need to draw both extension arrows opt.features &= ~QStyleOptionToolButton::HasMenu; p.drawComplexControl(QStyle::CC_ToolButton, opt); } diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qprintpreviewwidget.cpp --- a/src/gui/widgets/qprintpreviewwidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qprintpreviewwidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -469,7 +469,7 @@ \o Create the QPrintPreviewWidget Construct the QPrintPreviewWidget either by passing in an - exisiting QPrinter object, or have QPrintPreviewWidget create a + existing QPrinter object, or have QPrintPreviewWidget create a default constructed QPrinter object for you. \o Connect the paintRequested() signal to a slot. diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qpushbutton.cpp --- a/src/gui/widgets/qpushbutton.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qpushbutton.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -687,11 +687,11 @@ /*! \reimp */ bool QPushButton::hitButton(const QPoint &pos) const { - // This is only required if we are using the native style, so check that first. - QMacStyle *macStyle = qobject_cast(style()); - // If this is a flat button we just bail out. - if(isFlat() || (0 == macStyle)) + QStyleOptionButton opt; + initStyleOption(&opt); + if (qt_mac_buttonIsRenderedFlat(this, &opt)) return QAbstractButton::hitButton(pos); + // Now that we know we are using the native style, let's proceed. Q_D(const QPushButton); QPushButtonPrivate *nonConst = const_cast(d); diff -r ef0373b55136 -r 758a864f9613 src/gui/widgets/qtoolbarextension.cpp --- a/src/gui/widgets/qtoolbarextension.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/gui/widgets/qtoolbarextension.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -75,7 +75,7 @@ QStylePainter p(this); QStyleOptionToolButton opt; initStyleOption(&opt); - // We do not need to draw both extention arrows + // We do not need to draw both extension arrows opt.features &= ~QStyleOptionToolButton::HasMenu; p.drawComplexControl(QStyle::CC_ToolButton, opt); } diff -r ef0373b55136 -r 758a864f9613 src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp --- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -94,6 +94,7 @@ /*! \qmlclass FolderListModel QDeclarativeFolderListModel + \ingroup qml-working-with-data \brief The FolderListModel provides a model of the contents of a folder in a filesystem. FolderListModel provides access to the local filesystem. The \e folder property diff -r ef0373b55136 -r 758a864f9613 src/imports/gestures/qdeclarativegesturearea.cpp --- a/src/imports/gestures/qdeclarativegesturearea.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/imports/gestures/qdeclarativegesturearea.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -79,6 +79,8 @@ /*! \qmlclass GestureArea QDeclarativeGestureArea + \ingroup qml-basic-interaction-elements + \brief The GestureArea item enables simple gesture handling. \inherits Item diff -r ef0373b55136 -r 758a864f9613 src/imports/particles/qdeclarativeparticles.cpp --- a/src/imports/particles/qdeclarativeparticles.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/imports/particles/qdeclarativeparticles.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -154,6 +154,7 @@ /*! \qmlclass ParticleMotionLinear QDeclarativeParticleMotionLinear + \ingroup qml-particle-elements \since 4.7 \brief The ParticleMotionLinear object moves particles linearly. @@ -164,14 +165,6 @@ It has no further properties. */ - -/*! - \internal - \class QDeclarativeParticleMotionLinear - \ingroup group_effects - \brief The QDeclarativeParticleMotionLinear class moves the particles linearly. -*/ - void QDeclarativeParticleMotionLinear::advance(QDeclarativeParticle &p, int interval) { p.x += interval * p.x_velocity; @@ -180,6 +173,7 @@ /*! \qmlclass ParticleMotionGravity QDeclarativeParticleMotionGravity + \ingroup qml-particle-elements \since 4.7 \brief The ParticleMotionGravity object moves particles towards a point. @@ -194,14 +188,6 @@ */ /*! - \internal - \class QDeclarativeParticleMotionGravity - \ingroup group_effects - \brief The QDeclarativeParticleMotionGravity class moves the particles towards a point. - -*/ - -/*! \qmlproperty real ParticleMotionGravity::xattractor \qmlproperty real ParticleMotionGravity::yattractor These properties hold the x and y coordinates of the point attracting the particles. @@ -271,6 +257,7 @@ /*! \qmlclass ParticleMotionWander QDeclarativeParticleMotionWander + \ingroup qml-particle-elements \since 4.7 \brief The ParticleMotionWander object moves particles in a somewhat random fashion. @@ -308,16 +295,6 @@ */ /*! - \internal - \class QDeclarativeParticleMotionWander - \ingroup group_effects - \brief The QDeclarativeParticleMotionWander class moves particles in a somewhat random fashion. - - The particles will continue roughly in the original direction, however will randomly - drift to each side. -*/ - -/*! \qmlproperty real ParticleMotionWander::xvariance \qmlproperty real ParticleMotionWander::yvariance @@ -634,6 +611,7 @@ /*! \qmlclass Particles QDeclarativeParticles + \ingroup qml-particle-elements \since 4.7 \brief The Particles object generates and moves particles. \inherits Item @@ -705,13 +683,6 @@ \image particles.gif */ -/*! - \internal - \class QDeclarativeParticles - \ingroup group_effects - \brief The QDeclarativeParticles class generates and moves particles. -*/ - QDeclarativeParticles::QDeclarativeParticles(QDeclarativeItem *parent) : QDeclarativeItem(*(new QDeclarativeParticlesPrivate), parent) { diff -r ef0373b55136 -r 758a864f9613 src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp --- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -431,21 +431,24 @@ while (*n != NULL) { name = snd_device_name_get_hint(*n, "NAME"); - descr = snd_device_name_get_hint(*n, "DESC"); - io = snd_device_name_get_hint(*n, "IOID"); - if((name != NULL) && (descr != NULL) && ((io == NULL) || (io == filter))) { - QString deviceName = QLatin1String(name); - QString deviceDescription = QLatin1String(descr); - allDevices.append(deviceName.toLocal8Bit().constData()); - if(deviceDescription.contains(QLatin1String("Default Audio Device"))) - devices.append(deviceName.toLocal8Bit().constData()); + if (name != 0 && qstrcmp(name, "null") != 0) { + descr = snd_device_name_get_hint(*n, "DESC"); + io = snd_device_name_get_hint(*n, "IOID"); + + if ((descr != NULL) && ((io == NULL) || (io == filter))) { + QString deviceName = QLatin1String(name); + QString deviceDescription = QLatin1String(descr); + allDevices.append(deviceName.toLocal8Bit().constData()); + if (deviceDescription.contains(QLatin1String("Default Audio Device"))) + devices.append(deviceName.toLocal8Bit().constData()); + } + + free(name); + if (descr != NULL) + free(descr); + if (io != NULL) + free(io); } - if(name != NULL) - free(name); - if(descr != NULL) - free(descr); - if(io != NULL) - free(io); ++n; } snd_device_name_free_hint(hints); diff -r ef0373b55136 -r 758a864f9613 src/multimedia/video/qvideosurfaceformat.cpp --- a/src/multimedia/video/qvideosurfaceformat.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/multimedia/video/qvideosurfaceformat.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -252,7 +252,7 @@ bool QVideoSurfaceFormat::isValid() const { - return d->pixelFormat == QVideoFrame::Format_Invalid && d->frameSize.isValid(); + return d->pixelFormat != QVideoFrame::Format_Invalid && d->frameSize.isValid(); } /*! diff -r ef0373b55136 -r 758a864f9613 src/network/access/qhttpnetworkconnection.cpp --- a/src/network/access/qhttpnetworkconnection.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/access/qhttpnetworkconnection.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -653,6 +653,8 @@ // is the reply associated the currently processing of this channel? if (channels[i].reply == reply) { channels[i].reply = 0; + channels[i].request = QHttpNetworkRequest(); + channels[i].resendCurrent = false; if (!reply->isFinished() && !channels[i].alreadyPipelinedRequests.isEmpty()) { // the reply had to be prematurely removed, e.g. it was not finished diff -r ef0373b55136 -r 758a864f9613 src/network/access/qhttpnetworkconnectionchannel.cpp --- a/src/network/access/qhttpnetworkconnectionchannel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -647,8 +647,10 @@ // finished request. // Note that this may trigger a segfault at some other point. But then we can fix the underlying // problem. - if (!resendCurrent) + if (!resendCurrent) { + request = QHttpNetworkRequest(); reply = 0; + } // move next from pipeline to current request if (!alreadyPipelinedRequests.isEmpty()) { diff -r ef0373b55136 -r 758a864f9613 src/network/access/qnetworkaccessmanager.cpp --- a/src/network/access/qnetworkaccessmanager.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/access/qnetworkaccessmanager.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -201,7 +201,7 @@ deleteResource()) \value CustomOperation custom operation (created with - sendCustomRequest()) + sendCustomRequest()) \since 4.7 \omitvalue UnknownOperation diff -r ef0373b55136 -r 758a864f9613 src/network/access/qnetworkrequest.cpp --- a/src/network/access/qnetworkrequest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/access/qnetworkrequest.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -105,7 +105,8 @@ /*! \enum QNetworkRequest::Attribute - + \since 4.7 + Attribute codes for the QNetworkRequest and QNetworkReply. Attributes are extra meta-data that are used to control the @@ -174,21 +175,21 @@ When using this flag with sequential upload data, the ContentLengthHeader header must be set. - \value HttpPipeliningAllowedAttribute + \value HttpPipeliningAllowedAttribute Requests only, type: QVariant::Bool (default: false) Indicates whether the QNetworkAccessManager code is allowed to use HTTP pipelining with this request. - \value HttpPipeliningWasUsedAttribute + \value HttpPipeliningWasUsedAttribute Replies only, type: QVariant::Bool Indicates whether the HTTP pipelining was used for receiving this reply. \value CustomVerbAttribute Requests only, type: QVariant::ByteArray - Holds the value for the custom HTTP verb to send (destined for usage - of other verbs than GET, POST, PUT and DELETE). This verb is set - when calling QNetworkAccessManager::sendCustomRequest(). + Holds the value for the custom HTTP verb to send (destined for usage + of other verbs than GET, POST, PUT and DELETE). This verb is set + when calling QNetworkAccessManager::sendCustomRequest(). \value CookieLoadControlAttribute Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) @@ -198,45 +199,42 @@ XMLHttpRequest where withCredentials has not been set explicitly to true by the Javascript that created the request. - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. + See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag}{here} for more information. - \since 4.7 + (This value was introduced in 4.7.) - \value CookieSaveControlAttribute + + \value CookieSaveControlAttribute Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) Indicates whether to save 'Cookie' headers received from the server in reply to the request. - This attribute is set to false by QtWebKit when creating a cross-origin XMLHttpRequest where withCredentials has not been set explicitly to true by the Javascript that created the request. - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. + See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information. - \since 4.7 + (This value was introduced in 4.7.) - \value AuthenticationReuseAttribute + \value AuthenticationReuseAttribute Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic) Indicates whether to use cached authorization credentials in the request, if available. If this is set to QNetworkRequest::Manual and the authentication mechanism is 'Basic' or 'Digest', Qt will not send an an 'Authorization' HTTP header with any cached credentials it may have for the request's URL. - This attribute is set to QNetworkRequest::Manual by QtWebKit when creating a cross-origin XMLHttpRequest where withCredentials has not been set explicitly to true by the Javascript that created the request. - See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information. + See \l{http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag} {here} for more information. - \since 4.7 + (This value was introduced in 4.7.) \omitvalue MaximumDownloadBufferSizeAttribute - \since 4.7 - \internal + (This value was introduced in 4.7.) \omitvalue DownloadBufferAttribute - \since 4.7 - \internal + (This value was introduced in 4.7.) \value User Special type. Additional information can be passed in diff -r ef0373b55136 -r 758a864f9613 src/network/bearer/qnetworkconfigmanager.cpp --- a/src/network/bearer/qnetworkconfigmanager.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/bearer/qnetworkconfigmanager.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -45,16 +45,45 @@ #include "qbearerengine_p.h" #include +#include #ifndef QT_NO_BEARERMANAGEMENT QT_BEGIN_NAMESPACE -Q_GLOBAL_STATIC(QNetworkConfigurationManagerPrivate, connManager); +#define Q_GLOBAL_STATIC_QAPP_DESTRUCTION(TYPE, NAME) \ + Q_GLOBAL_STATIC_INIT(TYPE, NAME); \ + static void NAME##_cleanup() \ + { \ + delete this_##NAME.pointer; \ + this_##NAME.pointer = 0; \ + this_##NAME.destroyed = true; \ + } \ + static TYPE *NAME() \ + { \ + if (!this_##NAME.pointer && !this_##NAME.destroyed) { \ + TYPE *x = new TYPE; \ + if (!this_##NAME.pointer.testAndSetOrdered(0, x)) \ + delete x; \ + else \ + qAddPostRoutine(NAME##_cleanup); \ + } \ + return this_##NAME.pointer; \ + } + +Q_GLOBAL_STATIC_QAPP_DESTRUCTION(QNetworkConfigurationManagerPrivate, connManager); QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate() { - return connManager(); + static bool initialized = false; + + QNetworkConfigurationManagerPrivate *m = connManager(); + if (!initialized) { + initialized = true; + m->updateConfigurations(); + } + + return m; } /*! @@ -178,7 +207,7 @@ QNetworkConfigurationManager::QNetworkConfigurationManager( QObject* parent ) : QObject(parent) { - QNetworkConfigurationManagerPrivate *priv = connManager(); + QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate(); connect(priv, SIGNAL(configurationAdded(QNetworkConfiguration)), this, SIGNAL(configurationAdded(QNetworkConfiguration))); diff -r ef0373b55136 -r 758a864f9613 src/network/bearer/qnetworkconfigmanager_p.cpp --- a/src/network/bearer/qnetworkconfigmanager_p.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/bearer/qnetworkconfigmanager_p.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -63,9 +63,7 @@ : pollTimer(0), mutex(QMutex::Recursive), forcedPolling(0), firstUpdate(true) { qRegisterMetaType("QNetworkConfiguration"); - - moveToThread(QCoreApplicationPrivate::mainThread()); - updateConfigurations(); + qRegisterMetaType("QNetworkConfigurationPrivatePointer"); } QNetworkConfigurationManagerPrivate::~QNetworkConfigurationManagerPrivate() @@ -150,25 +148,29 @@ end = engine->accessPointConfigurations.end(); it != end; ++it) { QNetworkConfigurationPrivatePointer ptr = it.value(); - const QString bearerName = ptr->bearerName(); QMutexLocker configLocker(&ptr->mutex); + QNetworkConfiguration::BearerType bearerType = ptr->bearerType; if ((ptr->state & QNetworkConfiguration::Discovered) == QNetworkConfiguration::Discovered) { if (!defaultConfiguration) { defaultConfiguration = ptr; } else { + QMutexLocker defaultConfigLocker(&defaultConfiguration->mutex); + if (defaultConfiguration->state == ptr->state) { - if (defaultConfiguration->bearerName() == QLatin1String("Ethernet")) { + switch (defaultConfiguration->bearerType) { + case QNetworkConfiguration::BearerEthernet: // do nothing - } else if (defaultConfiguration->bearerName() == QLatin1String("WLAN")) { - // ethernet beats wlan - if (bearerName == QLatin1String("Ethernet")) - defaultConfiguration = ptr; - } else { - // ethernet and wlan beats other - if (bearerName == QLatin1String("Ethernet") || - bearerName == QLatin1String("WLAN")) { + break; + case QNetworkConfiguration::BearerWLAN: + // Ethernet beats WLAN + defaultConfiguration = ptr; + break; + default: + // Ethernet and WLAN beats other + if (bearerType == QNetworkConfiguration::BearerEthernet || + bearerType == QNetworkConfiguration::BearerWLAN) { defaultConfiguration = ptr; } } @@ -354,6 +356,13 @@ if (sender()) return; + if (thread() != QCoreApplicationPrivate::mainThread()) { + if (thread() != QThread::currentThread()) + return; + + moveToThread(QCoreApplicationPrivate::mainThread()); + } + updating = false; #ifndef QT_NO_LIBRARY diff -r ef0373b55136 -r 758a864f9613 src/network/bearer/qnetworkconfiguration.cpp --- a/src/network/bearer/qnetworkconfiguration.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/bearer/qnetworkconfiguration.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -183,6 +183,23 @@ */ /*! + \enum QNetworkConfiguration::BearerType + + Specifies the type of bearer used by a configuration. + + \value BearerUnknown The type of bearer is unknown or unspecified. The bearerTypeName() + function may return additional information. + \value BearerEthernet The configuration is for an Ethernet interfaces. + \value BearerWLAN The configuration is for a Wireless LAN interface. + \value Bearer2G The configuration is for a CSD, GPRS, HSCSD, EDGE or cdmaOne interface. + \value BearerCDMA2000 The configuration is for CDMA interface. + \value BearerWCDMA The configuration is for W-CDMA/UMTS interface. + \value BearerHSPA The configuration is for High Speed Packet Access (HSPA) interface. + \value BearerBluetooth The configuration is for a Bluetooth interface. + \value BearerWiMAX The configuration is for a WiMAX interface. +*/ + +/*! Constructs an invalid configuration object. \sa isValid() @@ -383,53 +400,113 @@ } /*! - Returns the type of bearer. The string is not translated and - therefore can not be shown to the user. The subsequent table presents the currently known - bearer types: + \fn QString QNetworkConfiguration::bearerName() const + \deprecated + + This function is deprecated. It is equivalent to calling bearerTypeName(), however + bearerType() should be used in preference. +*/ + +/*! + Returns the type of bearer used by this network configuration. + + If the bearer type is \l {QNetworkConfiguration::BearerUnknown}{unknown} the bearerTypeName() + function can be used to retrieve a textural type name for the bearer. + + An invalid network configuration always returns the BearerUnknown value. +*/ +QNetworkConfiguration::BearerType QNetworkConfiguration::bearerType() const +{ + if (!isValid()) + return BearerUnknown; + + QMutexLocker locker(&d->mutex); + + return d->bearerType; +} + +/*! + Returns the type of bearer used by this network configuration as a string. + + The string is not translated and therefore can not be shown to the user. The subsequent table + shows the fixed mappings between BearerType and the bearer type name for known types. If the + BearerType is unknown this function may return additional information if it is available; + otherwise an empty string will be returned. \table - \header + \header + \o BearerType \o Value - \o Description - \row - \o Unknown - \o The session is based on an unknown or unspecified bearer type. \row - \o Ethernet - \o The session is based on Ethernet. + \o BearerUnknown + \o + \o The session is based on an unknown or unspecified bearer type. The value of the + string returned describes the bearer type. \row + \o BearerEthernet + \o Ethernet + \row + \o BearerWLAN \o WLAN - \o The session is based on Wireless LAN. \row + \o Bearer2G \o 2G - \o The session uses CSD, GPRS, HSCSD, EDGE or cdmaOne. - \row + \row + \o BearerCDMA2000 \o CDMA2000 - \o The session uses CDMA. \row + \o BearerWCDMA \o WCDMA - \o The session uses W-CDMA/UMTS. \row + \o BearerHSPA \o HSPA - \o The session uses High Speed Packet Access. \row + \o BearerBluetooth \o Bluetooth - \o The session uses Bluetooth. \row + \o BearerWiMAX \o WiMAX - \o The session uses WiMAX. \endtable - This function returns an empty string if this is an invalid configuration, - a network configuration of type \l QNetworkConfiguration::ServiceNetwork or + This function returns an empty string if this is an invalid configuration, a network + configuration of type \l QNetworkConfiguration::ServiceNetwork or \l QNetworkConfiguration::UserChoice. + + \sa bearerType() */ -QString QNetworkConfiguration::bearerName() const +QString QNetworkConfiguration::bearerTypeName() const { if (!isValid()) return QString(); - return d->bearerName(); + QMutexLocker locker(&d->mutex); + + if (d->type == QNetworkConfiguration::ServiceNetwork || + d->type == QNetworkConfiguration::UserChoice) + return QString(); + + switch (d->bearerType) { + case BearerUnknown: + return d->bearerTypeName(); + case BearerEthernet: + return QLatin1String("Ethernet"); + case BearerWLAN: + return QLatin1String("WLAN"); + case Bearer2G: + return QLatin1String("2G"); + case BearerCDMA2000: + return QLatin1String("CDMA2000"); + case BearerWCDMA: + return QLatin1String("WCDMA"); + case BearerHSPA: + return QLatin1String("HSPA"); + case BearerBluetooth: + return QLatin1String("Bluetooth"); + case BearerWiMAX: + return QLatin1String("WiMAX"); + } + + return QLatin1String("Unknown"); } QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/network/bearer/qnetworkconfiguration.h --- a/src/network/bearer/qnetworkconfiguration.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/bearer/qnetworkconfiguration.h Mon Oct 04 01:19:32 2010 +0300 @@ -103,10 +103,35 @@ Q_DECLARE_FLAGS(StateFlags, StateFlag) +#ifndef QT_MOBILITY_BEARER + enum BearerType { + BearerUnknown, + BearerEthernet, + BearerWLAN, + Bearer2G, + BearerCDMA2000, + BearerWCDMA, + BearerHSPA, + BearerBluetooth, + BearerWiMAX + }; +#endif + StateFlags state() const; Type type() const; Purpose purpose() const; + +#ifndef QT_MOBILITY_BEARER +#ifdef QT_DEPRECATED + // Required to maintain source compatibility with Qt Mobility. + QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); } +#endif + BearerType bearerType() const; + QString bearerTypeName() const; +#else QString bearerName() const; +#endif + QString identifier() const; bool isRoamingAvailable() const; QList children() const; diff -r ef0373b55136 -r 758a864f9613 src/network/bearer/qnetworkconfiguration_p.h --- a/src/network/bearer/qnetworkconfiguration_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/bearer/qnetworkconfiguration_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -68,6 +68,7 @@ QNetworkConfigurationPrivate () : mutex(QMutex::Recursive), type(QNetworkConfiguration::Invalid), purpose(QNetworkConfiguration::UnknownPurpose), + bearerType(QNetworkConfiguration::BearerUnknown), isValid(false), roamingSupported(false) { } @@ -78,24 +79,22 @@ serviceNetworkMembers.clear(); } - virtual QString bearerName() const + virtual QString bearerTypeName() const { - QMutexLocker locker(&mutex); - - return bearer; + return QLatin1String("Unknown"); } QMap serviceNetworkMembers; mutable QMutex mutex; - QString bearer; QString name; QString id; QNetworkConfiguration::StateFlags state; QNetworkConfiguration::Type type; QNetworkConfiguration::Purpose purpose; + QNetworkConfiguration::BearerType bearerType; bool isValid; bool roamingSupported; diff -r ef0373b55136 -r 758a864f9613 src/network/bearer/qnetworksession.cpp --- a/src/network/bearer/qnetworksession.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/bearer/qnetworksession.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -629,8 +629,10 @@ If the session is based on a service network configuration the number of sent bytes across all active member configurations are returned. - This function may not always be supported on all platforms and returns - 0. The platform capability can be detected via QNetworkConfigurationManager::DataStatistics. + This function may not always be supported on all platforms and returns 0. + The platform capability can be detected via QNetworkConfigurationManager::DataStatistics. + + \note On some platforms this function may run the main event loop. */ quint64 QNetworkSession::bytesWritten() const { @@ -646,8 +648,10 @@ If the session is based on a service network configuration the number of sent bytes across all active member configurations are returned. - This function may not always be supported on all platforms and returns - 0. The platform capability can be detected via QNetworkConfigurationManager::DataStatistics. + This function may not always be supported on all platforms and returns 0. + The platform capability can be detected via QNetworkConfigurationManager::DataStatistics. + + \note On some platforms this function may run the main event loop. */ quint64 QNetworkSession::bytesReceived() const { diff -r ef0373b55136 -r 758a864f9613 src/network/bearer/qnetworksession.h --- a/src/network/bearer/qnetworksession.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/bearer/qnetworksession.h Mon Oct 04 01:19:32 2010 +0300 @@ -89,11 +89,7 @@ OperationNotSupportedError, InvalidConfigurationError }; -#ifndef QT_MOBILITY_BEARER - QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0); -#else explicit QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0); -#endif virtual ~QNetworkSession(); bool isOpen() const; diff -r ef0373b55136 -r 758a864f9613 src/network/kernel/qauthenticator.cpp --- a/src/network/kernel/qauthenticator.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/kernel/qauthenticator.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -52,10 +52,13 @@ #include #include +//#define NTLMV1_CLIENT QT_BEGIN_NAMESPACE +#ifdef NTLMV1_CLIENT #include "../../3rdparty/des/des.cpp" +#endif static QByteArray qNtlmPhase1(); static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phase2data); @@ -203,17 +206,29 @@ void QAuthenticator::setUser(const QString &user) { detach(); - int separatorPosn = 0; - separatorPosn = user.indexOf(QLatin1String("\\")); - if (separatorPosn == -1) { - //No domain name present + switch(d->method) { + case QAuthenticatorPrivate::DigestMd5: + case QAuthenticatorPrivate::Ntlm: + if((separatorPosn = user.indexOf(QLatin1String("\\"))) != -1) + { + //domain name is present + d->realm = user.left(separatorPosn); + d->user = user.mid(separatorPosn + 1); + } else if((separatorPosn = user.indexOf(QLatin1String("@"))) != -1) { + //domain name is present + d->realm = user.mid(separatorPosn + 1); + d->user = user.left(separatorPosn); + } else { + d->user = user; + d->realm.clear(); + } + break; + // For other auth mechanisms, domain name will be part of username + default: d->user = user; - } else { - //domain name is present - d->realm = user.left(separatorPosn); - d->user = user.mid(separatorPosn+1); + break; } } @@ -1178,11 +1193,9 @@ } // caller has to ensure a valid targetInfoBuff -static bool qExtractServerTime(const QByteArray& targetInfoBuff, - quint64 *serverTime) +static QByteArray qExtractServerTime(const QByteArray& targetInfoBuff) { - Q_ASSERT(serverTime != 0); - bool retValue = false; + QByteArray timeArray; QDataStream ds(targetInfoBuff); ds.setByteOrder(QDataStream::LittleEndian); @@ -1193,19 +1206,16 @@ ds >> avLen; while(avId != 0) { if(avId == AVTIMESTAMP) { - QByteArray timeArray(avLen, 0); + timeArray.resize(avLen); //avLen size of QByteArray is allocated ds.readRawData(timeArray.data(), avLen); - bool ok; - *serverTime = timeArray.toHex().toLongLong(&ok, 16); - retValue = true; break; } ds.skipRawData(avLen); ds >> avId; ds >> avLen; } - return retValue; + return timeArray; } static QByteArray qEncodeNtlmv2Response(const QAuthenticatorPrivate *ctx, @@ -1228,9 +1238,17 @@ ds.writeRawData(reserved1.constData(), reserved1.size()); quint64 time = 0; + QByteArray timeArray; + + if(ch.targetInfo.len) + { + timeArray = qExtractServerTime(ch.targetInfoBuff); + } //if server sends time, use it instead of current time - if(!(ch.targetInfo.len && qExtractServerTime(ch.targetInfoBuff, &time))) { + if(timeArray.size()) { + ds.writeRawData(timeArray.constData(), timeArray.size()); + } else { QDateTime currentTime(QDate::currentDate(), QTime::currentTime(), Qt::UTC); @@ -1242,8 +1260,8 @@ // represented as 100 nano seconds time = Q_UINT64_C(time * 10000000); + ds << time; } - ds << time; //8 byte client challenge QByteArray clientCh = clientChallenge(ctx); diff -r ef0373b55136 -r 758a864f9613 src/network/kernel/qhostinfo.cpp --- a/src/network/kernel/qhostinfo.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/kernel/qhostinfo.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -647,7 +647,7 @@ work(); } -// This function returns immediatly when we had a result in the cache, else it will later emit a signal +// This function returns immediately when we had a result in the cache, else it will later emit a signal QHostInfo qt_qhostinfo_lookup(const QString &name, QObject *receiver, const char *member, bool *valid, int *id) { *valid = false; diff -r ef0373b55136 -r 758a864f9613 src/network/kernel/qhostinfo_unix.cpp --- a/src/network/kernel/qhostinfo_unix.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/kernel/qhostinfo_unix.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -247,7 +247,10 @@ #ifndef QT_NO_IPV6 else if (node->ai_family == AF_INET6) { QHostAddress addr; - addr.setAddress(((sockaddr_in6 *) node->ai_addr)->sin6_addr.s6_addr); + sockaddr_in6 *sa6 = (sockaddr_in6 *) node->ai_addr; + addr.setAddress(sa6->sin6_addr.s6_addr); + if (sa6->sin6_scope_id) + addr.setScopeId(QString::number(sa6->sin6_scope_id)); if (!addresses.contains(addr)) addresses.append(addr); } diff -r ef0373b55136 -r 758a864f9613 src/network/socket/qabstractsocket.cpp --- a/src/network/socket/qabstractsocket.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/socket/qabstractsocket.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1380,7 +1380,7 @@ #endif } else { if (d->threadData->eventDispatcher) { - // this internal API for QHostInfo either immediatly gives us the desired + // this internal API for QHostInfo either immediately gives us the desired // QHostInfo from cache or later calls the _q_startConnecting slot. bool immediateResultValid = false; QHostInfo hostInfo = qt_qhostinfo_lookup(hostName, diff -r ef0373b55136 -r 758a864f9613 src/network/socket/qlocalsocket_win.cpp --- a/src/network/socket/qlocalsocket_win.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/socket/qlocalsocket_win.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -306,7 +306,7 @@ /*! \internal Sets the correct size of the read buffer after a read operation. - Returns false, if an error occured or the connection dropped. + Returns false, if an error occurred or the connection dropped. */ bool QLocalSocketPrivate::completeAsyncRead() { diff -r ef0373b55136 -r 758a864f9613 src/network/socket/qnativesocketengine_unix.cpp --- a/src/network/socket/qnativesocketengine_unix.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/socket/qnativesocketengine_unix.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -352,10 +352,13 @@ memset(&sockAddrIPv6, 0, sizeof(sockAddrIPv6)); sockAddrIPv6.sin6_family = AF_INET6; sockAddrIPv6.sin6_port = htons(port); + + QString scopeid = addr.scopeId(); + bool ok; + sockAddrIPv6.sin6_scope_id = scopeid.toInt(&ok); #ifndef QT_NO_IPV6IFNAME - sockAddrIPv6.sin6_scope_id = ::if_nametoindex(addr.scopeId().toLatin1().data()); -#else - sockAddrIPv6.sin6_scope_id = addr.scopeId().toInt(); + if (!ok) + sockAddrIPv6.sin6_scope_id = ::if_nametoindex(scopeid.toLatin1()); #endif Q_IPV6ADDR ip6 = addr.toIPv6Address(); memcpy(&sockAddrIPv6.sin6_addr.s6_addr, &ip6, sizeof(ip6)); @@ -562,7 +565,7 @@ #else int acceptedDescriptor = qt_safe_accept(socketDescriptor, 0, 0); #endif - //check if we have vaild descriptor at all + //check if we have valid descriptor at all if(acceptedDescriptor > 0) { // Ensure that the socket is closed on exec*() ::fcntl(acceptedDescriptor, F_SETFD, FD_CLOEXEC); diff -r ef0373b55136 -r 758a864f9613 src/network/socket/qnativesocketengine_win.cpp --- a/src/network/socket/qnativesocketengine_win.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/socket/qnativesocketengine_win.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -207,6 +207,7 @@ if (address.protocol() == QAbstractSocket::IPv6Protocol) { memset(sockAddrIPv6, 0, sizeof(qt_sockaddr_in6)); sockAddrIPv6->sin6_family = AF_INET6; + sockAddrIPv6->sin6_scope_id = address.scopeId().toInt(); WSAHtons(socketDescriptor, port, &(sockAddrIPv6->sin6_port)); Q_IPV6ADDR tmp = address.toIPv6Address(); memcpy(&(sockAddrIPv6->sin6_addr.qt_s6_addr), &tmp, sizeof(tmp)); diff -r ef0373b55136 -r 758a864f9613 src/network/ssl/qsslsocket.cpp --- a/src/network/ssl/qsslsocket.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/ssl/qsslsocket.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -210,7 +210,7 @@ valid. On failure, QSslSocket will emit the QSslSocket::sslErrors() signal. This mode is the default for clients. - \value AutoVerifyPeer QSslSocket will automaticaly use QueryPeer for + \value AutoVerifyPeer QSslSocket will automatically use QueryPeer for server sockets and VerifyPeer for client sockets. \sa QSslSocket::peerVerifyMode() @@ -1966,6 +1966,11 @@ QMutexLocker locker(&globalData()->mutex); const QSslConfigurationPrivate *global = globalData()->config.constData(); + if (!global) { + ptr = 0; + return; + } + ptr->ref = 1; ptr->peerCertificate = global->peerCertificate; ptr->peerCertificateChain = global->peerCertificateChain; diff -r ef0373b55136 -r 758a864f9613 src/network/ssl/qsslsocket_openssl.cpp --- a/src/network/ssl/qsslsocket_openssl.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/ssl/qsslsocket_openssl.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -750,7 +750,7 @@ ptrCertCloseStore(hSystemStore, 0); } } -#elif defined(Q_OS_UNIX) +#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) systemCerts.append(QSslCertificate::fromPath(QLatin1String("/var/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // AIX systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // Solaris systemCerts.append(QSslCertificate::fromPath(QLatin1String("/opt/openssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // HP-UX @@ -1288,6 +1288,11 @@ if (hostname.midRef(hostname.indexOf(QLatin1Char('.'))) != cn.midRef(firstCnDot)) return false; + // Check if the hostname is an IP address, if so then wildcards are not allowed + QHostAddress addr(hostname); + if (!addr.isNull()) + return false; + // Ok, I guess this was a wildcard CN and the hostname matches. return true; } diff -r ef0373b55136 -r 758a864f9613 src/network/ssl/qsslsocket_openssl_symbols.cpp --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -761,74 +761,95 @@ //============================================================================== QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime) { - char lBuffer[24]; - char *pBuffer = lBuffer; - size_t lTimeLength = aTime->length; char *pString = (char *) aTime->data; if (aTime->type == V_ASN1_UTCTIME) { + + char lBuffer[24]; + char *pBuffer = lBuffer; + if ((lTimeLength < 11) || (lTimeLength > 17)) return QDateTime(); memcpy(pBuffer, pString, 10); pBuffer += 10; pString += 10; - } else { - if (lTimeLength < 13) - return QDateTime(); + + if ((*pString == 'Z') || (*pString == '-') || (*pString == '+')) { + *pBuffer++ = '0'; + *pBuffer++ = '0'; + } else { + *pBuffer++ = *pString++; + *pBuffer++ = *pString++; + // Skip any fractional seconds... + if (*pString == '.') { + pString++; + while ((*pString >= '0') && (*pString <= '9')) + pString++; + } + } - memcpy(pBuffer, pString, 12); - pBuffer += 12; - pString += 12; - } + *pBuffer++ = 'Z'; + *pBuffer++ = '\0'; + + time_t lSecondsFromUCT; + if (*pString == 'Z') { + lSecondsFromUCT = 0; + } else { + if ((*pString != '+') && (*pString != '-')) + return QDateTime(); + + lSecondsFromUCT = ((pString[1] - '0') * 10 + (pString[2] - '0')) * 60; + lSecondsFromUCT += (pString[3] - '0') * 10 + (pString[4] - '0'); + lSecondsFromUCT *= 60; + if (*pString == '-') + lSecondsFromUCT = -lSecondsFromUCT; + } - if ((*pString == 'Z') || (*pString == '-') || (*pString == '+')) { - *pBuffer++ = '0'; - *pBuffer++ = '0'; + tm lTime; + lTime.tm_sec = ((lBuffer[10] - '0') * 10) + (lBuffer[11] - '0'); + lTime.tm_min = ((lBuffer[8] - '0') * 10) + (lBuffer[9] - '0'); + lTime.tm_hour = ((lBuffer[6] - '0') * 10) + (lBuffer[7] - '0'); + lTime.tm_mday = ((lBuffer[4] - '0') * 10) + (lBuffer[5] - '0'); + lTime.tm_mon = (((lBuffer[2] - '0') * 10) + (lBuffer[3] - '0')) - 1; + lTime.tm_year = ((lBuffer[0] - '0') * 10) + (lBuffer[1] - '0'); + if (lTime.tm_year < 50) + lTime.tm_year += 100; // RFC 2459 + + QDate resDate(lTime.tm_year + 1900, lTime.tm_mon + 1, lTime.tm_mday); + QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec); + + QDateTime result(resDate, resTime, Qt::UTC); + result = result.addSecs(lSecondsFromUCT); + return result; + + } else if (aTime->type == V_ASN1_GENERALIZEDTIME) { + + if (lTimeLength < 15) + return QDateTime(); // hopefully never triggered + + // generalized time is always YYYYMMDDHHMMSSZ (RFC 2459, section 4.1.2.5.2) + tm lTime; + lTime.tm_sec = ((pString[12] - '0') * 10) + (pString[13] - '0'); + lTime.tm_min = ((pString[10] - '0') * 10) + (pString[11] - '0'); + lTime.tm_hour = ((pString[8] - '0') * 10) + (pString[9] - '0'); + lTime.tm_mday = ((pString[6] - '0') * 10) + (pString[7] - '0'); + lTime.tm_mon = (((pString[4] - '0') * 10) + (pString[5] - '0')); + lTime.tm_year = ((pString[0] - '0') * 1000) + ((pString[1] - '0') * 100) + + ((pString[2] - '0') * 10) + (pString[3] - '0'); + + QDate resDate(lTime.tm_year, lTime.tm_mon, lTime.tm_mday); + QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec); + + QDateTime result(resDate, resTime, Qt::UTC); + return result; + } else { - *pBuffer++ = *pString++; - *pBuffer++ = *pString++; - // Skip any fractional seconds... - if (*pString == '.') { - pString++; - while ((*pString >= '0') && (*pString <= '9')) - pString++; - } + qWarning("unsupported date format detected"); + return QDateTime(); } - *pBuffer++ = 'Z'; - *pBuffer++ = '\0'; - - time_t lSecondsFromUCT; - if (*pString == 'Z') { - lSecondsFromUCT = 0; - } else { - if ((*pString != '+') && (*pString != '-')) - return QDateTime(); - - lSecondsFromUCT = ((pString[1] - '0') * 10 + (pString[2] - '0')) * 60; - lSecondsFromUCT += (pString[3] - '0') * 10 + (pString[4] - '0'); - lSecondsFromUCT *= 60; - if (*pString == '-') - lSecondsFromUCT = -lSecondsFromUCT; - } - - tm lTime; - lTime.tm_sec = ((lBuffer[10] - '0') * 10) + (lBuffer[11] - '0'); - lTime.tm_min = ((lBuffer[8] - '0') * 10) + (lBuffer[9] - '0'); - lTime.tm_hour = ((lBuffer[6] - '0') * 10) + (lBuffer[7] - '0'); - lTime.tm_mday = ((lBuffer[4] - '0') * 10) + (lBuffer[5] - '0'); - lTime.tm_mon = (((lBuffer[2] - '0') * 10) + (lBuffer[3] - '0')) - 1; - lTime.tm_year = ((lBuffer[0] - '0') * 10) + (lBuffer[1] - '0'); - if (lTime.tm_year < 50) - lTime.tm_year += 100; // RFC 2459 - - QDate resDate(lTime.tm_year + 1900, lTime.tm_mon + 1, lTime.tm_mday); - QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec); - QDateTime result(resDate, resTime, Qt::UTC); - result = result.addSecs(lSecondsFromUCT); - return result; } QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -90,7 +90,10 @@ QT_BEGIN_NAMESPACE -//#define QT_GL_NO_SCISSOR_TEST +#if defined(Q_OS_SYMBIAN) +#define QT_GL_NO_SCISSOR_TEST +#endif + #if defined(Q_WS_WIN) extern Q_GUI_EXPORT bool qt_cleartype_enabled; #endif @@ -374,12 +377,12 @@ dx = ceilf(dx - 0.5f); dy = ceilf(dy - 0.5f); } - +#ifndef Q_OS_SYMBIAN if (addOffset) { dx += 0.49f; dy += 0.49f; } - +#endif pmvMatrix[0][0] = (wfactor * transform.m11()) - transform.m13(); pmvMatrix[1][0] = (wfactor * transform.m21()) - transform.m23(); pmvMatrix[2][0] = (wfactor * dx) - transform.m33(); @@ -686,7 +689,12 @@ const QPointF* const points = reinterpret_cast(path.points()); // ### Remove before release... - static bool do_vectorpath_cache = qgetenv("QT_OPENGL_NO_PATH_CACHE").isEmpty(); +#ifdef Q_OS_SYMBIAN + // ### There are some unresolved issues in Symbian vector path caching. + static bool do_vectorpath_cache = false; +#else + static bool do_vectorpath_cache = true; +#endif // Check to see if there's any hints if (path.shape() == QVectorPath::RectangleHint) { diff -r ef0373b55136 -r 758a864f9613 src/opengl/gl2paintengineex/qtriangulator.cpp --- a/src/opengl/gl2paintengineex/qtriangulator.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/gl2paintengineex/qtriangulator.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -65,7 +65,11 @@ // Quick sort. template +#ifdef Q_CC_RVCT // RVCT 2.2 doesn't see recursive _static_ template function +void sort(T *array, int count, LessThan lessThan) +#else static void sort(T *array, int count, LessThan lessThan) +#endif { // If the number of elements fall below some threshold, use insertion sort. const int INSERTION_SORT_LIMIT = 7; // About 7 is fastest on my computer... @@ -122,7 +126,11 @@ // Quick sort. template +#ifdef Q_CC_RVCT +void sort(T *array, int count) // RVCT 2.2 doesn't see recursive _static_ template function +#else static void sort(T *array, int count) +#endif { // If the number of elements fall below some threshold, use insertion sort. const int INSERTION_SORT_LIMIT = 25; // About 25 is fastest on my computer... diff -r ef0373b55136 -r 758a864f9613 src/opengl/opengl.pro --- a/src/opengl/opengl.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/opengl.pro Mon Oct 04 01:19:32 2010 +0300 @@ -11,18 +11,18 @@ include(../qbase.pri) -!win32:!embedded:!mac:CONFIG += x11 +!win32:!embedded:!mac:!symbian:CONFIG += x11 contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles1):CONFIG += opengles1 contains(QT_CONFIG, opengles2):CONFIG += opengles2 contains(QT_CONFIG, egl):CONFIG += egl HEADERS += qgl.h \ - qgl_p.h \ - qglcolormap.h \ - qglpixelbuffer.h \ + qgl_p.h \ + qglcolormap.h \ + qglpixelbuffer.h \ qglpixelbuffer_p.h \ - qglframebufferobject.h \ + qglframebufferobject.h \ qglframebufferobject_p.h \ qglextensions_p.h \ qglpaintdevice_p.h \ @@ -30,9 +30,9 @@ SOURCES += qgl.cpp \ - qglcolormap.cpp \ - qglpixelbuffer.cpp \ - qglframebufferobject.cpp \ + qglcolormap.cpp \ + qglpixelbuffer.cpp \ + qglframebufferobject.cpp \ qglextensions.cpp \ qglpaintdevice.cpp \ qglbuffer.cpp \ @@ -119,7 +119,7 @@ win32:!wince*: { DEFINES += QT_NO_EGL SOURCES += qgl_win.cpp \ - qglpixelbuffer_win.cpp + qglpixelbuffer_win.cpp } wince*: { SOURCES += qgl_wince.cpp \ @@ -147,4 +147,14 @@ } } +symbian { + SOURCES += qgl_symbian.cpp \ + qglpixelbuffer_egl.cpp \ + qgl_egl.cpp + + HEADERS += qgl_egl_p.h + + symbian:TARGET.UID3 = 0x2002131A +} + INCLUDEPATH += ../3rdparty/harfbuzz/src diff -r ef0373b55136 -r 758a864f9613 src/opengl/qgl.cpp --- a/src/opengl/qgl.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qgl.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -96,7 +96,7 @@ QT_BEGIN_NAMESPACE -#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) +#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) QGLExtensionFuncs QGLContextPrivate::qt_extensionFuncs; #endif @@ -1688,6 +1688,10 @@ workaround_needsFullClearOnEveryFrame = false; workaround_brokenFBOReadBack = false; workaroundsCached = false; + + workaround_brokenTextureFromPixmap = false; + workaround_brokenTextureFromPixmap_init = false; + for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) vertexAttributeArraysEnabledState[i] = false; } @@ -1991,7 +1995,7 @@ option helps preserve this default behavior. \omitvalue CanFlipNativePixmapBindOption Used by x11 from pixmap to choose - wether or not it can bind the pixmap upside down or not. + whether or not it can bind the pixmap upside down or not. \omitvalue MemoryManagedBindOption Used by paint engines to indicate that the pixmap should be memory managed along side with @@ -2099,11 +2103,8 @@ #ifdef QT_NO_EGL void QGLContextPrivate::swapRegion(const QRegion *) { - static bool firstWarning = true; - if (firstWarning) { - qWarning() << "::swapRegion called but not supported!"; - firstWarning = false; - } + Q_Q(QGLContext); + q->swapBuffers(); } #endif @@ -2260,7 +2261,7 @@ } } -#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) +#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) QGLExtensionFuncs& QGLContextPrivate::extensionFuncs(const QGLContext *) { return qt_extensionFuncs; @@ -2283,11 +2284,19 @@ QGLTexture *QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint format, QGLContext::BindOptions options) { + Q_Q(QGLContext); + const qint64 key = image.cacheKey(); QGLTexture *texture = textureCacheLookup(key, target); if (texture) { - glBindTexture(target, texture->id); - return texture; + if (image.paintingActive()) { + // A QPainter is active on the image - take the safe route and replace the texture. + q->deleteTexture(texture->id); + texture = 0; + } else { + glBindTexture(target, texture->id); + return texture; + } } if (!texture) @@ -2553,14 +2562,19 @@ } #else Q_UNUSED(pd); - Q_UNUSED(q); #endif const qint64 key = pixmap.cacheKey(); QGLTexture *texture = textureCacheLookup(key, target); if (texture) { - glBindTexture(target, texture->id); - return texture; + if (pixmap.paintingActive()) { + // A QPainter is active on the pixmap - take the safe route and replace the texture. + q->deleteTexture(texture->id); + texture = 0; + } else { + glBindTexture(target, texture->id); + return texture; + } } #if defined(Q_WS_X11) @@ -2570,11 +2584,27 @@ && xinfo && xinfo->screen() == pixmap.x11Info().screen() && target == GL_TEXTURE_2D) { - texture = bindTextureFromNativePixmap(const_cast(&pixmap), key, options); - if (texture) { - texture->options |= QGLContext::MemoryManagedBindOption; - texture->boundPixmap = pd; - boundPixmaps.insert(pd, QPixmap(pixmap)); + if (!workaround_brokenTextureFromPixmap_init) { + workaround_brokenTextureFromPixmap_init = true; + + const QByteArray versionString(reinterpret_cast(glGetString(GL_VERSION))); + const int pos = versionString.indexOf("NVIDIA "); + + if (pos >= 0) { + const QByteArray nvidiaVersionString = versionString.mid(pos + strlen("NVIDIA ")); + + if (nvidiaVersionString.startsWith("195") || nvidiaVersionString.startsWith("256")) + workaround_brokenTextureFromPixmap = true; + } + } + + if (!workaround_brokenTextureFromPixmap) { + texture = bindTextureFromNativePixmap(const_cast(&pixmap), key, options); + if (texture) { + texture->options |= QGLContext::MemoryManagedBindOption; + texture->boundPixmap = pd; + boundPixmaps.insert(pd, QPixmap(pixmap)); + } } } #endif @@ -4177,6 +4207,34 @@ d->glcx->d_ptr->clearDrawable(); # endif } +#elif defined(Q_OS_SYMBIAN) + // prevents errors on some systems, where we get a flush to a + // hidden widget + if (e->type() == QEvent::Hide) { + makeCurrent(); + glFinish(); + doneCurrent(); + } else if (e->type() == QEvent::ParentChange) { + // if we've reparented a window that has the current context + // bound, we need to rebind that context to the new window id + if (d->glcx == QGLContext::currentContext()) + makeCurrent(); + + if (testAttribute(Qt::WA_TranslucentBackground)) + setContext(new QGLContext(d->glcx->requestedFormat(), this)); + } + + // A re-parent is likely to destroy the Symbian window and re-create it. It is important + // that we free the EGL surface _before_ the winID changes - otherwise we can leak. + if (e->type() == QEvent::ParentAboutToChange) + d->glcx->d_func()->destroyEglSurfaceForDevice(); + + if ((e->type() == QEvent::ParentChange) || (e->type() == QEvent::WindowStateChange)) { + // The window may have been re-created during re-parent or state change - if so, the EGL + // surface will need to be re-created. + d->recreateEglSurface(); + } + #endif return QWidget::event(e); @@ -4384,6 +4442,11 @@ Q_D(QGLWidget); if (!isValid()) return; +#ifdef Q_OS_SYMBIAN + // Crashes on Symbian if trying to render to invisible surfaces + if (!isVisible() && d->glcx->device()->devType() == QInternal::Widget) + return; +#endif makeCurrent(); #ifndef QT_OPENGL_ES if (d->glcx->deviceIsPixmap()) @@ -5196,6 +5259,8 @@ glExtensions |= FragmentProgram; if (extensions.match("GL_ARB_fragment_shader")) glExtensions |= FragmentShader; + if (extensions.match("GL_ARB_ES2_compatibility")) + glExtensions |= ES2Compatibility; if (extensions.match("GL_ARB_texture_mirrored_repeat")) glExtensions |= MirroredRepeat; if (extensions.match("GL_EXT_framebuffer_object")) @@ -5216,6 +5281,7 @@ glExtensions |= FramebufferObject; glExtensions |= GenerateMipmap; glExtensions |= FragmentShader; + glExtensions |= ES2Compatibility; #endif #if defined(QT_OPENGL_ES_1) if (extensions.match("GL_OES_framebuffer_object")) diff -r ef0373b55136 -r 758a864f9613 src/opengl/qgl_egl.cpp --- a/src/opengl/qgl_egl.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qgl_egl.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -230,7 +230,7 @@ void QGLContextPrivate::destroyEglSurfaceForDevice() { if (eglSurface != EGL_NO_SURFACE) { -#ifdef Q_WS_X11 +#if defined(Q_WS_X11) || defined(Q_OS_SYMBIAN) // Make sure we don't call eglDestroySurface on a surface which // was created for a different winId. This applies only to QGLWidget // paint device, so make sure this is the one we're operating on @@ -240,6 +240,7 @@ if (QGLWidget *wgl = qobject_cast(w)) { if (wgl->d_func()->eglSurfaceWindowId != wgl->winId()) { qWarning("WARNING: Potential EGL surface leak! Not destroying surface."); + eglSurface = EGL_NO_SURFACE; return; } } diff -r ef0373b55136 -r 758a864f9613 src/opengl/qgl_mac.mm --- a/src/opengl/qgl_mac.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qgl_mac.mm Mon Oct 04 01:19:32 2010 +0300 @@ -697,9 +697,17 @@ QWidget *w = (QWidget *)d->paintDevice; NSView *view = qt_mac_nativeview_for(w); - // ideally we would use QWidget::isVisible(), but we get "invalid drawable" errors - if (![(NSWindow *)qt_mac_window_for(w) isVisible]) - return; + // Trying to attach the GL context to the NSView will fail with + // "invalid drawable" if done too soon, but we have to make sure + // the connection is made before the first paint event. Using + // the NSView do to this check fails as the NSView is visible + // before it's safe to connect, and using the NSWindow fails as + // the NSWindow will become visible after the first paint event. + // This leaves us with the QWidget, who's visible state seems + // to match the point in time when it's safe to connect. + if (!w || !w->isVisible()) + return; // Not safe to attach GL context to view yet + if ([static_cast(d->cx) view] != view && ![view isHidden]) [static_cast(d->cx) setView:view]; } else if (d->paintDevice->devType() == QInternal::Pixmap) { @@ -804,17 +812,22 @@ static CFBundleRef qt_getOpenGLBundle() { CFBundleRef bundle = 0; + CFStringRef urlString = QCFString::toCFStringRef(QLatin1String("/System/Library/Frameworks/OpenGL.framework")); QCFType url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, - QCFString::toCFStringRef(QLatin1String("/System/Library/Frameworks/OpenGL.framework")), kCFURLPOSIXPathStyle, false); + urlString, kCFURLPOSIXPathStyle, false); if (url) bundle = CFBundleCreate(kCFAllocatorDefault, url); + CFRelease(urlString); return bundle; } void *QGLContext::getProcAddress(const QString &proc) const { - return CFBundleGetFunctionPointerForName(QCFType(qt_getOpenGLBundle()), - QCFString(proc)); + CFStringRef procName = QCFString(proc).toCFStringRef(proc); + void *result = CFBundleGetFunctionPointerForName(QCFType(qt_getOpenGLBundle()), + procName); + CFRelease(procName); + return result; } #ifndef QT_MAC_USE_COCOA /***************************************************************************** diff -r ef0373b55136 -r 758a864f9613 src/opengl/qgl_p.h --- a/src/opengl/qgl_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qgl_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -167,6 +167,9 @@ #if defined(Q_WS_X11) && !defined(QT_NO_EGL) , eglSurfaceWindowId(0) #endif +#if defined(Q_OS_SYMBIAN) + , eglSurfaceWindowId(0) +#endif { isGLWidget = 1; } @@ -208,6 +211,10 @@ #elif defined(Q_WS_QWS) QWSGLWindowSurface *wsurf; #endif +#ifdef Q_OS_SYMBIAN + void recreateEglSurface(); + WId eglSurfaceWindowId; +#endif }; class QGLContextResource; @@ -277,7 +284,8 @@ DDSTextureCompression = 0x00008000, ETC1TextureCompression = 0x00010000, PVRTCTextureCompression = 0x00020000, - FragmentShader = 0x00040000 + FragmentShader = 0x00040000, + ES2Compatibility = 0x00080000 }; Q_DECLARE_FLAGS(Extensions, Extension) @@ -393,6 +401,9 @@ uint workaround_brokenFBOReadBack : 1; uint workaroundsCached : 1; + uint workaround_brokenTextureFromPixmap : 1; + uint workaround_brokenTextureFromPixmap_init : 1; + QPaintDevice *paintDevice; QColor transpColor; QGLContext *q_ptr; @@ -414,7 +425,7 @@ static inline QGLExtensionFuncs& extensionFuncs(const QGLContext *ctx) { return ctx->d_ptr->group->extensionFuncs(); } #endif -#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) +#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) static QGLExtensionFuncs qt_extensionFuncs; static Q_OPENGL_EXPORT QGLExtensionFuncs& extensionFuncs(const QGLContext *); #endif diff -r ef0373b55136 -r 758a864f9613 src/opengl/qgl_symbian.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/opengl/qgl_symbian.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,362 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtOpenGL module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include "qgl.h" +#include +#include +#include +#include +#include +#include +#include +#include // to access QWExtra +#include "qgl_egl_p.h" +#include "qcolormap.h" +#include + +QT_BEGIN_NAMESPACE + +// Turn off "direct to window" rendering if EGL cannot support it. +#if !defined(EGL_RENDER_BUFFER) || !defined(EGL_SINGLE_BUFFER) +#if defined(QGL_DIRECT_TO_WINDOW) +#undef QGL_DIRECT_TO_WINDOW +#endif +#endif + +// Determine if preserved window contents should be used. +#if !defined(EGL_SWAP_BEHAVIOR) || !defined(EGL_BUFFER_PRESERVED) +#if !defined(QGL_NO_PRESERVED_SWAP) +#define QGL_NO_PRESERVED_SWAP 1 +#endif +#endif + +/* + QGLTemporaryContext implementation +*/ + + +class QGLTemporaryContextPrivate +{ +public: + bool initialized; + RWindow *window; + EGLContext context; + EGLSurface surface; + EGLDisplay display; +}; + +QGLTemporaryContext::QGLTemporaryContext(bool, QWidget *) + : d(new QGLTemporaryContextPrivate) +{ + d->initialized = false; + d->window = 0; + d->context = 0; + d->surface = 0; + + d->display = d->display = QEgl::display(); + + EGLConfig config; + int numConfigs = 0; + EGLint attribs[] = { + EGL_SURFACE_TYPE, EGL_WINDOW_BIT, +#ifdef QT_OPENGL_ES_2 + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, +#endif + EGL_NONE + }; + + eglChooseConfig(d->display, attribs, &config, 1, &numConfigs); + if (!numConfigs) { + qWarning("QGLTemporaryContext: No EGL configurations available."); + return; + } + + d->window = new RWindow(CCoeEnv::Static()->WsSession()); + d->window->Construct(CCoeEnv::Static()->RootWin(),(uint)this); + + d->surface = eglCreateWindowSurface(d->display, config, (EGLNativeWindowType) d->window, NULL); + + if (d->surface == EGL_NO_SURFACE) { + qWarning("QGLTemporaryContext: Error creating EGL surface."); + delete d->window; + d->window = 0; + return; + } + + EGLint contextAttribs[] = { +#ifdef QT_OPENGL_ES_2 + EGL_CONTEXT_CLIENT_VERSION, 2, +#endif + EGL_NONE + }; + d->context = eglCreateContext(d->display, config, 0, contextAttribs); + if (d->context != EGL_NO_CONTEXT + && eglMakeCurrent(d->display, d->surface, d->surface, d->context)) + { + d->initialized = true; + } else { + qWarning("QGLTemporaryContext: Error creating EGL context."); + d->window = 0; + return; + } +} + +QGLTemporaryContext::~QGLTemporaryContext() +{ + if (d->initialized) { + eglMakeCurrent(d->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + eglDestroyContext(d->display, d->context); + eglDestroySurface(d->display, d->surface); + delete d->window; + } +} + +bool QGLFormat::hasOpenGLOverlays() +{ + return false; +} + +// Chooses the EGL config and creates the EGL context +bool QGLContext::chooseContext(const QGLContext* shareContext) // almost same as in qgl_x11egl.cpp +{ + Q_D(QGLContext); + + if (!device()) + return false; + + int devType = device()->devType(); + + if ((devType != QInternal::Widget) && (devType != QInternal::Pbuffer)) { + qWarning("WARNING: Creating a QGLContext not supported on device type %d", devType); + return false; + } + + // Get the display and initialize it. + if (d->eglContext == 0) { + d->eglContext = new QEglContext(); + d->ownsEglContext = true; + d->eglContext->setApi(QEgl::OpenGL); + + // If the device is a widget with WA_TranslucentBackground set, make sure the glFormat + // has the alpha channel option set: + if (devType == QInternal::Widget) { + QWidget* widget = static_cast(device()); + if (widget->testAttribute(Qt::WA_TranslucentBackground)) + d->glFormat.setAlpha(true); + } + + // Construct the configuration we need for this surface. + QEglProperties configProps; + configProps.setDeviceType(devType); + configProps.setPaintDeviceFormat(device()); + configProps.setRenderableType(QEgl::OpenGL); + configProps.setValue(EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_SWAP_BEHAVIOR_PRESERVED_BIT); + + qt_eglproperties_set_glformat(configProps, d->glFormat); + + if (!d->eglContext->chooseConfig(configProps, QEgl::BestPixelFormat)) { + delete d->eglContext; + d->eglContext = 0; + return false; + } + + // Create a new context for the configuration. + QEglContext* eglSharedContext = shareContext ? shareContext->d_func()->eglContext : 0; + if (!d->eglContext->createContext(eglSharedContext)) { + delete d->eglContext; + d->eglContext = 0; + return false; + } + d->sharing = d->eglContext->isSharing(); + if (d->sharing && shareContext) + const_cast(shareContext)->d_func()->sharing = true; + } + + // Inform the higher layers about the actual format properties + qt_glformat_from_eglconfig(d->glFormat, d->eglContext->config()); + + // Do don't create the EGLSurface for everything. + // QWidget - yes, create the EGLSurface and store it in QGLContextPrivate::eglSurface + // QGLWidget - yes, create the EGLSurface and store it in QGLContextPrivate::eglSurface + // QGLPixelBuffer - no, it creates the surface itself and stores it in QGLPixelBufferPrivate::pbuf + + if (devType == QInternal::Widget) { + if (d->eglSurface != EGL_NO_SURFACE) + eglDestroySurface(d->eglContext->display(), d->eglSurface); + + d->eglSurface = QEgl::createSurface(device(), d->eglContext->config()); + +#if !defined(QGL_NO_PRESERVED_SWAP) + eglGetError(); // Clear error state first. + eglSurfaceAttrib(QEgl::display(), d->eglSurface, + EGL_SWAP_BEHAVIOR, EGL_BUFFER_PRESERVED); + if (eglGetError() != EGL_SUCCESS) { + qWarning("QGLContext: could not enable preserved swap"); + } +#endif + + setWindowCreated(true); + } + + return true; +} + +void QGLWidget::resizeEvent(QResizeEvent *) +{ + Q_D(QGLWidget); + if (!isValid()) + return; + + if (QGLContext::currentContext()) + doneCurrent(); + + // Symbian needs to recreate the surface on resize. + d->recreateEglSurface(); + + makeCurrent(); + if (!d->glcx->initialized()) + glInit(); + resizeGL(width(), height()); + //handle overlay +} + +const QGLContext* QGLWidget::overlayContext() const +{ + return 0; +} + +void QGLWidget::makeOverlayCurrent() +{ + //handle overlay +} + +void QGLWidget::updateOverlayGL() +{ + //handle overlay +} + +void QGLWidget::setContext(QGLContext *context, const QGLContext* shareContext, bool deleteOldContext) +{ + Q_D(QGLWidget); + if (context == 0) { + qWarning("QGLWidget::setContext: Cannot set null context"); + return; + } + if (!context->deviceIsPixmap() && context->device() != this) { + qWarning("QGLWidget::setContext: Context must refer to this widget"); + return; + } + + if (d->glcx) + d->glcx->doneCurrent(); + QGLContext* oldcx = d->glcx; + d->glcx = context; + + bool createFailed = false; + if (!d->glcx->isValid()) { + // Create the QGLContext here, which in turn chooses the EGL config + // and creates the EGL context: + if (!d->glcx->create(shareContext ? shareContext : oldcx)) + createFailed = true; + } + if (createFailed) { + if (deleteOldContext) + delete oldcx; + return; + } + + d->eglSurfaceWindowId = winId(); // Remember the window id we created the surface for +} + +void QGLWidgetPrivate::init(QGLContext *context, const QGLWidget* shareWidget) +{ + Q_Q(QGLWidget); + + initContext(context, shareWidget); + + if(q->isValid() && glcx->format().hasOverlay()) { + //no overlay + qWarning("QtOpenGL ES doesn't currently support overlays"); + } +} + +void QGLWidgetPrivate::cleanupColormaps() +{ +} + +const QGLColormap & QGLWidget::colormap() const +{ + return d_func()->cmap; +} + +void QGLWidget::setColormap(const QGLColormap &) +{ +} + +void QGLWidgetPrivate::recreateEglSurface() +{ + Q_Q(QGLWidget); + + WId currentId = q->winId(); + + if (glcx->d_func()->eglSurface != EGL_NO_SURFACE) { + eglDestroySurface(glcx->d_func()->eglContext->display(), + glcx->d_func()->eglSurface); + } + + glcx->d_func()->eglSurface = QEgl::createSurface(glcx->device(), + glcx->d_func()->eglContext->config()); + +#if !defined(QGL_NO_PRESERVED_SWAP) + eglGetError(); // Clear error state first. + eglSurfaceAttrib(QEgl::display(), glcx->d_func()->eglSurface, + EGL_SWAP_BEHAVIOR, EGL_BUFFER_PRESERVED); + if (eglGetError() != EGL_SUCCESS) { + qWarning("QGLContext: could not enable preserved swap"); + } +#endif + + eglSurfaceWindowId = currentId; +} + +QT_END_NAMESPACE + diff -r ef0373b55136 -r 758a864f9613 src/opengl/qgl_win.cpp --- a/src/opengl/qgl_win.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qgl_win.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1042,7 +1042,7 @@ iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB; iAttributes[i++] = TRUE; iAttributes[i++] = WGL_COLOR_BITS_ARB; - iAttributes[i++] = 32; + iAttributes[i++] = 24; iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB; iAttributes[i++] = d->glFormat.doubleBuffer(); if (d->glFormat.stereo()) { diff -r ef0373b55136 -r 758a864f9613 src/opengl/qglbuffer.cpp --- a/src/opengl/qglbuffer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qglbuffer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -416,7 +416,7 @@ \sa release(), create() */ -bool QGLBuffer::bind() const +bool QGLBuffer::bind() { #ifndef QT_NO_DEBUG if (!isCreated()) @@ -448,7 +448,7 @@ \sa bind() */ -void QGLBuffer::release() const +void QGLBuffer::release() { #ifndef QT_NO_DEBUG if (!isCreated()) diff -r ef0373b55136 -r 758a864f9613 src/opengl/qglbuffer.h --- a/src/opengl/qglbuffer.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qglbuffer.h Mon Oct 04 01:19:32 2010 +0300 @@ -101,8 +101,8 @@ void destroy(); - bool bind() const; - void release() const; + bool bind(); + void release(); static void release(QGLBuffer::Type type); diff -r ef0373b55136 -r 758a864f9613 src/opengl/qglextensions.cpp --- a/src/opengl/qglextensions.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qglextensions.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -255,6 +255,10 @@ glFramebufferTextureLayerEXT = (_glFramebufferTextureLayerEXT) ctx->getProcAddress(QLatin1String("glFramebufferTextureLayerEXT")); glFramebufferTextureFaceEXT = (_glFramebufferTextureFaceEXT) ctx->getProcAddress(QLatin1String("glFramebufferTextureFaceEXT")); + // Must at least have the FragmentShader extension to continue. + if (!(QGLExtensions::glExtensions() & QGLExtensions::FragmentShader)) + return false; + glCreateShader = (_glCreateShader) ctx->getProcAddress(QLatin1String("glCreateShader")); if (glCreateShader) { glShaderSource = (_glShaderSource) ctx->getProcAddress(QLatin1String("glShaderSource")); diff -r ef0373b55136 -r 758a864f9613 src/opengl/qglframebufferobject.cpp --- a/src/opengl/qglframebufferobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qglframebufferobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -445,11 +445,11 @@ GLint maxSamples; glGetIntegerv(GL_MAX_SAMPLES_EXT, &maxSamples); - samples = qBound(1, int(samples), int(maxSamples)); + samples = qBound(0, int(samples), int(maxSamples)); glGenRenderbuffers(1, &color_buffer); glBindRenderbuffer(GL_RENDERBUFFER_EXT, color_buffer); - if (glRenderbufferStorageMultisampleEXT) { + if (glRenderbufferStorageMultisampleEXT && samples > 0) { glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER_EXT, samples, internal_format, size.width(), size.height()); } else { diff -r ef0373b55136 -r 758a864f9613 src/opengl/qglshaderprogram.cpp --- a/src/opengl/qglshaderprogram.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qglshaderprogram.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -97,6 +97,10 @@ to just features that are present in GLSL/ES, and avoid standard variable names that only work on the desktop. + If the \c{GL_ARB_ES2_compatibility} extension is present, + then the above prefix is not added because the desktop OpenGL + implementation supports precision qualifiers. + \section1 Simple shader example \snippet doc/src/snippets/code/src_opengl_qglshaderprogram.cpp 1 @@ -394,8 +398,10 @@ srclen.append(GLint(headerLen)); } #ifdef QGL_DEFINE_QUALIFIERS - src.append(qualifierDefines); - srclen.append(GLint(sizeof(qualifierDefines) - 1)); + if (!(QGLExtensions::glExtensions() & QGLExtensions::ES2Compatibility)) { + src.append(qualifierDefines); + srclen.append(GLint(sizeof(qualifierDefines) - 1)); + } #endif #ifdef QGL_REDEFINE_HIGHP if (d->shaderType == Fragment) { @@ -2121,7 +2127,7 @@ Q_D(QGLShaderProgram); Q_UNUSED(d); if (location != -1) { - GLfloat values[4] = {GLfloat(size.width()), GLfloat(size.width())}; + GLfloat values[4] = {GLfloat(size.width()), GLfloat(size.height())}; glUniform2fv(location, 1, values); } } diff -r ef0373b55136 -r 758a864f9613 src/opengl/qpixmapdata_gl.cpp --- a/src/opengl/qpixmapdata_gl.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qpixmapdata_gl.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -367,7 +367,7 @@ } void QGLPixmapData::fromImage(const QImage &image, - Qt::ImageConversionFlags /*flags*/) + Qt::ImageConversionFlags flags) { if (image.size() == QSize(w, h)) setSerialNumber(++qt_gl_pixmap_serial); @@ -381,7 +381,9 @@ if (qApp->desktop()->depth() == 16) format = QImage::Format_RGB16; - if (image.hasAlphaChannel() && const_cast(image).data_ptr()->checkForAlphaPixels()) + if (image.hasAlphaChannel() + && ((flags & Qt::NoOpaqueDetection) + || const_cast(image).data_ptr()->checkForAlphaPixels())) format = QImage::Format_ARGB32_Premultiplied;; m_source = image.convertToFormat(format); diff -r ef0373b55136 -r 758a864f9613 src/opengl/qwindowsurface_gl.cpp --- a/src/opengl/qwindowsurface_gl.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qwindowsurface_gl.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -199,6 +199,7 @@ return widget; } + // destroys the share widget and prevents recreation void cleanup() { QGLWidget *w = widget; cleanedUp = true; @@ -206,6 +207,20 @@ delete w; } + // destroys the share widget, but allows it to be recreated later on + void destroy() { + if (cleanedUp) + return; + + QGLWidget *w = widget; + + // prevent potential recursions + cleanedUp = true; + widget = 0; + delete w; + cleanedUp = false; + } + static bool cleanedUp; private: @@ -233,6 +248,10 @@ return _qt_gl_share_widget()->shareWidget(); } +void qt_destroy_gl_share_widget() +{ + _qt_gl_share_widget()->destroy(); +} struct QGLWindowSurfacePrivate { @@ -407,6 +426,20 @@ void QGLWindowSurface::beginPaint(const QRegion &) { + if (! context()) + return; + + int clearFlags = 0; + + if (context()->d_func()->workaround_needsFullClearOnEveryFrame) + clearFlags = GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT; + else if (context()->format().alpha()) + clearFlags = GL_COLOR_BUFFER_BIT; + + if (clearFlags) { + glClearColor(0.0, 0.0, 0.0, 0.0); + glClear(clearFlags); + } } void QGLWindowSurface::endPaint(const QRegion &rgn) @@ -494,10 +527,9 @@ } } #endif - if (d_ptr->paintedRegion.boundingRect() != geometry()) { - // Emits warning if not supported. Should never happen unless - // setPartialUpdateSupport(true) has been called. - context()->d_func()->swapRegion(&d_ptr->paintedRegion); + if (d_ptr->paintedRegion.boundingRect() != geometry() && + hasPartialUpdateSupport()) { + context()->d_func()->swapRegion(&d_ptr->paintedRegion); } else context()->swapBuffers(); diff -r ef0373b55136 -r 758a864f9613 src/opengl/qwindowsurface_gl_p.h --- a/src/opengl/qwindowsurface_gl_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/opengl/qwindowsurface_gl_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -67,6 +67,7 @@ struct QGLWindowSurfacePrivate; Q_OPENGL_EXPORT QGLWidget* qt_gl_share_widget(); +Q_OPENGL_EXPORT void qt_destroy_gl_share_widget(); class QGLWindowSurfaceGLPaintDevice : public QGLPaintDevice { diff -r ef0373b55136 -r 758a864f9613 src/openvg/qpaintengine_vg.cpp --- a/src/openvg/qpaintengine_vg.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/openvg/qpaintengine_vg.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -77,6 +77,9 @@ #if !defined(QVG_NO_DRAW_GLYPHS) +// use the same rounding as in qrasterizer.cpp (6 bit fixed point) +static const qreal aliasedCoordinateDelta = 0.5 - 0.015625; + Q_DECL_IMPORT extern int qt_defaultDpiX(); Q_DECL_IMPORT extern int qt_defaultDpiY(); @@ -102,6 +105,7 @@ class QVGPaintEnginePrivate : public QPaintEngineExPrivate { + Q_DECLARE_PUBLIC(QVGPaintEngine) public: // Extra blending modes from VG_KHR_advanced_blending extension. // Use the QT_VG prefix to avoid conflicts with any definitions @@ -132,7 +136,7 @@ QT_VG_BLEND_XOR_KHR = 0x2026 }; - QVGPaintEnginePrivate(); + QVGPaintEnginePrivate(QVGPaintEngine *q_ptr); ~QVGPaintEnginePrivate(); void init(); @@ -153,6 +157,7 @@ void setBrushTransform(const QBrush& brush, VGMatrixMode mode); void setupColorRamp(const QGradient *grad, VGPaint paint); void setImageOptions(); + void systemStateChanged(); #if !defined(QVG_SCISSOR_CLIP) void ensureMask(QVGPaintEngine *engine, int width, int height); void modifyMask @@ -281,6 +286,9 @@ // Clear all lazily-set modes. void clearModes(); + +private: + QVGPaintEngine *q; }; inline void QVGPaintEnginePrivate::setImageMode(VGImageMode mode) @@ -332,7 +340,7 @@ imageQuality = (VGImageQuality)0; } -QVGPaintEnginePrivate::QVGPaintEnginePrivate() +QVGPaintEnginePrivate::QVGPaintEnginePrivate(QVGPaintEngine *q_ptr) : q(q_ptr) { init(); } @@ -1431,7 +1439,7 @@ } QVGPaintEngine::QVGPaintEngine() - : QPaintEngineEx(*new QVGPaintEnginePrivate) + : QPaintEngineEx(*new QVGPaintEnginePrivate(this)) { } @@ -2974,6 +2982,11 @@ } } +void QVGPaintEnginePrivate::systemStateChanged() +{ + q->updateScissor(); +} + static void drawVGImage(QVGPaintEnginePrivate *d, const QRectF& r, VGImage vgImg, const QSize& imageSize, const QRectF& sr) @@ -3432,9 +3445,10 @@ // Set the transformation to use for drawing the current glyphs. QTransform glyphTransform(d->pathTransform); if (d->transform.type() <= QTransform::TxTranslate) { - // Prevent blurriness of unscaled, unrotated text by using integer coordinates. - // Using ceil(x-0.5) instead of qRound() or int-cast, behave like other paint engines. - glyphTransform.translate(ceil(p.x() - 0.5), ceil(p.y() - 0.5)); + // Prevent blurriness of unscaled, unrotated text by forcing integer coordinates. + glyphTransform.translate( + floor(p.x() + glyphTransform.dx() + aliasedCoordinateDelta) - glyphTransform.dx(), + floor(p.y() - glyphTransform.dy() + aliasedCoordinateDelta) + glyphTransform.dy()); } else { glyphTransform.translate(p.x(), p.y()); } @@ -3596,6 +3610,7 @@ d->maskIsSet = false; d->scissorMask = false; d->maskRect = QRect(); + d->scissorDirty = true; clipEnabledChanged(); } diff -r ef0373b55136 -r 758a864f9613 src/openvg/qpixmapdata_vg.cpp --- a/src/openvg/qpixmapdata_vg.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/openvg/qpixmapdata_vg.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -47,6 +47,9 @@ #endif #include "qvg_p.h" #include "qvgimagepool_p.h" +#include +#include +#include QT_BEGIN_NAMESPACE @@ -152,11 +155,59 @@ void QVGPixmapData::fromImage (const QImage &image, Qt::ImageConversionFlags flags) { + QImage img = image; + createPixmapForImage(img, flags, false); +} + +void QVGPixmapData::fromImageReader(QImageReader *imageReader, + Qt::ImageConversionFlags flags) +{ + QImage image = imageReader->read(); + if (image.isNull()) + return; + + createPixmapForImage(image, flags, true); +} + +bool QVGPixmapData::fromFile(const QString &filename, const char *format, + Qt::ImageConversionFlags flags) +{ + QImage image = QImageReader(filename, format).read(); + if (image.isNull()) + return false; + + createPixmapForImage(image, flags, true); + + return !isNull(); +} + +bool QVGPixmapData::fromData(const uchar *buffer, uint len, const char *format, + Qt::ImageConversionFlags flags) +{ + QByteArray a = QByteArray::fromRawData(reinterpret_cast(buffer), len); + QBuffer b(&a); + b.open(QIODevice::ReadOnly); + QImage image = QImageReader(&b, format).read(); + if (image.isNull()) + return false; + + createPixmapForImage(image, flags, true); + + return !isNull(); +} + +void QVGPixmapData::createPixmapForImage(QImage &image, Qt::ImageConversionFlags flags, bool inPlace) +{ if (image.size() == QSize(w, h)) setSerialNumber(++qt_vg_pixmap_serial); else resize(image.width(), image.height()); - source = image.convertToFormat(sourceFormat(), flags); + + if (inPlace && image.data_ptr()->convertInPlace(sourceFormat(), flags)) + source = image; + else + source = image.convertToFormat(sourceFormat()); + recreate = true; } diff -r ef0373b55136 -r 758a864f9613 src/openvg/qpixmapdata_vg_p.h --- a/src/openvg/qpixmapdata_vg_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/openvg/qpixmapdata_vg_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -64,6 +64,7 @@ class QEglContext; class QVGImagePool; +class QImageReader; #if !defined(QT_NO_EGL) class QVGPixmapData; @@ -87,6 +88,12 @@ void resize(int width, int height); void fromImage(const QImage &image, Qt::ImageConversionFlags flags); + void fromImageReader(QImageReader *imageReader, + Qt::ImageConversionFlags flags); + bool fromFile(const QString &filename, const char *format, + Qt::ImageConversionFlags flags); + bool fromData(const uchar *buffer, uint len, const char *format, + Qt::ImageConversionFlags flags); void fill(const QColor &color); bool hasAlphaChannel() const; @@ -126,6 +133,7 @@ protected: int metric(QPaintDevice::PaintDeviceMetric metric) const; + void createPixmapForImage(QImage &image, Qt::ImageConversionFlags flags, bool inPlace); #if defined(Q_OS_SYMBIAN) void cleanup(); diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/bearer.pro --- a/src/plugins/bearer/bearer.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/bearer.pro Mon Oct 04 01:19:32 2010 +0300 @@ -5,7 +5,7 @@ SUBDIRS += icd } else { SUBDIRS += generic - !mac:SUBDIRS += connman networkmanager + linux*:SUBDIRS += connman networkmanager } } diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/connman/connman.pro --- a/src/plugins/bearer/connman/connman.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/connman/connman.pro Mon Oct 04 01:19:32 2010 +0300 @@ -4,12 +4,14 @@ QT = core network dbus HEADERS += qconnmanservice_linux_p.h \ + qofonoservice_linux_p.h \ qconnmanengine.h \ ../qnetworksession_impl.h \ ../qbearerengine_impl.h SOURCES += main.cpp \ qconnmanservice_linux.cpp \ + qofonoservice_linux.cpp \ qconnmanengine.cpp \ ../qnetworksession_impl.cpp diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/connman/qconnmanengine.cpp --- a/src/plugins/bearer/connman/qconnmanengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/connman/qconnmanengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -41,6 +41,7 @@ #include "qconnmanengine.h" #include "qconnmanservice_linux_p.h" +#include "qofonoservice_linux_p.h" #include "../qnetworksession_impl.h" #include @@ -109,7 +110,6 @@ QList QConnmanEngine::getConfigurations() { QMutexLocker locker(&mutex); - // foundConfigurations.clear(); getNetworkListing(); QList fetchedConfigurations; QNetworkConfigurationPrivate* cpPriv = 0; @@ -125,12 +125,12 @@ config->type = cpPriv->type; config->roamingSupported = cpPriv->roamingSupported; config->purpose = cpPriv->purpose; - config->bearer = cpPriv->bearer; + config->bearerType = cpPriv->bearerType; fetchedConfigurations.append(config); + delete config; } return fetchedConfigurations; -// return foundConfigurations; } void QConnmanEngine::getNetworkListing() @@ -148,8 +148,6 @@ } } - - void QConnmanEngine::doRequestUpdate() { connmanManager->requestScan(""); @@ -169,30 +167,6 @@ return accessPointConfigurations.contains(id); } -QString QConnmanEngine::bearerName(const QString &id) -{ - QMutexLocker locker(&mutex); - QConnmanServiceInterface serv(serviceFromId(id)); - QString connectionType = serv.getType(); - - if (connectionType == "ethernet") - return QLatin1String("Ethernet"); - else if (connectionType == "wifi") - return QLatin1String("WLAN"); - else if (connectionType == "cellular") { - QString mode = serv.getMode(); - if(mode == "gprs" || mode == "edge") { - return QLatin1String("2G"); - } else if(mode == "umts") { - return QLatin1String("WCDMA"); - } - } - else if (connectionType == "wimax") - return QLatin1String("WIMAX"); - - return QString(); -} - void QConnmanEngine::connectToId(const QString &id) { QMutexLocker locker(&mutex); @@ -208,11 +182,24 @@ void QConnmanEngine::disconnectFromId(const QString &id) { QMutexLocker locker(&mutex); - QConnmanServiceInterface serv(serviceFromId(id)); + QString servicePath = serviceFromId(id); + QConnmanServiceInterface serv(servicePath); if(!serv.isValid()) { emit connectionError(id, DisconnectionError); } else { - serv.disconnect(); + if(serv.getType() != "cellular") { + serv.disconnect(); + } else { + QOfonoManagerInterface ofonoManager(0); + QString modemPath = ofonoManager.currentModem().path(); + QOfonoDataConnectionManagerInterface dc(modemPath,0); + foreach(const QDBusObjectPath dcPath,dc.getPrimaryContexts()) { + if(dcPath.path().contains(servicePath.section("_",-1))) { + QOfonoPrimaryDataContextInterface primaryContext(dcPath.path(),0); + primaryContext.setActive(false); + } + } + } } } @@ -336,6 +323,9 @@ QMutexLocker locker(&mutex); QConnmanNetworkInterface network(netPath, this); foreach(QString service,connmanManager->getServices()) { + + QString devicePath = netPath.section("/",5,5); + QConnmanServiceInterface serv(service,this); if(serv.getName() == network.getName() && network.getSignalStrength() == serv.getSignalStrength()) { @@ -345,11 +335,9 @@ return QString(); } - void QConnmanEngine::propertyChangedContext(const QString &path,const QString &item, const QDBusVariant &value) { Q_UNUSED(path); -// qDebug() << __FUNCTION__ << path << item << value.variant(); QMutexLocker locker(&mutex); if(item == "Services") { @@ -378,17 +366,6 @@ technologies.insert(listPath, tech); } } - - foreach(const QString old, oldtech.keys()) { - if(!newlist.contains(old)) { - QConnmanTechnologyInterface *tech = oldtech.value(old); - disconnect(tech,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), - this,SLOT(technologyPropertyChangedContext(QString,QString,QDBusVariant))); - - technologies.remove(old); - getNetworkListing(); - } - } } } if(item == "State") { @@ -418,6 +395,9 @@ { QMutexLocker locker(&mutex); if(item == "Networks") { + + QConnmanNetworkInterface network(devpath, this); + QDBusArgument arg = qvariant_cast(value.variant()); QStringList remainingNetworks = qdbus_cast(arg); QString devicetype; @@ -476,6 +456,12 @@ } if(value.variant().toString() == "offline") { deviceMap.remove(path); + QConnmanTechnologyInterface tech(path); + disconnect(&tech,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), + this,SLOT(technologyPropertyChangedContext(QString,QString,QDBusVariant))); + + technologies.remove(path); + getNetworkListing(); } } } @@ -525,10 +511,18 @@ QMutexLocker locker(&mutex); QConnmanServiceInterface serv(service); QNetworkConfiguration::StateFlags flag = QNetworkConfiguration::Defined; - if(serv.isFavorite()) { - flag = ( flag | QNetworkConfiguration::Discovered); + if( serv.getType() == "cellular") { + if(serv.isSetupRequired()) { + flag = ( flag | QNetworkConfiguration::Defined); + } else { + flag = ( flag | QNetworkConfiguration::Discovered); + } } else { - flag = QNetworkConfiguration::Undefined; + if(serv.isFavorite()) { + flag = ( flag | QNetworkConfiguration::Discovered); + } else { + flag = QNetworkConfiguration::Undefined; + } } if(serv.getState() == "ready" || serv.getState() == "online") { @@ -538,25 +532,69 @@ return flag; } -QString QConnmanEngine::typeToBearer(const QString &type) +QNetworkConfiguration::BearerType QConnmanEngine::typeToBearer(const QString &type) { - QMutexLocker locker(&mutex); - if(type == "wifi") - return "WLAN"; - if(type == "ethernet") - return "Ethernet"; - if(type == "bluetooth") - return "Bluetooth"; - if(type == "cellular") { - return "Cellular"; - // not handled: CDMA2000 HSPA + if (type == "wifi") + return QNetworkConfiguration::BearerWLAN; + if (type == "ethernet") + return QNetworkConfiguration::BearerEthernet; + if (type == "bluetooth") + return QNetworkConfiguration::BearerBluetooth; + if (type == "cellular") { + return ofonoTechToBearerType(type); } - if(type == "wimax") - return "WiMax"; + if (type == "wimax") + return QNetworkConfiguration::BearerWiMAX; + // if(type == "gps") // if(type == "vpn") - return "Unknown"; + return QNetworkConfiguration::BearerUnknown; +} + +QNetworkConfiguration::BearerType QConnmanEngine::ofonoTechToBearerType(const QString &/*type*/) +{ + QOfonoManagerInterface ofonoManager(this); + QOfonoNetworkRegistrationInterface ofonoNetwork(ofonoManager.currentModem().path(),this); + + if(ofonoNetwork.isValid()) { + foreach(const QDBusObjectPath op,ofonoNetwork.getOperators() ) { + QOfonoNetworkOperatorInterface opIface(op.path(),this); + + foreach(const QString opTech, opIface.getTechnologies()) { + + if(opTech == "gsm") { + return QNetworkConfiguration::Bearer2G; + } + if(opTech == "edge"){ + return QNetworkConfiguration::BearerCDMA2000; //wrong, I know + } + if(opTech == "umts"){ + return QNetworkConfiguration::BearerWCDMA; + } + if(opTech == "hspa"){ + return QNetworkConfiguration::BearerHSPA; + } + if(opTech == "lte"){ + return QNetworkConfiguration::BearerWiMAX; //not exact + } + } + } + } + return QNetworkConfiguration::BearerUnknown; +} + +bool QConnmanEngine::isRoamingAllowed(const QString &context) +{ + QOfonoManagerInterface ofonoManager(this); + QString modemPath = ofonoManager.currentModem().path(); + QOfonoDataConnectionManagerInterface dc(modemPath,this); + foreach(const QDBusObjectPath dcPath,dc.getPrimaryContexts()) { + if(dcPath.path().contains(context.section("_",-1))) { + return dc.isRoamingAllowed(); + } + } + return false; } void QConnmanEngine::removeConfiguration(const QString &id) @@ -587,7 +625,6 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath) { - QMutexLocker locker(&mutex); QConnmanServiceInterface *serv; serv = new QConnmanServiceInterface(servicePath); @@ -612,15 +649,30 @@ QString networkName = serv->getName(); - if(serv->getType() == "Cellular") { - networkName = serv->getAPN(); + const QString connectionType = serv->getType(); + if (connectionType == "ethernet") { + cpPriv->bearerType = QNetworkConfiguration::BearerEthernet; + } else if (connectionType == "wifi") { + cpPriv->bearerType = QNetworkConfiguration::BearerWLAN; + } else if (connectionType == "cellular") { + cpPriv->bearerType = ofonoTechToBearerType("cellular"); + if(servicePath.isEmpty()) { + networkName = serv->getAPN(); + if(networkName.isEmpty()) { + networkName = serv->getName(); + } + } + cpPriv->roamingSupported = isRoamingAllowed(servicePath); + } else if (connectionType == "wimax") { + cpPriv->bearerType = QNetworkConfiguration::BearerWiMAX; + } else { + cpPriv->bearerType = QNetworkConfiguration::BearerUnknown; } cpPriv->name = networkName; cpPriv->isValid = true; cpPriv->id = id; cpPriv->type = QNetworkConfiguration::InternetAccessPoint; - cpPriv->bearer = bearerName(id); if(serv->getSecurity() == "none") { cpPriv->purpose = QNetworkConfiguration::PublicPurpose; @@ -638,7 +690,6 @@ foundConfigurations.append(cpPriv); configInterfaces[cpPriv->id] = device.getInterface(); - locker.unlock(); emit configurationAdded(ptr); locker.relock(); @@ -649,6 +700,8 @@ void QConnmanEngine::addNetworkConfiguration(const QString &networkPath) { QMutexLocker locker(&mutex); + if(networkPath.isNull()) + return; QConnmanNetworkInterface *network; network = new QConnmanNetworkInterface(networkPath, this); @@ -662,12 +715,12 @@ id = QString::number(qHash(networkPath)); } else { id = QString::number(qHash(servicePath)); - serv = new QConnmanServiceInterface(servicePath,this); - connect(serv,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), - this,SLOT(servicePropertyChangedContext(QString,QString, QDBusVariant))); + serv = new QConnmanServiceInterface(servicePath,this); + connect(serv,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), + this,SLOT(servicePropertyChangedContext(QString,QString, QDBusVariant))); } - if (!accessPointConfigurations.contains(id)) { + if (!id.isEmpty() && !accessPointConfigurations.contains(id)) { knownNetworks[device.getType()].append(networkPath); @@ -683,31 +736,30 @@ if(networkName.isEmpty()) networkName = "Hidden Network"; - QString bearerName; + QNetworkConfiguration::BearerType bearerType; if(servicePath.isEmpty()) { QString devicePath = networkPath.section("/",0,5); + QConnmanDeviceInterface device(devicePath,this); - bearerName = typeToBearer(device.getType()); + bearerType = typeToBearer(device.getType()); } else { - bearerName = typeToBearer(serv->getType()); - } - - if(bearerName == "Cellular") { - QString mode = serv->getMode(); - if(mode == "gprs" || mode == "edge") { - bearerName = "2G"; - } else if(mode == "umts") { - bearerName = "WCDMA"; + if(serv->getType() == "cellular") { + bearerType = ofonoTechToBearerType("cellular"); + if(servicePath.isEmpty()) { + networkName = serv->getName(); + } + cpPriv->roamingSupported = isRoamingAllowed(servicePath); + } else { + bearerType = typeToBearer(serv->getType()); } - networkName = serv->getAPN(); } cpPriv->name = networkName; cpPriv->isValid = true; cpPriv->id = id; cpPriv->type = QNetworkConfiguration::InternetAccessPoint; - cpPriv->bearer = bearerName; + cpPriv->bearerType = bearerType; if(network->getWifiSecurity() == "none") { cpPriv->purpose = QNetworkConfiguration::PublicPurpose; @@ -729,7 +781,9 @@ emit configurationAdded(ptr); locker.relock(); emit updateCompleted(); - } + } /*else { + qDebug() << "Not added~~~~~~~~~~~"; + }*/ } bool QConnmanEngine::requiresPolling() const @@ -765,7 +819,19 @@ if(!serv.isValid()) { emit connectionError(identifier, QBearerEngineImpl::InterfaceLookupError); } else { - serv.connect(); + if(serv.getType() != "cellular") { + serv.connect(); + } else { + QOfonoManagerInterface ofonoManager(0); + QString modemPath = ofonoManager.currentModem().path(); + QOfonoDataConnectionManagerInterface dc(modemPath,0); + foreach(const QDBusObjectPath dcPath,dc.getPrimaryContexts()) { + if(dcPath.path().contains(servicePath.section("_",-1))) { + QOfonoPrimaryDataContextInterface primaryContext(dcPath.path(),0); + primaryContext.setActive(true); + } + } + } } } diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/connman/qconnmanengine.h --- a/src/plugins/bearer/connman/qconnmanengine.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/connman/qconnmanengine.h Mon Oct 04 01:19:32 2010 +0300 @@ -80,8 +80,6 @@ virtual QString getInterfaceFromId(const QString &id); bool hasIdentifier(const QString &id); - virtual QString bearerName(const QString &id); - virtual void connectToId(const QString &id); virtual void disconnectFromId(const QString &id); @@ -125,7 +123,7 @@ QString networkFromId(const QString &id); QNetworkConfiguration::StateFlags getStateForService(const QString &service); - QString typeToBearer(const QString &type); + QNetworkConfiguration::BearerType typeToBearer(const QString &type); void removeConfiguration(const QString &servicePath); void addServiceConfiguration(const QString &servicePath); @@ -139,7 +137,8 @@ QMap deviceMap; //tech path, device path QMap serviceNetworks; //service, network - + QNetworkConfiguration::BearerType ofonoTechToBearerType(const QString &type); + bool isRoamingAllowed(const QString &context); protected: bool requiresPolling() const; QConnmanConnectThread *connThread; diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/connman/qconnmanservice_linux.cpp --- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -53,6 +53,8 @@ #include "qconnmanservice_linux_p.h" +#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_DBUS QT_BEGIN_NAMESPACE static QDBusConnection dbusConnection = QDBusConnection::systemBus(); @@ -129,8 +131,10 @@ QVariantMap QConnmanManagerInterface::getProperties() { - QDBusReply reply = this->call(QLatin1String("GetProperties")); - return reply.value(); + if(this->isValid()) { + QDBusReply reply = this->call(QLatin1String("GetProperties")); + return reply.value(); + } else return QVariantMap(); } QString QConnmanManagerInterface::getState() @@ -477,9 +481,7 @@ QVariantMap map = getProperties(); if (map.contains(property)) { var = map.value(property); - } else { - qDebug() <<__FUNCTION__<< "Could not find" << property; - } + } return var; } @@ -518,8 +520,6 @@ void QConnmanServiceInterface::connectNotify(const char *signal) { -// qWarning() << __FUNCTION__ << signal << this->path(); - if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) { dbusConnection.connect(QLatin1String(CONNMAN_SERVICE), this->path(), @@ -551,8 +551,12 @@ QVariantMap QConnmanServiceInterface::getProperties() { - QDBusReply reply = this->call(QLatin1String("GetProperties")); - return reply.value(); + if(this->isValid()) { + QDBusReply reply = this->call(QLatin1String("GetProperties")); + return reply.value(); + } + else + return QVariantMap(); } QVariant QConnmanServiceInterface::getProperty(const QString &property) @@ -561,9 +565,7 @@ QVariantMap map = getProperties(); if (map.contains(property)) { var = map.value(property); - } else { -// qDebug() <<__FUNCTION__<< "Could not find" << property; - } + } return var; } @@ -725,6 +727,99 @@ return qdbus_cast(var); } +QString QConnmanServiceInterface::getMethod() +{ + QVariant var; + QVariantMap map = getEthernet(); + QMapIterator it(map); + while(it.hasNext()) { + it.next(); + if(it.key() == "Method") { + return it.value().toString(); + } + } + return QString(); +} + +QString QConnmanServiceInterface::getInterface() +{ + QVariant var; + QVariantMap map = getEthernet(); + + QMapIterator it(map); + while(it.hasNext()) { + it.next(); + if(it.key() == "Interface") { + return it.value().toString(); + } + } + + return QString(); +} + +QString QConnmanServiceInterface::getMacAddress() +{ + QVariant var; + QVariantMap map = getEthernet(); + + QMapIterator it(map); + while(it.hasNext()) { + it.next(); + if(it.key() == "Address") { + return it.value().toString(); + } + } + return QString(); +} + +quint16 QConnmanServiceInterface::getMtu() +{ + quint16 mtu=0; + QVariant var; + QVariantMap map = getEthernet(); + + QMapIterator it(map); + while(it.hasNext()) { + it.next(); + if(it.key() == "MTU") { + return it.value().toUInt(); + } + } + return mtu; +} + +quint16 QConnmanServiceInterface::getSpeed() +{ + quint16 speed=0; + QVariant var; + QVariantMap map = getEthernet(); + + QMapIterator it(map); + while(it.hasNext()) { + it.next(); + if(it.key() == "Speed") { + return it.value().toUInt(); + } + } + return speed; +} + +QString QConnmanServiceInterface::getDuplex() +{ + QVariant var; + QVariantMap map = getEthernet(); + + QMapIterator it(map); + while(it.hasNext()) { + it.next(); + if(it.key() == "Duplex") { + return it.value().toString(); + } + } + return QString(); +} + + bool QConnmanServiceInterface::isOfflineMode() { QVariant var = getProperty("OfflineMode"); @@ -889,12 +984,17 @@ quint32 QConnmanCounterInterface::getReceivedByteCount() { -return 0; + return 0; } quint32 QConnmanCounterInterface::getTransmittedByteCount() { -return 0; + return 0; +} + +quint64 QConnmanCounterInterface::getTimeOnline() +{ + return 0; } ///////////////////////////////////////// @@ -950,15 +1050,7 @@ bool QConnmanDeviceInterface::setProperty(const QString &name, const QDBusVariant &value) { - -// QList args; - qWarning() << __FUNCTION__ << name << value.variant(); -// args << qVariantFromValue(name); -// args << qVariantFromValue(value); - QDBusMessage reply = this->call(QLatin1String("SetProperty"),name, qVariantFromValue(value)); -qWarning() << reply.errorMessage(); - return true; } @@ -1047,7 +1139,6 @@ << qVariantFromValue(QDBusVariant(powered)); QDBusMessage reply = this->callWithArgumentList(QDBus::AutoDetect,QLatin1String("SetProperty"),args); - qWarning() << reply.errorMessage() << reply.errorName(); return true; } @@ -1063,10 +1154,12 @@ void QConnmanDBusHelper::propertyChanged(const QString &item, const QDBusVariant &var) { QDBusMessage msg = this->message(); -// qWarning() << sender(); - // qWarning() << msg.interface() << msg.path() << item << var.variant() <<"\n"; Q_EMIT propertyChangedContext(msg.path() ,item, var); } ///////////////// QT_END_NAMESPACE + +#endif // QT_NO_DBUS +#endif // QT_NO_BEARERMANAGEMENT + diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/connman/qconnmanservice_linux_p.h --- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -65,6 +65,9 @@ #include #include +#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_DBUS + #ifndef __CONNMAN_DBUS_H #define CONNMAN_SERVICE "org.moblin.connman" @@ -249,6 +252,13 @@ QVariantMap getProxy(); QVariantMap getEthernet(); + QString getMethod(); + QString getInterface(); + QString getMacAddress(); + quint16 getMtu(); + quint16 getSpeed(); + QString getDuplex(); + bool isOfflineMode(); QStringList getServices(); @@ -321,6 +331,7 @@ QString getInterface(); quint32 getReceivedByteCount(); quint32 getTransmittedByteCount(); + quint64 getTimeOnline(); private: QConnmanCounterInterfacePrivate *d; @@ -378,4 +389,7 @@ QT_END_NAMESPACE +#endif // QT_NO_DBUS +#endif // QT_NO_BEARERMANAGEMENT + #endif //QCONNMANSERVICE_H diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/connman/qofonoservice_linux.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/plugins/bearer/connman/qofonoservice_linux.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,940 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "qofonoservice_linux_p.h" + + +QT_BEGIN_NAMESPACE +static QDBusConnection dbusConnection = QDBusConnection::systemBus(); + + +QOfonoManagerInterface::QOfonoManagerInterface( QObject *parent) + : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE), + QLatin1String(OFONO_MANAGER_PATH), + OFONO_MANAGER_INTERFACE, + QDBusConnection::systemBus(), parent) +{ +} + +QOfonoManagerInterface::~QOfonoManagerInterface() +{ +} + +QList QOfonoManagerInterface::getModems() +{ + QVariant var = getProperty("Modems"); + return qdbus_cast >(var); +} + +QDBusObjectPath QOfonoManagerInterface::currentModem() +{ + QList modems = getModems(); + foreach(const QDBusObjectPath modem, modems) { + QOfonoModemInterface device(modem.path()); + if(device.isPowered() && device.isOnline()) + return modem;; + } + return QDBusObjectPath(); +} + + +void QOfonoManagerInterface::connectNotify(const char *signal) +{ +if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) { + if(!connection().connect(QLatin1String(OFONO_SERVICE), + QLatin1String(OFONO_MANAGER_PATH), + QLatin1String(OFONO_MANAGER_INTERFACE), + QLatin1String("PropertyChanged"), + this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) { + qWarning() << "PropertyCHanged not connected"; + } + } + + if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) { + QOfonoDBusHelper *helper; + helper = new QOfonoDBusHelper(this); + + dbusConnection.connect(QLatin1String(OFONO_SERVICE), + QLatin1String(OFONO_MANAGER_PATH), + QLatin1String(OFONO_MANAGER_INTERFACE), + QLatin1String("PropertyChanged"), + helper,SLOT(propertyChanged(QString,QDBusVariant))); + + + QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), + this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &))); + } +} + +void QOfonoManagerInterface::disconnectNotify(const char *signal) +{ + if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) { + + } +} + +QVariant QOfonoManagerInterface::getProperty(const QString &property) +{ + QVariantMap map = getProperties(); + if (map.contains(property)) { + return map.value(property); + } else { + qDebug() << Q_FUNC_INFO << "does not contain" << property; + } + return QVariant(); +} + +QVariantMap QOfonoManagerInterface::getProperties() +{ + QDBusReply reply = this->call(QLatin1String("GetProperties")); + if(reply.isValid()) + return reply.value(); + else + return QVariantMap(); +} + +QOfonoDBusHelper::QOfonoDBusHelper(QObject * parent) + : QObject(parent) +{ +} + +QOfonoDBusHelper::~QOfonoDBusHelper() +{ +} + +void QOfonoDBusHelper::propertyChanged(const QString &item, const QDBusVariant &var) +{ + QDBusMessage msg = this->message(); + Q_EMIT propertyChangedContext(msg.path() ,item, var); +} + + +QOfonoModemInterface::QOfonoModemInterface(const QString &dbusPathName, QObject *parent) + : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE), + dbusPathName, + OFONO_MODEM_INTERFACE, + QDBusConnection::systemBus(), parent) +{ +} + +QOfonoModemInterface::~QOfonoModemInterface() +{ +} + +bool QOfonoModemInterface::isPowered() +{ + QVariant var = getProperty("Powered"); + return qdbus_cast(var); +} + +bool QOfonoModemInterface::isOnline() +{ + QVariant var = getProperty("Online"); + return qdbus_cast(var); +} + +QString QOfonoModemInterface::getName() +{ + QVariant var = getProperty("Name"); + return qdbus_cast(var); +} + +QString QOfonoModemInterface::getManufacturer() +{ + QVariant var = getProperty("Manufacturer"); + return qdbus_cast(var); + +} + +QString QOfonoModemInterface::getModel() +{ + + QVariant var = getProperty("Model"); + return qdbus_cast(var); +} + +QString QOfonoModemInterface::getRevision() +{ + QVariant var = getProperty("Revision"); + return qdbus_cast(var); + +} +QString QOfonoModemInterface::getSerial() +{ + QVariant var = getProperty("Serial"); + return qdbus_cast(var); + +} + +QStringList QOfonoModemInterface::getFeatures() +{ + //sms, sim + QVariant var = getProperty("Features"); + return qdbus_cast(var); +} + +QStringList QOfonoModemInterface::getInterfaces() +{ + QVariant var = getProperty("Interfaces"); + return qdbus_cast(var); +} + +QString QOfonoModemInterface::defaultInterface() +{ + foreach(const QString &modem,getInterfaces()) { + return modem; + } + return QString(); +} + + +void QOfonoModemInterface::connectNotify(const char *signal) +{ + if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) { + if(!connection().connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_MODEM_INTERFACE), + QLatin1String("PropertyChanged"), + this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) { + qWarning() << "PropertyCHanged not connected"; + } + } + + if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) { + QOfonoDBusHelper *helper; + helper = new QOfonoDBusHelper(this); + + dbusConnection.connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_MODEM_INTERFACE), + QLatin1String("PropertyChanged"), + helper,SLOT(propertyChanged(QString,QDBusVariant))); + + + QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), + this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &))); + }} + +void QOfonoModemInterface::disconnectNotify(const char *signal) +{ + if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) { + + } +} + +QVariantMap QOfonoModemInterface::getProperties() +{ + QDBusReply reply = this->call(QLatin1String("GetProperties")); + return reply.value(); +} + +QVariant QOfonoModemInterface::getProperty(const QString &property) +{ + QVariant var; + QVariantMap map = getProperties(); + if (map.contains(property)) { + var = map.value(property); + } else { + qDebug() << Q_FUNC_INFO << "does not contain" << property; + } + return var; +} + + +QOfonoNetworkRegistrationInterface::QOfonoNetworkRegistrationInterface(const QString &dbusPathName, QObject *parent) + : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE), + dbusPathName, + OFONO_NETWORK_REGISTRATION_INTERFACE, + QDBusConnection::systemBus(), parent) +{ +} + +QOfonoNetworkRegistrationInterface::~QOfonoNetworkRegistrationInterface() +{ +} + +QString QOfonoNetworkRegistrationInterface::getStatus() +{ + /* + "unregistered" Not registered to any network + "registered" Registered to home network + "searching" Not registered, but searching + "denied" Registration has been denied + "unknown" Status is unknown + "roaming" Registered, but roaming*/ + QVariant var = getProperty("Status"); + return qdbus_cast(var); +} + +quint16 QOfonoNetworkRegistrationInterface::getLac() +{ + QVariant var = getProperty("LocationAreaCode"); + return var.value(); +} + + +quint32 QOfonoNetworkRegistrationInterface::getCellId() +{ + QVariant var = getProperty("CellId"); + return var.value(); +} + +QString QOfonoNetworkRegistrationInterface::getTechnology() +{ + // "gsm", "edge", "umts", "hspa","lte" + QVariant var = getProperty("Technology"); + return qdbus_cast(var); +} + +QString QOfonoNetworkRegistrationInterface::getOperatorName() +{ + QVariant var = getProperty("Name"); + return qdbus_cast(var); +} + +int QOfonoNetworkRegistrationInterface::getSignalStrength() +{ + QVariant var = getProperty("Strength"); + return qdbus_cast(var); + +} + +QString QOfonoNetworkRegistrationInterface::getBaseStation() +{ + QVariant var = getProperty("BaseStation"); + return qdbus_cast(var); +} + +QList QOfonoNetworkRegistrationInterface::getOperators() +{ + QVariant var = getProperty("Operators"); + return qdbus_cast >(var); +} + +void QOfonoNetworkRegistrationInterface::connectNotify(const char *signal) +{ +if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) { + if(!connection().connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_NETWORK_REGISTRATION_INTERFACE), + QLatin1String("PropertyChanged"), + this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) { + qWarning() << "PropertyCHanged not connected"; + } + } + + if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) { + QOfonoDBusHelper *helper; + helper = new QOfonoDBusHelper(this); + + dbusConnection.connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_NETWORK_REGISTRATION_INTERFACE), + QLatin1String("PropertyChanged"), + helper,SLOT(propertyChanged(QString,QDBusVariant))); + + + QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), + this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &))); + } +} + +void QOfonoNetworkRegistrationInterface::disconnectNotify(const char *signal) +{ + if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) { + + } +} + +QVariant QOfonoNetworkRegistrationInterface::getProperty(const QString &property) +{ + QVariant var; + QVariantMap map = getProperties(); + if (map.contains(property)) { + var = map.value(property); + } else { + qDebug() << Q_FUNC_INFO << "does not contain" << property; + } + return var; +} + +QVariantMap QOfonoNetworkRegistrationInterface::getProperties() +{ + QDBusReply reply = this->call(QLatin1String("GetProperties")); + return reply.value(); +} + + + +QOfonoNetworkOperatorInterface::QOfonoNetworkOperatorInterface(const QString &dbusPathName, QObject *parent) + : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE), + dbusPathName, + OFONO_NETWORK_OPERATOR_INTERFACE, + QDBusConnection::systemBus(), parent) +{ +} + +QOfonoNetworkOperatorInterface::~QOfonoNetworkOperatorInterface() +{ +} + +QString QOfonoNetworkOperatorInterface::getName() +{ + QVariant var = getProperty("Name"); + return qdbus_cast(var); +} + +QString QOfonoNetworkOperatorInterface::getStatus() +{ + // "unknown", "available", "current" and "forbidden" + QVariant var = getProperty("Status"); + return qdbus_cast(var); +} + +QString QOfonoNetworkOperatorInterface::getMcc() +{ + QVariant var = getProperty("MobileCountryCode"); + return qdbus_cast(var); +} + +QString QOfonoNetworkOperatorInterface::getMnc() +{ + QVariant var = getProperty("MobileNetworkCode"); + return qdbus_cast(var); +} + +QStringList QOfonoNetworkOperatorInterface::getTechnologies() +{ + QVariant var = getProperty("Technologies"); + return qdbus_cast(var); +} + +void QOfonoNetworkOperatorInterface::connectNotify(const char *signal) +{ +if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) { + if(!connection().connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_NETWORK_OPERATOR_INTERFACE), + QLatin1String("PropertyChanged"), + this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) { + qWarning() << "PropertyCHanged not connected"; + } + } + + if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) { + QOfonoDBusHelper *helper; + helper = new QOfonoDBusHelper(this); + + dbusConnection.connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_NETWORK_OPERATOR_INTERFACE), + QLatin1String("PropertyChanged"), + helper,SLOT(propertyChanged(QString,QDBusVariant))); + + + QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), + this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &))); + } +} + +void QOfonoNetworkOperatorInterface::disconnectNotify(const char *signal) +{ + if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) { + + } +} + +QVariant QOfonoNetworkOperatorInterface::getProperty(const QString &property) +{ + QVariant var; + QVariantMap map = getProperties(); + if (map.contains(property)) { + var = map.value(property); + } else { + qDebug() << Q_FUNC_INFO << "does not contain" << property; + } + return var; +} + +QVariantMap QOfonoNetworkOperatorInterface::getProperties() +{ + QDBusReply reply = this->call(QLatin1String("GetProperties")); + return reply.value(); +} + +QOfonoSimInterface::QOfonoSimInterface(const QString &dbusPathName, QObject *parent) + : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE), + dbusPathName, + OFONO_SIM_MANAGER_INTERFACE, + QDBusConnection::systemBus(), parent) +{ +} + +QOfonoSimInterface::~QOfonoSimInterface() +{ +} + +bool QOfonoSimInterface::isPresent() +{ + QVariant var = getProperty("Present"); + return qdbus_cast(var); +} + +QString QOfonoSimInterface::getHomeMcc() +{ + QVariant var = getProperty("MobileCountryCode"); + return qdbus_cast(var); +} + +QString QOfonoSimInterface::getHomeMnc() +{ + QVariant var = getProperty("MobileNetworkCode"); + return qdbus_cast(var); +} + +// QStringList subscriberNumbers(); +// QMap serviceNumbers(); +QString QOfonoSimInterface::pinRequired() +{ + QVariant var = getProperty("PinRequired"); + return qdbus_cast(var); +} + +QString QOfonoSimInterface::lockedPins() +{ + QVariant var = getProperty("LockedPins"); + return qdbus_cast(var); +} + +QString QOfonoSimInterface::cardIdentifier() +{ + QVariant var = getProperty("CardIdentifier"); + return qdbus_cast(var); +} + +void QOfonoSimInterface::connectNotify(const char *signal) +{ +if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) { + if(!connection().connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_SIM_MANAGER_INTERFACE), + QLatin1String("PropertyChanged"), + this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) { + qWarning() << "PropertyCHanged not connected"; + } + } + + if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) { + QOfonoDBusHelper *helper; + helper = new QOfonoDBusHelper(this); + + dbusConnection.connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_SIM_MANAGER_INTERFACE), + QLatin1String("PropertyChanged"), + helper,SLOT(propertyChanged(QString,QDBusVariant))); + + + QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), + this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &))); + } +} + +void QOfonoSimInterface::disconnectNotify(const char *signal) +{ + if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) { + + } +} + +QVariant QOfonoSimInterface::getProperty(const QString &property) +{ + QVariant var; + QVariantMap map = getProperties(); + if (map.contains(property)) { + var = map.value(property); + } else { + qDebug() << Q_FUNC_INFO << "does not contain" << property; + } + return var; +} + +QVariantMap QOfonoSimInterface::getProperties() +{ + QDBusReply reply = this->call(QLatin1String("GetProperties")); + return reply.value(); +} + +QOfonoDataConnectionManagerInterface::QOfonoDataConnectionManagerInterface(const QString &dbusPathName, QObject *parent) + : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE), + dbusPathName, + OFONO_DATA_CONNECTION_MANAGER_INTERFACE, + QDBusConnection::systemBus(), parent) +{ +} + +QOfonoDataConnectionManagerInterface::~QOfonoDataConnectionManagerInterface() +{ +} + +QList QOfonoDataConnectionManagerInterface::getPrimaryContexts() +{ + QVariant var = getProperty("PrimaryContexts"); + return qdbus_cast >(var); +} + +bool QOfonoDataConnectionManagerInterface::isAttached() +{ + QVariant var = getProperty("Attached"); + return qdbus_cast(var); +} + +bool QOfonoDataConnectionManagerInterface::isRoamingAllowed() +{ + QVariant var = getProperty("RoamingAllowed"); + return qdbus_cast(var); +} + +bool QOfonoDataConnectionManagerInterface::isPowered() +{ + QVariant var = getProperty("Powered"); + return qdbus_cast(var); +} + +void QOfonoDataConnectionManagerInterface::connectNotify(const char *signal) +{ +if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) { + if(!connection().connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_DATA_CONNECTION_MANAGER_INTERFACE), + QLatin1String("PropertyChanged"), + this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) { + qWarning() << "PropertyCHanged not connected"; + } + } + + if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) { + QOfonoDBusHelper *helper; + helper = new QOfonoDBusHelper(this); + + dbusConnection.connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_DATA_CONNECTION_MANAGER_INTERFACE), + QLatin1String("PropertyChanged"), + helper,SLOT(propertyChanged(QString,QDBusVariant))); + + + QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), + this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &))); + } +} + +void QOfonoDataConnectionManagerInterface::disconnectNotify(const char *signal) +{ + if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) { + + } +} + +QVariant QOfonoDataConnectionManagerInterface::getProperty(const QString &property) +{ + QVariant var; + QVariantMap map = getProperties(); + if (map.contains(property)) { + var = map.value(property); + } else { + qDebug() << Q_FUNC_INFO << "does not contain" << property; + } + return var; +} + +QVariantMap QOfonoDataConnectionManagerInterface::getProperties() +{ + QDBusReply reply = this->call(QLatin1String("GetProperties")); + return reply.value(); +} + +QOfonoPrimaryDataContextInterface::QOfonoPrimaryDataContextInterface(const QString &dbusPathName, QObject *parent) + : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE), + dbusPathName, + OFONO_DATA_CONTEXT_INTERFACE, + QDBusConnection::systemBus(), parent) +{ +} + +QOfonoPrimaryDataContextInterface::~QOfonoPrimaryDataContextInterface() +{ +} + +bool QOfonoPrimaryDataContextInterface::isActive() +{ + QVariant var = getProperty("Active"); + return qdbus_cast(var); +} + +QString QOfonoPrimaryDataContextInterface::getApName() +{ + QVariant var = getProperty("AccessPointName"); + return qdbus_cast(var); +} + +QString QOfonoPrimaryDataContextInterface::getType() +{ + QVariant var = getProperty("Type"); + return qdbus_cast(var); +} + +QString QOfonoPrimaryDataContextInterface::getName() +{ + QVariant var = getProperty("Name"); + return qdbus_cast(var); +} + +QVariantMap QOfonoPrimaryDataContextInterface::getSettings() +{ + QVariant var = getProperty("Settings"); + return qdbus_cast(var); +} + +QString QOfonoPrimaryDataContextInterface::getInterface() +{ + QVariant var = getProperty("Interface"); + return qdbus_cast(var); +} + +QString QOfonoPrimaryDataContextInterface::getAddress() +{ + QVariant var = getProperty("Address"); + return qdbus_cast(var); +} + +bool QOfonoPrimaryDataContextInterface::setActive(bool on) +{ +// this->setProperty("Active", QVariant(on)); + + return setProp("Active", qVariantFromValue(on)); +} + +bool QOfonoPrimaryDataContextInterface::setApn(const QString &name) +{ + return setProp("AccessPointName", QVariant::fromValue(name)); +} + +void QOfonoPrimaryDataContextInterface::connectNotify(const char *signal) +{ +if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) { + if(!connection().connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_DATA_CONTEXT_INTERFACE), + QLatin1String("PropertyChanged"), + this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) { + qWarning() << "PropertyCHanged not connected"; + } + } + + if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) { + QOfonoDBusHelper *helper; + helper = new QOfonoDBusHelper(this); + + dbusConnection.connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_DATA_CONTEXT_INTERFACE), + QLatin1String("PropertyChanged"), + helper,SLOT(propertyChanged(QString,QDBusVariant))); + + + QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), + this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &))); + } +} + +void QOfonoPrimaryDataContextInterface::disconnectNotify(const char *signal) +{ + if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) { + + } +} + +QVariant QOfonoPrimaryDataContextInterface::getProperty(const QString &property) +{ + QVariant var; + QVariantMap map = getProperties(); + if (map.contains(property)) { + var = map.value(property); + } else { + qDebug() << Q_FUNC_INFO << "does not contain" << property; + } + return var; +} + +QVariantMap QOfonoPrimaryDataContextInterface::getProperties() +{ + QDBusReply reply = this->call(QLatin1String("GetProperties")); + return reply.value(); +} + +bool QOfonoPrimaryDataContextInterface::setProp(const QString &property, const QVariant &var) +{ + QList args; + args << qVariantFromValue(property) << qVariantFromValue(QDBusVariant(var)); + + QDBusMessage reply = this->callWithArgumentList(QDBus::AutoDetect, + QLatin1String("SetProperty"), + args); + bool ok = true; + if(reply.type() != QDBusMessage::ReplyMessage) { + qWarning() << reply.errorMessage(); + ok = false; + } + qWarning() << reply.errorMessage(); + return ok; +} + +QOfonoSmsInterface::QOfonoSmsInterface(const QString &dbusPathName, QObject *parent) + : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE), + dbusPathName, + OFONO_SMS_MANAGER_INTERFACE, + QDBusConnection::systemBus(), parent) +{ +} + +QOfonoSmsInterface::~QOfonoSmsInterface() +{ +} + +void QOfonoSmsInterface::connectNotify(const char *signal) +{ + if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QDBusVariant))) { + if(!connection().connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_SMS_MANAGER_INTERFACE), + QLatin1String("PropertyChanged"), + this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) { + qWarning() << "PropertyCHanged not connected"; + } + } + + if (QLatin1String(signal) == SIGNAL(propertyChangedContext(QString,QString,QDBusVariant))) { + QOfonoDBusHelper *helper; + helper = new QOfonoDBusHelper(this); + + dbusConnection.connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_SMS_MANAGER_INTERFACE), + QLatin1String("PropertyChanged"), + helper,SLOT(propertyChanged(QString,QDBusVariant))); + + + QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), + this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &))); + } + + if (QLatin1String(signal) == SIGNAL(immediateMessage(QString,QVariantMap))) { + if(!connection().connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_SMS_MANAGER_INTERFACE), + QLatin1String("ImmediateMessage"), + this,SIGNAL(immediateMessage(QString,QVariantMap )))) { + qWarning() << "PropertyCHanged not connected"; + } + } + + if (QLatin1String(signal) == SIGNAL(incomingMessage(QString,QVariantMap))) { + if(!connection().connect(QLatin1String(OFONO_SERVICE), + this->path(), + QLatin1String(OFONO_SMS_MANAGER_INTERFACE), + QLatin1String("IncomingMessage"), + this,SIGNAL(incomingMessage(QString,QVariantMap)))) { + qWarning() << "PropertyCHanged not connected"; + } + } +} + +void QOfonoSmsInterface::disconnectNotify(const char *signal) +{ + if (QLatin1String(signal) == SIGNAL(propertyChanged(QString,QVariant))) { + + } +} + +QVariant QOfonoSmsInterface::getProperty(const QString &property) +{ + QVariant var; + QVariantMap map = getProperties(); + if (map.contains(property)) { + var = map.value(property); + } else { + qDebug() << Q_FUNC_INFO << "does not contain" << property; + } + return var; +} + +QVariantMap QOfonoSmsInterface::getProperties() +{ + QDBusReply reply = this->call(QLatin1String("GetProperties")); + return reply.value(); +} + +void QOfonoSmsInterface::sendMessage(const QString &to, const QString &message) +{ + QDBusReply reply = this->call(QLatin1String("SendMessage"), + QVariant::fromValue(to), + QVariant::fromValue(message)); + bool ok = true; + if(reply.error().type() == QDBusError::InvalidArgs) { + qWarning() << reply.error().message(); + ok = false; + } +} + +QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/connman/qofonoservice_linux_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/plugins/bearer/connman/qofonoservice_linux_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,332 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QOFONOSERVICE_H +#define QOFONOSERVICE_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#define OFONO_SERVICE "org.ofono" +#define OFONO_MANAGER_INTERFACE "org.ofono.Manager" +#define OFONO_MANAGER_PATH "/" +#define OFONO_MODEM_INTERFACE "org.ofono.Modem" +#define OFONO_NETWORK_REGISTRATION_INTERFACE "org.ofono.NetworkRegistration" +#define OFONO_NETWORK_OPERATOR_INTERFACE "org.ofono.NetworkOperator" +#define OFONO_DATA_CONNECTION_MANAGER_INTERFACE "org.ofono.DataConnectionManager" +#define OFONO_SIM_MANAGER_INTERFACE "org.ofono.SimManager" +#define OFONO_DATA_CONTEXT_INTERFACE "org.ofono.PrimaryDataContext" + +#define OFONO_SMS_MANAGER_INTERFACE "org.ofono.SmsManager" +#define OFONO_PHONEBOOK_INTERFACE "org.ofono.Phonebook" +#define OFONO_MESSAGE_WAITING_INTERFACE "org.ofono.MessageWaiting" + + + +QT_BEGIN_NAMESPACE + +QT_END_NAMESPACE + + +QT_BEGIN_NAMESPACE + +class QOfonoManagerInterface : public QDBusAbstractInterface +{ + Q_OBJECT + +public: + + QOfonoManagerInterface( QObject *parent = 0); + ~QOfonoManagerInterface(); + + QDBusObjectPath path() const; + + QVariantMap getProperties(); + bool setProperty(const QString &name, const QDBusVariant &value); + QList getModems(); + QDBusObjectPath currentModem(); + +Q_SIGNALS: + void propertyChanged(const QString &, const QDBusVariant &value); + void propertyChangedContext(const QString &,const QString &,const QDBusVariant &); +protected: + void connectNotify(const char *signal); + void disconnectNotify(const char *signal); + QVariant getProperty(const QString &); + +}; + + +class QOfonoDBusHelper: public QObject, protected QDBusContext + { + Q_OBJECT + public: + QOfonoDBusHelper(QObject *parent = 0); + ~QOfonoDBusHelper(); + + public slots: + void propertyChanged(const QString &, const QDBusVariant &); + Q_SIGNALS: + void propertyChangedContext(const QString &,const QString &,const QDBusVariant &); +}; + +class QOfonoModemInterface : public QDBusAbstractInterface +{ + Q_OBJECT + +public: + + QOfonoModemInterface(const QString &dbusModemPathName, QObject *parent = 0); + ~QOfonoModemInterface(); + + QVariantMap getProperties(); + //properties + bool isPowered(); + bool isOnline(); + QString getName(); + QString getManufacturer(); + QString getModel(); + QString getRevision(); + QString getSerial(); + + QStringList getFeatures(); //sms, sim + QStringList getInterfaces(); + QString defaultInterface(); + +protected: + void connectNotify(const char *signal); + void disconnectNotify(const char *signal); + QVariant getProperty(const QString &); +Q_SIGNALS: + void propertyChanged(const QString &, const QDBusVariant &value); + void propertyChangedContext(const QString &,const QString &,const QDBusVariant &); +}; + + +class QOfonoNetworkRegistrationInterface : public QDBusAbstractInterface +{ + Q_OBJECT + +public: + + QOfonoNetworkRegistrationInterface(const QString &dbusModemPathName, QObject *parent = 0); + ~QOfonoNetworkRegistrationInterface(); + + QVariantMap getProperties(); + + //properties + QString getStatus(); + quint16 getLac(); + quint32 getCellId(); + QString getTechnology(); + QString getOperatorName(); + int getSignalStrength(); + QString getBaseStation(); + QList getOperators(); + +protected: + void connectNotify(const char *signal); + void disconnectNotify(const char *signal); + QVariant getProperty(const QString &); +Q_SIGNALS: + void propertyChanged(const QString &, const QDBusVariant &value); + void propertyChangedContext(const QString &,const QString &,const QDBusVariant &); + +}; + +class QOfonoNetworkOperatorInterface : public QDBusAbstractInterface +{ + Q_OBJECT + +public: +//modem or operator paths + QOfonoNetworkOperatorInterface(const QString &dbusPathName, QObject *parent = 0); + ~QOfonoNetworkOperatorInterface(); + + QVariantMap getProperties(); + + //properties + QString getName(); + QString getStatus();// "unknown", "available", "current" and "forbidden" + QString getMcc(); + QString getMnc(); + QStringList getTechnologies(); + +protected: + void connectNotify(const char *signal); + void disconnectNotify(const char *signal); + QVariant getProperty(const QString &); +}; + +class QOfonoSimInterface : public QDBusAbstractInterface +{ + Q_OBJECT + +public: + + QOfonoSimInterface(const QString &dbusModemPathName, QObject *parent = 0); + ~QOfonoSimInterface(); + + QVariantMap getProperties(); + + //properties + bool isPresent(); + QString getHomeMcc(); + QString getHomeMnc(); +// QStringList subscriberNumbers(); +// QMap serviceNumbers(); + QString pinRequired(); + QString lockedPins(); + QString cardIdentifier(); + +protected: + void connectNotify(const char *signal); + void disconnectNotify(const char *signal); + QVariant getProperty(const QString &); +}; + + +class QOfonoDataConnectionManagerInterface : public QDBusAbstractInterface +{ + Q_OBJECT + +public: + + QOfonoDataConnectionManagerInterface(const QString &dbusPathName, QObject *parent = 0); + ~QOfonoDataConnectionManagerInterface(); + + QVariantMap getProperties(); + + //properties + QList getPrimaryContexts(); + bool isAttached(); + bool isRoamingAllowed(); + bool isPowered(); + + bool setPower(bool on); + +protected: + void connectNotify(const char *signal); + void disconnectNotify(const char *signal); + QVariant getProperty(const QString &); +}; + + +class QOfonoPrimaryDataContextInterface : public QDBusAbstractInterface +{ + Q_OBJECT + +public: + + QOfonoPrimaryDataContextInterface(const QString &dbusPathName, QObject *parent = 0); + ~QOfonoPrimaryDataContextInterface(); + + QVariantMap getProperties(); + + //properties + bool isActive(); + QString getApName(); + QString getType(); + QString getName(); + QVariantMap getSettings(); + QString getInterface(); + QString getAddress(); + + bool setActive(bool on); + bool setApn(const QString &name); + +protected: + void connectNotify(const char *signal); + void disconnectNotify(const char *signal); + QVariant getProperty(const QString &); + bool setProp(const QString &, const QVariant &var); +}; + +class QOfonoSmsInterface : public QDBusAbstractInterface +{ + Q_OBJECT + +public: + + QOfonoSmsInterface(const QString &dbusModemPathName, QObject *parent = 0); + ~QOfonoSmsInterface(); + + QVariantMap getProperties(); + void sendMessage(const QString &to, const QString &message); + + //properties + QString serviceCenterAddress(); + bool useDeliveryReports(); + QString bearer(); + +protected: + void connectNotify(const char *signal); + void disconnectNotify(const char *signal); + QVariant getProperty(const QString &); + +Q_SIGNALS: + void propertyChanged(const QString &, const QDBusVariant &value); + void propertyChangedContext(const QString &,const QString &,const QDBusVariant &); + void immediateMessage(const QString &message, const QVariantMap &info); + void incomingMessage(const QString &message, const QVariantMap &info); +}; + +#endif //QOFONOSERVICE_H diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/corewlan/qcorewlanengine.h --- a/src/plugins/bearer/corewlan/qcorewlanengine.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/corewlan/qcorewlanengine.h Mon Oct 04 01:19:32 2010 +0300 @@ -68,8 +68,6 @@ QString getInterfaceFromId(const QString &id); bool hasIdentifier(const QString &id); - QString bearerName(const QString &id); - void connectToId(const QString &id); void disconnectFromId(const QString &id); diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/corewlan/qcorewlanengine.mm --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm Mon Oct 04 01:19:32 2010 +0300 @@ -264,7 +264,7 @@ ptr->id = id; ptr->state = state; ptr->type = QNetworkConfiguration::InternetAccessPoint; - ptr->bearer = QLatin1String("WLAN"); + ptr->bearerType = QNetworkConfiguration::BearerWLAN; ptr->purpose = purpose; fetchedConfigurations.append( ptr); @@ -305,50 +305,53 @@ SCDynamicStoreRef dynRef = SCDynamicStoreCreate(kCFAllocatorSystemDefault, (CFStringRef)@"Qt corewlan", nil, nil); NSDictionary * airportPlist = (NSDictionary *)SCDynamicStoreCopyValue(dynRef, (CFStringRef)[NSString stringWithFormat:@"Setup:/Network/Interface/%@/AirPort", nsInterfaceName]); CFRelease(dynRef); - - NSDictionary *prefNetDict = [airportPlist objectForKey:@"PreferredNetworks"]; + if(airportPlist != nil) { + NSDictionary *prefNetDict = [airportPlist objectForKey:@"PreferredNetworks"]; - NSArray *thisSsidarray = [prefNetDict valueForKey:@"SSID_STR"]; - for(NSString *ssidkey in thisSsidarray) { - QString thisSsid = qt_mac_NSStringToQString(ssidkey); - if(!userProfiles.contains(thisSsid)) { - QMap map; - map.insert(thisSsid, qt_mac_NSStringToQString(nsInterfaceName)); - userProfiles.insert(thisSsid, map); + NSArray *thisSsidarray = [prefNetDict valueForKey:@"SSID_STR"]; + for(NSString *ssidkey in thisSsidarray) { + QString thisSsid = qt_mac_NSStringToQString(ssidkey); + if(!userProfiles.contains(thisSsid)) { + QMap map; + map.insert(thisSsid, qt_mac_NSStringToQString(nsInterfaceName)); + userProfiles.insert(thisSsid, map); + } } + CFRelease(airportPlist); } - CFRelease(airportPlist); // 802.1X user profiles QString userProfilePath = QDir::homePath() + "/Library/Preferences/com.apple.eap.profiles.plist"; NSDictionary* eapDict = [[[NSDictionary alloc] initWithContentsOfFile:qt_mac_QStringToNSString(userProfilePath)] autorelease]; - NSString *profileStr= @"Profiles"; - NSString *nameStr = @"UserDefinedName"; - NSString *networkSsidStr = @"Wireless Network"; - for (id profileKey in eapDict) { - if ([profileStr isEqualToString:profileKey]) { - NSDictionary *itemDict = [eapDict objectForKey:profileKey]; - for (id itemKey in itemDict) { + if(eapDict != nil) { + NSString *profileStr= @"Profiles"; + NSString *nameStr = @"UserDefinedName"; + NSString *networkSsidStr = @"Wireless Network"; + for (id profileKey in eapDict) { + if ([profileStr isEqualToString:profileKey]) { + NSDictionary *itemDict = [eapDict objectForKey:profileKey]; + for (id itemKey in itemDict) { - NSInteger dictSize = [itemKey count]; - id objects[dictSize]; - id keys[dictSize]; + NSInteger dictSize = [itemKey count]; + id objects[dictSize]; + id keys[dictSize]; - [itemKey getObjects:objects andKeys:keys]; - QString networkName; - QString ssid; - for(int i = 0; i < dictSize; i++) { - if([nameStr isEqualToString:keys[i]]) { - networkName = qt_mac_NSStringToQString(objects[i]); - } - if([networkSsidStr isEqualToString:keys[i]]) { - ssid = qt_mac_NSStringToQString(objects[i]); - } - if(!userProfiles.contains(networkName) - && !ssid.isEmpty()) { - QMap map; - map.insert(ssid, qt_mac_NSStringToQString(nsInterfaceName)); - userProfiles.insert(networkName, map); + [itemKey getObjects:objects andKeys:keys]; + QString networkName; + QString ssid; + for(int i = 0; i < dictSize; i++) { + if([nameStr isEqualToString:keys[i]]) { + networkName = qt_mac_NSStringToQString(objects[i]); + } + if([networkSsidStr isEqualToString:keys[i]]) { + ssid = qt_mac_NSStringToQString(objects[i]); + } + if(!userProfiles.contains(networkName) + && !ssid.isEmpty()) { + QMap map; + map.insert(ssid, qt_mac_NSStringToQString(nsInterfaceName)); + userProfiles.insert(networkName, map); + } } } } @@ -789,8 +792,8 @@ changed = true; } - if (ptr->bearer != cpPriv->bearer) { - ptr->bearer = cpPriv->bearer; + if (ptr->bearerType != cpPriv->bearerType) { + ptr->bearerType = cpPriv->bearerType; changed = true; } @@ -855,6 +858,8 @@ NSString *filePath = @"/Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist"; NSDictionary* plistDict = [[[NSDictionary alloc] initWithContentsOfFile:filePath] autorelease]; + if(plistDict == nil) + return timestamp; NSString *input = @"KnownNetworks"; NSString *timeStampStr = @"_timeStamp"; @@ -864,9 +869,13 @@ if ([input isEqualToString:key]) { NSDictionary *knownNetworksDict = [plistDict objectForKey:key]; + if(knownNetworksDict == nil) + return timestamp; for (id networkKey in knownNetworksDict) { bool isFound = false; NSDictionary *itemDict = [knownNetworksDict objectForKey:networkKey]; + if(itemDict == nil) + return timestamp; NSInteger dictSize = [itemDict count]; id objects[dictSize]; id keys[dictSize]; diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/generic/qgenericengine.cpp --- a/src/plugins/bearer/generic/qgenericengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/generic/qgenericengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_NETWORKINTERFACE -static QString qGetInterfaceType(const QString &interface) +static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interface) { #ifdef Q_OS_WIN32 unsigned long oid; @@ -78,10 +78,10 @@ NDIS_MEDIUM medium; NDIS_PHYSICAL_MEDIUM physicalMedium; - HANDLE handle = CreateFile((TCHAR *)QString("\\\\.\\%1").arg(interface).utf16(), 0, + HANDLE handle = CreateFile((TCHAR *)QString::fromLatin1("\\\\.\\%1").arg(interface).utf16(), 0, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); if (handle == INVALID_HANDLE_VALUE) - return QLatin1String("Unknown"); + return QNetworkConfiguration::BearerUnknown; oid = OID_GEN_MEDIA_SUPPORTED; bytesWritten = 0; @@ -89,7 +89,7 @@ &medium, sizeof(medium), &bytesWritten, 0); if (!result) { CloseHandle(handle); - return QLatin1String("Unknown"); + return QNetworkConfiguration::BearerUnknown; } oid = OID_GEN_PHYSICAL_MEDIUM; @@ -100,9 +100,9 @@ CloseHandle(handle); if (medium == NdisMedium802_3) - return QLatin1String("Ethernet"); + return QNetworkConfiguration::BearerEthernet; else - return QLatin1String("Unknown"); + return QNetworkConfiguration::BearerUnknown; } CloseHandle(handle); @@ -110,16 +110,16 @@ if (medium == NdisMedium802_3) { switch (physicalMedium) { case NdisPhysicalMediumWirelessLan: - return QLatin1String("WLAN"); + return QNetworkConfiguration::BearerWLAN; case NdisPhysicalMediumBluetooth: - return QLatin1String("Bluetooth"); + return QNetworkConfiguration::BearerBluetooth; case NdisPhysicalMediumWiMax: - return QLatin1String("WiMAX"); + return QNetworkConfiguration::BearerWiMAX; default: #ifdef BEARER_MANAGEMENT_DEBUG qDebug() << "Physical Medium" << physicalMedium; #endif - return QLatin1String("Ethernet"); + return QNetworkConfiguration::BearerEthernet; } } @@ -135,12 +135,12 @@ close(sock); if (result >= 0 && request.ifr_hwaddr.sa_family == ARPHRD_ETHER) - return QLatin1String("Ethernet"); + return QNetworkConfiguration::BearerEthernet; #else Q_UNUSED(interface); #endif - return QLatin1String("Unknown"); + return QNetworkConfiguration::BearerUnknown; } #endif @@ -214,7 +214,7 @@ continue; // ignore WLAN interface handled in separate engine - if (qGetInterfaceType(interface.name()) == QLatin1String("WLAN")) + if (qGetInterfaceType(interface.name()) == QNetworkConfiguration::BearerWLAN) continue; uint identifier; @@ -277,7 +277,7 @@ ptr->id = id; ptr->state = state; ptr->type = QNetworkConfiguration::InternetAccessPoint; - ptr->bearer = qGetInterfaceType(interface.name()); + ptr->bearerType = qGetInterfaceType(interface.name()); accessPointConfigurations.insert(id, ptr); configurationInterface.insert(id, interface.name()); diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/generic/qgenericengine.h --- a/src/plugins/bearer/generic/qgenericengine.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/generic/qgenericengine.h Mon Oct 04 01:19:32 2010 +0300 @@ -65,8 +65,6 @@ QString getInterfaceFromId(const QString &id); bool hasIdentifier(const QString &id); - QString bearerName(const QString &id); - void connectToId(const QString &id); void disconnectFromId(const QString &id); diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/icd/icd.pro --- a/src/plugins/bearer/icd/icd.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/icd/icd.pro Mon Oct 04 01:19:32 2010 +0300 @@ -3,8 +3,8 @@ QT += network dbus -QMAKE_CXXFLAGS += $$QT_CFLAGS_ICD -LIBS += $$QT_LIBS_ICD +QMAKE_CXXFLAGS *= $$QT_CFLAGS_DBUS $$QT_CFLAGS_CONNSETTINGS +LIBS += $$QT_LIBS_CONNSETTINGS HEADERS += qicdengine.h \ qnetworksession_impl.h @@ -15,6 +15,9 @@ #DEFINES += BEARER_MANAGEMENT_DEBUG +include(../../../3rdparty/libconninet.pri) +include(../../../3rdparty/libgq.pri) + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/icd/qicdengine.cpp --- a/src/plugins/bearer/icd/qicdengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/icd/qicdengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -60,16 +60,11 @@ { } -QString IcdNetworkConfigurationPrivate::bearerName() const +QString IcdNetworkConfigurationPrivate::bearerTypeName() const { - if (iap_type == QLatin1String("WLAN_INFRA") || - iap_type == QLatin1String("WLAN_ADHOC")) { - return QLatin1String("WLAN"); - } else if (iap_type == QLatin1String("GPRS")) { - return QLatin1String("HSPA"); - } else { - return iap_type; - } + QMutexLocker locker(&mutex); + + return iap_type; } /* The IapAddTimer is a helper class that makes sure we update @@ -222,7 +217,7 @@ } QIcdEngine::QIcdEngine(QObject *parent) -: QBearerEngine(parent), iapMonitor(new IapMonitor), m_dbusInterface(0), +: QBearerEngine(parent), iapMonitor(0), m_dbusInterface(0), firstUpdate(true), m_scanGoingOn(false) { } @@ -263,6 +258,7 @@ startListeningStateSignalsForAllConnections(); /* Turn on IAP add/remove monitoring */ + iapMonitor = new IapMonitor; iapMonitor->setup(this); /* We create a default configuration which is a pseudo config */ @@ -279,6 +275,8 @@ userChoiceConfigurations.insert(cpPriv->id, ptr); doRequestUpdate(); + + getIcdInitialState(); } static inline QString network_attrs_to_security(uint network_attrs) @@ -400,6 +398,7 @@ ptr->mutex.lock(); ptr->id = iap_id; toIcdConfig(ptr)->iap_type = iap_type; + ptr->bearerType = bearerTypeFromIapType(iap_type); toIcdConfig(ptr)->network_attrs = getNetworkAttrs(true, iap_id, iap_type, QString()); toIcdConfig(ptr)->network_id = ssid; toIcdConfig(ptr)->service_id = saved_iap.value("service_id").toString(); @@ -424,6 +423,7 @@ cpPriv->isValid = true; cpPriv->id = iap_id; cpPriv->iap_type = iap_type; + cpPriv->bearerType = bearerTypeFromIapType(iap_type); cpPriv->network_attrs = getNetworkAttrs(true, iap_id, iap_type, QString()); cpPriv->service_id = saved_iap.value("service_id").toString(); cpPriv->service_type = saved_iap.value("service_type").toString(); @@ -480,6 +480,7 @@ ptr->isValid = true; if (toIcdConfig(ptr)->iap_type != iap_type) { toIcdConfig(ptr)->iap_type = iap_type; + ptr->bearerType = bearerTypeFromIapType(iap_type); update_needed = true; } if (iap_type.startsWith(QLatin1String("WLAN"))) { @@ -522,8 +523,6 @@ void QIcdEngine::doRequestUpdate(QList scanned) { - QMutexLocker locker(&mutex); - /* Contains all known iap_ids from storage */ QList knownConfigs = accessPointConfigurations.keys(); @@ -580,6 +579,7 @@ cpPriv->network_id = ssid; cpPriv->network_attrs = getNetworkAttrs(true, iap_id, iap_type, QString()); cpPriv->iap_type = iap_type; + cpPriv->bearerType = bearerTypeFromIapType(iap_type); cpPriv->service_id = saved_ap.value("service_id").toString(); cpPriv->service_type = saved_ap.value("service_type").toString(); cpPriv->type = QNetworkConfiguration::InternetAccessPoint; @@ -588,9 +588,9 @@ QNetworkConfigurationPrivatePointer ptr(cpPriv); accessPointConfigurations.insert(iap_id, ptr); - locker.unlock(); + mutex.unlock(); emit configurationAdded(ptr); - locker.relock(); + mutex.lock(); #ifdef BEARER_MANAGEMENT_DEBUG qDebug("IAP: %s, name: %s, ssid: %s, added to known list", @@ -625,7 +625,11 @@ changed = true; } - if (ptr->state != QNetworkConfiguration::Discovered) { + /* If this config is the current active one, we do not set it + * to discovered. + */ + if ((ptr->state != QNetworkConfiguration::Discovered) && + (ptr->state != QNetworkConfiguration::Active)) { ptr->state = QNetworkConfiguration::Discovered; changed = true; } @@ -643,9 +647,9 @@ ptr->mutex.unlock(); if (changed) { - locker.unlock(); + mutex.unlock(); emit configurationChanged(ptr); - locker.relock(); + mutex.lock(); } if (!ap.scan.network_type.startsWith(QLatin1String("WLAN"))) @@ -688,6 +692,7 @@ cpPriv->id = scanned_ssid.data(); // Note: id is now ssid, it should be set to IAP id if the IAP is saved cpPriv->network_id = scanned_ssid; cpPriv->iap_type = ap.scan.network_type; + cpPriv->bearerType = bearerTypeFromIapType(cpPriv->iap_type); cpPriv->network_attrs = ap.scan.network_attrs; cpPriv->service_id = ap.scan.service_id; cpPriv->service_type = ap.scan.service_type; @@ -703,9 +708,9 @@ QNetworkConfigurationPrivatePointer ptr(cpPriv); accessPointConfigurations.insert(ptr->id, ptr); - locker.unlock(); + mutex.unlock(); emit configurationAdded(ptr); - locker.relock(); + mutex.lock(); } else { knownConfigs.removeOne(scanned_ssid); } @@ -733,9 +738,9 @@ ptr->state = QNetworkConfiguration::Defined; configLocker.unlock(); - locker.unlock(); + mutex.unlock(); emit configurationChanged(ptr); - locker.relock(); + mutex.lock(); } } } @@ -744,9 +749,9 @@ foreach (const QString &oldIface, knownConfigs) { QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.take(oldIface); if (ptr) { - locker.unlock(); + mutex.unlock(); emit configurationRemoved(ptr); - locker.relock(); + mutex.lock(); //if we would have SNAP support we would have to remove the references //from existing ServiceNetworks to the removed access point configuration } @@ -762,9 +767,9 @@ } if (!firstUpdate) { - locker.unlock(); + mutex.unlock(); emit updateCompleted(); - locker.relock(); + mutex.lock(); } if (firstUpdate) @@ -781,18 +786,54 @@ void QIcdEngine::startListeningStateSignalsForAllConnections() { - QMutexLocker locker(&mutex); - // Start listening ICD_DBUS_API_STATE_SIG signals m_dbusInterface->connection().connect(ICD_DBUS_API_INTERFACE, ICD_DBUS_API_PATH, ICD_DBUS_API_INTERFACE, ICD_DBUS_API_STATE_SIG, this, SLOT(connectionStateSignalsSlot(QDBusMessage))); +} - // Calling ICD_DBUS_API_STATE_REQ makes sure that initial state will be updated immediately - m_gettingInitialConnectionState = true; - m_dbusInterface->call(ICD_DBUS_API_STATE_REQ); +void QIcdEngine::getIcdInitialState() +{ + /* Instead of requesting ICD status asynchronously, we ask it synchronously. + * It ensures that we always get right icd status BEFORE initialize() ends. + * If not, initialize() might end before we got icd status and + * QNetworkConfigurationManager::updateConfigurations() + * call from user might also end before receiving icd status. + * In such case, we come up to a bug: + * QNetworkConfigurationManagerPrivate::isOnline() will be false even + * if we are connected. + */ + Maemo::Icd icd; + QList state_results; + QNetworkConfigurationPrivatePointer ptr; + + if (icd.state(state_results) && !state_results.isEmpty()) { + + if (!(state_results.first().params.network_attrs == 0 && + state_results.first().params.network_id.isEmpty())) { + + switch (state_results.first().state) { + case ICD_STATE_CONNECTED: + m_onlineIapId = state_results.first().params.network_id; + + ptr = accessPointConfigurations.value(m_onlineIapId); + if (ptr) { + QMutexLocker configLocker(&ptr->mutex); + ptr->state = QNetworkConfiguration::Active; + configLocker.unlock(); + + mutex.unlock(); + emit configurationChanged(ptr); + mutex.lock(); + } + break; + default: + break; + } + } + } } void QIcdEngine::connectionStateSignalsSlot(QDBusMessage msg) @@ -817,12 +858,12 @@ ptr->type = QNetworkConfiguration::InternetAccessPoint; if (ptr->state != QNetworkConfiguration::Active) { ptr->state = QNetworkConfiguration::Active; - if (!m_gettingInitialConnectionState) { - configLocker.unlock(); - locker.unlock(); - emit configurationChanged(ptr); - locker.relock(); - } + + configLocker.unlock(); + locker.unlock(); + emit configurationChanged(ptr); + locker.relock(); + m_onlineIapId = iapid; } } else { @@ -843,22 +884,21 @@ ptr->type = QNetworkConfiguration::InternetAccessPoint; if (ptr->state == QNetworkConfiguration::Active) { ptr->state = QNetworkConfiguration::Discovered; - if (!m_gettingInitialConnectionState) { - configLocker.unlock(); - locker.unlock(); - emit configurationChanged(ptr); - locker.relock(); + + configLocker.unlock(); + locker.unlock(); + emit configurationChanged(ptr); + locker.relock(); - // Note: If ICD switches used IAP from one to another: - // 1) new IAP is reported to be online first - // 2) old IAP is reported to be offline then - // => Device can be reported to be offline only - // if last known online IAP is reported to be disconnected - if (iapid == m_onlineIapId) { - // It's known that there is only one global ICD connection - // => Because ICD state was reported to be DISCONNECTED, Device is offline - m_onlineIapId.clear(); - } + // Note: If ICD switches used IAP from one to another: + // 1) new IAP is reported to be online first + // 2) old IAP is reported to be offline then + // => Device can be reported to be offline only + // if last known online IAP is reported to be disconnected + if (iapid == m_onlineIapId) { + // It's known that there is only one global ICD connection + // => Because ICD state was reported to be DISCONNECTED, Device is offline + m_onlineIapId.clear(); } } } else { @@ -879,8 +919,6 @@ locker.unlock(); emit iapStateChanged(iapid, icd_connection_state); locker.relock(); - - m_gettingInitialConnectionState = false; } void QIcdEngine::requestUpdate() @@ -906,8 +944,6 @@ void QIcdEngine::cancelAsyncConfigurationUpdate() { - QMutexLocker locker(&mutex); - if (!m_scanGoingOn) { return; } @@ -947,7 +983,9 @@ if (icd_scan_status == ICD_SCAN_COMPLETE) { m_typesToBeScanned.removeOne(arguments[6].toString()); if (!m_typesToBeScanned.count()) { + locker.unlock(); finishAsyncConfigurationUpdate(); + locker.relock(); } } else { Maemo::IcdScanResult scanResult; @@ -977,7 +1015,8 @@ m_scanTimer.stop(); m_dbusInterface->call(ICD_DBUS_API_SCAN_CANCEL); } - iapMonitor->cleanup(); + if (iapMonitor) + iapMonitor->cleanup(); } bool QIcdEngine::hasIdentifier(const QString &id) diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/icd/qicdengine.h --- a/src/plugins/bearer/icd/qicdengine.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/icd/qicdengine.h Mon Oct 04 01:19:32 2010 +0300 @@ -54,13 +54,25 @@ class IapMonitor; class QDBusInterface; +inline QNetworkConfiguration::BearerType bearerTypeFromIapType(const QString &iapType) +{ + if (iapType == QLatin1String("WLAN_INFRA") || + iapType == QLatin1String("WLAN_ADHOC")) { + return QNetworkConfiguration::BearerWLAN; + } else if (iapType == QLatin1String("GPRS")) { + return QNetworkConfiguration::BearerHSPA; + } else { + return QNetworkConfiguration::BearerUnknown; + } +} + class IcdNetworkConfigurationPrivate : public QNetworkConfigurationPrivate { public: IcdNetworkConfigurationPrivate(); ~IcdNetworkConfigurationPrivate(); - QString bearerName() const; + virtual QString bearerTypeName() const; // In Maemo the id field (defined in QNetworkConfigurationPrivate) // is the IAP id (which typically is UUID) @@ -114,13 +126,13 @@ QMutexLocker locker(&mutex); accessPointConfigurations.insert(ptr->id, ptr); + + locker.unlock(); emit configurationAdded(ptr); } inline void changedSessionConfiguration(QNetworkConfigurationPrivatePointer ptr) { - QMutexLocker locker(&mutex); - emit configurationChanged(ptr); } @@ -132,14 +144,15 @@ void iapStateChanged(const QString& iapid, uint icd_connection_state); private Q_SLOTS: - void doRequestUpdate(QList scanned = QList()); - void cancelAsyncConfigurationUpdate(); void finishAsyncConfigurationUpdate(); void asyncUpdateConfigurationsSlot(QDBusMessage msg); void connectionStateSignalsSlot(QDBusMessage msg); private: void startListeningStateSignalsForAllConnections(); + void doRequestUpdate(QList scanned = QList()); + void cancelAsyncConfigurationUpdate(); + void getIcdInitialState(); private: IapMonitor *iapMonitor; @@ -150,7 +163,6 @@ QList m_scanResult; bool firstUpdate; - bool m_gettingInitialConnectionState; bool m_scanGoingOn; }; diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/icd/qnetworksession_impl.cpp --- a/src/plugins/bearer/icd/qnetworksession_impl.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -235,7 +235,7 @@ } -quint64 QNetworkSessionPrivateImpl::getStatistics(bool sent) const +QNetworkSessionPrivateImpl::Statistics QNetworkSessionPrivateImpl::getStatistics() const { /* This could be also implemented by using the Maemo::Icd::statistics() * that gets the statistics data for a specific IAP. Change if @@ -243,56 +243,51 @@ */ Maemo::Icd icd; QList stats_results; - quint64 counter_rx = 0, counter_tx = 0; + Statistics stats = { 0, 0, 0}; - if (!icd.statistics(stats_results)) { - return 0; - } + if (!icd.statistics(stats_results)) + return stats; foreach (const Maemo::IcdStatisticsResult &res, stats_results) { - if (res.params.network_attrs & ICD_NW_ATTR_IAPNAME) { - /* network_id is the IAP UUID */ - if (QString(res.params.network_id.data()) == activeConfig.identifier()) { - counter_tx = res.bytes_sent; - counter_rx = res.bytes_received; - } - } else { - /* We probably will never get to this branch */ - IcdNetworkConfigurationPrivate *icdConfig = - toIcdConfig(privateConfiguration(activeConfig)); + if (res.params.network_attrs & ICD_NW_ATTR_IAPNAME) { + /* network_id is the IAP UUID */ + if (QString(res.params.network_id.data()) == activeConfig.identifier()) { + stats.txData = res.bytes_sent; + stats.rxData = res.bytes_received; + stats.activeTime = res.time_active; + } + } else { + /* We probably will never get to this branch */ + IcdNetworkConfigurationPrivate *icdConfig = + toIcdConfig(privateConfiguration(activeConfig)); - icdConfig->mutex.lock(); - if (res.params.network_id == icdConfig->network_id) { - counter_tx = res.bytes_sent; - counter_rx = res.bytes_received; - } - icdConfig->mutex.unlock(); - } + icdConfig->mutex.lock(); + if (res.params.network_id == icdConfig->network_id) { + stats.txData = res.bytes_sent; + stats.rxData = res.bytes_received; + stats.activeTime = res.time_active; + } + icdConfig->mutex.unlock(); + } } - if (sent) - return counter_tx; - else - return counter_rx; + return stats; } quint64 QNetworkSessionPrivateImpl::bytesWritten() const { - return getStatistics(true); + return getStatistics().txData; } quint64 QNetworkSessionPrivateImpl::bytesReceived() const { - return getStatistics(false); + return getStatistics().rxData; } quint64 QNetworkSessionPrivateImpl::activeTime() const { - if (startTime.isNull()) { - return 0; - } - return startTime.secsTo(QDateTime::currentDateTime()); + return getStatistics().activeTime; } @@ -323,6 +318,7 @@ cpPriv->purpose = fromPriv->purpose; cpPriv->network_id = fromPriv->network_id; cpPriv->iap_type = fromPriv->iap_type; + cpPriv->bearerType = fromPriv->bearerType; cpPriv->network_attrs = fromPriv->network_attrs; cpPriv->service_type = fromPriv->service_type; cpPriv->service_id = fromPriv->service_id; @@ -343,8 +339,6 @@ isOpen = false; opened = false; - connect(&manager, SIGNAL(updateCompleted()), this, SLOT(networkConfigurationsChanged())); - connect(engine, SIGNAL(iapStateChanged(const QString&, uint)), this, SLOT(iapStateChanged(const QString&, uint))); @@ -448,6 +442,7 @@ ptr->id = toIcdConfig(ptr)->network_id; toIcdConfig(ptr)->network_attrs = state_results.first().params.network_attrs; toIcdConfig(ptr)->iap_type = state_results.first().params.network_type; + ptr->bearerType = bearerTypeFromIapType(toIcdConfig(ptr)->iap_type); toIcdConfig(ptr)->service_type = state_results.first().params.service_type; toIcdConfig(ptr)->service_id = state_results.first().params.service_id; toIcdConfig(ptr)->service_attrs = state_results.first().params.service_attrs; @@ -463,14 +458,15 @@ else ptr->name = ptr->id; + const QString identifier = ptr->id; + + configLocker.unlock(); + // Add the new active configuration to manager or update the old config - if (!engine->hasIdentifier(ptr->id)) { - configLocker.unlock(); + if (!engine->hasIdentifier(identifier)) engine->addSessionConfiguration(ptr); - } else { - configLocker.unlock(); + else engine->changedSessionConfiguration(ptr); - } } break; @@ -824,6 +820,7 @@ icdConfig->name = name; icdConfig->iap_type = rep.arguments().at(3).toString(); // connect_result.connect.network_type; + icdConfig->bearerType = bearerTypeFromIapType(icdConfig->iap_type); icdConfig->isValid = true; icdConfig->state = QNetworkConfiguration::Active; icdConfig->type = QNetworkConfiguration::InternetAccessPoint; @@ -891,12 +888,12 @@ state = QNetworkSession::Closing; emit stateChanged(state); + // we fake a disconnection, session error is sent + updateState(QNetworkSession::Disconnected); + opened = false; isOpen = false; - // we fake a disconnection, session error is not sent - updateState(QNetworkSession::Disconnected); - icd.disconnect(ICD_CONNECTION_FLAG_APPLICATION_EVENT); startTime = QDateTime(); } else { diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/icd/qnetworksession_impl.h --- a/src/plugins/bearer/icd/qnetworksession_impl.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/icd/qnetworksession_impl.h Mon Oct 04 01:19:32 2010 +0300 @@ -170,6 +170,12 @@ QNetworkConfigurationManager manager; QIcdEngine *engine; + struct Statistics { + quint64 txData; + quint64 rxData; + quint64 activeTime; + }; + // The config set on QNetworkSession. QNetworkConfiguration config; @@ -186,7 +192,7 @@ friend class IcdListener; void updateState(QNetworkSession::State); void updateIdentifier(const QString &newId); - quint64 getStatistics(bool sent) const; + Statistics getStatistics() const; void cleanupSession(void); void updateProxyInformation(); diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/nativewifi/qnativewifiengine.cpp --- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -206,7 +206,7 @@ ptr->id = id; ptr->state = state; ptr->type = QNetworkConfiguration::InternetAccessPoint; - ptr->bearer = QLatin1String("WLAN"); + ptr->bearerType = QNetworkConfiguration::BearerWLAN; accessPointConfigurations.insert(id, ptr); @@ -350,11 +350,6 @@ return false; } -/*QString QNativeWifiEngine::bearerName(const QString &) -{ - return QLatin1String("WLAN"); -}*/ - void QNativeWifiEngine::connectToId(const QString &id) { QMutexLocker locker(&mutex); diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/nativewifi/qnativewifiengine.h --- a/src/plugins/bearer/nativewifi/qnativewifiengine.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/nativewifi/qnativewifiengine.h Mon Oct 04 01:19:32 2010 +0300 @@ -75,8 +75,6 @@ QString getInterfaceFromId(const QString &id); bool hasIdentifier(const QString &id); - //QString bearerName(const QString &id); - void connectToId(const QString &id); void disconnectFromId(const QString &id); diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -104,14 +104,23 @@ QMutexLocker locker(&mutex); // Get current list of access points. - foreach (const QDBusObjectPath &devicePath, interface->getDevices()) + foreach (const QDBusObjectPath &devicePath, interface->getDevices()) { + locker.unlock(); deviceAdded(devicePath); + locker.relock(); + } // Get connections. - foreach (const QDBusObjectPath &settingsPath, systemSettings->listConnections()) + foreach (const QDBusObjectPath &settingsPath, systemSettings->listConnections()) { + locker.unlock(); newConnection(settingsPath, systemSettings); - foreach (const QDBusObjectPath &settingsPath, userSettings->listConnections()) + locker.relock(); + } + foreach (const QDBusObjectPath &settingsPath, userSettings->listConnections()) { + locker.unlock(); newConnection(settingsPath, userSettings); + locker.relock(); + } // Get active connections. foreach (const QDBusObjectPath &acPath, interface->activeConnections()) { @@ -132,11 +141,6 @@ return interface->isValid(); } -void QNetworkManagerEngine::doRequestUpdate() -{ - emit updateCompleted(); -} - QString QNetworkManagerEngine::getInterfaceFromId(const QString &id) { QMutexLocker locker(&mutex); @@ -181,30 +185,6 @@ return false; } -QString QNetworkManagerEngine::bearerName(const QString &id) -{ - QMutexLocker locker(&mutex); - - QNetworkManagerSettingsConnection *connection = connectionFromId(id); - - if (!connection) - return QString(); - - QNmSettingsMap map = connection->getSettings(); - const QString connectionType = map.value("connection").value("type").toString(); - - if (connectionType == "802-3-ethernet") - return QLatin1String("Ethernet"); - else if (connectionType == "802-11-wireless") - return QLatin1String("WLAN"); - else if (connectionType == "gsm") - return QLatin1String("2G"); - else if (connectionType == "cdma") - return QLatin1String("CDMA2000"); - else - return QString(); -} - void QNetworkManagerEngine::connectToId(const QString &id) { QMutexLocker locker(&mutex); @@ -257,9 +237,7 @@ void QNetworkManagerEngine::requestUpdate() { - QMutexLocker locker(&mutex); - - QTimer::singleShot(0, this, SLOT(doRequestUpdate())); + QMetaObject::invokeMethod(this, "updateCompleted", Qt::QueuedConnection); } void QNetworkManagerEngine::interfacePropertiesChanged(const QString &path, @@ -385,13 +363,10 @@ void QNetworkManagerEngine::deviceAdded(const QDBusObjectPath &path) { - QMutexLocker locker(&mutex); - QNetworkManagerInterfaceDevice device(path.path()); if (device.deviceType() == DEVICE_TYPE_802_11_WIRELESS) { QNetworkManagerInterfaceDeviceWireless *wirelessDevice = new QNetworkManagerInterfaceDeviceWireless(device.connectionInterface()->path()); - wirelessDevices.insert(path.path(), wirelessDevice); wirelessDevice->setConnections(); connect(wirelessDevice, SIGNAL(accessPointAdded(QString,QDBusObjectPath)), @@ -403,6 +378,10 @@ foreach (const QDBusObjectPath &apPath, wirelessDevice->getAccessPoints()) newAccessPoint(QString(), apPath); + + mutex.lock(); + wirelessDevices.insert(path.path(), wirelessDevice); + mutex.unlock(); } } @@ -611,7 +590,7 @@ ptr->purpose = QNetworkConfiguration::PublicPurpose; } ptr->state = QNetworkConfiguration::Undefined; - ptr->bearer = QLatin1String("WLAN"); + ptr->bearerType = QNetworkConfiguration::BearerWLAN; accessPointConfigurations.insert(ptr->id, ptr); @@ -709,8 +688,6 @@ const QString &settingsPath, const QNmSettingsMap &map) { - QMutexLocker locker(&mutex); - QNetworkConfigurationPrivate *cpPriv = new QNetworkConfigurationPrivate; cpPriv->name = map.value("connection").value("id").toString(); cpPriv->isValid = true; @@ -724,7 +701,7 @@ const QString connectionType = map.value("connection").value("type").toString(); if (connectionType == QLatin1String("802-3-ethernet")) { - cpPriv->bearer = QLatin1String("Ethernet"); + cpPriv->bearerType = QNetworkConfiguration::BearerEthernet; cpPriv->purpose = QNetworkConfiguration::PublicPurpose; foreach (const QDBusObjectPath &devicePath, interface->getDevices()) { @@ -739,7 +716,7 @@ } } } else if (connectionType == QLatin1String("802-11-wireless")) { - cpPriv->bearer = QLatin1String("WLAN"); + cpPriv->bearerType = QNetworkConfiguration::BearerWLAN; const QString connectionSsid = map.value("802-11-wireless").value("ssid").toString(); const QString connectionSecurity = map.value("802-11-wireless").value("security").toString(); @@ -759,17 +736,17 @@ QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.take(accessPointId); - locker.unlock(); + mutex.unlock(); emit configurationRemoved(ptr); - locker.relock(); + mutex.lock(); } break; } } } else if (connectionType == "gsm") { - cpPriv->bearer = QLatin1String("2G"); + cpPriv->bearerType = QNetworkConfiguration::Bearer2G; } else if (connectionType == "cdma") { - cpPriv->bearer = QLatin1String("CDMA2000"); + cpPriv->bearerType = QNetworkConfiguration::BearerCDMA2000; } return cpPriv; @@ -777,8 +754,6 @@ QNetworkManagerSettingsConnection *QNetworkManagerEngine::connectionFromId(const QString &id) const { - QMutexLocker locker(&mutex); - for (int i = 0; i < connections.count(); ++i) { QNetworkManagerSettingsConnection *connection = connections.at(i); const QString service = connection->connectionInterface()->service(); diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/networkmanager/qnetworkmanagerengine.h --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h Mon Oct 04 01:19:32 2010 +0300 @@ -78,8 +78,6 @@ QString getInterfaceFromId(const QString &id); bool hasIdentifier(const QString &id); - QString bearerName(const QString &id); - void connectToId(const QString &id); void disconnectFromId(const QString &id); @@ -118,8 +116,6 @@ void removeAccessPoint(const QString &path, const QDBusObjectPath &objectPath); void updateAccessPoint(const QMap &map); - void doRequestUpdate(); - private: QNetworkConfigurationPrivate *parseConnection(const QString &service, const QString &settingsPath, diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp --- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -718,146 +718,80 @@ NMDeviceType QNetworkManagerSettingsConnection::getType() { - QNmSettingsMap::const_iterator i = d->settingsMap.find(QLatin1String("connection")); - while (i != d->settingsMap.end() && i.key() == QLatin1String("connection")) { - QMap innerMap = i.value(); - QMap::const_iterator ii = innerMap.find(QLatin1String("type")); - while (ii != innerMap.end() && ii.key() == QLatin1String("type")) { - QString devType = ii.value().toString(); - if (devType == QLatin1String("802-3-ethernet")) { - return DEVICE_TYPE_802_3_ETHERNET; - } - if (devType == QLatin1String("802-11-wireless")) { - return DEVICE_TYPE_802_11_WIRELESS; - } - ii++; - } - i++; - } - return DEVICE_TYPE_UNKNOWN; + const QString devType = + d->settingsMap.value(QLatin1String("connection")).value(QLatin1String("type")).toString(); + + if (devType == QLatin1String("802-3-ethernet")) + return DEVICE_TYPE_802_3_ETHERNET; + else if (devType == QLatin1String("802-11-wireless")) + return DEVICE_TYPE_802_11_WIRELESS; + else + return DEVICE_TYPE_UNKNOWN; } bool QNetworkManagerSettingsConnection::isAutoConnect() { - QNmSettingsMap::const_iterator i = d->settingsMap.find(QLatin1String("connection")); - while (i != d->settingsMap.end() && i.key() == QLatin1String("connection")) { - QMap innerMap = i.value(); - QMap::const_iterator ii = innerMap.find(QLatin1String("autoconnect")); - while (ii != innerMap.end() && ii.key() == QLatin1String("autoconnect")) { - return ii.value().toBool(); - ii++; - } - i++; - } - return true; //default networkmanager is autoconnect + const QVariant autoConnect = + d->settingsMap.value(QLatin1String("connection")).value(QLatin1String("autoconnect")); + + // NetworkManager default is to auto connect + if (!autoConnect.isValid()) + return true; + + return autoConnect.toBool(); } quint64 QNetworkManagerSettingsConnection::getTimestamp() { - QNmSettingsMap::const_iterator i = d->settingsMap.find(QLatin1String("connection")); - while (i != d->settingsMap.end() && i.key() == QLatin1String("connection")) { - QMap innerMap = i.value(); - QMap::const_iterator ii = innerMap.find(QLatin1String("timestamp")); - while (ii != innerMap.end() && ii.key() == QLatin1String("timestamp")) { - return ii.value().toUInt(); - ii++; - } - i++; - } - return 0; + qDebug() << d->settingsMap.value(QLatin1String("connection")); + + return d->settingsMap.value(QLatin1String("connection")) + .value(QLatin1String("timestamp")).toUInt(); } QString QNetworkManagerSettingsConnection::getId() { - QNmSettingsMap::const_iterator i = d->settingsMap.find(QLatin1String("connection")); - while (i != d->settingsMap.end() && i.key() == QLatin1String("connection")) { - QMap innerMap = i.value(); - QMap::const_iterator ii = innerMap.find(QLatin1String("id")); - while (ii != innerMap.end() && ii.key() == QLatin1String("id")) { - return ii.value().toString(); - ii++; - } - i++; - } - return QString(); + return d->settingsMap.value(QLatin1String("connection")).value(QLatin1String("id")).toString(); } QString QNetworkManagerSettingsConnection::getUuid() { - QNmSettingsMap::const_iterator i = d->settingsMap.find(QLatin1String("connection")); - while (i != d->settingsMap.end() && i.key() == QLatin1String("connection")) { - QMap innerMap = i.value(); - QMap::const_iterator ii = innerMap.find(QLatin1String("uuid")); - while (ii != innerMap.end() && ii.key() == QLatin1String("uuid")) { - return ii.value().toString(); - ii++; - } - i++; - } + const QString id = d->settingsMap.value(QLatin1String("connection")) + .value(QLatin1String("uuid")).toString(); + // is no uuid, return the connection path - return d->connectionInterface->path(); + return id.isEmpty() ? d->connectionInterface->path() : id; } QString QNetworkManagerSettingsConnection::getSsid() { - QNmSettingsMap::const_iterator i = d->settingsMap.find(QLatin1String("802-11-wireless")); - while (i != d->settingsMap.end() && i.key() == QLatin1String("802-11-wireless")) { - QMap innerMap = i.value(); - QMap::const_iterator ii = innerMap.find(QLatin1String("ssid")); - while (ii != innerMap.end() && ii.key() == QLatin1String("ssid")) { - return ii.value().toString(); - ii++; - } - i++; - } - return QString(); + return d->settingsMap.value(QLatin1String("802-11-wireless")) + .value(QLatin1String("ssid")).toString(); } QString QNetworkManagerSettingsConnection::getMacAddress() { - if(getType() == DEVICE_TYPE_802_3_ETHERNET) { - QNmSettingsMap::const_iterator i = d->settingsMap.find(QLatin1String("802-3-ethernet")); - while (i != d->settingsMap.end() && i.key() == QLatin1String("802-3-ethernet")) { - QMap innerMap = i.value(); - QMap::const_iterator ii = innerMap.find(QLatin1String("mac-address")); - while (ii != innerMap.end() && ii.key() == QLatin1String("mac-address")) { - return ii.value().toString(); - ii++; - } - i++; - } - } + NMDeviceType type = getType(); - else if(getType() == DEVICE_TYPE_802_11_WIRELESS) { - QNmSettingsMap::const_iterator i = d->settingsMap.find(QLatin1String("802-11-wireless")); - while (i != d->settingsMap.end() && i.key() == QLatin1String("802-11-wireless")) { - QMap innerMap = i.value(); - QMap::const_iterator ii = innerMap.find(QLatin1String("mac-address")); - while (ii != innerMap.end() && ii.key() == QLatin1String("mac-address")) { - return ii.value().toString(); - ii++; - } - i++; - } + if (type == DEVICE_TYPE_802_3_ETHERNET) { + return d->settingsMap.value(QLatin1String("802-3-ethernet")) + .value(QLatin1String("mac-address")).toString(); + } else if (type == DEVICE_TYPE_802_11_WIRELESS) { + return d->settingsMap.value(QLatin1String("802-11-wireless")) + .value(QLatin1String("mac-address")).toString(); + } else { + return QString(); } - return QString(); } -QStringList QNetworkManagerSettingsConnection::getSeenBssids() +QStringList QNetworkManagerSettingsConnection::getSeenBssids() { - if(getType() == DEVICE_TYPE_802_11_WIRELESS) { - QNmSettingsMap::const_iterator i = d->settingsMap.find(QLatin1String("802-11-wireless")); - while (i != d->settingsMap.end() && i.key() == QLatin1String("802-11-wireless")) { - QMap innerMap = i.value(); - QMap::const_iterator ii = innerMap.find(QLatin1String("seen-bssids")); - while (ii != innerMap.end() && ii.key() == QLatin1String("seen-bssids")) { - return ii.value().toStringList(); - ii++; - } - i++; - } + if (getType() == DEVICE_TYPE_802_11_WIRELESS) { + return d->settingsMap.value(QLatin1String("802-11-wireless")) + .value(QLatin1String("seen-bssids")).toStringList(); + } else { + return QStringList(); } - return QStringList(); } class QNetworkManagerConnectionActivePrivate diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/nla/qnlaengine.cpp --- a/src/plugins/bearer/nla/qnlaengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/nla/qnlaengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -119,7 +119,7 @@ } #endif -static QString qGetInterfaceType(const QString &interface) +static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interface) { #ifdef Q_OS_WINCE Q_UNUSED(interface) @@ -130,10 +130,10 @@ NDIS_MEDIUM medium; NDIS_PHYSICAL_MEDIUM physicalMedium; - HANDLE handle = CreateFile((TCHAR *)QString(QLatin1String("\\\\.\\%1")).arg(interface).utf16(), - 0, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + HANDLE handle = CreateFile((TCHAR *)QString::fromLatin1("\\\\.\\%1").arg(interface).utf16(), 0, + FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); if (handle == INVALID_HANDLE_VALUE) - return QLatin1String("Unknown"); + return QNetworkConfiguration::BearerUnknown; oid = OID_GEN_MEDIA_SUPPORTED; bytesWritten = 0; @@ -141,7 +141,7 @@ &medium, sizeof(medium), &bytesWritten, 0); if (!result) { CloseHandle(handle); - return QLatin1String("Unknown"); + return QNetworkConfiguration::BearerUnknown; } oid = OID_GEN_PHYSICAL_MEDIUM; @@ -152,9 +152,9 @@ CloseHandle(handle); if (medium == NdisMedium802_3) - return QLatin1String("Ethernet"); + return QNetworkConfiguration::BearerEthernet; else - return QLatin1String("Unknown"); + return QNetworkConfiguration::BearerUnknown; } CloseHandle(handle); @@ -162,16 +162,16 @@ if (medium == NdisMedium802_3) { switch (physicalMedium) { case NdisPhysicalMediumWirelessLan: - return QLatin1String("WLAN"); + return QNetworkConfiguration::BearerWLAN; case NdisPhysicalMediumBluetooth: - return QLatin1String("Bluetooth"); + return QNetworkConfiguration::BearerBluetooth; case NdisPhysicalMediumWiMax: - return QLatin1String("WiMAX"); + return QNetworkConfiguration::BearerWiMAX; default: #ifdef BEARER_MANAGEMENT_DEBUG qDebug() << "Physical Medium" << physicalMedium; #endif - return QLatin1String("Ethernet"); + return QNetworkConfiguration::BearerEthernet; } } @@ -181,7 +181,7 @@ #endif - return QLatin1String("Unknown"); + return QNetworkConfiguration::BearerUnknown; } class QNlaThread : public QThread @@ -374,10 +374,9 @@ #endif break; case NLA_CONNECTIVITY: - if (blob->data.connectivity.internet == NLA_INTERNET_YES) - cpPriv->internet = true; - else - cpPriv->internet = false; +#ifdef BEARER_MANAGEMENT_DEBUG + qDebug("%s: unhandled header type NLA_CONNECTIVITY", __FUNCTION__); +#endif break; case NLA_ICS: #ifdef BEARER_MANAGEMENT_DEBUG @@ -438,8 +437,10 @@ } while (offset != 0 && offset < querySet->lpBlob->cbSize); } - if (QNlaEngine *engine = qobject_cast(parent())) - cpPriv->bearer = engine->bearerName(cpPriv->id); + if (QNlaEngine *engine = qobject_cast(parent())) { + const QString interface = engine->getInterfaceFromId(cpPriv->id); + cpPriv->bearerType = qGetInterfaceType(interface); + } return cpPriv; } @@ -586,16 +587,6 @@ return configurationInterface.contains(id.toUInt()); } -QString QNlaEngine::bearerName(const QString &id) -{ - QString interface = getInterfaceFromId(id); - - if (interface.isEmpty()) - return QString(); - - return qGetInterfaceType(interface); -} - void QNlaEngine::connectToId(const QString &id) { emit connectionError(id, OperationNotSupported); diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/nla/qnlaengine.h --- a/src/plugins/bearer/nla/qnlaengine.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/nla/qnlaengine.h Mon Oct 04 01:19:32 2010 +0300 @@ -85,8 +85,6 @@ QString getInterfaceFromId(const QString &id); bool hasIdentifier(const QString &id); - QString bearerName(const QString &id); - void connectToId(const QString &id); void disconnectFromId(const QString &id); diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/symbian/3_1/3_1.pro --- a/src/plugins/bearer/symbian/3_1/3_1.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/symbian/3_1/3_1.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,5 +1,9 @@ include(../symbian.pri) -LIBS += -lapengine +is_using_gnupoc { + LIBS += -lapengine +} else { + LIBS += -lAPEngine +} TARGET = $${TARGET}_3_1 TARGET.UID3 = 0x2002131C diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/symbian/qnetworksession_impl.cpp --- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -48,6 +48,14 @@ #include #include +#ifdef SNAP_FUNCTIONALITY_AVAILABLE +#include +#endif + +#if defined(OCC_FUNCTIONALITY_AVAILABLE) && defined(SNAP_FUNCTIONALITY_AVAILABLE) +#include +#endif + #ifndef QT_NO_BEARERMANAGEMENT QT_BEGIN_NAMESPACE @@ -102,19 +110,20 @@ // Cancel possible RConnection::Start() Cancel(); iSocketServ.Close(); - + // Close global 'Open C' RConnection // Clears also possible unsetdefaultif() flags. setdefaultif(0); - + iConnectionMonitor.Close(); iOpenCLibrary.Close(); #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG - qDebug() << "QNS this : " << QString::number((uint)this) << " - destroyed (and setdefaultif(0))"; + qDebug() << "QNS this : " << QString::number((uint)this) + << " - destroyed (and setdefaultif(0))"; #endif } -void QNetworkSessionPrivateImpl::configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, QNetworkSession::State newState) +void QNetworkSessionPrivateImpl::configurationStateChanged(quint32 accessPointId, quint32 connMonId, QNetworkSession::State newState) { if (iHandleStateNotificationsFromManager) { #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG @@ -146,62 +155,67 @@ } } +void QNetworkSessionPrivateImpl::configurationAdded(QNetworkConfigurationPrivatePointer config) +{ + Q_UNUSED(config); + // If session is based on service network, some other app may create new access points + // to the SNAP --> synchronize session's state with that of interface's. + if (!publicConfig.isValid() || publicConfig.type() != QNetworkConfiguration::ServiceNetwork) + return; + +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "configurationAdded IAP: " + << toSymbianConfig(privateConfiguration(config))->numericIdentifier(); +#endif + + syncStateWithInterface(); +} + +// Function sets the state of the session to match the state +// of the underlying interface (the configuration this session is based on) void QNetworkSessionPrivateImpl::syncStateWithInterface() { if (!publicConfig.isValid()) return; - if (iFirstSync && publicConfig.isValid()) { - QObject::connect(engine, SIGNAL(configurationStateChanged(TUint32, TUint32, QNetworkSession::State)), - this, SLOT(configurationStateChanged(TUint32, TUint32, QNetworkSession::State))); + if (iFirstSync) { + QObject::connect(engine, + SIGNAL(configurationStateChanged(quint32,quint32,QNetworkSession::State)), + this, + SLOT(configurationStateChanged(quint32,quint32,QNetworkSession::State))); // Listen to configuration removals, so that in case the configuration // this session is based on is removed, session knows to enter Invalid -state. QObject::connect(engine, SIGNAL(configurationRemoved(QNetworkConfigurationPrivatePointer)), this, SLOT(configurationRemoved(QNetworkConfigurationPrivatePointer))); + // Connect to configuration additions, so that in case a configuration is added + // in a SNAP this session is based on, the session knows to synch its state with its + // interface. + QObject::connect(engine, SIGNAL(configurationAdded(QNetworkConfigurationPrivatePointer)), + this, SLOT(configurationAdded(QNetworkConfigurationPrivatePointer))); } // Start listening IAP state changes from QNetworkConfigurationManagerPrivate iHandleStateNotificationsFromManager = true; - // Check open connections to see if there is already - // an open connection to selected IAP or SNAP - TUint count; - TRequestStatus status; - iConnectionMonitor.GetConnectionCount(count, status); - User::WaitForRequest(status); - if (status.Int() != KErrNone) { - return; - } - - TUint numSubConnections; - TUint connectionId; - for (TUint i = 1; i <= count; i++) { - TInt ret = iConnectionMonitor.GetConnectionInfo(i, connectionId, numSubConnections); - if (ret == KErrNone) { - TUint apId; - iConnectionMonitor.GetUintAttribute(connectionId, 0, KIAPId, apId, status); - User::WaitForRequest(status); - if (status.Int() == KErrNone) { - TInt connectionStatus; - iConnectionMonitor.GetIntAttribute(connectionId, 0, KConnectionStatus, connectionStatus, status); - User::WaitForRequest(status); - if (connectionStatus == KLinkLayerOpen) { - if (state != QNetworkSession::Closing) { - if (newState(QNetworkSession::Connected, apId)) { - return; - } - } - } - } - } - } - - if (state != QNetworkSession::Connected) { - if ((publicConfig.state() & QNetworkConfiguration::Discovered) == - QNetworkConfiguration::Discovered) { - newState(QNetworkSession::Disconnected); - } else { - newState(QNetworkSession::NotAvailable); - } + // Check what is the state of the configuration this session is based on + // and set the session in appropriate state. +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "syncStateWithInterface() state of publicConfig is: " << publicConfig.state(); +#endif + switch (publicConfig.state()) { + case QNetworkConfiguration::Active: + newState(QNetworkSession::Connected); + break; + case QNetworkConfiguration::Discovered: + newState(QNetworkSession::Disconnected); + break; + case QNetworkConfiguration::Defined: + newState(QNetworkSession::NotAvailable); + break; + case QNetworkConfiguration::Undefined: + default: + newState(QNetworkSession::Invalid); } } @@ -253,7 +267,8 @@ << "currentInterface() requested, state: " << state << "publicConfig validity: " << publicConfig.isValid(); if (activeInterface.isValid()) - qDebug() << "interface is: " << activeInterface.humanReadableName(); + qDebug() << "QNS this : " << QString::number((uint)this) << " - " + << "interface is: " << activeInterface.humanReadableName(); #endif if (!publicConfig.isValid() || state != QNetworkSession::Connected) { @@ -382,7 +397,7 @@ SymbianNetworkConfigurationPrivate *symbianConfig = toSymbianConfig(privateConfiguration(publicConfig)); -#ifdef OCC_FUNCTIONALITY_AVAILABLE +#if defined(OCC_FUNCTIONALITY_AVAILABLE) && defined(SNAP_FUNCTIONALITY_AVAILABLE) // With One Click Connectivity (Symbian^3 onwards) it is possible // to connect silently, without any popups. TConnPrefList pref; @@ -412,7 +427,7 @@ SymbianNetworkConfigurationPrivate *symbianConfig = toSymbianConfig(privateConfiguration(publicConfig)); -#ifdef OCC_FUNCTIONALITY_AVAILABLE +#if defined(OCC_FUNCTIONALITY_AVAILABLE) && defined(SNAP_FUNCTIONALITY_AVAILABLE) // On Symbian^3 if service network is not reachable, it triggers a UI (aka EasyWLAN) where // user can create new IAPs. To detect this, we need to store the number of IAPs // there was before connection was started. @@ -519,7 +534,7 @@ Cancel(); // closes iConnection iSocketServ.Close(); - + // Close global 'Open C' RConnection. If OpenC supports, // close the defaultif for good to avoid difficult timing // and bouncing issues of network going immediately back up @@ -906,6 +921,14 @@ if (iapId == 0) { _LIT(KSetting, "IAP\\Id"); iConnection.GetIntSetting(KSetting, iapId); +#ifdef SNAP_FUNCTIONALITY_AVAILABLE + // Check if this is an Easy WLAN configuration. On Symbian^3 RConnection may report + // the used configuration as 'EasyWLAN' IAP ID if someone has just opened the configuration + // from WLAN Scan dialog, _and_ that connection is still up. We need to find the + // real matching configuration. Function alters the Easy WLAN ID to real IAP ID (only if + // easy WLAN): + easyWlanTrueIapId(iapId); +#endif } #ifdef SNAP_FUNCTIONALITY_AVAILABLE @@ -944,12 +967,18 @@ } } } else { -#ifdef OCC_FUNCTIONALITY_AVAILABLE - // On Symbian^3 (only, not earlier or Symbian^4) if the SNAP was not reachable, it triggers - // user choice type of activity (EasyWLAN). As a result, a new IAP may be created, and - // hence if was not found yet. Therefore update configurations and see if there is something new. +#ifdef SNAP_FUNCTIONALITY_AVAILABLE + // On Symbian^3 (only, not earlier or Symbian^4) if the SNAP was not reachable, it + // triggers user choice type of activity (EasyWLAN). As a result, a new IAP may be + // created, and hence if was not found yet. Therefore update configurations and see if + // there is something new. + // 1. Update knowledge from the databases. - engine->requestUpdate(); + if (thread() != engine->thread()) + QMetaObject::invokeMethod(engine, "requestUpdate", Qt::BlockingQueuedConnection); + else + engine->requestUpdate(); + // 2. Check if new configuration was created during connection creation QList knownConfigs = engine->accessPointConfigurationIdentifiers(); #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG @@ -982,7 +1011,7 @@ qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "configuration was not found, returning invalid."; #endif -#endif // OCC_FUNCTIONALITY_AVAILABLE +#endif // Given IAP Id was not found from known IAPs array return QNetworkConfiguration(); } @@ -1002,7 +1031,12 @@ } else { // Check if new (WLAN) IAP was created in IAP/SNAP dialog // 1. Sync internal configurations array to commsdb first - engine->updateConfigurations(); + if (thread() != engine->thread()) { + QMetaObject::invokeMethod(engine, "requestUpdate", + Qt::BlockingQueuedConnection); + } else { + engine->requestUpdate(); + } // 2. Check if new configuration was created during connection creation QStringList knownConfigs = engine->accessPointConfigurationIdentifiers(); if (knownConfigs.count() > iKnownConfigsBeforeConnectionStart.count()) { @@ -1044,6 +1078,11 @@ TInt error = KErrNone; QNetworkConfiguration newActiveConfig = activeConfiguration(); if (!newActiveConfig.isValid()) { + // RConnection startup was successfull but no configuration + // was found. That indicates that user has chosen to create a + // new WLAN configuration (from scan results), but that new + // configuration does not have access to Internet (Internet + // Connectivity Test, ICT, failed). error = KErrGeneral; } else { // Use name of the IAP to open global 'Open C' RConnection @@ -1053,16 +1092,24 @@ strcpy(ifr.ifr_name, nameAsByteArray.constData()); error = setdefaultif(&ifr); } - if (error != KErrNone) { isOpen = false; isOpening = false; iError = QNetworkSession::UnknownSessionError; QT_TRYCATCH_LEAVING(emit QNetworkSessionPrivate::error(iError)); - Cancel(); if (ipConnectionNotifier) { ipConnectionNotifier->StopNotifications(); } + if (!newActiveConfig.isValid()) { + // No valid configuration, bail out. + // Status updates from QNCM won't be received correctly + // because there is no configuration to associate them with so transit here. + iConnection.Close(); + newState(QNetworkSession::Closing); + newState(QNetworkSession::Disconnected); + } else { + Cancel(); + } QT_TRYCATCH_LEAVING(syncStateWithInterface()); return; } @@ -1117,7 +1164,9 @@ isOpening = false; activeConfig = QNetworkConfiguration(); serviceConfig = QNetworkConfiguration(); - if (publicConfig.state() == QNetworkConfiguration::Undefined || + if (statusCode == KErrCancel) { + iError = QNetworkSession::SessionAbortedError; + } else if (publicConfig.state() == QNetworkConfiguration::Undefined || publicConfig.state() == QNetworkConfiguration::Defined) { iError = QNetworkSession::InvalidConfigurationError; } else { @@ -1300,7 +1349,7 @@ } } } -#ifdef OCC_FUNCTIONALITY_AVAILABLE +#ifdef SNAP_FUNCTIONALITY_AVAILABLE // If the retVal is not true here, it means that the status update may apply to an IAP outside of // SNAP (session is based on SNAP but follows IAP outside of it), which may occur on Symbian^3 EasyWlan. if (retVal == false && activeConfig.isValid() && @@ -1430,6 +1479,64 @@ } } +#if defined(SNAP_FUNCTIONALITY_AVAILABLE) +bool QNetworkSessionPrivateImpl::easyWlanTrueIapId(TUint32 &trueIapId) const +{ + RCmManager iCmManager; + TRAPD(err, iCmManager.OpenL()); + if (err != KErrNone) + return false; + + // Check if this is easy wlan id in the first place + if (trueIapId != iCmManager.EasyWlanIdL()) { + iCmManager.Close(); + return false; + } + + iCmManager.Close(); + + // Loop through all connections that connection monitor is aware + // and check for IAPs based on easy WLAN + TRequestStatus status; + TUint connectionCount; + iConnectionMonitor.GetConnectionCount(connectionCount, status); + User::WaitForRequest(status); + TUint connectionId; + TUint subConnectionCount; + TUint apId; + if (status.Int() == KErrNone) { + for (TUint i = 1; i <= connectionCount; i++) { + iConnectionMonitor.GetConnectionInfo(i, connectionId, subConnectionCount); + iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, + KIAPId, apId, status); + User::WaitForRequest(status); + if (apId == trueIapId) { + TBuf<50>easyWlanNetworkName; + iConnectionMonitor.GetStringAttribute(connectionId, 0, KNetworkName, + easyWlanNetworkName, status); + User::WaitForRequest(status); + if (status.Int() != KErrNone) + continue; + + const QString ssid = QString::fromUtf16(easyWlanNetworkName.Ptr(), + easyWlanNetworkName.Length()); + + QNetworkConfigurationPrivatePointer ptr = engine->configurationFromSsid(ssid); + if (ptr) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNCM easyWlanTrueIapId(), found true IAP ID: " + << toSymbianConfig(ptr)->numericIdentifier(); +#endif + trueIapId = toSymbianConfig(ptr)->numericIdentifier(); + return true; + } + } + } + } + return false; +} +#endif + ConnectionProgressNotifier::ConnectionProgressNotifier(QNetworkSessionPrivateImpl& owner, RConnection& connection) : CActive(CActive::EPriorityUserInput), iOwner(owner), iConnection(connection) { diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/symbian/qnetworksession_impl.h --- a/src/plugins/bearer/symbian/qnetworksession_impl.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/symbian/qnetworksession_impl.h Mon Oct 04 01:19:32 2010 +0300 @@ -64,9 +64,6 @@ #ifdef SNAP_FUNCTIONALITY_AVAILABLE #include #endif -#ifdef OCC_FUNCTIONALITY_AVAILABLE - #include -#endif QT_BEGIN_NAMESPACE @@ -132,9 +129,11 @@ void DoCancel(); private Q_SLOTS: - void configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, QNetworkSession::State newState); + void configurationStateChanged(quint32 accessPointId, quint32 connMonId, + QNetworkSession::State newState); void configurationRemoved(QNetworkConfigurationPrivatePointer config); - + void configurationAdded(QNetworkConfigurationPrivatePointer config); + private: TUint iapClientCount(TUint aIAPId) const; quint64 transferredData(TUint dataType) const; @@ -146,6 +145,11 @@ QNetworkInterface interface(TUint iapId) const; #endif +#if defined(SNAP_FUNCTIONALITY_AVAILABLE) + bool easyWlanTrueIapId(TUint32 &trueIapId) const; +#endif + + private: // data SymbianEngine *engine; diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/symbian/symbian.pri --- a/src/plugins/bearer/symbian/symbian.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/symbian/symbian.pri Mon Oct 04 01:19:32 2010 +0300 @@ -14,8 +14,6 @@ symbian-abld:INCLUDEPATH += $$QT_BUILD_TREE/include/QtNetwork/private LIBS += -lcommdb \ - -lapsettingshandlerui \ - -lconnmon \ -lcentralrepository \ -lesock \ -linsock \ @@ -23,6 +21,14 @@ -lefsrv \ -lnetmeta +is_using_gnupoc { + LIBS += -lconnmon \ + -lapsettingshandlerui +} else { + LIBS += -lConnMon \ + -lApSettingsHandlerUI +} + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/symbian/symbian.pro --- a/src/plugins/bearer/symbian/symbian.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/symbian/symbian.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,42 +1,5 @@ TEMPLATE = subdirs -QT += network - -HEADERS += symbianengine.h \ - qnetworksession_impl.h - -SOURCES += symbianengine.cpp \ - qnetworksession_impl.cpp \ - main.cpp - -symbian { - TARGET.UID3=0x20021319 - # exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \ - # exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) { - message("Building with SNAP support") - DEFINES += SNAP_FUNCTIONALITY_AVAILABLE - LIBS += -lcmmanager - # } else { - # message("Building without SNAP support") - # LIBS += -lapengine - # } -} - -INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE -symbian-abld:INCLUDEPATH += $$QT_BUILD_TREE/include/QtNetwork/private - -LIBS += -lcommdb \ - -lApSettingsHandlerUI \ - -lConnMon \ - -lcentralrepository \ - -lesock \ - -linsock \ - -lecom \ - -lefsrv \ - -lnetmeta - -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer -target.path += $$[QT_INSTALL_PLUGINS]/bearer -INSTALLS += target -SUBDIRS += 3_1 3_2 symbian_3 - +#QTP: build only for symbian_3 +#SUBDIRS += 3_1 3_2 symbian_3 +SUBDIRS += symbian_3 \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/symbian/symbian_3/symbian_3.pro --- a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,19 +1,23 @@ include(../symbian.pri) symbian { - exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \ - exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) { + # exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \ + # exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) { DEFINES += SNAP_FUNCTIONALITY_AVAILABLE LIBS += -lcmmanager - exists($$MW_LAYER_PUBLIC_EXPORT_PATH(extendedconnpref.h)) { + exists($$prependEpocroot($$MW_LAYER_PUBLIC_EXPORT_PATH(extendedconnpref.h))) { DEFINES += OCC_FUNCTIONALITY_AVAILABLE LIBS += -lextendedconnpref } - } else { + # } else { # Fall back to 3_1 implementation on platforms that do not have cmmanager - LIBS += -lapengine - } + # is_using_gnupoc { + # LIBS += -lapengine + # } else { + # LIBS += -lAPEngine + # } + # } } TARGET.UID3 = 0x20021319 diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/symbian/symbianengine.cpp --- a/src/plugins/bearer/symbian/symbianengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/symbian/symbianengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -65,7 +65,7 @@ #else #include #include - #include + #include #endif #ifndef QT_NO_BEARERMANAGEMENT @@ -75,7 +75,7 @@ static const int KUserChoiceIAPId = 0; SymbianNetworkConfigurationPrivate::SymbianNetworkConfigurationPrivate() -: bearer(BearerUnknown), numericId(0), connectionId(0) +: numericId(0), connectionId(0) { } @@ -83,32 +83,6 @@ { } -QString SymbianNetworkConfigurationPrivate::bearerName() const -{ - QMutexLocker locker(&mutex); - - switch (bearer) { - case BearerEthernet: - return QLatin1String("Ethernet"); - case BearerWLAN: - return QLatin1String("WLAN"); - case Bearer2G: - return QLatin1String("2G"); - case BearerCDMA2000: - return QLatin1String("CDMA2000"); - case BearerWCDMA: - return QLatin1String("WCDMA"); - case BearerHSPA: - return QLatin1String("HSPA"); - case BearerBluetooth: - return QLatin1String("Bluetooth"); - case BearerWiMAX: - return QLatin1String("WiMAX"); - default: - return QString(); - } -} - SymbianEngine::SymbianEngine(QObject *parent) : QBearerEngine(parent), CActive(CActive::EPriorityHigh), iFirstUpdate(true), iInitOk(true), iUpdatePending(false) @@ -146,7 +120,7 @@ SymbianNetworkConfigurationPrivate *cpPriv = new SymbianNetworkConfigurationPrivate; cpPriv->name = "UserChoice"; - cpPriv->bearer = SymbianNetworkConfigurationPrivate::BearerUnknown; + cpPriv->bearerType = QNetworkConfiguration::BearerUnknown; cpPriv->state = QNetworkConfiguration::Discovered; cpPriv->isValid = true; cpPriv->id = QString::number(qHash(KUserChoiceIAPId)); @@ -270,7 +244,7 @@ QList knownConfigs = accessPointConfigurations.keys(); QList knownSnapConfigs = snapConfigurations.keys(); -#ifdef SNAP_FUNCTIONALITY_AVAILABLE +#ifdef SNAP_FUNCTIONALITY_AVAILABLE // S60 version is >= Series60 3rd Edition Feature Pack 2 TInt error = KErrNone; @@ -291,14 +265,17 @@ if (error == KErrNone) { QNetworkConfigurationPrivatePointer ptr(cpPriv); accessPointConfigurations.insert(ptr->id, ptr); - - mutex.unlock(); - // Emit configuration added. Connected slots may throw execptions - // which propagate here --> must be converted to leaves (standard - // std::exception would cause any TRAP trapping this function to terminate - // program). - QT_TRYCATCH_LEAVING(emit configurationAdded(ptr)); - mutex.lock(); + if (!iFirstUpdate) { + // Emit configuration added. Connected slots may throw execptions + // which propagate here --> must be converted to leaves (standard + // std::exception would cause any TRAP trapping this function to terminate + // program). + QT_TRYCATCH_LEAVING(updateActiveAccessPoints()); + updateStatesToSnaps(); + mutex.unlock(); + QT_TRYCATCH_LEAVING(emit configurationAdded(ptr)); + mutex.lock(); + } } } CleanupStack::PopAndDestroy(&connectionMethod); @@ -311,7 +288,17 @@ iCmManager.AllDestinationsL(destinations); for(int i = 0; i < destinations.Count(); i++) { RCmDestination destination; - destination = iCmManager.DestinationL(destinations[i]); + + // Some destinatsions require ReadDeviceData -capability (MMS/WAP) + // The below function will leave in these cases. Don't. Proceed to + // next destination (if any). + TRAPD(error, destination = iCmManager.DestinationL(destinations[i])); + if (error == KErrPermissionDenied) { + continue; + } else { + User::LeaveIfError(error); + } + CleanupClosePushL(destination); QString ident = QT_BEARERMGMT_CONFIGURATION_SNAP_PREFIX + QString::number(qHash(destination.Id())); @@ -319,12 +306,12 @@ knownSnapConfigs.removeOne(ident); } else { SymbianNetworkConfigurationPrivate *cpPriv = new SymbianNetworkConfigurationPrivate; - + HBufC *pName = destination.NameLC(); QT_TRYCATCH_LEAVING(cpPriv->name = QString::fromUtf16(pName->Ptr(),pName->Length())); CleanupStack::PopAndDestroy(pName); pName = NULL; - + cpPriv->isValid = true; cpPriv->id = ident; cpPriv->numericId = destination.Id(); @@ -336,10 +323,13 @@ QNetworkConfigurationPrivatePointer ptr(cpPriv); snapConfigurations.insert(ident, ptr); - - mutex.unlock(); - QT_TRYCATCH_LEAVING(emit configurationAdded(ptr)); - mutex.lock(); + if (!iFirstUpdate) { + QT_TRYCATCH_LEAVING(updateActiveAccessPoints()); + updateStatesToSnaps(); + mutex.unlock(); + QT_TRYCATCH_LEAVING(emit configurationAdded(ptr)); + mutex.lock(); + } } // Loop through all connection methods in this SNAP @@ -352,19 +342,23 @@ QString iface = QT_BEARERMGMT_CONFIGURATION_IAP_PREFIX+QString::number(qHash(iapId)); // Check that IAP can be found from accessPointConfigurations list QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(iface); - if (ptr) { - knownConfigs.removeOne(iface); - } else { + if (!ptr) { SymbianNetworkConfigurationPrivate *cpPriv = NULL; TRAP(error, cpPriv = configFromConnectionMethodL(connectionMethod)); if (error == KErrNone) { ptr = QNetworkConfigurationPrivatePointer(cpPriv); accessPointConfigurations.insert(ptr->id, ptr); - mutex.unlock(); - QT_TRYCATCH_LEAVING(emit configurationAdded(ptr)); - mutex.lock(); + if (!iFirstUpdate) { + QT_TRYCATCH_LEAVING(updateActiveAccessPoints()); + updateStatesToSnaps(); + mutex.unlock(); + QT_TRYCATCH_LEAVING(emit configurationAdded(ptr)); + mutex.lock(); + } } + } else { + knownConfigs.removeOne(iface); } if (ptr) { @@ -387,6 +381,9 @@ privSNAP->roamingSupported = privSNAP->serviceNetworkMembers.count() > 1; snapConfigLocker.unlock(); + + updateStatesToSnaps(); + mutex.unlock(); QT_TRYCATCH_LEAVING(emit configurationChanged(privSNAP)); mutex.lock(); @@ -395,7 +392,6 @@ CleanupStack::PopAndDestroy(&destination); } CleanupStack::PopAndDestroy(&destinations); - #else // S60 version is < Series60 3rd Edition Feature Pack 2 CCommsDbTableView* pDbTView = ipCommsDB->OpenTableLC(TPtrC(IAP)); @@ -413,10 +409,13 @@ if (readNetworkConfigurationValuesFromCommsDb(apId, cpPriv)) { QNetworkConfigurationPrivatePointer ptr(cpPriv); accessPointConfigurations.insert(ident, ptr); - - mutex.unlock(); - QT_TRYCATCH_LEAVING(emit configurationAdded(ptr)); - mutex.lock(); + if (!iFirstUpdate) { + QT_TRYCATCH_LEAVING(updateActiveAccessPoints()); + updateStatesToSnaps(); + mutex.unlock(); + QT_TRYCATCH_LEAVING(emit configurationAdded(ptr)); + mutex.lock(); + } } else { delete cpPriv; } @@ -425,8 +424,9 @@ } CleanupStack::PopAndDestroy(pDbTView); #endif + QT_TRYCATCH_LEAVING(updateActiveAccessPoints()); - + foreach (const QString &oldIface, knownConfigs) { //remove non existing IAP QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.take(oldIface); @@ -468,6 +468,10 @@ stopCommsDatabaseNotifications(); TRAP_IGNORE(defaultConfig = defaultConfigurationL()); startCommsDatabaseNotifications(); + +#ifdef SNAP_FUNCTIONALITY_AVAILABLE + updateStatesToSnaps(); +#endif } #ifdef SNAP_FUNCTIONALITY_AVAILABLE @@ -487,25 +491,25 @@ TUint32 bearerId = connectionMethod.GetIntAttributeL(CMManager::ECmCommsDBBearerType); switch (bearerId) { case KCommDbBearerCSD: - cpPriv->bearer = SymbianNetworkConfigurationPrivate::Bearer2G; + cpPriv->bearerType = QNetworkConfiguration::Bearer2G; break; case KCommDbBearerWcdma: - cpPriv->bearer = SymbianNetworkConfigurationPrivate::BearerWCDMA; + cpPriv->bearerType = QNetworkConfiguration::BearerWCDMA; break; case KCommDbBearerLAN: - cpPriv->bearer = SymbianNetworkConfigurationPrivate::BearerEthernet; + cpPriv->bearerType = QNetworkConfiguration::BearerEthernet; break; case KCommDbBearerVirtual: - cpPriv->bearer = SymbianNetworkConfigurationPrivate::BearerUnknown; + cpPriv->bearerType = QNetworkConfiguration::BearerUnknown; break; case KCommDbBearerPAN: - cpPriv->bearer = SymbianNetworkConfigurationPrivate::BearerUnknown; + cpPriv->bearerType = QNetworkConfiguration::BearerUnknown; break; case KCommDbBearerWLAN: - cpPriv->bearer = SymbianNetworkConfigurationPrivate::BearerWLAN; + cpPriv->bearerType = QNetworkConfiguration::BearerWLAN; break; default: - cpPriv->bearer = SymbianNetworkConfigurationPrivate::BearerUnknown; + cpPriv->bearerType = QNetworkConfiguration::BearerUnknown; break; } @@ -589,28 +593,28 @@ apNetworkConfiguration->roamingSupported = false; switch (pAPItem->BearerTypeL()) { case EApBearerTypeCSD: - apNetworkConfiguration->bearer = SymbianNetworkConfigurationPrivate::Bearer2G; + apNetworkConfiguration->bearerType = QNetworkConfiguration::Bearer2G; break; case EApBearerTypeGPRS: - apNetworkConfiguration->bearer = SymbianNetworkConfigurationPrivate::Bearer2G; + apNetworkConfiguration->bearerType = QNetworkConfiguration::Bearer2G; break; case EApBearerTypeHSCSD: - apNetworkConfiguration->bearer = SymbianNetworkConfigurationPrivate::BearerHSPA; + apNetworkConfiguration->bearerType = QNetworkConfiguration::BearerHSPA; break; case EApBearerTypeCDMA: - apNetworkConfiguration->bearer = SymbianNetworkConfigurationPrivate::BearerCDMA2000; + apNetworkConfiguration->bearerType = QNetworkConfiguration::BearerCDMA2000; break; case EApBearerTypeWLAN: - apNetworkConfiguration->bearer = SymbianNetworkConfigurationPrivate::BearerWLAN; + apNetworkConfiguration->bearerType = QNetworkConfiguration::BearerWLAN; break; case EApBearerTypeLAN: - apNetworkConfiguration->bearer = SymbianNetworkConfigurationPrivate::BearerEthernet; + apNetworkConfiguration->bearerType = QNetworkConfiguration::BearerEthernet; break; case EApBearerTypeLANModem: - apNetworkConfiguration->bearer = SymbianNetworkConfigurationPrivate::BearerEthernet; + apNetworkConfiguration->bearerType = QNetworkConfiguration::BearerEthernet; break; default: - apNetworkConfiguration->bearer = SymbianNetworkConfigurationPrivate::BearerUnknown; + apNetworkConfiguration->bearerType = QNetworkConfiguration::BearerUnknown; break; } @@ -688,15 +692,21 @@ User::WaitForRequest(status); QString ident = QT_BEARERMGMT_CONFIGURATION_IAP_PREFIX+QString::number(qHash(apId)); QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(ident); -#ifdef OCC_FUNCTIONALITY_AVAILABLE +#ifdef SNAP_FUNCTIONALITY_AVAILABLE if (!ptr) { // If IAP was not found, check if the update was about EasyWLAN ptr = configurationFromEasyWlan(apId, connectionId); + // Change the ident correspondingly + if (ptr) { + ident = QT_BEARERMGMT_CONFIGURATION_IAP_PREFIX + + QString::number(qHash(toSymbianConfig(ptr)->numericIdentifier())); + } } #endif if (ptr) { iConnectionMonitor.GetIntAttribute(connectionId, subConnectionCount, KConnectionStatus, connectionStatus, status); - User::WaitForRequest(status); + User::WaitForRequest(status); + if (connectionStatus == KLinkLayerOpen) { online = true; inactiveConfigs.removeOne(ident); @@ -834,38 +844,38 @@ SymbianNetworkConfigurationPrivate *p = toSymbianConfig(ptr); - if (p->bearer >= SymbianNetworkConfigurationPrivate::Bearer2G && - p->bearer <= SymbianNetworkConfigurationPrivate::BearerHSPA) { + if (p->bearerType >= QNetworkConfiguration::Bearer2G && + p->bearerType <= QNetworkConfiguration::BearerHSPA) { switch (bearerInfo) { case EBearerInfoCSD: - p->bearer = SymbianNetworkConfigurationPrivate::Bearer2G; + p->bearerType = QNetworkConfiguration::Bearer2G; break; case EBearerInfoWCDMA: - p->bearer = SymbianNetworkConfigurationPrivate::BearerWCDMA; + p->bearerType = QNetworkConfiguration::BearerWCDMA; break; case EBearerInfoCDMA2000: - p->bearer = SymbianNetworkConfigurationPrivate::BearerCDMA2000; + p->bearerType = QNetworkConfiguration::BearerCDMA2000; break; case EBearerInfoGPRS: - p->bearer = SymbianNetworkConfigurationPrivate::Bearer2G; + p->bearerType = QNetworkConfiguration::Bearer2G; break; case EBearerInfoHSCSD: - p->bearer = SymbianNetworkConfigurationPrivate::Bearer2G; + p->bearerType = QNetworkConfiguration::Bearer2G; break; case EBearerInfoEdgeGPRS: - p->bearer = SymbianNetworkConfigurationPrivate::Bearer2G; + p->bearerType = QNetworkConfiguration::Bearer2G; break; case EBearerInfoWcdmaCSD: - p->bearer = SymbianNetworkConfigurationPrivate::BearerWCDMA; + p->bearerType = QNetworkConfiguration::BearerWCDMA; break; case EBearerInfoHSDPA: - p->bearer = SymbianNetworkConfigurationPrivate::BearerHSPA; + p->bearerType = QNetworkConfiguration::BearerHSPA; break; case EBearerInfoHSUPA: - p->bearer = SymbianNetworkConfigurationPrivate::BearerHSPA; + p->bearerType = QNetworkConfiguration::BearerHSPA; break; case EBearerInfoHSxPA: - p->bearer = SymbianNetworkConfigurationPrivate::BearerHSPA; + p->bearerType = QNetworkConfiguration::BearerHSPA; break; } } @@ -1044,7 +1054,7 @@ QString ident = QT_BEARERMGMT_CONFIGURATION_IAP_PREFIX+QString::number(qHash(apId)); QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(ident); -#ifdef OCC_FUNCTIONALITY_AVAILABLE +#ifdef SNAP_FUNCTIONALITY_AVAILABLE if (!ptr) { // Check if status was regarding EasyWLAN ptr = configurationFromEasyWlan(apId, connectionId); @@ -1069,7 +1079,7 @@ User::WaitForRequest(status); QString ident = QT_BEARERMGMT_CONFIGURATION_IAP_PREFIX+QString::number(qHash(apId)); QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(ident); -#ifdef OCC_FUNCTIONALITY_AVAILABLE +#ifdef SNAP_FUNCTIONALITY_AVAILABLE if (!ptr) { // Check for EasyWLAN ptr = configurationFromEasyWlan(apId, connectionId); @@ -1161,6 +1171,8 @@ QT_TRYCATCH_LEAVING(changeConfigurationStateAtMaxTo(ptr, QNetworkConfiguration::Defined)); } } + // Something has in IAPs, update states to SNAPs + updateStatesToSnaps(); } break; @@ -1177,7 +1189,7 @@ User::WaitForRequest(status); QString ident = QT_BEARERMGMT_CONFIGURATION_IAP_PREFIX+QString::number(qHash(apId)); QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(ident); -#ifdef OCC_FUNCTIONALITY_AVAILABLE +#ifdef SNAP_FUNCTIONALITY_AVAILABLE if (!ptr) { // If IAP was not found, check if the update was about EasyWLAN ptr = configurationFromEasyWlan(apId, connectionId); @@ -1198,11 +1210,39 @@ } } -#ifdef OCC_FUNCTIONALITY_AVAILABLE +/* + Returns the network configuration that matches the given SSID. +*/ +QNetworkConfigurationPrivatePointer SymbianEngine::configurationFromSsid(const QString &ssid) +{ + QMutexLocker locker(&mutex); + + // Browser through all items and check their name for match + QHash::ConstIterator i = + accessPointConfigurations.constBegin(); + while (i != accessPointConfigurations.constEnd()) { + QNetworkConfigurationPrivatePointer ptr = i.value(); + + QMutexLocker configLocker(&ptr->mutex); + + if (ptr->name == ssid) { +#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG + qDebug() << "QNCM EasyWlan uses real SSID: " << ssid; +#endif + return ptr; + } + ++i; + } + + return QNetworkConfigurationPrivatePointer(); +} + +#ifdef SNAP_FUNCTIONALITY_AVAILABLE // Tries to derive configuration from EasyWLAN. // First checks if the interface brought up was EasyWLAN, then derives the real SSID, // and looks up configuration based on that one. -QNetworkConfigurationPrivatePointer SymbianEngine::configurationFromEasyWlan(TUint32 apId, TUint connectionId) +QNetworkConfigurationPrivatePointer SymbianEngine::configurationFromEasyWlan(TUint32 apId, + TUint connectionId) { if (apId == iCmManager.EasyWlanIdL()) { TRequestStatus status; @@ -1211,11 +1251,12 @@ easyWlanNetworkName, status ); User::WaitForRequest(status); if (status.Int() == KErrNone) { - QString realSSID = QString::fromUtf16(easyWlanNetworkName.Ptr(), easyWlanNetworkName.Length()); + const QString realSSID = QString::fromUtf16(easyWlanNetworkName.Ptr(), + easyWlanNetworkName.Length()); // Browser through all items and check their name for match - QHash >::const_iterator i = - accessPointConfigurations.constBegin(); + QHash::ConstIterator i = + accessPointConfigurations.constBegin(); while (i != accessPointConfigurations.constEnd()) { QNetworkConfigurationPrivatePointer ptr = i.value(); diff -r ef0373b55136 -r 758a864f9613 src/plugins/bearer/symbian/symbianengine.h --- a/src/plugins/bearer/symbian/symbianengine.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/bearer/symbian/symbianengine.h Mon Oct 04 01:19:32 2010 +0300 @@ -73,23 +73,9 @@ class SymbianNetworkConfigurationPrivate : public QNetworkConfigurationPrivate { public: - enum Bearer { - BearerEthernet, - BearerWLAN, - Bearer2G, - BearerCDMA2000, - BearerWCDMA, - BearerHSPA, - BearerBluetooth, - BearerWiMAX, - BearerUnknown = -1 - }; - SymbianNetworkConfigurationPrivate(); ~SymbianNetworkConfigurationPrivate(); - QString bearerName() const; - inline TUint32 numericIdentifier() const { QMutexLocker locker(&mutex); @@ -110,8 +96,6 @@ QString mappingName; - Bearer bearer; - // So called IAP id from the platform. Remains constant as long as the // platform is aware of the configuration ie. it is stored in the databases // --> does not depend on whether connections are currently open or not. @@ -154,10 +138,15 @@ QStringList accessPointConfigurationIdentifiers(); + QNetworkConfigurationPrivatePointer configurationFromSsid(const QString &ssid); + + // For QNetworkSessionPrivateImpl to indicate about state changes + void configurationStateChangeReport(TUint32 accessPointId, QNetworkSession::State newState); + Q_SIGNALS: void onlineStateChanged(bool isOnline); - void configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, + void configurationStateChanged(quint32 accessPointId, quint32 connMonId, QNetworkSession::State newState); public Q_SLOTS: @@ -203,11 +192,9 @@ private: // MConnectionMonitorObserver void EventL(const CConnMonEventBase& aEvent); - // For QNetworkSessionPrivate to indicate about state changes - void configurationStateChangeReport(TUint32 accessPointId, - QNetworkSession::State newState); -#ifdef OCC_FUNCTIONALITY_AVAILABLE - QNetworkConfigurationPrivatePointer configurationFromEasyWlan(TUint32 apId, TUint connectionId); +#ifdef SNAP_FUNCTIONALITY_AVAILABLE + QNetworkConfigurationPrivatePointer configurationFromEasyWlan(TUint32 apId, + TUint connectionId); #endif private: // Data @@ -227,7 +214,6 @@ friend class QNetworkSessionPrivate; friend class AccessPointsAvailabilityScanner; - friend class QNetworkSessionPrivateImpl; #ifdef SNAP_FUNCTIONALITY_AVAILABLE RCmManager iCmManager; diff -r ef0373b55136 -r 758a864f9613 src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -167,7 +167,6 @@ static QCache imageCache(4*1024*1024); // 4 MB #endif -#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS || defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS || defined QT_DEBUG #define VOID_ARG() static_cast(false) enum PaintOperation { DRAW_RECTS = 0x0001, DRAW_LINES = 0x0002, DRAW_IMAGE = 0x0004, @@ -178,88 +177,81 @@ DRAW_STATICTEXT = 0x8000, ALL = 0xffff }; -#ifdef QT_DEBUG -static void initRasterFallbacksMasks(int *warningMask, int *disableMask) +enum { RasterWarn = 1, RasterDisable = 2 }; +static inline uint rasterFallbacksMask(PaintOperation op) { - struct { - const char *name; - PaintOperation operation; - } const operations[] = { - { "DRAW_RECTS", DRAW_RECTS }, - { "DRAW_LINES", DRAW_LINES }, - { "DRAW_IMAGE", DRAW_IMAGE }, - { "DRAW_PIXMAP", DRAW_PIXMAP }, - { "DRAW_TILED_PIXMAP", DRAW_TILED_PIXMAP }, - { "STROKE_PATH", STROKE_PATH }, - { "DRAW_PATH", DRAW_PATH }, - { "DRAW_POINTS", DRAW_POINTS }, - { "DRAW_ELLIPSE", DRAW_ELLIPSE }, - { "DRAW_POLYGON", DRAW_POLYGON }, - { "DRAW_TEXT", DRAW_TEXT }, - { "FILL_PATH", FILL_PATH }, - { "FILL_RECT", FILL_RECT }, - { "DRAW_COLORSPANS", DRAW_COLORSPANS }, - { "DRAW_ROUNDED_RECT", DRAW_ROUNDED_RECT }, - { "ALL", ALL }, - { 0, ALL } - }; + uint ret = 0; +#ifdef QT_DIRECTFB_WARN_ON_RASTERFALLBACKS + if (op & QT_DIRECTFB_WARN_ON_RASTERFALLBACKS) + ret |= RasterWarn; +#endif +#ifdef QT_DIRECTFB_DISABLE_RASTERFALLBACKS + if (op & QT_DIRECTFB_DISABLE_RASTERFALLBACKS) + ret |= RasterDisable; +#endif + static int warningMask = -1; + static int disableMask = -1; + if (warningMask < 0) { + struct { + const char *name; + PaintOperation operation; + } const operations[] = { + { "DRAW_RECTS", DRAW_RECTS }, + { "DRAW_LINES", DRAW_LINES }, + { "DRAW_IMAGE", DRAW_IMAGE }, + { "DRAW_PIXMAP", DRAW_PIXMAP }, + { "DRAW_TILED_PIXMAP", DRAW_TILED_PIXMAP }, + { "STROKE_PATH", STROKE_PATH }, + { "DRAW_PATH", DRAW_PATH }, + { "DRAW_POINTS", DRAW_POINTS }, + { "DRAW_ELLIPSE", DRAW_ELLIPSE }, + { "DRAW_POLYGON", DRAW_POLYGON }, + { "DRAW_TEXT", DRAW_TEXT }, + { "FILL_PATH", FILL_PATH }, + { "FILL_RECT", FILL_RECT }, + { "DRAW_COLORSPANS", DRAW_COLORSPANS }, + { "DRAW_ROUNDED_RECT", DRAW_ROUNDED_RECT }, + { "ALL", ALL }, + { 0, ALL } + }; - QStringList warning = QString::fromLatin1(qgetenv("QT_DIRECTFB_WARN_ON_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'), - QString::SkipEmptyParts); - QStringList disable = QString::fromLatin1(qgetenv("QT_DIRECTFB_DISABLE_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'), - QString::SkipEmptyParts); - *warningMask = 0; - *disableMask = 0; - if (!warning.isEmpty() || !disable.isEmpty()) { - for (int i=0; operations[i].name; ++i) { - const QString name = QString::fromLatin1(operations[i].name); - int idx = warning.indexOf(name); - if (idx != -1) { - *warningMask |= operations[i].operation; - warning.erase(warning.begin() + idx); - } - idx = disable.indexOf(name); - if (idx != -1) { - *disableMask |= operations[i].operation; - disable.erase(disable.begin() + idx); + QStringList warning = QString::fromLatin1(qgetenv("QT_DIRECTFB_WARN_ON_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'), + QString::SkipEmptyParts); + QStringList disable = QString::fromLatin1(qgetenv("QT_DIRECTFB_DISABLE_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'), + QString::SkipEmptyParts); + warningMask = 0; + disableMask = 0; + if (!warning.isEmpty() || !disable.isEmpty()) { + for (int i=0; operations[i].name; ++i) { + const QString name = QString::fromLatin1(operations[i].name); + int idx = warning.indexOf(name); + if (idx != -1) { + warningMask |= operations[i].operation; + warning.erase(warning.begin() + idx); + } + idx = disable.indexOf(name); + if (idx != -1) { + disableMask |= operations[i].operation; + disable.erase(disable.begin() + idx); + } } } - } - if (!warning.isEmpty()) { - qWarning("QDirectFBPaintEngine QT_DIRECTFB_WARN_ON_RASTERFALLBACKS Unknown operation(s): %s", - qPrintable(warning.join(QLatin1String("|")))); + if (!warning.isEmpty()) { + qWarning("QDirectFBPaintEngine QT_DIRECTFB_WARN_ON_RASTERFALLBACKS Unknown operation(s): %s", + qPrintable(warning.join(QLatin1String("|")))); + } + if (!disable.isEmpty()) { + qWarning("QDirectFBPaintEngine QT_DIRECTFB_DISABLE_RASTERFALLBACKS Unknown operation(s): %s", + qPrintable(disable.join(QLatin1String("|")))); + } } - if (!disable.isEmpty()) { - qWarning("QDirectFBPaintEngine QT_DIRECTFB_DISABLE_RASTERFALLBACKS Unknown operation(s): %s", - qPrintable(disable.join(QLatin1String("|")))); - } - + if (op & warningMask) + ret |= RasterWarn; + if (op & disableMask) + ret |= RasterDisable; + return ret; } -#endif -static inline int rasterFallbacksMask(bool warn) -{ -#ifdef QT_DIRECTFB_WARN_ON_RASTERFALLBACKS - if (warn) - return QT_DIRECTFB_WARN_ON_RASTERFALLBACKS; -#endif -#ifdef QT_DIRECTFB_DISABLE_RASTERFALLBACKS - if (!warn) - return QT_DIRECTFB_DISABLE_RASTERFALLBACKS; -#endif -#ifndef QT_DEBUG - return 0; -#else - static int warnMask = -1; - static int disableMask = -1; - if (warnMask == -1) - initRasterFallbacksMasks(&warnMask, &disableMask); - return warn ? warnMask : disableMask; -#endif -} -#endif - -#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS || defined QT_DEBUG template static void rasterFallbackWarn(const char *msg, const char *func, const device *dev, uint transformationType, bool simplePen, @@ -267,16 +259,14 @@ const char *nameOne, const T1 &one, const char *nameTwo, const T2 &two, const char *nameThree, const T3 &three); -#endif -#if defined QT_DEBUG || (defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS && defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS) #define RASTERFALLBACK(op, one, two, three) \ { \ - const bool disable = op & rasterFallbacksMask(false); \ - if (op & rasterFallbacksMask(true)) \ - rasterFallbackWarn(disable \ - ? "Disabled raster engine operation" \ - : "Falling back to raster engine for", \ + static const uint rasterFallbacks = rasterFallbacksMask(op); \ + switch (rasterFallbacks) { \ + case 0: break; \ + case RasterWarn: \ + rasterFallbackWarn("Falling back to raster engine for", \ __FUNCTION__, \ state()->painter->device(), \ d_func()->transformationType, \ @@ -284,26 +274,20 @@ d_func()->clipType, \ d_func()->compositionModeStatus, \ #one, one, #two, two, #three, three); \ - if (disable) \ + break; \ + case RasterDisable|RasterWarn: \ + rasterFallbackWarn("Disabled raster engine operation", \ + __FUNCTION__, \ + state()->painter->device(), \ + d_func()->transformationType, \ + d_func()->simplePen, \ + d_func()->clipType, \ + d_func()->compositionModeStatus, \ + #one, one, #two, two, #three, three); \ + case RasterDisable: \ return; \ + } \ } -#elif defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS -#define RASTERFALLBACK(op, one, two, three) \ - if (op & rasterFallbacksMask(false)) \ - return; -#elif defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS -#define RASTERFALLBACK(op, one, two, three) \ - if (op & rasterFallbacksMask(true)) \ - rasterFallbackWarn("Falling back to raster engine for", \ - __FUNCTION__, state()->painter->device(), \ - d_func()->transformationType, \ - d_func()->simplePen, \ - d_func()->clipType, \ - d_func()->compositionModeStatus, \ - #one, one, #two, two, #three, three); -#else -#define RASTERFALLBACK(op, one, two, three) -#endif template static inline void drawLines(const T *lines, int n, const QTransform &transform, IDirectFBSurface *surface); @@ -1362,7 +1346,6 @@ } } -#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS || defined QT_DEBUG template inline const T *ptr(const T &t) { return &t; } template <> inline const bool* ptr(const bool &) { return 0; } template @@ -1403,8 +1386,6 @@ qWarning("%s", qPrintable(out)); } -#endif // QT_DIRECTFB_WARN_ON_RASTERFALLBACKS - QT_END_NAMESPACE #endif // QT_NO_QWS_DIRECTFB diff -r ef0373b55136 -r 758a864f9613 src/plugins/graphicssystems/opengl/opengl.pro --- a/src/plugins/graphicssystems/opengl/opengl.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/plugins/graphicssystems/opengl/opengl.pro Mon Oct 04 01:19:32 2010 +0300 @@ -9,3 +9,5 @@ target.path += $$[QT_INSTALL_PLUGINS]/graphicssystems INSTALLS += target + +symbian: TARGET.UID3 = 0x2002131B diff -r ef0373b55136 -r 758a864f9613 src/qbase.pri --- a/src/qbase.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/src/qbase.pri Mon Oct 04 01:19:32 2010 +0300 @@ -168,13 +168,25 @@ TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end +qtPrepareTool(QMAKE_LUPDATE, lupdate) +qtPrepareTool(QMAKE_LRELEASE, lrelease) + moc_dir.name = moc_location moc_dir.variable = QMAKE_MOC uic_dir.name = uic_location uic_dir.variable = QMAKE_UIC -QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir +rcc_dir.name = rcc_location +rcc_dir.variable = QMAKE_RCC + +lupdate_dir.name = lupdate_location +lupdate_dir.variable = QMAKE_LUPDATE + +lrelease_dir.name = lrelease_location +lrelease_dir.variable = QMAKE_LRELEASE + +QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir include(qt_targets.pri) diff -r ef0373b55136 -r 758a864f9613 src/qt3support/widgets/q3gridview.cpp --- a/src/qt3support/widgets/q3gridview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/qt3support/widgets/q3gridview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -84,7 +84,7 @@ size in a potentially scrollable canvas. If you need rows and columns with different sizes, use a Q3Table instead. If you need a simple list of items, use a Q3ListBox. If you need to present - hierachical data use a Q3ListView, and if you need random objects + hierarichal data use a Q3ListView, and if you need random objects at random positions, consider using either a Q3IconView or a Q3Canvas. */ diff -r ef0373b55136 -r 758a864f9613 src/s60installs/bwins/QtCoreu.def --- a/src/s60installs/bwins/QtCoreu.def Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/bwins/QtCoreu.def Mon Oct 04 01:19:32 2010 +0300 @@ -3122,7 +3122,7 @@ ?reset@QIODevice@@UAE_NXZ @ 3121 NONAME ; bool QIODevice::reset(void) ?reset@QMetaProperty@@QBE_NPAVQObject@@@Z @ 3122 NONAME ; bool QMetaProperty::reset(class QObject *) const ?reset@QTextStream@@QAEXXZ @ 3123 NONAME ; void QTextStream::reset(void) - ?resetCurrentSender@QObjectPrivate@@SAXPAVQObject@@PAUSender@1@1@Z @ 3124 NONAME ABSENT ; void QObjectPrivate::resetCurrentSender(class QObject *, struct QObjectPrivate::Sender *, struct QObjectPrivate::Sender *) + ?resetCurrentSender@QObjectPrivate@@SAXPAVQObject@@PAUSender@1@1@Z @ 3124 NONAME ; void QObjectPrivate::resetCurrentSender(class QObject *, struct QObjectPrivate::Sender *, struct QObjectPrivate::Sender *) ?resetDeleteWatch@QObjectPrivate@@SAXPAV1@PAHH@Z @ 3125 NONAME ; void QObjectPrivate::resetDeleteWatch(class QObjectPrivate *, int *, int) ?resetStatus@QDataStream@@QAEXXZ @ 3126 NONAME ; void QDataStream::resetStatus(void) ?resetStatus@QTextStream@@QAEXXZ @ 3127 NONAME ; void QTextStream::resetStatus(void) @@ -3281,7 +3281,7 @@ ?setCoords@QRectF@@QAEXMMMM@Z @ 3280 NONAME ; void QRectF::setCoords(float, float, float, float) ?setCurrent@QDir@@SA_NABVQString@@@Z @ 3281 NONAME ; bool QDir::setCurrent(class QString const &) ?setCurrentPath@QFSFileEngine@@SA_NABVQString@@@Z @ 3282 NONAME ; bool QFSFileEngine::setCurrentPath(class QString const &) - ?setCurrentSender@QObjectPrivate@@SAPAUSender@1@PAVQObject@@PAU21@@Z @ 3283 NONAME ABSENT ; struct QObjectPrivate::Sender * QObjectPrivate::setCurrentSender(class QObject *, struct QObjectPrivate::Sender *) + ?setCurrentSender@QObjectPrivate@@SAPAUSender@1@PAVQObject@@PAU21@@Z @ 3283 NONAME ; struct QObjectPrivate::Sender * QObjectPrivate::setCurrentSender(class QObject *, struct QObjectPrivate::Sender *) ?setCurrentTime@QAbstractAnimation@@QAEXH@Z @ 3284 NONAME ; void QAbstractAnimation::setCurrentTime(int) ?setCurrentTime@QTimeLine@@QAEXH@Z @ 3285 NONAME ; void QTimeLine::setCurrentTime(int) ?setCurveShape@QTimeLine@@QAEXW4CurveShape@1@@Z @ 3286 NONAME ; void QTimeLine::setCurveShape(enum QTimeLine::CurveShape) @@ -4417,71 +4417,69 @@ ?QBasicAtomicInt_testAndSetRelease@@YA_NPCHHH@Z @ 4416 NONAME ; bool QBasicAtomicInt_testAndSetRelease(int volatile *, int, int) ?QBasicAtomicInt_fetchAndStoreAcquire@@YAHPCHH@Z @ 4417 NONAME ; int QBasicAtomicInt_fetchAndStoreAcquire(int volatile *, int) ?QBasicAtomicInt_fetchAndAddAcquire@@YAHPCHH@Z @ 4418 NONAME ; int QBasicAtomicInt_fetchAndAddAcquire(int volatile *, int) - ??0QString@@QAE@PBVQChar@@@Z @ 4419 NONAME ; QString::QString(class QChar const *) - ??0QTextDecoder@@QAE@PBVQTextCodec@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4420 NONAME ; QTextDecoder::QTextDecoder(class QTextCodec const *, class QFlags) - ??0QTextEncoder@@QAE@PBVQTextCodec@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4421 NONAME ; QTextEncoder::QTextEncoder(class QTextCodec const *, class QFlags) - ??0QVariant@@QAE@ABVQEasingCurve@@@Z @ 4422 NONAME ; QVariant::QVariant(class QEasingCurve const &) - ??5@YAAAVQDataStream@@AAV0@AAVQEasingCurve@@@Z @ 4423 NONAME ; class QDataStream & operator>>(class QDataStream &, class QEasingCurve &) - ??6@YAAAVQDataStream@@AAV0@ABVQEasingCurve@@@Z @ 4424 NONAME ; class QDataStream & operator<<(class QDataStream &, class QEasingCurve const &) - ??8QElapsedTimer@@QBE_NABV0@@Z @ 4425 NONAME ; bool QElapsedTimer::operator==(class QElapsedTimer const &) const - ??9QElapsedTimer@@QBE_NABV0@@Z @ 4426 NONAME ; bool QElapsedTimer::operator!=(class QElapsedTimer const &) const - ??M@YA_NABVQElapsedTimer@@0@Z @ 4427 NONAME ; bool operator<(class QElapsedTimer const &, class QElapsedTimer const &) - ?append@QListData@@QAEPAPAXH@Z @ 4428 NONAME ; void * * QListData::append(int) - ?clearHistory@QStateMachinePrivate@@QAEXXZ @ 4429 NONAME ; void QStateMachinePrivate::clearHistory(void) - ?clockType@QElapsedTimer@@SA?AW4ClockType@1@XZ @ 4430 NONAME ; enum QElapsedTimer::ClockType QElapsedTimer::clockType(void) - ?currentDateTimeUtc@QDateTime@@SA?AV1@XZ @ 4431 NONAME ; class QDateTime QDateTime::currentDateTimeUtc(void) - ?currentMSecsSinceEpoch@QDateTime@@SA_JXZ @ 4432 NONAME ; long long QDateTime::currentMSecsSinceEpoch(void) - ?detach@QListData@@QAEPAUData@1@H@Z @ 4433 NONAME ; struct QListData::Data * QListData::detach(int) - ?detach_grow@QListData@@QAEPAUData@1@PAHH@Z @ 4434 NONAME ; struct QListData::Data * QListData::detach_grow(int *, int) - ?elapsed@QElapsedTimer@@QBE_JXZ @ 4435 NONAME ; long long QElapsedTimer::elapsed(void) const - ?fromMSecsSinceEpoch@QDateTime@@SA?AV1@_J@Z @ 4436 NONAME ; class QDateTime QDateTime::fromMSecsSinceEpoch(long long) - ?hasExpired@QElapsedTimer@@QBE_N_J@Z @ 4437 NONAME ; bool QElapsedTimer::hasExpired(long long) const - ?invalidate@QElapsedTimer@@QAEXXZ @ 4438 NONAME ; void QElapsedTimer::invalidate(void) - ?isMonotonic@QElapsedTimer@@SA_NXZ @ 4439 NONAME ; bool QElapsedTimer::isMonotonic(void) - ?isSharedWith@QByteArray@@QBE_NABV1@@Z @ 4440 NONAME ; bool QByteArray::isSharedWith(class QByteArray const &) const - ?isSharedWith@QString@@QBE_NABV1@@Z @ 4441 NONAME ; bool QString::isSharedWith(class QString const &) const - ?isValid@QElapsedTimer@@QBE_NXZ @ 4442 NONAME ; bool QElapsedTimer::isValid(void) const - ?makeDecoder@QTextCodec@@QBEPAVQTextDecoder@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4443 NONAME ; class QTextDecoder * QTextCodec::makeDecoder(class QFlags) const - ?makeEncoder@QTextCodec@@QBEPAVQTextEncoder@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4444 NONAME ; class QTextEncoder * QTextCodec::makeEncoder(class QFlags) const - ?msecsSinceReference@QElapsedTimer@@QBE_JXZ @ 4445 NONAME ; long long QElapsedTimer::msecsSinceReference(void) const - ?msecsTo@QElapsedTimer@@QBE_JABV1@@Z @ 4446 NONAME ; long long QElapsedTimer::msecsTo(class QElapsedTimer const &) const - ?qDecodeDataUrl@@YA?AU?$QPair@VQString@@VQByteArray@@@@ABVQUrl@@@Z @ 4447 NONAME ; struct QPair qDecodeDataUrl(class QUrl const &) - ?qDetectCPUFeatures@@YAIXZ @ 4448 NONAME ; unsigned int qDetectCPUFeatures(void) + ?validCodecs@QTextCodec@@CA_NXZ @ 4419 NONAME ; bool QTextCodec::validCodecs(void) + ?clearHistory@QStateMachinePrivate@@QAEXXZ @ 4420 NONAME ; void QStateMachinePrivate::clearHistory(void) + ?nativeArguments@QProcess@@QBE?AVQString@@XZ @ 4421 NONAME ; class QString QProcess::nativeArguments(void) const + ?detach@QListData@@QAEPAUData@1@H@Z @ 4422 NONAME ; struct QListData::Data * QListData::detach(int) + ?trUtf8@QEventDispatcherSymbian@@SA?AVQString@@PBD0H@Z @ 4423 NONAME ; class QString QEventDispatcherSymbian::trUtf8(char const *, char const *, int) + ?destroyed@QAbstractDeclarativeData@@2P6AXPAV1@PAVQObject@@@ZA @ 4424 NONAME ; void (*QAbstractDeclarativeData::destroyed)(class QAbstractDeclarativeData *, class QObject *) + ??M@YA_NABVQElapsedTimer@@0@Z @ 4425 NONAME ; bool operator<(class QElapsedTimer const &, class QElapsedTimer const &) + ?clockType@QElapsedTimer@@SA?AW4ClockType@1@XZ @ 4426 NONAME ; enum QElapsedTimer::ClockType QElapsedTimer::clockType(void) + ?isHighSurrogate@QChar@@SA_NI@Z @ 4427 NONAME ; bool QChar::isHighSurrogate(unsigned int) + ?start@QElapsedTimer@@QAEXXZ @ 4428 NONAME ; void QElapsedTimer::start(void) + ??0QVariant@@QAE@ABVQEasingCurve@@@Z @ 4429 NONAME ; QVariant::QVariant(class QEasingCurve const &) + ?isValid@QElapsedTimer@@QBE_NXZ @ 4430 NONAME ; bool QElapsedTimer::isValid(void) const + ?qt_metacast@QEventDispatcherSymbian@@UAEPAXPBD@Z @ 4431 NONAME ; void * QEventDispatcherSymbian::qt_metacast(char const *) + ?toMSecsSinceEpoch@QDateTime@@QBE_JXZ @ 4432 NONAME ; long long QDateTime::toMSecsSinceEpoch(void) const + ?hasExpired@QElapsedTimer@@QBE_N_J@Z @ 4433 NONAME ; bool QElapsedTimer::hasExpired(long long) const + ?makeEncoder@QTextCodec@@QBEPAVQTextEncoder@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4434 NONAME ; class QTextEncoder * QTextCodec::makeEncoder(class QFlags) const + ??9QElapsedTimer@@QBE_NABV0@@Z @ 4435 NONAME ; bool QElapsedTimer::operator!=(class QElapsedTimer const &) const + ?setRawData@QString@@QAEAAV1@PBVQChar@@H@Z @ 4436 NONAME ; class QString & QString::setRawData(class QChar const *, int) + ?registerTypedef@QMetaType@@SAHPBDH@Z @ 4437 NONAME ; int QMetaType::registerTypedef(char const *, int) + ??8QElapsedTimer@@QBE_NABV0@@Z @ 4438 NONAME ; bool QElapsedTimer::operator==(class QElapsedTimer const &) const + ?makeDecoder@QTextCodec@@QBEPAVQTextDecoder@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4439 NONAME ; class QTextDecoder * QTextCodec::makeDecoder(class QFlags) const + ?metaObject@QEventDispatcherSymbian@@UBEPBUQMetaObject@@XZ @ 4440 NONAME ; struct QMetaObject const * QEventDispatcherSymbian::metaObject(void) const + ?transitions@QState@@QBE?AV?$QList@PAVQAbstractTransition@@@@XZ @ 4441 NONAME ; class QList QState::transitions(void) const + ?qDetectCPUFeatures@@YAIXZ @ 4442 NONAME ; unsigned int qDetectCPUFeatures(void) + ?isSharedWith@QString@@QBE_NABV1@@Z @ 4443 NONAME ; bool QString::isSharedWith(class QString const &) const + ?parentChanged@QAbstractDeclarativeData@@2P6AXPAV1@PAVQObject@@1@ZA @ 4444 NONAME ; void (*QAbstractDeclarativeData::parentChanged)(class QAbstractDeclarativeData *, class QObject *, class QObject *) + ?currentMSecsSinceEpoch@QDateTime@@SA_JXZ @ 4445 NONAME ; long long QDateTime::currentMSecsSinceEpoch(void) + ?staticMetaObject@QEventDispatcherSymbian@@2UQMetaObject@@B @ 4446 NONAME ; struct QMetaObject const QEventDispatcherSymbian::staticMetaObject + ?msecsTo@QElapsedTimer@@QBE_JABV1@@Z @ 4447 NONAME ; long long QElapsedTimer::msecsTo(class QElapsedTimer const &) const + ?toEasingCurve@QVariant@@QBE?AVQEasingCurve@@XZ @ 4448 NONAME ; class QEasingCurve QVariant::toEasingCurve(void) const ?registerStreamOperators@QMetaType@@SAXHP6AXAAVQDataStream@@PBX@ZP6AX0PAX@Z@Z @ 4449 NONAME ; void QMetaType::registerStreamOperators(int, void (*)(class QDataStream &, void const *), void (*)(class QDataStream &, void *)) - ?registerTypedef@QMetaType@@SAHPBDH@Z @ 4450 NONAME ; int QMetaType::registerTypedef(char const *, int) - ?replace@QByteArray@@QAEAAV1@HHPBDH@Z @ 4451 NONAME ; class QByteArray & QByteArray::replace(int, int, char const *, int) - ?restart@QElapsedTimer@@QAE_JXZ @ 4452 NONAME ; long long QElapsedTimer::restart(void) - ?secsTo@QElapsedTimer@@QBE_JABV1@@Z @ 4453 NONAME ; long long QElapsedTimer::secsTo(class QElapsedTimer const &) const - ?setMSecsSinceEpoch@QDateTime@@QAEX_J@Z @ 4454 NONAME ; void QDateTime::setMSecsSinceEpoch(long long) - ?start@QElapsedTimer@@QAEXXZ @ 4455 NONAME ; void QElapsedTimer::start(void) - ?toEasingCurve@QVariant@@QBE?AVQEasingCurve@@XZ @ 4456 NONAME ; class QEasingCurve QVariant::toEasingCurve(void) const - ?toMSecsSinceEpoch@QDateTime@@QBE_JXZ @ 4457 NONAME ; long long QDateTime::toMSecsSinceEpoch(void) const - ?transitions@QState@@QBE?AV?$QList@PAVQAbstractTransition@@@@XZ @ 4458 NONAME ; class QList QState::transitions(void) const - ?validCodecs@QTextCodec@@CA_NXZ @ 4459 NONAME ; bool QTextCodec::validCodecs(void) - ?destroyed@QDeclarativeData@@2P6AXPAV1@PAVQObject@@@ZA @ 4460 NONAME ABSENT ; void (*QDeclarativeData::destroyed)(class QDeclarativeData *, class QObject *) - ?parentChanged@QDeclarativeData@@2P6AXPAV1@PAVQObject@@1@ZA @ 4461 NONAME ABSENT ; void (*QDeclarativeData::parentChanged)(class QDeclarativeData *, class QObject *, class QObject *) - ?parentChanged@QAbstractDeclarativeData@@2P6AXPAV1@PAVQObject@@1@ZA @ 4462 NONAME ; void (*QAbstractDeclarativeData::parentChanged)(class QAbstractDeclarativeData *, class QObject *, class QObject *) - ?destroyed@QAbstractDeclarativeData@@2P6AXPAV1@PAVQObject@@@ZA @ 4463 NONAME ; void (*QAbstractDeclarativeData::destroyed)(class QAbstractDeclarativeData *, class QObject *) - ?selectThread@QEventDispatcherSymbian@@AAEAAVQSelectThread@@XZ @ 4464 NONAME ; class QSelectThread & QEventDispatcherSymbian::selectThread(void) - ?setRawData@QByteArray@@QAEAAV1@PBDI@Z @ 4465 NONAME ; class QByteArray & QByteArray::setRawData(char const *, unsigned int) - ?setRawData@QString@@QAEAAV1@PBVQChar@@H@Z @ 4466 NONAME ; class QString & QString::setRawData(class QChar const *, int) - ?getStaticMetaObject@QEventDispatcherSymbian@@SAABUQMetaObject@@XZ @ 4467 NONAME ; struct QMetaObject const & QEventDispatcherSymbian::getStaticMetaObject(void) - ?isHighSurrogate@QChar@@SA_NI@Z @ 4468 NONAME ; bool QChar::isHighSurrogate(unsigned int) - ?isLowSurrogate@QChar@@SA_NI@Z @ 4469 NONAME ; bool QChar::isLowSurrogate(unsigned int) - ?metaObject@QEventDispatcherSymbian@@UBEPBUQMetaObject@@XZ @ 4470 NONAME ; struct QMetaObject const * QEventDispatcherSymbian::metaObject(void) const - ?msecsTo@QDateTime@@QBE_JABV1@@Z @ 4471 NONAME ; long long QDateTime::msecsTo(class QDateTime const &) const - ?qt_metacall@QEventDispatcherSymbian@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 4472 NONAME ; int QEventDispatcherSymbian::qt_metacall(enum QMetaObject::Call, int, void * *) - ?qt_metacast@QEventDispatcherSymbian@@UAEPAXPBD@Z @ 4473 NONAME ; void * QEventDispatcherSymbian::qt_metacast(char const *) - ?requiresSurrogates@QChar@@SA_NI@Z @ 4474 NONAME ; bool QChar::requiresSurrogates(unsigned int) - ?symbianInit@QCoreApplicationPrivate@@QAEXXZ @ 4475 NONAME ; void QCoreApplicationPrivate::symbianInit(void) - ?tr@QEventDispatcherSymbian@@SA?AVQString@@PBD0@Z @ 4476 NONAME ; class QString QEventDispatcherSymbian::tr(char const *, char const *) - ?tr@QEventDispatcherSymbian@@SA?AVQString@@PBD0H@Z @ 4477 NONAME ; class QString QEventDispatcherSymbian::tr(char const *, char const *, int) - ?trUtf8@QEventDispatcherSymbian@@SA?AVQString@@PBD0@Z @ 4478 NONAME ; class QString QEventDispatcherSymbian::trUtf8(char const *, char const *) - ?trUtf8@QEventDispatcherSymbian@@SA?AVQString@@PBD0H@Z @ 4479 NONAME ; class QString QEventDispatcherSymbian::trUtf8(char const *, char const *, int) - ?staticMetaObject@QEventDispatcherSymbian@@2UQMetaObject@@B @ 4480 NONAME ; struct QMetaObject const QEventDispatcherSymbian::staticMetaObject + ?replace@QByteArray@@QAEAAV1@HHPBDH@Z @ 4450 NONAME ; class QByteArray & QByteArray::replace(int, int, char const *, int) + ?elapsed@QElapsedTimer@@QBE_JXZ @ 4451 NONAME ; long long QElapsedTimer::elapsed(void) const + ??0QTextEncoder@@QAE@PBVQTextCodec@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4452 NONAME ; QTextEncoder::QTextEncoder(class QTextCodec const *, class QFlags) + ??6@YAAAVQDataStream@@AAV0@ABVQEasingCurve@@@Z @ 4453 NONAME ; class QDataStream & operator<<(class QDataStream &, class QEasingCurve const &) + ?qDecodeDataUrl@@YA?AU?$QPair@VQString@@VQByteArray@@@@ABVQUrl@@@Z @ 4454 NONAME ; struct QPair qDecodeDataUrl(class QUrl const &) + ?trUtf8@QEventDispatcherSymbian@@SA?AVQString@@PBD0@Z @ 4455 NONAME ; class QString QEventDispatcherSymbian::trUtf8(char const *, char const *) + ?setNativeArguments@QProcess@@QAEXABVQString@@@Z @ 4456 NONAME ; void QProcess::setNativeArguments(class QString const &) + ?msecsTo@QDateTime@@QBE_JABV1@@Z @ 4457 NONAME ; long long QDateTime::msecsTo(class QDateTime const &) const + ?tr@QEventDispatcherSymbian@@SA?AVQString@@PBD0H@Z @ 4458 NONAME ; class QString QEventDispatcherSymbian::tr(char const *, char const *, int) + ?setMSecsSinceEpoch@QDateTime@@QAEX_J@Z @ 4459 NONAME ; void QDateTime::setMSecsSinceEpoch(long long) + ?tr@QEventDispatcherSymbian@@SA?AVQString@@PBD0@Z @ 4460 NONAME ; class QString QEventDispatcherSymbian::tr(char const *, char const *) + ?isSharedWith@QByteArray@@QBE_NABV1@@Z @ 4461 NONAME ; bool QByteArray::isSharedWith(class QByteArray const &) const + ?secsTo@QElapsedTimer@@QBE_JABV1@@Z @ 4462 NONAME ; long long QElapsedTimer::secsTo(class QElapsedTimer const &) const + ??5@YAAAVQDataStream@@AAV0@AAVQEasingCurve@@@Z @ 4463 NONAME ; class QDataStream & operator>>(class QDataStream &, class QEasingCurve &) + ??0QString@@QAE@PBVQChar@@@Z @ 4464 NONAME ; QString::QString(class QChar const *) + ?append@QListData@@QAEPAPAXH@Z @ 4465 NONAME ; void * * QListData::append(int) + ?getStaticMetaObject@QEventDispatcherSymbian@@SAABUQMetaObject@@XZ @ 4466 NONAME ; struct QMetaObject const & QEventDispatcherSymbian::getStaticMetaObject(void) + ?peek@QIODevicePrivate@@UAE?AVQByteArray@@_J@Z @ 4467 NONAME ; class QByteArray QIODevicePrivate::peek(long long) + ?detach_grow@QListData@@QAEPAUData@1@PAHH@Z @ 4468 NONAME ; struct QListData::Data * QListData::detach_grow(int *, int) + ?symbianInit@QCoreApplicationPrivate@@QAEXXZ @ 4469 NONAME ; void QCoreApplicationPrivate::symbianInit(void) + ??0QTextDecoder@@QAE@PBVQTextCodec@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4470 NONAME ; QTextDecoder::QTextDecoder(class QTextCodec const *, class QFlags) + ?requiresSurrogates@QChar@@SA_NI@Z @ 4471 NONAME ; bool QChar::requiresSurrogates(unsigned int) + ?isLowSurrogate@QChar@@SA_NI@Z @ 4472 NONAME ; bool QChar::isLowSurrogate(unsigned int) + ?qt_metacall@QEventDispatcherSymbian@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 4473 NONAME ; int QEventDispatcherSymbian::qt_metacall(enum QMetaObject::Call, int, void * *) + ?setRawData@QByteArray@@QAEAAV1@PBDI@Z @ 4474 NONAME ; class QByteArray & QByteArray::setRawData(char const *, unsigned int) + ?fromMSecsSinceEpoch@QDateTime@@SA?AV1@_J@Z @ 4475 NONAME ; class QDateTime QDateTime::fromMSecsSinceEpoch(long long) + ?invalidate@QElapsedTimer@@QAEXXZ @ 4476 NONAME ; void QElapsedTimer::invalidate(void) + ?restart@QElapsedTimer@@QAE_JXZ @ 4477 NONAME ; long long QElapsedTimer::restart(void) + ?currentDateTimeUtc@QDateTime@@SA?AV1@XZ @ 4478 NONAME ; class QDateTime QDateTime::currentDateTimeUtc(void) + ?isMonotonic@QElapsedTimer@@SA_NXZ @ 4479 NONAME ; bool QElapsedTimer::isMonotonic(void) + ?peek@QIODevicePrivate@@UAE_JPAD_J@Z @ 4480 NONAME ; long long QIODevicePrivate::peek(char *, long long) ?textDirection@QLocale@@QBE?AW4LayoutDirection@Qt@@XZ @ 4481 NONAME ; enum Qt::LayoutDirection QLocale::textDirection(void) const - ?nativeArguments@QProcess@@QBE?AVQString@@XZ @ 4482 NONAME ; class QString QProcess::nativeArguments(void) const - ?setNativeArguments@QProcess@@QAEXABVQString@@@Z @ 4483 NONAME ; void QProcess::setNativeArguments(class QString const &) - ?peek@QIODevicePrivate@@UAE?AVQByteArray@@_J@Z @ 4484 NONAME ; class QByteArray QIODevicePrivate::peek(long long) - ?peek@QIODevicePrivate@@UAE_JPAD_J@Z @ 4485 NONAME ; long long QIODevicePrivate::peek(char *, long long) + ?msecsSinceReference@QElapsedTimer@@QBE_JXZ @ 4482 NONAME ; long long QElapsedTimer::msecsSinceReference(void) const + ?selectThread@QEventDispatcherSymbian@@AAEAAVQSelectThread@@XZ @ 4483 NONAME ; class QSelectThread & QEventDispatcherSymbian::selectThread(void) diff -r ef0373b55136 -r 758a864f9613 src/s60installs/bwins/QtDeclarativeu.def --- a/src/s60installs/bwins/QtDeclarativeu.def Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/bwins/QtDeclarativeu.def Mon Oct 04 01:19:32 2010 +0300 @@ -1677,11 +1677,12 @@ ?setMethodBody@QDeclarativeEngineDebug@@QAE_NHABVQString@@0@Z @ 1676 NONAME ; bool QDeclarativeEngineDebug::setMethodBody(int, class QString const &, class QString const &) ?resetBindingForObject@QDeclarativeEngineDebug@@QAE_NHABVQString@@@Z @ 1677 NONAME ; bool QDeclarativeEngineDebug::resetBindingForObject(int, class QString const &) ?forceActiveFocus@QDeclarativeItem@@QAEXXZ @ 1678 NONAME ; void QDeclarativeItem::forceActiveFocus(void) - ?qmlregister@QDeclarativePrivate@@YAHW4RegistrationType@1@PAX@Z @ 1679 NONAME ; int QDeclarativePrivate::qmlregister(enum QDeclarativePrivate::RegistrationType, void *) - ?engine@QDeclarativeView@@QBEPAVQDeclarativeEngine@@XZ @ 1680 NONAME ; class QDeclarativeEngine * QDeclarativeView::engine(void) const - ?activeFocusChanged@QDeclarativeItem@@IAEX_N@Z @ 1681 NONAME ; void QDeclarativeItem::activeFocusChanged(bool) - ?focusScopeItemChange@QDeclarativeItemPrivate@@UAEX_N@Z @ 1682 NONAME ; void QDeclarativeItemPrivate::focusScopeItemChange(bool) + ?activeFocusChanged@QDeclarativeItem@@IAEX_N@Z @ 1679 NONAME ; void QDeclarativeItem::activeFocusChanged(bool) + ?focusScopeItemChange@QDeclarativeItemPrivate@@UAEX_N@Z @ 1680 NONAME ; void QDeclarativeItemPrivate::focusScopeItemChange(bool) + ?hasActiveFocus@QDeclarativeItem@@QBE_NXZ @ 1681 NONAME ; bool QDeclarativeItem::hasActiveFocus(void) const + ?engine@QDeclarativeView@@QBEPAVQDeclarativeEngine@@XZ @ 1682 NONAME ; class QDeclarativeEngine * QDeclarativeView::engine(void) const ?rootContext@QDeclarativeView@@QBEPAVQDeclarativeContext@@XZ @ 1683 NONAME ; class QDeclarativeContext * QDeclarativeView::rootContext(void) const ?rootContext@QDeclarativeEngine@@QBEPAVQDeclarativeContext@@XZ @ 1684 NONAME ; class QDeclarativeContext * QDeclarativeEngine::rootContext(void) const - ?hasActiveFocus@QDeclarativeItem@@QBE_NXZ @ 1685 NONAME ; bool QDeclarativeItem::hasActiveFocus(void) const + ?qmlregister@QDeclarativePrivate@@YAHW4RegistrationType@1@PAX@Z @ 1685 NONAME ; int QDeclarativePrivate::qmlregister(enum QDeclarativePrivate::RegistrationType, void *) + ?hasValue@QDeclarativeOpenMetaObject@@QBE_NH@Z @ 1686 NONAME ; bool QDeclarativeOpenMetaObject::hasValue(int) const diff -r ef0373b55136 -r 758a864f9613 src/s60installs/bwins/QtGuiu.def --- a/src/s60installs/bwins/QtGuiu.def Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/bwins/QtGuiu.def Mon Oct 04 01:19:32 2010 +0300 @@ -4148,7 +4148,7 @@ ?ensureSceneTransformRecursive@QGraphicsItemPrivate@@QAEXPAPAVQGraphicsItem@@@Z @ 4147 NONAME ; void QGraphicsItemPrivate::ensureSceneTransformRecursive(class QGraphicsItem * *) ?ensureSequentialSiblingIndex@QGraphicsItemPrivate@@QAEXXZ @ 4148 NONAME ; void QGraphicsItemPrivate::ensureSequentialSiblingIndex(void) ?ensureSortedChildren@QGraphicsItemPrivate@@QAEXXZ @ 4149 NONAME ; void QGraphicsItemPrivate::ensureSortedChildren(void) - ?ensureSpace@QTextEngine@@QBEXH@Z @ 4150 NONAME ; void QTextEngine::ensureSpace(int) const + ?ensureSpace@QTextEngine@@QBEXH@Z @ 4150 NONAME ABSENT ; void QTextEngine::ensureSpace(int) const ?ensureVisible@QGraphicsItem@@QAEXABVQRectF@@HH@Z @ 4151 NONAME ; void QGraphicsItem::ensureVisible(class QRectF const &, int, int) ?ensureVisible@QGraphicsItem@@QAEXMMMMHH@Z @ 4152 NONAME ; void QGraphicsItem::ensureVisible(float, float, float, float, int, int) ?ensureVisible@QGraphicsView@@QAEXABVQRectF@@HH@Z @ 4153 NONAME ; void QGraphicsView::ensureVisible(class QRectF const &, int, int) @@ -8181,7 +8181,7 @@ ?rowsInserted@QTreeView@@MAEXABVQModelIndex@@HH@Z @ 8180 NONAME ; void QTreeView::rowsInserted(class QModelIndex const &, int, int) ?rowsRemoved@QTreeView@@IAEXABVQModelIndex@@HH@Z @ 8181 NONAME ; void QTreeView::rowsRemoved(class QModelIndex const &, int, int) ?rubberBandSelectionMode@QGraphicsView@@QBE?AW4ItemSelectionMode@Qt@@XZ @ 8182 NONAME ; enum Qt::ItemSelectionMode QGraphicsView::rubberBandSelectionMode(void) const - ?s60AdjustedPosition@QDialog@@AAE_NXZ @ 8183 NONAME ABSENT ; bool QDialog::s60AdjustedPosition(void) + ?symbianAdjustedPosition@QDialog@@AAE_NXZ @ 8183 NONAME ; bool QDialog::symbianAdjustedPosition(void) ?s60UpdateIsOpaque@QWidgetPrivate@@QAEXXZ @ 8184 NONAME ; void QWidgetPrivate::s60UpdateIsOpaque(void) ?saturation@QColor@@QBEHXZ @ 8185 NONAME ; int QColor::saturation(void) const ?saturationF@QColor@@QBEMXZ @ 8186 NONAME ; float QColor::saturationF(void) const @@ -12372,7 +12372,7 @@ ?staticMetaObject@QBoxLayout@@2UQMetaObject@@B @ 12371 NONAME ; struct QMetaObject const QBoxLayout::staticMetaObject ?qt_tab_all_widgets@@3_NA @ 12372 NONAME ; bool qt_tab_all_widgets ?staticMetaObject@QSpinBox@@2UQMetaObject@@B @ 12373 NONAME ; struct QMetaObject const QSpinBox::staticMetaObject - ?scanCodeCache@QApplicationPrivate@@0V?$QHash@HI@@A @ 12374 NONAME ; class QHash QApplicationPrivate::scanCodeCache + ?scanCodeCache@QApplicationPrivate@@0V?$QHash@HI@@A @ 12374 NONAME ABSENT ; class QHash QApplicationPrivate::scanCodeCache ?staticMetaObject@QItemSelectionModel@@2UQMetaObject@@B @ 12375 NONAME ; struct QMetaObject const QItemSelectionModel::staticMetaObject ?staticMetaObject@QItemDelegate@@2UQMetaObject@@B @ 12376 NONAME ; struct QMetaObject const QItemDelegate::staticMetaObject ?staticMetaObject@QPushButton@@2UQMetaObject@@B @ 12377 NONAME ; struct QMetaObject const QPushButton::staticMetaObject @@ -12548,9 +12548,9 @@ ?timerEvent@QS60Style@@MAEXPAVQTimerEvent@@@Z @ 12547 NONAME ; void QS60Style::timerEvent(class QTimerEvent *) ?updateAncestorFlags@QGraphicsItemPrivate@@QAEXXZ @ 12548 NONAME ; void QGraphicsItemPrivate::updateAncestorFlags(void) ?updateChildWithGraphicsEffectFlagRecursively@QGraphicsItemPrivate@@QAEXXZ @ 12549 NONAME ; void QGraphicsItemPrivate::updateChildWithGraphicsEffectFlagRecursively(void) - ?isOpacityNull@QGraphicsItemPrivate@@SA_NM@Z @ 12550 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(float) - ?isOpacityNull@QGraphicsItemPrivate@@QBE_NXZ @ 12551 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(void) const - ?api@QEglContext@@QBE?AW4API@QEgl@@XZ @ 12552 NONAME ABSENT ; enum QEgl::API QEglContext::api(void) const + ?api@QEglContext@@QBE?AW4API@QEgl@@XZ @ 12550 NONAME ; enum QEgl::API QEglContext::api(void) const + ?display@QEglContext@@SAHXZ @ 12551 NONAME ABSENT ; int QEglContext::display(void) + ?isOpacityNull@QGraphicsItemPrivate@@SA_NM@Z @ 12552 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(float) ?chooseConfig@QEglContext@@QAE_NABVQEglProperties@@W4PixelFormatMatch@QEgl@@@Z @ 12553 NONAME ; bool QEglContext::chooseConfig(class QEglProperties const &, enum QEgl::PixelFormatMatch) ?destroySurface@QEglContext@@QAEXH@Z @ 12554 NONAME ; void QEglContext::destroySurface(int) ?lazyDoneCurrent@QEglContext@@QAE_NXZ @ 12555 NONAME ; bool QEglContext::lazyDoneCurrent(void) @@ -12559,343 +12559,333 @@ ?configAttrib@QEglContext@@QBE_NHPAH@Z @ 12558 NONAME ABSENT ; bool QEglContext::configAttrib(int, int *) const ??0QEglProperties@@QAE@ABV0@@Z @ 12559 NONAME ; QEglProperties::QEglProperties(class QEglProperties const &) ?config@QEglContext@@QBEHXZ @ 12560 NONAME ; int QEglContext::config(void) const - ?openDisplay@QEglContext@@QAE_NPAVQPaintDevice@@@Z @ 12561 NONAME ABSENT ; bool QEglContext::openDisplay(class QPaintDevice *) + ?clearFocusHelper@QGraphicsItemPrivate@@QAEX_N@Z @ 12561 NONAME ; void QGraphicsItemPrivate::clearFocusHelper(bool) ?error@QEglContext@@SAHXZ @ 12562 NONAME ABSENT ; int QEglContext::error(void) ?swapBuffers@QEglContext@@QAE_NH@Z @ 12563 NONAME ; bool QEglContext::swapBuffers(int) - ?setApi@QEglContext@@QAEXW4API@QEgl@@@Z @ 12564 NONAME ; void QEglContext::setApi(enum QEgl::API) - ?makeCurrent@QEglContext@@QAE_NH@Z @ 12565 NONAME ; bool QEglContext::makeCurrent(int) - ?createSurface@QEglContext@@QAEHPAVQPaintDevice@@PBVQEglProperties@@@Z @ 12566 NONAME ; int QEglContext::createSurface(class QPaintDevice *, class QEglProperties const *) - ?dumpAllConfigs@QEglContext@@QAEXXZ @ 12567 NONAME ABSENT ; void QEglContext::dumpAllConfigs(void) - ?reduceConfiguration@QEglProperties@@QAE_NXZ @ 12568 NONAME ; bool QEglProperties::reduceConfiguration(void) - ?removeValue@QEglProperties@@QAE_NH@Z @ 12569 NONAME ; bool QEglProperties::removeValue(int) - ?toString@QEglProperties@@QBE?AVQString@@XZ @ 12570 NONAME ; class QString QEglProperties::toString(void) const - ?dumpAllConfigs@QEglProperties@@SAXXZ @ 12571 NONAME ABSENT ; void QEglProperties::dumpAllConfigs(void) - ?defaultDisplay@QEglContext@@SAHPAVQPaintDevice@@@Z @ 12572 NONAME ABSENT ; int QEglContext::defaultDisplay(class QPaintDevice *) - ?configProperties@QEglContext@@QBE?AVQEglProperties@@H@Z @ 12573 NONAME ABSENT ; class QEglProperties QEglContext::configProperties(int) const - ?properties@QEglProperties@@QBEPBHXZ @ 12574 NONAME ; int const * QEglProperties::properties(void) const - ??0QEglContext@@QAE@XZ @ 12575 NONAME ; QEglContext::QEglContext(void) - ??1QEglContext@@QAE@XZ @ 12576 NONAME ; QEglContext::~QEglContext(void) - ?isValid@QEglContext@@QBE_NXZ @ 12577 NONAME ; bool QEglContext::isValid(void) const - ?value@QEglProperties@@QBEHH@Z @ 12578 NONAME ; int QEglProperties::value(int) const - ?clearError@QEglContext@@SAXXZ @ 12579 NONAME ABSENT ; void QEglContext::clearError(void) - ??0QEglProperties@@QAE@H@Z @ 12580 NONAME ; QEglProperties::QEglProperties(int) - ?setValue@QEglProperties@@QAEXHH@Z @ 12581 NONAME ; void QEglProperties::setValue(int, int) - ?setPaintDeviceFormat@QEglProperties@@QAEXPAVQPaintDevice@@@Z @ 12582 NONAME ; void QEglProperties::setPaintDeviceFormat(class QPaintDevice *) - ?destroy@QEglContext@@QAEXXZ @ 12583 NONAME ABSENT ; void QEglContext::destroy(void) - ?setRenderableType@QEglProperties@@QAEXW4API@QEgl@@@Z @ 12584 NONAME ; void QEglProperties::setRenderableType(enum QEgl::API) - ?setContext@QEglContext@@QAEXH@Z @ 12585 NONAME ; void QEglContext::setContext(int) - ?waitClient@QEglContext@@QAEXXZ @ 12586 NONAME ABSENT ; void QEglContext::waitClient(void) - ?isEmpty@QEglProperties@@QBE_NXZ @ 12587 NONAME ; bool QEglProperties::isEmpty(void) const - ?getDisplay@QEglContext@@CAHPAVQPaintDevice@@@Z @ 12588 NONAME ABSENT ; int QEglContext::getDisplay(class QPaintDevice *) - ?isSharing@QEglContext@@QBE_NXZ @ 12589 NONAME ; bool QEglContext::isSharing(void) const - ?isCurrent@QEglContext@@QBE_NXZ @ 12590 NONAME ; bool QEglContext::isCurrent(void) const - ??0QEglProperties@@QAE@XZ @ 12591 NONAME ; QEglProperties::QEglProperties(void) - ?extensions@QEglContext@@SA?AVQString@@XZ @ 12592 NONAME ABSENT ; class QString QEglContext::extensions(void) - ?setCurrentContext@QEglContext@@CAXW4API@QEgl@@PAV1@@Z @ 12593 NONAME ; void QEglContext::setCurrentContext(enum QEgl::API, class QEglContext *) - ??1QEglProperties@@QAE@XZ @ 12594 NONAME ; QEglProperties::~QEglProperties(void) - ?createContext@QEglContext@@QAE_NPAV1@PBVQEglProperties@@@Z @ 12595 NONAME ; bool QEglContext::createContext(class QEglContext *, class QEglProperties const *) - ?setConfig@QEglContext@@QAEXH@Z @ 12596 NONAME ; void QEglContext::setConfig(int) - ?hasExtension@QEglContext@@SA_NPBD@Z @ 12597 NONAME ABSENT ; bool QEglContext::hasExtension(char const *) - ?doneCurrent@QEglContext@@QAE_NXZ @ 12598 NONAME ; bool QEglContext::doneCurrent(void) - ?display@QEglContext@@QBEHXZ @ 12599 NONAME ABSENT ; int QEglContext::display(void) const - ?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12600 NONAME ; void QEglProperties::setPixelFormat(enum QImage::Format) - ?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12601 NONAME ; class QEglContext * QEglContext::currentContext(enum QEgl::API) - ?errorString@QEglContext@@SA?AVQString@@H@Z @ 12602 NONAME ABSENT ; class QString QEglContext::errorString(int) - ?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @ 12603 NONAME ; bool QFontDatabase::removeAllApplicationFonts() - ??0FileInfo@QZipReader@@QAE@XZ @ 12604 NONAME ; QZipReader::FileInfo::FileInfo(void) - ??0QAbstractScrollAreaPrivate@@QAE@XZ @ 12605 NONAME ; QAbstractScrollAreaPrivate::QAbstractScrollAreaPrivate(void) - ??0QGraphicsViewPrivate@@QAE@XZ @ 12606 NONAME ; QGraphicsViewPrivate::QGraphicsViewPrivate(void) - ??0QKeySequence@@QAE@ABVQString@@W4SequenceFormat@0@@Z @ 12607 NONAME ; QKeySequence::QKeySequence(class QString const &, enum QKeySequence::SequenceFormat) - ??0QStaticText@@QAE@ABV0@@Z @ 12608 NONAME ; QStaticText::QStaticText(class QStaticText const &) - ??0QStaticText@@QAE@ABVQString@@ABVQSizeF@@@Z @ 12609 NONAME ABSENT ; QStaticText::QStaticText(class QString const &, class QSizeF const &) - ??0QStaticText@@QAE@XZ @ 12610 NONAME ; QStaticText::QStaticText(void) - ??0QStaticTextItem@@QAE@XZ @ 12611 NONAME ; QStaticTextItem::QStaticTextItem(void) - ??0QZipReader@@QAE@ABVQString@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@@Z @ 12612 NONAME ; QZipReader::QZipReader(class QString const &, class QFlags) - ??0QZipReader@@QAE@PAVQIODevice@@@Z @ 12613 NONAME ; QZipReader::QZipReader(class QIODevice *) - ??1FileInfo@QZipReader@@QAE@XZ @ 12614 NONAME ; QZipReader::FileInfo::~FileInfo(void) - ??1QAbstractScrollAreaPrivate@@UAE@XZ @ 12615 NONAME ; QAbstractScrollAreaPrivate::~QAbstractScrollAreaPrivate(void) - ??1QGraphicsViewPrivate@@UAE@XZ @ 12616 NONAME ; QGraphicsViewPrivate::~QGraphicsViewPrivate(void) - ??1QStaticText@@QAE@XZ @ 12617 NONAME ; QStaticText::~QStaticText(void) - ??1QStaticTextItem@@QAE@XZ @ 12618 NONAME ; QStaticTextItem::~QStaticTextItem(void) - ??1QZipReader@@QAE@XZ @ 12619 NONAME ; QZipReader::~QZipReader(void) - ??4FileInfo@QZipReader@@QAEAAU01@ABU01@@Z @ 12620 NONAME ; struct QZipReader::FileInfo & QZipReader::FileInfo::operator=(struct QZipReader::FileInfo const &) - ??4QStaticText@@QAEAAV0@ABV0@@Z @ 12621 NONAME ; class QStaticText & QStaticText::operator=(class QStaticText const &) - ??8QStaticText@@QBE_NABV0@@Z @ 12622 NONAME ; bool QStaticText::operator==(class QStaticText const &) const - ??9QStaticText@@QBE_NABV0@@Z @ 12623 NONAME ; bool QStaticText::operator!=(class QStaticText const &) const - ??_EQAbstractScrollAreaPrivate@@UAE@I@Z @ 12624 NONAME ; QAbstractScrollAreaPrivate::~QAbstractScrollAreaPrivate(unsigned int) - ??_EQGraphicsViewPrivate@@UAE@I@Z @ 12625 NONAME ; QGraphicsViewPrivate::~QGraphicsViewPrivate(unsigned int) - ?_q_hslide@QAbstractScrollAreaPrivate@@QAEXH@Z @ 12626 NONAME ; void QAbstractScrollAreaPrivate::_q_hslide(int) + ?canKeypadNavigate@QWidgetPrivate@@SA_NW4Orientation@Qt@@@Z @ 12564 NONAME ; bool QWidgetPrivate::canKeypadNavigate(enum Qt::Orientation) + ?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @ 12565 NONAME ; bool QFontDatabase::removeAllApplicationFonts(void) + ?setApi@QEglContext@@QAEXW4API@QEgl@@@Z @ 12566 NONAME ; void QEglContext::setApi(enum QEgl::API) + ?updateDisplayText@QLineControl@@AAEX_N@Z @ 12567 NONAME ; void QLineControl::updateDisplayText(bool) + ?makeCurrent@QEglContext@@QAE_NH@Z @ 12568 NONAME ; bool QEglContext::makeCurrent(int) + ?isPixmapCached@QImagePixmapCleanupHooks@@SA_NABVQPixmap@@@Z @ 12569 NONAME ; bool QImagePixmapCleanupHooks::isPixmapCached(class QPixmap const &) + ?createSurface@QEglContext@@QAEHPAVQPaintDevice@@PBVQEglProperties@@@Z @ 12570 NONAME ; int QEglContext::createSurface(class QPaintDevice *, class QEglProperties const *) + ?dumpAllConfigs@QEglContext@@QAEXXZ @ 12571 NONAME ABSENT ; void QEglContext::dumpAllConfigs(void) + ?reduceConfiguration@QEglProperties@@QAE_NXZ @ 12572 NONAME ; bool QEglProperties::reduceConfiguration(void) + ?nativeDisplay@QEglContext@@CAHXZ @ 12573 NONAME ABSENT ; int QEglContext::nativeDisplay(void) + ?getGlyphBearings@QFontEngine@@UAEXIPAM0@Z @ 12574 NONAME ; void QFontEngine::getGlyphBearings(unsigned int, float *, float *) + ?removeValue@QEglProperties@@QAE_NH@Z @ 12575 NONAME ; bool QEglProperties::removeValue(int) + ?toString@QEglProperties@@QBE?AVQString@@XZ @ 12576 NONAME ; class QString QEglProperties::toString(void) const + ?isOpacityNull@QGraphicsItemPrivate@@QBE_NXZ @ 12577 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(void) const + ?dumpAllConfigs@QEglProperties@@SAXXZ @ 12578 NONAME ABSENT ; void QEglProperties::dumpAllConfigs(void) + ?inTabWidget@QWidgetPrivate@@SA_NPAVQWidget@@@Z @ 12579 NONAME ; bool QWidgetPrivate::inTabWidget(class QWidget *) + ?configProperties@QEglContext@@QBE?AVQEglProperties@@H@Z @ 12580 NONAME ABSENT ; class QEglProperties QEglContext::configProperties(int) const + ?properties@QEglProperties@@QBEPBHXZ @ 12581 NONAME ; int const * QEglProperties::properties(void) const + ?destroyContext@QEglContext@@QAEXXZ @ 12582 NONAME ; void QEglContext::destroyContext(void) + ??0QEglContext@@QAE@XZ @ 12583 NONAME ; QEglContext::QEglContext(void) + ??1QEglContext@@QAE@XZ @ 12584 NONAME ; QEglContext::~QEglContext(void) + ?isValid@QEglContext@@QBE_NXZ @ 12585 NONAME ; bool QEglContext::isValid(void) const + ?value@QEglProperties@@QBEHH@Z @ 12586 NONAME ; int QEglProperties::value(int) const + ?clearError@QEglContext@@SAXXZ @ 12587 NONAME ABSENT ; void QEglContext::clearError(void) + ??0QEglProperties@@QAE@H@Z @ 12588 NONAME ; QEglProperties::QEglProperties(int) + ?setValue@QEglProperties@@QAEXHH@Z @ 12589 NONAME ; void QEglProperties::setValue(int, int) + ?setPaintDeviceFormat@QEglProperties@@QAEXPAVQPaintDevice@@@Z @ 12590 NONAME ; void QEglProperties::setPaintDeviceFormat(class QPaintDevice *) + ?isImageCached@QImagePixmapCleanupHooks@@SA_NABVQImage@@@Z @ 12591 NONAME ; bool QImagePixmapCleanupHooks::isImageCached(class QImage const &) + ?setRenderableType@QEglProperties@@QAEXW4API@QEgl@@@Z @ 12592 NONAME ; void QEglProperties::setRenderableType(enum QEgl::API) + ?setContext@QEglContext@@QAEXH@Z @ 12593 NONAME ; void QEglContext::setContext(int) + ?waitClient@QEglContext@@QAEXXZ @ 12594 NONAME ABSENT ; void QEglContext::waitClient(void) + ?isEmpty@QEglProperties@@QBE_NXZ @ 12595 NONAME ; bool QEglProperties::isEmpty(void) const + ?dpy@QEglContext@@0HA @ 12596 NONAME ABSENT ; int QEglContext::dpy + ?isSharing@QEglContext@@QBE_NXZ @ 12597 NONAME ; bool QEglContext::isSharing(void) const + ?isCurrent@QEglContext@@QBE_NXZ @ 12598 NONAME ; bool QEglContext::isCurrent(void) const + ??0QEglProperties@@QAE@XZ @ 12599 NONAME ; QEglProperties::QEglProperties(void) + ?extensions@QEglContext@@SA?AVQString@@XZ @ 12600 NONAME ABSENT ; class QString QEglContext::extensions(void) + ?setCurrentContext@QEglContext@@CAXW4API@QEgl@@PAV1@@Z @ 12601 NONAME ; void QEglContext::setCurrentContext(enum QEgl::API, class QEglContext *) + ??1QEglProperties@@QAE@XZ @ 12602 NONAME ; QEglProperties::~QEglProperties(void) + ?createContext@QEglContext@@QAE_NPAV1@PBVQEglProperties@@@Z @ 12603 NONAME ; bool QEglContext::createContext(class QEglContext *, class QEglProperties const *) + ?setConfig@QEglContext@@QAEXH@Z @ 12604 NONAME ; void QEglContext::setConfig(int) + ?hasExtension@QEglContext@@SA_NPBD@Z @ 12605 NONAME ABSENT ; bool QEglContext::hasExtension(char const *) + ?doneCurrent@QEglContext@@QAE_NXZ @ 12606 NONAME ; bool QEglContext::doneCurrent(void) + ?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12607 NONAME ; void QEglProperties::setPixelFormat(enum QImage::Format) + ?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12608 NONAME ; class QEglContext * QEglContext::currentContext(enum QEgl::API) + ?setFocusHelper@QGraphicsItemPrivate@@QAEXW4FocusReason@Qt@@_N1@Z @ 12609 NONAME ; void QGraphicsItemPrivate::setFocusHelper(enum Qt::FocusReason, bool, bool) + ?errorString@QEglContext@@SA?AVQString@@H@Z @ 12610 NONAME ABSENT ; class QString QEglContext::errorString(int) + ?positionInBlock@QTextCursor@@QBEHXZ @ 12611 NONAME ; int QTextCursor::positionInBlock(void) const + ?height@QGraphicsItemPrivate@@UBEMXZ @ 12612 NONAME ; float QGraphicsItemPrivate::height(void) const + ?clearUndoRedoStacks@QTextDocument@@QAEXW4Stacks@1@@Z @ 12613 NONAME ; void QTextDocument::clearUndoRedoStacks(enum QTextDocument::Stacks) + ?mapToViewRect@QGraphicsViewPrivate@@QBE?AVQRect@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12614 NONAME ; class QRect QGraphicsViewPrivate::mapToViewRect(class QGraphicsItem const *, class QRectF const &) const + ?findItems@QGraphicsViewPrivate@@QBE?AV?$QList@PAVQGraphicsItem@@@@ABVQRegion@@PA_NABVQTransform@@@Z @ 12615 NONAME ; class QList QGraphicsViewPrivate::findItems(class QRegion const &, bool *, class QTransform const &) const + ?constScanLine@QImage@@QBEPBEH@Z @ 12616 NONAME ; unsigned char const * QImage::constScanLine(int) const + ?text@QStaticText@@QBE?AVQString@@XZ @ 12617 NONAME ; class QString QStaticText::text(void) const + ?updateLastCenterPoint@QGraphicsViewPrivate@@QAEXXZ @ 12618 NONAME ; void QGraphicsViewPrivate::updateLastCenterPoint(void) + ?sideWidget@QWizard@@QBEPAVQWidget@@XZ @ 12619 NONAME ; class QWidget * QWizard::sideWidget(void) const + ?verticalScroll@QGraphicsViewPrivate@@QBE_JXZ @ 12620 NONAME ; long long QGraphicsViewPrivate::verticalScroll(void) const + ?fileInfoList@QZipReader@@QBE?AV?$QList@UFileInfo@QZipReader@@@@XZ @ 12621 NONAME ; class QList QZipReader::fileInfoList(void) const + ?setSideWidget@QWizard@@QAEXPAVQWidget@@@Z @ 12622 NONAME ; void QWizard::setSideWidget(class QWidget *) + ?paste@QLineControl@@QAEXW4Mode@QClipboard@@@Z @ 12623 NONAME ; void QLineControl::paste(enum QClipboard::Mode) + ?performanceHint@QStaticText@@QBE?AW4PerformanceHint@1@XZ @ 12624 NONAME ; enum QStaticText::PerformanceHint QStaticText::performanceHint(void) const + ?frameStartIndex@QPaintBuffer@@QBEHH@Z @ 12625 NONAME ; int QPaintBuffer::frameStartIndex(int) const + ??0QAbstractScrollAreaPrivate@@QAE@XZ @ 12626 NONAME ; QAbstractScrollAreaPrivate::QAbstractScrollAreaPrivate(void) ?_q_setViewportCursor@QGraphicsViewPrivate@@QAEXABVQCursor@@@Z @ 12627 NONAME ; void QGraphicsViewPrivate::_q_setViewportCursor(class QCursor const &) - ?_q_showOrHideScrollBars@QAbstractScrollAreaPrivate@@QAEXXZ @ 12628 NONAME ; void QAbstractScrollAreaPrivate::_q_showOrHideScrollBars(void) - ?_q_unsetViewportCursor@QGraphicsViewPrivate@@QAEXXZ @ 12629 NONAME ; void QGraphicsViewPrivate::_q_unsetViewportCursor(void) - ?_q_vslide@QAbstractScrollAreaPrivate@@QAEXH@Z @ 12630 NONAME ; void QAbstractScrollAreaPrivate::_q_vslide(int) - ?allocStyleOptionsArray@QGraphicsViewPrivate@@QAEPAVQStyleOptionGraphicsItem@@H@Z @ 12631 NONAME ; class QStyleOptionGraphicsItem * QGraphicsViewPrivate::allocStyleOptionsArray(int) - ?anchorAt@QPlainTextEdit@@QBE?AVQString@@ABVQPoint@@@Z @ 12632 NONAME ; class QString QPlainTextEdit::anchorAt(class QPoint const &) const - ?assign@QKeySequence@@AAEHABVQString@@W4SequenceFormat@1@@Z @ 12633 NONAME ; int QKeySequence::assign(class QString const &, enum QKeySequence::SequenceFormat) - ?autoFillBackground@QGraphicsWidget@@QBE_NXZ @ 12634 NONAME ; bool QGraphicsWidget::autoFillBackground(void) const - ?canKeypadNavigate@QWidgetPrivate@@SA_NW4Orientation@Qt@@@Z @ 12635 NONAME ; bool QWidgetPrivate::canKeypadNavigate(enum Qt::Orientation) - ?centerView@QGraphicsViewPrivate@@QAEXW4ViewportAnchor@QGraphicsView@@@Z @ 12636 NONAME ; void QGraphicsViewPrivate::centerView(enum QGraphicsView::ViewportAnchor) - ?clearUndoRedoStacks@QTextDocument@@QAEXW4Stacks@1@@Z @ 12637 NONAME ; void QTextDocument::clearUndoRedoStacks(enum QTextDocument::Stacks) - ?close@QZipReader@@QAEXXZ @ 12638 NONAME ; void QZipReader::close(void) - ?constBits@QImage@@QBEPBEXZ @ 12639 NONAME ; unsigned char const * QImage::constBits(void) const - ?constScanLine@QImage@@QBEPBEH@Z @ 12640 NONAME ; unsigned char const * QImage::constScanLine(int) const - ?contentsOffset@QAbstractScrollAreaPrivate@@UBE?AVQPoint@@XZ @ 12641 NONAME ; class QPoint QAbstractScrollAreaPrivate::contentsOffset(void) const - ?convertFromImage@QPixmap@@QAE_NABVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12642 NONAME ; bool QPixmap::convertFromImage(class QImage const &, class QFlags) - ?count@QZipReader@@QBEHXZ @ 12643 NONAME ; int QZipReader::count(void) const - ?create@Fragment@QPainter@@SA?AV12@ABVQPointF@@ABVQRectF@@MMMM@Z @ 12644 NONAME ABSENT ; class QPainter::Fragment QPainter::Fragment::create(class QPointF const &, class QRectF const &, float, float, float, float) - ?detach@QStaticText@@AAEXXZ @ 12645 NONAME ; void QStaticText::detach(void) - ?directoryLoaded@QFileSystemModel@@IAEXABVQString@@@Z @ 12646 NONAME ; void QFileSystemModel::directoryLoaded(class QString const &) - ?dispatchPendingUpdateRequests@QGraphicsViewPrivate@@QAEXXZ @ 12647 NONAME ; void QGraphicsViewPrivate::dispatchPendingUpdateRequests(void) - ?drawPixmapFragments@QPaintEngineEx@@UAEXPBVFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4FragmentHint@QPainter@@@@@Z @ 12648 NONAME ABSENT ; void QPaintEngineEx::drawPixmapFragments(class QPainter::Fragment const *, int, class QPixmap const &, class QFlags) - ?drawPixmapFragments@QPainter@@QAEXPBVFragment@1@HABVQPixmap@@V?$QFlags@W4FragmentHint@QPainter@@@@@Z @ 12649 NONAME ABSENT ; void QPainter::drawPixmapFragments(class QPainter::Fragment const *, int, class QPixmap const &, class QFlags) - ?drawStaticText@QPainter@@QAEXABVQPoint@@ABVQStaticText@@@Z @ 12650 NONAME ; void QPainter::drawStaticText(class QPoint const &, class QStaticText const &) - ?drawStaticText@QPainter@@QAEXABVQPointF@@ABVQStaticText@@@Z @ 12651 NONAME ; void QPainter::drawStaticText(class QPointF const &, class QStaticText const &) - ?drawStaticText@QPainter@@QAEXHHABVQStaticText@@@Z @ 12652 NONAME ; void QPainter::drawStaticText(int, int, class QStaticText const &) - ?entryInfoAt@QZipReader@@QBE?AUFileInfo@1@H@Z @ 12653 NONAME ; struct QZipReader::FileInfo QZipReader::entryInfoAt(int) const - ?exists@QZipReader@@QBE_NXZ @ 12654 NONAME ; bool QZipReader::exists(void) const - ?extractAll@QZipReader@@QBE_NABVQString@@@Z @ 12655 NONAME ; bool QZipReader::extractAll(class QString const &) const - ?fileData@QZipReader@@QBE?AVQByteArray@@ABVQString@@@Z @ 12656 NONAME ; class QByteArray QZipReader::fileData(class QString const &) const - ?fileInfoList@QZipReader@@QBE?AV?$QList@UFileInfo@QZipReader@@@@XZ @ 12657 NONAME ; class QList QZipReader::fileInfoList(void) const - ?findItems@QGraphicsViewPrivate@@QBE?AV?$QList@PAVQGraphicsItem@@@@ABVQRegion@@PA_NABVQTransform@@@Z @ 12658 NONAME ; class QList QGraphicsViewPrivate::findItems(class QRegion const &, bool *, class QTransform const &) const - ?fixup@QIntValidator@@UBEXAAVQString@@@Z @ 12659 NONAME ; void QIntValidator::fixup(class QString &) const - ?freeStyleOptionsArray@QGraphicsViewPrivate@@QAEXPAVQStyleOptionGraphicsItem@@@Z @ 12660 NONAME ; void QGraphicsViewPrivate::freeStyleOptionsArray(class QStyleOptionGraphicsItem *) - ?getPixmapCursor@QApplicationPrivate@@QAE?AVQPixmap@@W4CursorShape@Qt@@@Z @ 12661 NONAME ; class QPixmap QApplicationPrivate::getPixmapCursor(enum Qt::CursorShape) - ?getSubRange@QBezier@@QBE?AV1@MM@Z @ 12662 NONAME ; class QBezier QBezier::getSubRange(float, float) const - ?hasSelectedText@QLabel@@QBE_NXZ @ 12663 NONAME ; bool QLabel::hasSelectedText(void) const - ?horizontalScroll@QGraphicsViewPrivate@@QBE_JXZ @ 12664 NONAME ; long long QGraphicsViewPrivate::horizontalScroll(void) const - ?inTabWidget@QWidgetPrivate@@SA_NPAVQWidget@@@Z @ 12665 NONAME ; bool QWidgetPrivate::inTabWidget(class QWidget *) - ?init@QAbstractScrollAreaPrivate@@QAEXXZ @ 12666 NONAME ; void QAbstractScrollAreaPrivate::init(void) - ?isImageCached@QImagePixmapCleanupHooks@@SA_NABVQImage@@@Z @ 12667 NONAME ; bool QImagePixmapCleanupHooks::isImageCached(class QImage const &) - ?isPixmapCached@QImagePixmapCleanupHooks@@SA_NABVQPixmap@@@Z @ 12668 NONAME ; bool QImagePixmapCleanupHooks::isPixmapCached(class QPixmap const &) - ?isReadable@QZipReader@@QBE_NXZ @ 12669 NONAME ; bool QZipReader::isReadable(void) const - ?isValidColor@QColor@@SA_NABVQString@@@Z @ 12670 NONAME ; bool QColor::isValidColor(class QString const &) - ?layoutChildren@QAbstractScrollAreaPrivate@@QAEXXZ @ 12671 NONAME ; void QAbstractScrollAreaPrivate::layoutChildren(void) - ?mapBy@QBezier@@QBE?AV1@ABVQTransform@@@Z @ 12672 NONAME ; class QBezier QBezier::mapBy(class QTransform const &) const - ?mapRectFromScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABV2@@Z @ 12673 NONAME ; class QRectF QGraphicsViewPrivate::mapRectFromScene(class QRectF const &) const - ?mapRectToScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABVQRect@@@Z @ 12674 NONAME ; class QRectF QGraphicsViewPrivate::mapRectToScene(class QRect const &) const - ?mapToScene@QGraphicsViewPrivate@@QBE?AVQPointF@@ABV2@@Z @ 12675 NONAME ; class QPointF QGraphicsViewPrivate::mapToScene(class QPointF const &) const - ?mapToScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABV2@@Z @ 12676 NONAME ; class QRectF QGraphicsViewPrivate::mapToScene(class QRectF const &) const - ?mapToViewRect@QGraphicsViewPrivate@@QBE?AVQRect@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12677 NONAME ; class QRect QGraphicsViewPrivate::mapToViewRect(class QGraphicsItem const *, class QRectF const &) const - ?mapToViewRegion@QGraphicsViewPrivate@@QBE?AVQRegion@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12678 NONAME ; class QRegion QGraphicsViewPrivate::mapToViewRegion(class QGraphicsItem const *, class QRectF const &) const - ?maximumSize@QStaticText@@QBE?AVQSizeF@@XZ @ 12679 NONAME ABSENT ; class QSizeF QStaticText::maximumSize(void) const - ?mouseMoveEventHandler@QGraphicsViewPrivate@@QAEXPAVQMouseEvent@@@Z @ 12680 NONAME ; void QGraphicsViewPrivate::mouseMoveEventHandler(class QMouseEvent *) - ?performanceHint@QStaticText@@QBE?AW4PerformanceHint@1@XZ @ 12681 NONAME ; enum QStaticText::PerformanceHint QStaticText::performanceHint(void) const - ?populate@QTextureGlyphCache@@QAEXPAVQFontEngine@@HPBIPBUQFixedPoint@@@Z @ 12682 NONAME ; void QTextureGlyphCache::populate(class QFontEngine *, int, unsigned int const *, struct QFixedPoint const *) - ?populateSceneDragDropEvent@QGraphicsViewPrivate@@QAEXPAVQGraphicsSceneDragDropEvent@@PAVQDropEvent@@@Z @ 12683 NONAME ; void QGraphicsViewPrivate::populateSceneDragDropEvent(class QGraphicsSceneDragDropEvent *, class QDropEvent *) - ?positionInBlock@QTextCursor@@QBEHXZ @ 12684 NONAME ; int QTextCursor::positionInBlock(void) const - ?prepare@QStaticText@@QAEXABVQTransform@@ABVQFont@@@Z @ 12685 NONAME ; void QStaticText::prepare(class QTransform const &, class QFont const &) - ?processPendingUpdates@QGraphicsViewPrivate@@QAEXXZ @ 12686 NONAME ; void QGraphicsViewPrivate::processPendingUpdates(void) - ?q_func@QAbstractScrollAreaPrivate@@AAEPAVQAbstractScrollArea@@XZ @ 12687 NONAME ; class QAbstractScrollArea * QAbstractScrollAreaPrivate::q_func(void) - ?q_func@QAbstractScrollAreaPrivate@@ABEPBVQAbstractScrollArea@@XZ @ 12688 NONAME ; class QAbstractScrollArea const * QAbstractScrollAreaPrivate::q_func(void) const - ?q_func@QGraphicsViewPrivate@@AAEPAVQGraphicsView@@XZ @ 12689 NONAME ; class QGraphicsView * QGraphicsViewPrivate::q_func(void) - ?q_func@QGraphicsViewPrivate@@ABEPBVQGraphicsView@@XZ @ 12690 NONAME ; class QGraphicsView const * QGraphicsViewPrivate::q_func(void) const - ?qt_draw_glyphs@@YAXPAVQPainter@@PBIPBVQPointF@@H@Z @ 12691 NONAME ; void qt_draw_glyphs(class QPainter *, unsigned int const *, class QPointF const *, int) - ?recalculateContentSize@QGraphicsViewPrivate@@QAEXXZ @ 12692 NONAME ; void QGraphicsViewPrivate::recalculateContentSize(void) - ?render@QWidgetPrivate@@QAEXPAVQPaintDevice@@ABVQPoint@@ABVQRegion@@V?$QFlags@W4RenderFlag@QWidget@@@@_N@Z @ 12693 NONAME ; void QWidgetPrivate::render(class QPaintDevice *, class QPoint const &, class QRegion const &, class QFlags, bool) - ?replaceScrollBar@QAbstractScrollAreaPrivate@@QAEXPAVQScrollBar@@W4Orientation@Qt@@@Z @ 12694 NONAME ; void QAbstractScrollAreaPrivate::replaceScrollBar(class QScrollBar *, enum Qt::Orientation) - ?replayLastMouseEvent@QGraphicsViewPrivate@@QAEXXZ @ 12695 NONAME ; void QGraphicsViewPrivate::replayLastMouseEvent(void) - ?rubberBandRegion@QGraphicsViewPrivate@@QBE?AVQRegion@@PBVQWidget@@ABVQRect@@@Z @ 12696 NONAME ; class QRegion QGraphicsViewPrivate::rubberBandRegion(class QWidget const *, class QRect const &) const - ?scrollBarPolicyChanged@QAbstractScrollAreaPrivate@@UAEXW4Orientation@Qt@@W4ScrollBarPolicy@3@@Z @ 12697 NONAME ; void QAbstractScrollAreaPrivate::scrollBarPolicyChanged(enum Qt::Orientation, enum Qt::ScrollBarPolicy) - ?selectedText@QLabel@@QBE?AVQString@@XZ @ 12698 NONAME ; class QString QLabel::selectedText(void) const - ?selectionStart@QLabel@@QBEHXZ @ 12699 NONAME ; int QLabel::selectionStart(void) const - ?setAutoFillBackground@QGraphicsWidget@@QAEX_N@Z @ 12700 NONAME ; void QGraphicsWidget::setAutoFillBackground(bool) - ?setColorFromString@QColor@@AAE_NABVQString@@@Z @ 12701 NONAME ; bool QColor::setColorFromString(class QString const &) - ?setMaximumSize@QStaticText@@QAEXABVQSizeF@@@Z @ 12702 NONAME ABSENT ; void QStaticText::setMaximumSize(class QSizeF const &) - ?setPerformanceHint@QStaticText@@QAEXW4PerformanceHint@1@@Z @ 12703 NONAME ; void QStaticText::setPerformanceHint(enum QStaticText::PerformanceHint) - ?setSelection@QLabel@@QAEXHH@Z @ 12704 NONAME ; void QLabel::setSelection(int, int) - ?setText@QStaticText@@QAEXABVQString@@@Z @ 12705 NONAME ; void QStaticText::setText(class QString const &) - ?setTextFormat@QStaticText@@QAEXW4TextFormat@Qt@@@Z @ 12706 NONAME ; void QStaticText::setTextFormat(enum Qt::TextFormat) - ?setUserData@QStaticTextItem@@QAEXPAVQStaticTextUserData@@@Z @ 12707 NONAME ; void QStaticTextItem::setUserData(class QStaticTextUserData *) - ?size@QStaticText@@QBE?AVQSizeF@@XZ @ 12708 NONAME ; class QSizeF QStaticText::size(void) const - ?status@QZipReader@@QBE?AW4Status@1@XZ @ 12709 NONAME ; enum QZipReader::Status QZipReader::status(void) const - ?storeDragDropEvent@QGraphicsViewPrivate@@QAEXPBVQGraphicsSceneDragDropEvent@@@Z @ 12710 NONAME ; void QGraphicsViewPrivate::storeDragDropEvent(class QGraphicsSceneDragDropEvent const *) - ?storeMouseEvent@QGraphicsViewPrivate@@QAEXPAVQMouseEvent@@@Z @ 12711 NONAME ; void QGraphicsViewPrivate::storeMouseEvent(class QMouseEvent *) - ?text@QStaticText@@QBE?AVQString@@XZ @ 12712 NONAME ; class QString QStaticText::text(void) const - ?textFormat@QStaticText@@QBE?AW4TextFormat@Qt@@XZ @ 12713 NONAME ; enum Qt::TextFormat QStaticText::textFormat(void) const - ?translateTouchEvent@QGraphicsViewPrivate@@SAXPAV1@PAVQTouchEvent@@@Z @ 12714 NONAME ; void QGraphicsViewPrivate::translateTouchEvent(class QGraphicsViewPrivate *, class QTouchEvent *) - ?updateAll@QGraphicsViewPrivate@@QAEXXZ @ 12715 NONAME ; void QGraphicsViewPrivate::updateAll(void) - ?updateInputMethodSensitivity@QGraphicsViewPrivate@@QAEXXZ @ 12716 NONAME ; void QGraphicsViewPrivate::updateInputMethodSensitivity(void) - ?updateLastCenterPoint@QGraphicsViewPrivate@@QAEXXZ @ 12717 NONAME ; void QGraphicsViewPrivate::updateLastCenterPoint(void) - ?updateRect@QGraphicsViewPrivate@@QAE_NABVQRect@@@Z @ 12718 NONAME ; bool QGraphicsViewPrivate::updateRect(class QRect const &) - ?updateRegion@QGraphicsViewPrivate@@QAE_NABVQRegion@@@Z @ 12719 NONAME ABSENT ; bool QGraphicsViewPrivate::updateRegion(class QRegion const &) - ?updateScroll@QGraphicsViewPrivate@@QAEXXZ @ 12720 NONAME ; void QGraphicsViewPrivate::updateScroll(void) - ?verticalScroll@QGraphicsViewPrivate@@QBE_JXZ @ 12721 NONAME ; long long QGraphicsViewPrivate::verticalScroll(void) const - ?viewportEvent@QAbstractScrollAreaPrivate@@QAE_NPAVQEvent@@@Z @ 12722 NONAME ; bool QAbstractScrollAreaPrivate::viewportEvent(class QEvent *) - ?visibilityChanged@QToolBar@@IAEX_N@Z @ 12723 NONAME ; void QToolBar::visibilityChanged(bool) - ??0FileInfo@QZipReader@@QAE@ABU01@@Z @ 12724 NONAME ; QZipReader::FileInfo::FileInfo(struct QZipReader::FileInfo const &) - ??0QStaticText@@QAE@ABVQString@@@Z @ 12725 NONAME ; QStaticText::QStaticText(class QString const &) - ?append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12726 NONAME ABSENT ; void QGraphicsItemPrivate::append(class QDeclarativeListProperty *, class QGraphicsObject *) - ?bitPlaneCount@QImage@@QBEHXZ @ 12727 NONAME ; int QImage::bitPlaneCount(void) const - ?childrenChanged@QGraphicsObject@@IAEXXZ @ 12728 NONAME ; void QGraphicsObject::childrenChanged(void) - ?childrenList@QGraphicsItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQGraphicsObject@@@@XZ @ 12729 NONAME ; class QDeclarativeListProperty QGraphicsItemPrivate::childrenList(void) - ?clearFocusHelper@QGraphicsItemPrivate@@QAEX_N@Z @ 12730 NONAME ; void QGraphicsItemPrivate::clearFocusHelper(bool) - ?commandDescription@QPaintBuffer@@QBE?AVQString@@H@Z @ 12731 NONAME ; class QString QPaintBuffer::commandDescription(int) const - ?create@PixmapFragment@QPainter@@SA?AV12@ABVQPointF@@ABVQRectF@@MMMM@Z @ 12732 NONAME ; class QPainter::PixmapFragment QPainter::PixmapFragment::create(class QPointF const &, class QRectF const &, float, float, float, float) - ?device@QZipReader@@QBEPAVQIODevice@@XZ @ 12733 NONAME ; class QIODevice * QZipReader::device(void) const - ?drawPixmapFragments@QPaintEngineEx@@UAEXPBVPixmapFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12734 NONAME ; void QPaintEngineEx::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags) - ?drawPixmapFragments@QPainter@@QAEXPBVPixmapFragment@1@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12735 NONAME ; void QPainter::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags) - ?frameEndIndex@QPaintBuffer@@QBEHH@Z @ 12736 NONAME ; int QPaintBuffer::frameEndIndex(int) const - ?frameStartIndex@QPaintBuffer@@QBEHH@Z @ 12737 NONAME ; int QPaintBuffer::frameStartIndex(int) const - ?geometryChanged@QGraphicsWidget@@IAEXXZ @ 12738 NONAME ; void QGraphicsWidget::geometryChanged(void) - ?getGlyphBearings@QFontEngine@@UAEXIPAM0@Z @ 12739 NONAME ; void QFontEngine::getGlyphBearings(unsigned int, float *, float *) - ?height@QGraphicsItemPrivate@@UBEMXZ @ 12740 NONAME ; float QGraphicsItemPrivate::height(void) const - ?heightChanged@QGraphicsObject@@IAEXXZ @ 12741 NONAME ; void QGraphicsObject::heightChanged(void) - ?horizontalAdvance@QTextLine@@QBEMXZ @ 12742 NONAME ; float QTextLine::horizontalAdvance(void) const - ?isValid@FileInfo@QZipReader@@QBE_NXZ @ 12743 NONAME ; bool QZipReader::FileInfo::isValid(void) const - ?layoutChanged@QGraphicsWidget@@IAEXXZ @ 12744 NONAME ; void QGraphicsWidget::layoutChanged(void) - ?pageAdded@QWizard@@IAEXH@Z @ 12745 NONAME ; void QWizard::pageAdded(int) - ?pageRemoved@QWizard@@IAEXH@Z @ 12746 NONAME ; void QWizard::pageRemoved(int) - ?paste@QLineControl@@QAEXW4Mode@QClipboard@@@Z @ 12747 NONAME ; void QLineControl::paste(enum QClipboard::Mode) - ?paste@QTextControl@@QAEXW4Mode@QClipboard@@@Z @ 12748 NONAME ; void QTextControl::paste(enum QClipboard::Mode) - ?placeholderText@QLineEdit@@QBE?AVQString@@XZ @ 12749 NONAME ; class QString QLineEdit::placeholderText(void) const - ?prependGraphicsTransform@QGraphicsItemPrivate@@QAEXPAVQGraphicsTransform@@@Z @ 12750 NONAME ; void QGraphicsItemPrivate::prependGraphicsTransform(class QGraphicsTransform *) - ?processCommands@QPaintBuffer@@QBEHPAVQPainter@@HH@Z @ 12751 NONAME ; int QPaintBuffer::processCommands(class QPainter *, int, int) const - ?processCommands@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@HH@Z @ 12752 NONAME ; void QPainterReplayer::processCommands(class QPaintBuffer const &, class QPainter *, int, int) - ?resetHeight@QGraphicsItemPrivate@@UAEXXZ @ 12753 NONAME ; void QGraphicsItemPrivate::resetHeight(void) - ?resetWidth@QGraphicsItemPrivate@@UAEXXZ @ 12754 NONAME ; void QGraphicsItemPrivate::resetWidth(void) - ?resizeEvent@QSplitterHandle@@MAEXPAVQResizeEvent@@@Z @ 12755 NONAME ; void QSplitterHandle::resizeEvent(class QResizeEvent *) - ?setFocusHelper@QGraphicsItemPrivate@@QAEXW4FocusReason@Qt@@_N1@Z @ 12756 NONAME ; void QGraphicsItemPrivate::setFocusHelper(enum Qt::FocusReason, bool, bool) - ?setHeight@QGraphicsItemPrivate@@UAEXM@Z @ 12757 NONAME ; void QGraphicsItemPrivate::setHeight(float) - ?setPlaceholderText@QLineEdit@@QAEXABVQString@@@Z @ 12758 NONAME ; void QLineEdit::setPlaceholderText(class QString const &) - ?setSideWidget@QWizard@@QAEXPAVQWidget@@@Z @ 12759 NONAME ; void QWizard::setSideWidget(class QWidget *) - ?setTextWidth@QStaticText@@QAEXM@Z @ 12760 NONAME ; void QStaticText::setTextWidth(float) - ?setWidth@QGraphicsItemPrivate@@UAEXM@Z @ 12761 NONAME ; void QGraphicsItemPrivate::setWidth(float) - ?sideWidget@QWizard@@QBEPAVQWidget@@XZ @ 12762 NONAME ; class QWidget * QWizard::sideWidget(void) const - ?textWidth@QStaticText@@QBEMXZ @ 12763 NONAME ; float QStaticText::textWidth(void) const - ?updateDisplayText@QLineControl@@AAEX_N@Z @ 12764 NONAME ; void QLineControl::updateDisplayText(bool) - ?updateMicroFocus@QGraphicsItem@@IAEXXZ @ 12765 NONAME ; void QGraphicsItem::updateMicroFocus(void) - ?updateMicroFocus@QGraphicsObject@@IAEXXZ @ 12766 NONAME ; void QGraphicsObject::updateMicroFocus(void) - ?width@QGraphicsItemPrivate@@UBEMXZ @ 12767 NONAME ; float QGraphicsItemPrivate::width(void) const - ?widthChanged@QGraphicsObject@@IAEXXZ @ 12768 NONAME ; void QGraphicsObject::widthChanged(void) - ?children_append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12769 NONAME ; void QGraphicsItemPrivate::children_append(class QDeclarativeListProperty *, class QGraphicsObject *) - ?children_at@QGraphicsItemPrivate@@SAPAVQGraphicsObject@@PAV?$QDeclarativeListProperty@VQGraphicsObject@@@@H@Z @ 12770 NONAME ; class QGraphicsObject * QGraphicsItemPrivate::children_at(class QDeclarativeListProperty *, int) - ?children_count@QGraphicsItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@@Z @ 12771 NONAME ; int QGraphicsItemPrivate::children_count(class QDeclarativeListProperty *) - ?display@QEglContext@@QAEHXZ @ 12772 NONAME ; int QEglContext::display(void) - ?defaultConfig@QEgl@@YAHHW4API@1@V?$QFlags@W4ConfigOption@QEgl@@@@@Z @ 12773 NONAME ; int QEgl::defaultConfig(int, enum QEgl::API, class QFlags) - ?configAttrib@QEglContext@@QBEHH@Z @ 12774 NONAME ; int QEglContext::configAttrib(int) const - ?error@QEgl@@YAHXZ @ 12775 NONAME ABSENT ; int QEgl::error(void) - ?errorString@QEgl@@YA?AVQString@@XZ @ 12776 NONAME ABSENT ; class QString QEgl::errorString(void) - ?configProperties@QEglContext@@QBE?AVQEglProperties@@XZ @ 12777 NONAME ABSENT ; class QEglProperties QEglContext::configProperties(void) const - ?extensions@QEgl@@YA?AVQString@@XZ @ 12778 NONAME ; class QString QEgl::extensions(void) - ?nativePixmap@QEgl@@YAPAXPAVQPixmap@@@Z @ 12779 NONAME ; void * QEgl::nativePixmap(class QPixmap *) - ?display@QEgl@@YAHXZ @ 12780 NONAME ; int QEgl::display(void) - ?eglCreateImageKHR@QEgl@@YAHHHHHPBH@Z @ 12781 NONAME ; int QEgl::eglCreateImageKHR(int, int, int, int, int const *) - ?hasExtension@QEgl@@YA_NPBD@Z @ 12782 NONAME ; bool QEgl::hasExtension(char const *) - ?destroyContext@QEglContext@@QAEXXZ @ 12783 NONAME ; void QEglContext::destroyContext(void) - ?nativeWindow@QEgl@@YAPAXPAVQWidget@@@Z @ 12784 NONAME ; void * QEgl::nativeWindow(class QWidget *) - ?errorString@QEgl@@YA?AVQString@@H@Z @ 12785 NONAME ; class QString QEgl::errorString(int) - ?chooseConfig@QEgl@@YAHPBVQEglProperties@@W4PixelFormatMatch@1@@Z @ 12786 NONAME ; int QEgl::chooseConfig(class QEglProperties const *, enum QEgl::PixelFormatMatch) - ?eglDestroyImageKHR@QEgl@@YAHHH@Z @ 12787 NONAME ; int QEgl::eglDestroyImageKHR(int, int) - ?isEmpty@QItemSelectionRange@@QBE_NXZ @ 12788 NONAME ; bool QItemSelectionRange::isEmpty(void) const - ?clearError@QEgl@@YAXXZ @ 12789 NONAME ABSENT ; void QEgl::clearError(void) - ?nativeDisplay@QEgl@@YAHXZ @ 12790 NONAME ; int QEgl::nativeDisplay(void) - ?dumpAllConfigs@QEgl@@YAXXZ @ 12791 NONAME ; void QEgl::dumpAllConfigs(void) - ?setDeviceType@QEglProperties@@QAEXH@Z @ 12792 NONAME ; void QEglProperties::setDeviceType(int) - ?glyphPadding@QTextureGlyphCache@@UBEHXZ @ 12793 NONAME ; int QTextureGlyphCache::glyphPadding(void) const - ?createSurface@QEgl@@YAHPAVQPaintDevice@@HPBVQEglProperties@@@Z @ 12794 NONAME ; int QEgl::createSurface(class QPaintDevice *, int, class QEglProperties const *) - ?setPartialUpdateSupport@QWindowSurface@@IAEX_N@Z @ 12795 NONAME ; void QWindowSurface::setPartialUpdateSupport(bool) - ?transformChanged@QGraphicsItemPrivate@@UAEXXZ @ 12796 NONAME ; void QGraphicsItemPrivate::transformChanged(void) - ?hasPartialUpdateSupport@QWindowSurface@@QBE_NXZ @ 12797 NONAME ; bool QWindowSurface::hasPartialUpdateSupport(void) const - ?name@QIcon@@QBE?AVQString@@XZ @ 12798 NONAME ; class QString QIcon::name(void) const - ?iconName@QIconEngineV2@@QAE?AVQString@@XZ @ 12799 NONAME ; class QString QIconEngineV2::iconName(void) - ?updateRectF@QGraphicsViewPrivate@@QAE_NABVQRectF@@@Z @ 12800 NONAME ; bool QGraphicsViewPrivate::updateRectF(class QRectF const &) - ?updateRegion@QGraphicsViewPrivate@@QAE_NABVQRectF@@ABVQTransform@@@Z @ 12801 NONAME ; bool QGraphicsViewPrivate::updateRegion(class QRectF const &, class QTransform const &) - ?totalUsed@QPixmapCache@@SAHXZ @ 12802 NONAME ; int QPixmapCache::totalUsed(void) - ?allPixmaps@QPixmapCache@@SA?AV?$QList@U?$QPair@VQString@@VQPixmap@@@@@@XZ @ 12803 NONAME ; class QList > QPixmapCache::allPixmaps(void) - ?flushDetachedPixmaps@QPixmapCache@@SAXXZ @ 12804 NONAME ; void QPixmapCache::flushDetachedPixmaps(void) - ??0QImageTextureGlyphCache@@QAE@W4Type@QFontEngineGlyphCache@@ABVQTransform@@@Z @ 12805 NONAME ; QImageTextureGlyphCache::QImageTextureGlyphCache(enum QFontEngineGlyphCache::Type, class QTransform const &) - ??1QImageTextureGlyphCache@@UAE@XZ @ 12806 NONAME ; QImageTextureGlyphCache::~QImageTextureGlyphCache(void) - ??_EQImageTextureGlyphCache@@UAE@I@Z @ 12807 NONAME ; QImageTextureGlyphCache::~QImageTextureGlyphCache(unsigned int) - ?addToPolygon@QBezier@@QBEXPAVQPolygonF@@M@Z @ 12808 NONAME ; void QBezier::addToPolygon(class QPolygonF *, float) const - ?createTextureData@QImageTextureGlyphCache@@UAEXHH@Z @ 12809 NONAME ; void QImageTextureGlyphCache::createTextureData(int, int) - ?curveThreshold@QStrokerOps@@QBEMXZ @ 12810 NONAME ; float QStrokerOps::curveThreshold(void) const - ?fillTexture@QImageTextureGlyphCache@@UAEXABUCoord@QTextureGlyphCache@@I@Z @ 12811 NONAME ; void QImageTextureGlyphCache::fillTexture(struct QTextureGlyphCache::Coord const &, unsigned int) - ?glyphMargin@QImageTextureGlyphCache@@UBEHXZ @ 12812 NONAME ; int QImageTextureGlyphCache::glyphMargin(void) const - ?image@QImageTextureGlyphCache@@QBEABVQImage@@XZ @ 12813 NONAME ; class QImage const & QImageTextureGlyphCache::image(void) const - ?resizeTextureData@QImageTextureGlyphCache@@UAEXHH@Z @ 12814 NONAME ; void QImageTextureGlyphCache::resizeTextureData(int, int) - ?setCurveThreshold@QStrokerOps@@QAEXM@Z @ 12815 NONAME ; void QStrokerOps::setCurveThreshold(float) - ?setCurveThresholdFromTransform@QStrokerOps@@QAEXABVQTransform@@@Z @ 12816 NONAME ; void QStrokerOps::setCurveThresholdFromTransform(class QTransform const &) - ?setUpdateClip@QGraphicsViewPrivate@@QAEXPAVQGraphicsItem@@@Z @ 12817 NONAME ; void QGraphicsViewPrivate::setUpdateClip(class QGraphicsItem *) - ?toPolygon@QBezier@@QBE?AVQPolygonF@@M@Z @ 12818 NONAME ; class QPolygonF QBezier::toPolygon(float) const - ?updatePaintedViewBoundingRects@QGraphicsItemPrivate@@QAEX_N@Z @ 12819 NONAME ; void QGraphicsItemPrivate::updatePaintedViewBoundingRects(bool) - ?invertedAppearance@QProgressBar@@QBE_NXZ @ 12820 NONAME ; bool QProgressBar::invertedAppearance(void) const - ?setKeepPositionOnInsert@QTextCursor@@QAEX_N@Z @ 12821 NONAME ; void QTextCursor::setKeepPositionOnInsert(bool) - ?verticalMovementX@QTextCursor@@QBEHXZ @ 12822 NONAME ; int QTextCursor::verticalMovementX(void) const - ?width@QFontMetrics@@QBEHABVQString@@HH@Z @ 12823 NONAME ; int QFontMetrics::width(class QString const &, int, int) const - ?runtimeData@QPixmapData@@UBEPAV1@XZ @ 12824 NONAME ; class QPixmapData * QPixmapData::runtimeData(void) const - ?textDirection@QProgressBar@@QBE?AW4Direction@1@XZ @ 12825 NONAME ; enum QProgressBar::Direction QProgressBar::textDirection(void) const - ?setVerticalMovementX@QTextCursor@@QAEXH@Z @ 12826 NONAME ; void QTextCursor::setVerticalMovementX(int) - ?childAtRecursiveHelper@QWidgetPrivate@@QBEPAVQWidget@@ABVQPoint@@_N1@Z @ 12827 NONAME ; class QWidget * QWidgetPrivate::childAtRecursiveHelper(class QPoint const &, bool, bool) const - ?isRightToLeft@QTextEngine@@QBE_NXZ @ 12828 NONAME ; bool QTextEngine::isRightToLeft(void) const - ?childrenBoundingRectHelper@QGraphicsItemPrivate@@QAEXPAVQTransform@@PAVQRectF@@_N@Z @ 12829 NONAME ; void QGraphicsItemPrivate::childrenBoundingRectHelper(class QTransform *, class QRectF *, bool) - ?runtime_graphics_system@QApplicationPrivate@@2_NA @ 12830 NONAME ; bool QApplicationPrivate::runtime_graphics_system - ?aboutToDestroy@QWidgetPrivate@@UAEXXZ @ 12831 NONAME ; void QWidgetPrivate::aboutToDestroy(void) - ?keepPositionOnInsert@QTextCursor@@QBE_NXZ @ 12832 NONAME ; bool QTextCursor::keepPositionOnInsert(void) const - ?pointInsideRectAndMask@QWidgetPrivate@@QBE_NABVQPoint@@@Z @ 12833 NONAME ; bool QWidgetPrivate::pointInsideRectAndMask(class QPoint const &) const - ?textDirection@QTextBlock@@QBE?AW4LayoutDirection@Qt@@XZ @ 12834 NONAME ; enum Qt::LayoutDirection QTextBlock::textDirection(void) const - ?createCompatiblePixmapData@QRuntimePixmapData@@UBEPAVQPixmapData@@XZ @ 12835 NONAME ; class QPixmapData * QRuntimePixmapData::createCompatiblePixmapData(void) const - ?alphaChannel@QRuntimePixmapData@@UBE?AVQPixmap@@XZ @ 12836 NONAME ; class QPixmap QRuntimePixmapData::alphaChannel(void) const - ?memoryUsage@QRuntimePixmapData@@UBEIXZ @ 12837 NONAME ; unsigned int QRuntimePixmapData::memoryUsage(void) const - ?textOption@QStaticText@@QBE?AVQTextOption@@XZ @ 12838 NONAME ; class QTextOption QStaticText::textOption(void) const - ?OpenIniFileLC@QS60MainApplication@@UBEPAVCDictionaryStore@@AAVRFs@@@Z @ 12839 NONAME ; class CDictionaryStore * QS60MainApplication::OpenIniFileLC(class RFs &) const - ?Reserved_MtsmObject@QS60MainAppUi@@MAEXXZ @ 12840 NONAME ; void QS60MainAppUi::Reserved_MtsmObject(void) - ?setTextOption@QStaticText@@QAEXABVQTextOption@@@Z @ 12841 NONAME ; void QStaticText::setTextOption(class QTextOption const &) - ?readBackInfo@QRuntimePixmapData@@QAEXXZ @ 12842 NONAME ; void QRuntimePixmapData::readBackInfo(void) - ?buffer@QRuntimePixmapData@@UAEPAVQImage@@XZ @ 12843 NONAME ; class QImage * QRuntimePixmapData::buffer(void) - ?paintEngine@QRuntimePixmapData@@UBEPAVQPaintEngine@@XZ @ 12844 NONAME ; class QPaintEngine * QRuntimePixmapData::paintEngine(void) const - ?toImage@QRuntimePixmapData@@UBE?AVQImage@@XZ @ 12845 NONAME ; class QImage QRuntimePixmapData::toImage(void) const - ?HandleForegroundEventL@QS60MainAppUi@@MAEXH@Z @ 12846 NONAME ; void QS60MainAppUi::HandleForegroundEventL(int) - ?toNativeType@QRuntimePixmapData@@UAEPAXW4NativeType@QPixmapData@@@Z @ 12847 NONAME ; void * QRuntimePixmapData::toNativeType(enum QPixmapData::NativeType) - ?fromNativeType@QRuntimePixmapData@@UAEXPAXW4NativeType@QPixmapData@@@Z @ 12848 NONAME ; void QRuntimePixmapData::fromNativeType(void *, enum QPixmapData::NativeType) - ?runtimeData@QRuntimePixmapData@@UBEPAVQPixmapData@@XZ @ 12849 NONAME ; class QPixmapData * QRuntimePixmapData::runtimeData(void) const - ?OpenFileL@QS60MainDocument@@UAEPAVCFileStore@@HABVTDesC16@@AAVRFs@@@Z @ 12850 NONAME ; class CFileStore * QS60MainDocument::OpenFileL(int, class TDesC16 const &, class RFs &) - ?fromFile@QRuntimePixmapData@@UAE_NABVQString@@PBDV?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12851 NONAME ; bool QRuntimePixmapData::fromFile(class QString const &, char const *, class QFlags) - ?HandleTouchPaneSizeChange@QS60MainAppUi@@UAEXXZ @ 12852 NONAME ; void QS60MainAppUi::HandleTouchPaneSizeChange(void) - ?toImage@QPixmapData@@UBE?AVQImage@@ABVQRect@@@Z @ 12853 NONAME ; class QImage QPixmapData::toImage(class QRect const &) const - ?copy@QRuntimePixmapData@@UAEXPBVQPixmapData@@ABVQRect@@@Z @ 12854 NONAME ; void QRuntimePixmapData::copy(class QPixmapData const *, class QRect const &) - ?fromData@QRuntimePixmapData@@UAE_NPBEIPBDV?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12855 NONAME ; bool QRuntimePixmapData::fromData(unsigned char const *, unsigned int, char const *, class QFlags) - ?symbianAdjustedPosition@QDialog@@AAE_NXZ @ 12856 NONAME ; bool QDialog::symbianAdjustedPosition(void) - ?hasAlphaChannel@QRuntimePixmapData@@UBE_NXZ @ 12857 NONAME ; bool QRuntimePixmapData::hasAlphaChannel(void) const - ?Reserved_MtsmPosition@QS60MainAppUi@@MAEXXZ @ 12858 NONAME ; void QS60MainAppUi::Reserved_MtsmPosition(void) - ?ApplicationRect@QS60MainAppUi@@UBE?AVTRect@@XZ @ 12859 NONAME ; class TRect QS60MainAppUi::ApplicationRect(void) const - ?HandleSystemEventL@QS60MainAppUi@@MAEXABVTWsEvent@@@Z @ 12860 NONAME ; void QS60MainAppUi::HandleSystemEventL(class TWsEvent const &) - ?metric@QRuntimePixmapData@@UBEHW4PaintDeviceMetric@QPaintDevice@@@Z @ 12861 NONAME ; int QRuntimePixmapData::metric(enum QPaintDevice::PaintDeviceMetric) const - ?HandleApplicationSpecificEventL@QS60MainAppUi@@MAEXHABVTWsEvent@@@Z @ 12862 NONAME ; void QS60MainAppUi::HandleApplicationSpecificEventL(int, class TWsEvent const &) - ?HandleError@QS60MainAppUi@@UAE?AW4TErrorHandlerResponse@@HABUSExtendedError@@AAVTDes16@@1@Z @ 12863 NONAME ; enum TErrorHandlerResponse QS60MainAppUi::HandleError(int, struct SExtendedError const &, class TDes16 &, class TDes16 &) - ?fromImage@QRuntimePixmapData@@UAEXABVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12864 NONAME ; void QRuntimePixmapData::fromImage(class QImage const &, class QFlags) - ?transformed@QRuntimePixmapData@@UBE?AVQPixmap@@ABVQTransform@@W4TransformationMode@Qt@@@Z @ 12865 NONAME ; class QPixmap QRuntimePixmapData::transformed(class QTransform const &, enum Qt::TransformationMode) const - ?swapBuffersRegion2NOK@QEglContext@@QAE_NHPBVQRegion@@@Z @ 12866 NONAME ; bool QEglContext::swapBuffersRegion2NOK(int, class QRegion const *) - ?PrepareToExit@QS60MainAppUi@@UAEXXZ @ 12867 NONAME ; void QS60MainAppUi::PrepareToExit(void) - ??1QRuntimePixmapData@@UAE@XZ @ 12868 NONAME ; QRuntimePixmapData::~QRuntimePixmapData(void) - ?setAlphaChannel@QRuntimePixmapData@@UAEXABVQPixmap@@@Z @ 12869 NONAME ; void QRuntimePixmapData::setAlphaChannel(class QPixmap const &) - ?toImage@QRasterPixmapData@@UBE?AVQImage@@ABVQRect@@@Z @ 12870 NONAME ; class QImage QRasterPixmapData::toImage(class QRect const &) const - ?fromData@QRasterPixmapData@@UAE_NPBEIPBDV?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12871 NONAME ; bool QRasterPixmapData::fromData(unsigned char const *, unsigned int, char const *, class QFlags) + ?display@QEglContext@@QAEHXZ @ 12628 NONAME ; int QEglContext::display(void) + ?setPartialUpdateSupport@QWindowSurface@@IAEX_N@Z @ 12629 NONAME ; void QWindowSurface::setPartialUpdateSupport(bool) + ?transformChanged@QGraphicsItemPrivate@@UAEXXZ @ 12630 NONAME ; void QGraphicsItemPrivate::transformChanged(void) + ?setUserData@QStaticTextItem@@QAEXPAVQStaticTextUserData@@@Z @ 12631 NONAME ; void QStaticTextItem::setUserData(class QStaticTextUserData *) + ?isValid@FileInfo@QZipReader@@QBE_NXZ @ 12632 NONAME ; bool QZipReader::FileInfo::isValid(void) const + ?hasSelectedText@QLabel@@QBE_NXZ @ 12633 NONAME ; bool QLabel::hasSelectedText(void) const + ?size@QStaticText@@QBE?AVQSizeF@@XZ @ 12634 NONAME ; class QSizeF QStaticText::size(void) const + ?processCommands@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@HH@Z @ 12635 NONAME ; void QPainterReplayer::processCommands(class QPaintBuffer const &, class QPainter *, int, int) + ?defaultConfig@QEgl@@YAHHW4API@1@V?$QFlags@W4ConfigOption@QEgl@@@@@Z @ 12636 NONAME ; int QEgl::defaultConfig(int, enum QEgl::API, class QFlags) + ??0QZipReader@@QAE@PAVQIODevice@@@Z @ 12637 NONAME ; QZipReader::QZipReader(class QIODevice *) + ?configAttrib@QEglContext@@QBEHH@Z @ 12638 NONAME ; int QEglContext::configAttrib(int) const + ?setAutoFillBackground@QGraphicsWidget@@QAEX_N@Z @ 12639 NONAME ; void QGraphicsWidget::setAutoFillBackground(bool) + ??4QStaticText@@QAEAAV0@ABV0@@Z @ 12640 NONAME ; class QStaticText & QStaticText::operator=(class QStaticText const &) + ?updateRegion@QGraphicsViewPrivate@@QAE_NABVQRectF@@ABVQTransform@@@Z @ 12641 NONAME ; bool QGraphicsViewPrivate::updateRegion(class QRectF const &, class QTransform const &) + ??9QStaticText@@QBE_NABV0@@Z @ 12642 NONAME ; bool QStaticText::operator!=(class QStaticText const &) const + ??_EQGraphicsViewPrivate@@UAE@I@Z @ 12643 NONAME ; QGraphicsViewPrivate::~QGraphicsViewPrivate(unsigned int) + ?status@QZipReader@@QBE?AW4Status@1@XZ @ 12644 NONAME ; enum QZipReader::Status QZipReader::status(void) const + ?autoFillBackground@QGraphicsWidget@@QBE_NXZ @ 12645 NONAME ; bool QGraphicsWidget::autoFillBackground(void) const + ?createTextureData@QImageTextureGlyphCache@@UAEXHH@Z @ 12646 NONAME ; void QImageTextureGlyphCache::createTextureData(int, int) + ?image@QImageTextureGlyphCache@@QBEABVQImage@@XZ @ 12647 NONAME ; class QImage const & QImageTextureGlyphCache::image(void) const + ?extensions@QEgl@@YA?AVQString@@XZ @ 12648 NONAME ; class QString QEgl::extensions(void) + ?pageRemoved@QWizard@@IAEXH@Z @ 12649 NONAME ; void QWizard::pageRemoved(int) + ?init@QAbstractScrollAreaPrivate@@QAEXXZ @ 12650 NONAME ; void QAbstractScrollAreaPrivate::init(void) + ?mapRectToScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABVQRect@@@Z @ 12651 NONAME ; class QRectF QGraphicsViewPrivate::mapRectToScene(class QRect const &) const + ?width@QGraphicsItemPrivate@@UBEMXZ @ 12652 NONAME ; float QGraphicsItemPrivate::width(void) const + ?toPolygon@QBezier@@QBE?AVQPolygonF@@M@Z @ 12653 NONAME ; class QPolygonF QBezier::toPolygon(float) const + ?freeStyleOptionsArray@QGraphicsViewPrivate@@QAEXPAVQStyleOptionGraphicsItem@@@Z @ 12654 NONAME ; void QGraphicsViewPrivate::freeStyleOptionsArray(class QStyleOptionGraphicsItem *) + ?visibilityChanged@QToolBar@@IAEX_N@Z @ 12655 NONAME ; void QToolBar::visibilityChanged(bool) + ?updateInputMethodSensitivity@QGraphicsViewPrivate@@QAEXXZ @ 12656 NONAME ; void QGraphicsViewPrivate::updateInputMethodSensitivity(void) + ?glyphMargin@QImageTextureGlyphCache@@UBEHXZ @ 12657 NONAME ; int QImageTextureGlyphCache::glyphMargin(void) const + ?setTextFormat@QStaticText@@QAEXW4TextFormat@Qt@@@Z @ 12658 NONAME ; void QStaticText::setTextFormat(enum Qt::TextFormat) + ?storeDragDropEvent@QGraphicsViewPrivate@@QAEXPBVQGraphicsSceneDragDropEvent@@@Z @ 12659 NONAME ; void QGraphicsViewPrivate::storeDragDropEvent(class QGraphicsSceneDragDropEvent const *) + ?updateRect@QGraphicsViewPrivate@@QAE_NABVQRect@@@Z @ 12660 NONAME ; bool QGraphicsViewPrivate::updateRect(class QRect const &) + ?fileData@QZipReader@@QBE?AVQByteArray@@ABVQString@@@Z @ 12661 NONAME ; class QByteArray QZipReader::fileData(class QString const &) const + ?translateTouchEvent@QGraphicsViewPrivate@@SAXPAV1@PAVQTouchEvent@@@Z @ 12662 NONAME ; void QGraphicsViewPrivate::translateTouchEvent(class QGraphicsViewPrivate *, class QTouchEvent *) + ?dispatchPendingUpdateRequests@QGraphicsViewPrivate@@QAEXXZ @ 12663 NONAME ; void QGraphicsViewPrivate::dispatchPendingUpdateRequests(void) + ?updatePaintedViewBoundingRects@QGraphicsItemPrivate@@QAEX_N@Z @ 12664 NONAME ; void QGraphicsItemPrivate::updatePaintedViewBoundingRects(bool) + ?setHeight@QGraphicsItemPrivate@@UAEXM@Z @ 12665 NONAME ; void QGraphicsItemPrivate::setHeight(float) + ?isValidColor@QColor@@SA_NABVQString@@@Z @ 12666 NONAME ; bool QColor::isValidColor(class QString const &) + ??0QStaticTextItem@@QAE@XZ @ 12667 NONAME ; QStaticTextItem::QStaticTextItem(void) + ?updateMicroFocus@QGraphicsItem@@IAEXXZ @ 12668 NONAME ; void QGraphicsItem::updateMicroFocus(void) + ??1QStaticText@@QAE@XZ @ 12669 NONAME ; QStaticText::~QStaticText(void) + ?nativePixmap@QEgl@@YAPAXPAVQPixmap@@@Z @ 12670 NONAME ; void * QEgl::nativePixmap(class QPixmap *) + ?render@QWidgetPrivate@@QAEXPAVQPaintDevice@@ABVQPoint@@ABVQRegion@@V?$QFlags@W4RenderFlag@QWidget@@@@_N@Z @ 12671 NONAME ; void QWidgetPrivate::render(class QPaintDevice *, class QPoint const &, class QRegion const &, class QFlags, bool) + ?constBits@QImage@@QBEPBEXZ @ 12672 NONAME ; unsigned char const * QImage::constBits(void) const + ??8QStaticText@@QBE_NABV0@@Z @ 12673 NONAME ; bool QStaticText::operator==(class QStaticText const &) const + ??0FileInfo@QZipReader@@QAE@XZ @ 12674 NONAME ; QZipReader::FileInfo::FileInfo(void) + ?q_func@QGraphicsViewPrivate@@ABEPBVQGraphicsView@@XZ @ 12675 NONAME ; class QGraphicsView const * QGraphicsViewPrivate::q_func(void) const + ?textFormat@QStaticText@@QBE?AW4TextFormat@Qt@@XZ @ 12676 NONAME ; enum Qt::TextFormat QStaticText::textFormat(void) const + ?isReadable@QZipReader@@QBE_NXZ @ 12677 NONAME ; bool QZipReader::isReadable(void) const + ?getPixmapCursor@QApplicationPrivate@@QAE?AVQPixmap@@W4CursorShape@Qt@@@Z @ 12678 NONAME ; class QPixmap QApplicationPrivate::getPixmapCursor(enum Qt::CursorShape) + ?entryInfoAt@QZipReader@@QBE?AUFileInfo@1@H@Z @ 12679 NONAME ; struct QZipReader::FileInfo QZipReader::entryInfoAt(int) const + ?children_append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12680 NONAME ; void QGraphicsItemPrivate::children_append(class QDeclarativeListProperty *, class QGraphicsObject *) + ?hasPartialUpdateSupport@QWindowSurface@@QBE_NXZ @ 12681 NONAME ; bool QWindowSurface::hasPartialUpdateSupport(void) const + ?storeMouseEvent@QGraphicsViewPrivate@@QAEXPAVQMouseEvent@@@Z @ 12682 NONAME ; void QGraphicsViewPrivate::storeMouseEvent(class QMouseEvent *) + ?mapToScene@QGraphicsViewPrivate@@QBE?AVQPointF@@ABV2@@Z @ 12683 NONAME ; class QPointF QGraphicsViewPrivate::mapToScene(class QPointF const &) const + ?display@QEgl@@YAHXZ @ 12684 NONAME ; int QEgl::display(void) + ?drawStaticText@QPainter@@QAEXABVQPoint@@ABVQStaticText@@@Z @ 12685 NONAME ; void QPainter::drawStaticText(class QPoint const &, class QStaticText const &) + ?fillTexture@QImageTextureGlyphCache@@UAEXABUCoord@QTextureGlyphCache@@I@Z @ 12686 NONAME ; void QImageTextureGlyphCache::fillTexture(struct QTextureGlyphCache::Coord const &, unsigned int) + ?addToPolygon@QBezier@@QBEXPAVQPolygonF@@M@Z @ 12687 NONAME ; void QBezier::addToPolygon(class QPolygonF *, float) const + ?eglCreateImageKHR@QEgl@@YAHHHHHPBH@Z @ 12688 NONAME ; int QEgl::eglCreateImageKHR(int, int, int, int, int const *) + ?resetWidth@QGraphicsItemPrivate@@UAEXXZ @ 12689 NONAME ; void QGraphicsItemPrivate::resetWidth(void) + ?detach@QStaticText@@AAEXXZ @ 12690 NONAME ; void QStaticText::detach(void) + ?totalUsed@QPixmapCache@@SAHXZ @ 12691 NONAME ; int QPixmapCache::totalUsed(void) + ??0QKeySequence@@QAE@ABVQString@@W4SequenceFormat@0@@Z @ 12692 NONAME ; QKeySequence::QKeySequence(class QString const &, enum QKeySequence::SequenceFormat) + ?device@QZipReader@@QBEPAVQIODevice@@XZ @ 12693 NONAME ; class QIODevice * QZipReader::device(void) const + ?hasExtension@QEgl@@YA_NPBD@Z @ 12694 NONAME ; bool QEgl::hasExtension(char const *) + ?mapRectFromScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABV2@@Z @ 12695 NONAME ; class QRectF QGraphicsViewPrivate::mapRectFromScene(class QRectF const &) const + ?commandDescription@QPaintBuffer@@QBE?AVQString@@H@Z @ 12696 NONAME ; class QString QPaintBuffer::commandDescription(int) const + ?layoutChanged@QGraphicsWidget@@IAEXXZ @ 12697 NONAME ; void QGraphicsWidget::layoutChanged(void) + ??0QGraphicsViewPrivate@@QAE@XZ @ 12698 NONAME ; QGraphicsViewPrivate::QGraphicsViewPrivate(void) + ?anchorAt@QPlainTextEdit@@QBE?AVQString@@ABVQPoint@@@Z @ 12699 NONAME ; class QString QPlainTextEdit::anchorAt(class QPoint const &) const + ?getSubRange@QBezier@@QBE?AV1@MM@Z @ 12700 NONAME ; class QBezier QBezier::getSubRange(float, float) const + ?replaceScrollBar@QAbstractScrollAreaPrivate@@QAEXPAVQScrollBar@@W4Orientation@Qt@@@Z @ 12701 NONAME ; void QAbstractScrollAreaPrivate::replaceScrollBar(class QScrollBar *, enum Qt::Orientation) + ?mapToViewRegion@QGraphicsViewPrivate@@QBE?AVQRegion@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12702 NONAME ; class QRegion QGraphicsViewPrivate::mapToViewRegion(class QGraphicsItem const *, class QRectF const &) const + ?allPixmaps@QPixmapCache@@SA?AV?$QList@U?$QPair@VQString@@VQPixmap@@@@@@XZ @ 12703 NONAME ; class QList > QPixmapCache::allPixmaps(void) + ??_EQAbstractScrollAreaPrivate@@UAE@I@Z @ 12704 NONAME ; QAbstractScrollAreaPrivate::~QAbstractScrollAreaPrivate(unsigned int) + ?pageAdded@QWizard@@IAEXH@Z @ 12705 NONAME ; void QWizard::pageAdded(int) + ?populate@QTextureGlyphCache@@QAEXPAVQFontEngine@@HPBIPBUQFixedPoint@@@Z @ 12706 NONAME ; void QTextureGlyphCache::populate(class QFontEngine *, int, unsigned int const *, struct QFixedPoint const *) + ??1QStaticTextItem@@QAE@XZ @ 12707 NONAME ; QStaticTextItem::~QStaticTextItem(void) + ?populateSceneDragDropEvent@QGraphicsViewPrivate@@QAEXPAVQGraphicsSceneDragDropEvent@@PAVQDropEvent@@@Z @ 12708 NONAME ; void QGraphicsViewPrivate::populateSceneDragDropEvent(class QGraphicsSceneDragDropEvent *, class QDropEvent *) + ?updateAll@QGraphicsViewPrivate@@QAEXXZ @ 12709 NONAME ; void QGraphicsViewPrivate::updateAll(void) + ?nativeWindow@QEgl@@YAPAXPAVQWidget@@@Z @ 12710 NONAME ; void * QEgl::nativeWindow(class QWidget *) + ?children_count@QGraphicsItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@@Z @ 12711 NONAME ; int QGraphicsItemPrivate::children_count(class QDeclarativeListProperty *) + ?allocStyleOptionsArray@QGraphicsViewPrivate@@QAEPAVQStyleOptionGraphicsItem@@H@Z @ 12712 NONAME ; class QStyleOptionGraphicsItem * QGraphicsViewPrivate::allocStyleOptionsArray(int) + ?resizeTextureData@QImageTextureGlyphCache@@UAEXHH@Z @ 12713 NONAME ; void QImageTextureGlyphCache::resizeTextureData(int, int) + ?drawPixmapFragments@QPainter@@QAEXPBVPixmapFragment@1@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12714 NONAME ; void QPainter::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags) + ?setColorFromString@QColor@@AAE_NABVQString@@@Z @ 12715 NONAME ; bool QColor::setColorFromString(class QString const &) + ??1QAbstractScrollAreaPrivate@@UAE@XZ @ 12716 NONAME ; QAbstractScrollAreaPrivate::~QAbstractScrollAreaPrivate(void) + ?setText@QStaticText@@QAEXABVQString@@@Z @ 12717 NONAME ; void QStaticText::setText(class QString const &) + ?bitPlaneCount@QImage@@QBEHXZ @ 12718 NONAME ; int QImage::bitPlaneCount(void) const + ?_q_unsetViewportCursor@QGraphicsViewPrivate@@QAEXXZ @ 12719 NONAME ; void QGraphicsViewPrivate::_q_unsetViewportCursor(void) + ?setUpdateClip@QGraphicsViewPrivate@@QAEXPAVQGraphicsItem@@@Z @ 12720 NONAME ; void QGraphicsViewPrivate::setUpdateClip(class QGraphicsItem *) + ?resetHeight@QGraphicsItemPrivate@@UAEXXZ @ 12721 NONAME ; void QGraphicsItemPrivate::resetHeight(void) + ?runtimeData@QPixmapData@@UBEPAV1@XZ @ 12722 NONAME ; class QPixmapData * QPixmapData::runtimeData(void) const + ?selectedText@QLabel@@QBE?AVQString@@XZ @ 12723 NONAME ; class QString QLabel::selectedText(void) const + ?childrenList@QGraphicsItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQGraphicsObject@@@@XZ @ 12724 NONAME ; class QDeclarativeListProperty QGraphicsItemPrivate::childrenList(void) + ?childrenChanged@QGraphicsObject@@IAEXXZ @ 12725 NONAME ; void QGraphicsObject::childrenChanged(void) + ?recalculateContentSize@QGraphicsViewPrivate@@QAEXXZ @ 12726 NONAME ; void QGraphicsViewPrivate::recalculateContentSize(void) + ?heightChanged@QGraphicsObject@@IAEXXZ @ 12727 NONAME ; void QGraphicsObject::heightChanged(void) + ?name@QIcon@@QBE?AVQString@@XZ @ 12728 NONAME ; class QString QIcon::name(void) const + ?errorString@QEgl@@YA?AVQString@@H@Z @ 12729 NONAME ; class QString QEgl::errorString(int) + ??4FileInfo@QZipReader@@QAEAAU01@ABU01@@Z @ 12730 NONAME ; struct QZipReader::FileInfo & QZipReader::FileInfo::operator=(struct QZipReader::FileInfo const &) + ??1QGraphicsViewPrivate@@UAE@XZ @ 12731 NONAME ; QGraphicsViewPrivate::~QGraphicsViewPrivate(void) + ?chooseConfig@QEgl@@YAHPBVQEglProperties@@W4PixelFormatMatch@1@@Z @ 12732 NONAME ; int QEgl::chooseConfig(class QEglProperties const *, enum QEgl::PixelFormatMatch) + ?prependGraphicsTransform@QGraphicsItemPrivate@@QAEXPAVQGraphicsTransform@@@Z @ 12733 NONAME ; void QGraphicsItemPrivate::prependGraphicsTransform(class QGraphicsTransform *) + ?eglDestroyImageKHR@QEgl@@YAHHH@Z @ 12734 NONAME ; int QEgl::eglDestroyImageKHR(int, int) + ?qt_draw_glyphs@@YAXPAVQPainter@@PBIPBVQPointF@@H@Z @ 12735 NONAME ; void qt_draw_glyphs(class QPainter *, unsigned int const *, class QPointF const *, int) + ?isEmpty@QItemSelectionRange@@QBE_NXZ @ 12736 NONAME ; bool QItemSelectionRange::isEmpty(void) const + ?count@QZipReader@@QBEHXZ @ 12737 NONAME ; int QZipReader::count(void) const + ?centerView@QGraphicsViewPrivate@@QAEXW4ViewportAnchor@QGraphicsView@@@Z @ 12738 NONAME ; void QGraphicsViewPrivate::centerView(enum QGraphicsView::ViewportAnchor) + ?contentsOffset@QAbstractScrollAreaPrivate@@UBE?AVQPoint@@XZ @ 12739 NONAME ; class QPoint QAbstractScrollAreaPrivate::contentsOffset(void) const + ?_q_vslide@QAbstractScrollAreaPrivate@@QAEXH@Z @ 12740 NONAME ; void QAbstractScrollAreaPrivate::_q_vslide(int) + ??1QZipReader@@QAE@XZ @ 12741 NONAME ; QZipReader::~QZipReader(void) + ??_EQImageTextureGlyphCache@@UAE@I@Z @ 12742 NONAME ; QImageTextureGlyphCache::~QImageTextureGlyphCache(unsigned int) + ?drawPixmapFragments@QPaintEngineEx@@UAEXPBVPixmapFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12743 NONAME ; void QPaintEngineEx::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags) + ?nativeDisplay@QEgl@@YAHXZ @ 12744 NONAME ; int QEgl::nativeDisplay(void) + ?layoutChildren@QAbstractScrollAreaPrivate@@QAEXXZ @ 12745 NONAME ; void QAbstractScrollAreaPrivate::layoutChildren(void) + ?horizontalScroll@QGraphicsViewPrivate@@QBE_JXZ @ 12746 NONAME ; long long QGraphicsViewPrivate::horizontalScroll(void) const + ?updateRectF@QGraphicsViewPrivate@@QAE_NABVQRectF@@@Z @ 12747 NONAME ; bool QGraphicsViewPrivate::updateRectF(class QRectF const &) + ?setPlaceholderText@QLineEdit@@QAEXABVQString@@@Z @ 12748 NONAME ; void QLineEdit::setPlaceholderText(class QString const &) + ?resizeEvent@QSplitterHandle@@MAEXPAVQResizeEvent@@@Z @ 12749 NONAME ; void QSplitterHandle::resizeEvent(class QResizeEvent *) + ?drawStaticText@QPainter@@QAEXHHABVQStaticText@@@Z @ 12750 NONAME ; void QPainter::drawStaticText(int, int, class QStaticText const &) + ?setSelection@QLabel@@QAEXHH@Z @ 12751 NONAME ; void QLabel::setSelection(int, int) + ?q_func@QAbstractScrollAreaPrivate@@AAEPAVQAbstractScrollArea@@XZ @ 12752 NONAME ; class QAbstractScrollArea * QAbstractScrollAreaPrivate::q_func(void) + ?updateMicroFocus@QGraphicsObject@@IAEXXZ @ 12753 NONAME ; void QGraphicsObject::updateMicroFocus(void) + ?drawStaticText@QPainter@@QAEXABVQPointF@@ABVQStaticText@@@Z @ 12754 NONAME ; void QPainter::drawStaticText(class QPointF const &, class QStaticText const &) + ?processPendingUpdates@QGraphicsViewPrivate@@QAEXXZ @ 12755 NONAME ; void QGraphicsViewPrivate::processPendingUpdates(void) + ?rubberBandRegion@QGraphicsViewPrivate@@QBE?AVQRegion@@PBVQWidget@@ABVQRect@@@Z @ 12756 NONAME ; class QRegion QGraphicsViewPrivate::rubberBandRegion(class QWidget const *, class QRect const &) const + ?children_at@QGraphicsItemPrivate@@SAPAVQGraphicsObject@@PAV?$QDeclarativeListProperty@VQGraphicsObject@@@@H@Z @ 12757 NONAME ; class QGraphicsObject * QGraphicsItemPrivate::children_at(class QDeclarativeListProperty *, int) + ?widthChanged@QGraphicsObject@@IAEXXZ @ 12758 NONAME ; void QGraphicsObject::widthChanged(void) + ?_q_showOrHideScrollBars@QAbstractScrollAreaPrivate@@QAEXXZ @ 12759 NONAME ; void QAbstractScrollAreaPrivate::_q_showOrHideScrollBars(void) + ?mouseMoveEventHandler@QGraphicsViewPrivate@@QAEXPAVQMouseEvent@@@Z @ 12760 NONAME ; void QGraphicsViewPrivate::mouseMoveEventHandler(class QMouseEvent *) + ?replayLastMouseEvent@QGraphicsViewPrivate@@QAEXXZ @ 12761 NONAME ; void QGraphicsViewPrivate::replayLastMouseEvent(void) + ??0QStaticText@@QAE@ABVQString@@@Z @ 12762 NONAME ; QStaticText::QStaticText(class QString const &) + ?close@QZipReader@@QAEXXZ @ 12763 NONAME ; void QZipReader::close(void) + ?geometryChanged@QGraphicsWidget@@IAEXXZ @ 12764 NONAME ; void QGraphicsWidget::geometryChanged(void) + ?setCurveThreshold@QStrokerOps@@QAEXM@Z @ 12765 NONAME ; void QStrokerOps::setCurveThreshold(float) + ?_q_hslide@QAbstractScrollAreaPrivate@@QAEXH@Z @ 12766 NONAME ; void QAbstractScrollAreaPrivate::_q_hslide(int) + ?selectionStart@QLabel@@QBEHXZ @ 12767 NONAME ; int QLabel::selectionStart(void) const + ??0QStaticText@@QAE@XZ @ 12768 NONAME ; QStaticText::QStaticText(void) + ?curveThreshold@QStrokerOps@@QBEMXZ @ 12769 NONAME ; float QStrokerOps::curveThreshold(void) const + ?iconName@QIconEngineV2@@QAE?AVQString@@XZ @ 12770 NONAME ; class QString QIconEngineV2::iconName(void) + ?mapBy@QBezier@@QBE?AV1@ABVQTransform@@@Z @ 12771 NONAME ; class QBezier QBezier::mapBy(class QTransform const &) const + ??0QZipReader@@QAE@ABVQString@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@@Z @ 12772 NONAME ; QZipReader::QZipReader(class QString const &, class QFlags) + ?flushDetachedPixmaps@QPixmapCache@@SAXXZ @ 12773 NONAME ; void QPixmapCache::flushDetachedPixmaps(void) + ?exists@QZipReader@@QBE_NXZ @ 12774 NONAME ; bool QZipReader::exists(void) const + ?prepare@QStaticText@@QAEXABVQTransform@@ABVQFont@@@Z @ 12775 NONAME ; void QStaticText::prepare(class QTransform const &, class QFont const &) + ?paste@QTextControl@@QAEXW4Mode@QClipboard@@@Z @ 12776 NONAME ; void QTextControl::paste(enum QClipboard::Mode) + ?horizontalAdvance@QTextLine@@QBEMXZ @ 12777 NONAME ; float QTextLine::horizontalAdvance(void) const + ?setCurveThresholdFromTransform@QStrokerOps@@QAEXABVQTransform@@@Z @ 12778 NONAME ; void QStrokerOps::setCurveThresholdFromTransform(class QTransform const &) + ?textWidth@QStaticText@@QBEMXZ @ 12779 NONAME ; float QStaticText::textWidth(void) const + ?create@PixmapFragment@QPainter@@SA?AV12@ABVQPointF@@ABVQRectF@@MMMM@Z @ 12780 NONAME ; class QPainter::PixmapFragment QPainter::PixmapFragment::create(class QPointF const &, class QRectF const &, float, float, float, float) + ?extractAll@QZipReader@@QBE_NABVQString@@@Z @ 12781 NONAME ; bool QZipReader::extractAll(class QString const &) const + ??0FileInfo@QZipReader@@QAE@ABU01@@Z @ 12782 NONAME ; QZipReader::FileInfo::FileInfo(struct QZipReader::FileInfo const &) + ?setTextWidth@QStaticText@@QAEXM@Z @ 12783 NONAME ; void QStaticText::setTextWidth(float) + ?fixup@QIntValidator@@UBEXAAVQString@@@Z @ 12784 NONAME ; void QIntValidator::fixup(class QString &) const + ?dumpAllConfigs@QEgl@@YAXXZ @ 12785 NONAME ; void QEgl::dumpAllConfigs(void) + ?assign@QKeySequence@@AAEHABVQString@@W4SequenceFormat@1@@Z @ 12786 NONAME ; int QKeySequence::assign(class QString const &, enum QKeySequence::SequenceFormat) + ?q_func@QAbstractScrollAreaPrivate@@ABEPBVQAbstractScrollArea@@XZ @ 12787 NONAME ; class QAbstractScrollArea const * QAbstractScrollAreaPrivate::q_func(void) const + ?mapToScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABV2@@Z @ 12788 NONAME ; class QRectF QGraphicsViewPrivate::mapToScene(class QRectF const &) const + ?updateScroll@QGraphicsViewPrivate@@QAEXXZ @ 12789 NONAME ; void QGraphicsViewPrivate::updateScroll(void) + ?directoryLoaded@QFileSystemModel@@IAEXABVQString@@@Z @ 12790 NONAME ; void QFileSystemModel::directoryLoaded(class QString const &) + ?placeholderText@QLineEdit@@QBE?AVQString@@XZ @ 12791 NONAME ; class QString QLineEdit::placeholderText(void) const + ?setWidth@QGraphicsItemPrivate@@UAEXM@Z @ 12792 NONAME ; void QGraphicsItemPrivate::setWidth(float) + ?q_func@QGraphicsViewPrivate@@AAEPAVQGraphicsView@@XZ @ 12793 NONAME ; class QGraphicsView * QGraphicsViewPrivate::q_func(void) + ?setDeviceType@QEglProperties@@QAEXH@Z @ 12794 NONAME ; void QEglProperties::setDeviceType(int) + ?convertFromImage@QPixmap@@QAE_NABVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12795 NONAME ; bool QPixmap::convertFromImage(class QImage const &, class QFlags) + ?processCommands@QPaintBuffer@@QBEHPAVQPainter@@HH@Z @ 12796 NONAME ; int QPaintBuffer::processCommands(class QPainter *, int, int) const + ?glyphPadding@QTextureGlyphCache@@UBEHXZ @ 12797 NONAME ; int QTextureGlyphCache::glyphPadding(void) const + ??1FileInfo@QZipReader@@QAE@XZ @ 12798 NONAME ; QZipReader::FileInfo::~FileInfo(void) + ?scrollBarPolicyChanged@QAbstractScrollAreaPrivate@@UAEXW4Orientation@Qt@@W4ScrollBarPolicy@3@@Z @ 12799 NONAME ; void QAbstractScrollAreaPrivate::scrollBarPolicyChanged(enum Qt::Orientation, enum Qt::ScrollBarPolicy) + ?createSurface@QEgl@@YAHPAVQPaintDevice@@HPBVQEglProperties@@@Z @ 12800 NONAME ; int QEgl::createSurface(class QPaintDevice *, int, class QEglProperties const *) + ?viewportEvent@QAbstractScrollAreaPrivate@@QAE_NPAVQEvent@@@Z @ 12801 NONAME ; bool QAbstractScrollAreaPrivate::viewportEvent(class QEvent *) + ?frameEndIndex@QPaintBuffer@@QBEHH@Z @ 12802 NONAME ; int QPaintBuffer::frameEndIndex(int) const + ??1QImageTextureGlyphCache@@UAE@XZ @ 12803 NONAME ; QImageTextureGlyphCache::~QImageTextureGlyphCache(void) + ?setPerformanceHint@QStaticText@@QAEXW4PerformanceHint@1@@Z @ 12804 NONAME ; void QStaticText::setPerformanceHint(enum QStaticText::PerformanceHint) + ??0QStaticText@@QAE@ABV0@@Z @ 12805 NONAME ; QStaticText::QStaticText(class QStaticText const &) + ??0QImageTextureGlyphCache@@QAE@W4Type@QFontEngineGlyphCache@@ABVQTransform@@@Z @ 12806 NONAME ; QImageTextureGlyphCache::QImageTextureGlyphCache(enum QFontEngineGlyphCache::Type, class QTransform const &) + ?verticalMovementX@QTextCursor@@QBEHXZ @ 12807 NONAME ; int QTextCursor::verticalMovementX(void) const + ?runtime_graphics_system@QApplicationPrivate@@2_NA @ 12808 NONAME ; bool QApplicationPrivate::runtime_graphics_system + ?keepPositionOnInsert@QTextCursor@@QBE_NXZ @ 12809 NONAME ; bool QTextCursor::keepPositionOnInsert(void) const + ?setKeepPositionOnInsert@QTextCursor@@QAEX_N@Z @ 12810 NONAME ; void QTextCursor::setKeepPositionOnInsert(bool) + ?textDirection@QProgressBar@@QBE?AW4Direction@1@XZ @ 12811 NONAME ; enum QProgressBar::Direction QProgressBar::textDirection(void) const + ?setVerticalMovementX@QTextCursor@@QAEXH@Z @ 12812 NONAME ; void QTextCursor::setVerticalMovementX(int) + ?invertedAppearance@QProgressBar@@QBE_NXZ @ 12813 NONAME ; bool QProgressBar::invertedAppearance(void) const + ?width@QFontMetrics@@QBEHABVQString@@HH@Z @ 12814 NONAME ; int QFontMetrics::width(class QString const &, int, int) const + ?aboutToDestroy@QWidgetPrivate@@UAEXXZ @ 12815 NONAME ; void QWidgetPrivate::aboutToDestroy(void) + ?setTextOption@QStaticText@@QAEXABVQTextOption@@@Z @ 12816 NONAME ; void QStaticText::setTextOption(class QTextOption const &) + ?pointInsideRectAndMask@QWidgetPrivate@@QBE_NABVQPoint@@@Z @ 12817 NONAME ; bool QWidgetPrivate::pointInsideRectAndMask(class QPoint const &) const + ?childAtRecursiveHelper@QWidgetPrivate@@QBEPAVQWidget@@ABVQPoint@@_N1@Z @ 12818 NONAME ; class QWidget * QWidgetPrivate::childAtRecursiveHelper(class QPoint const &, bool, bool) const + ?textOption@QStaticText@@QBE?AVQTextOption@@XZ @ 12819 NONAME ; class QTextOption QStaticText::textOption(void) const + ?isRightToLeft@QTextEngine@@QBE_NXZ @ 12820 NONAME ; bool QTextEngine::isRightToLeft(void) const + ?textDirection@QTextBlock@@QBE?AW4LayoutDirection@Qt@@XZ @ 12821 NONAME ; enum Qt::LayoutDirection QTextBlock::textDirection(void) const + ?convertInPlace@QImageData@@QAE_NW4Format@QImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12822 NONAME ; bool QImageData::convertInPlace(enum QImage::Format, class QFlags) + ?createPixmapForImage@QRasterPixmapData@@IAEXAAVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@_N@Z @ 12823 NONAME ; void QRasterPixmapData::createPixmapForImage(class QImage &, class QFlags, bool) + ??0Tab@QTextOption@@QAE@MW4TabType@1@VQChar@@@Z @ 12824 NONAME ; QTextOption::Tab::Tab(float, enum QTextOption::TabType, class QChar) + ?fromData@QRasterPixmapData@@UAE_NPBEIPBDV?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12825 NONAME ; bool QRasterPixmapData::fromData(unsigned char const *, unsigned int, char const *, class QFlags) + ?transformed@QRuntimePixmapData@@UBE?AVQPixmap@@ABVQTransform@@W4TransformationMode@Qt@@@Z @ 12826 NONAME ; class QPixmap QRuntimePixmapData::transformed(class QTransform const &, enum Qt::TransformationMode) const + ?scroll@QRuntimePixmapData@@UAE_NHHABVQRect@@@Z @ 12827 NONAME ; bool QRuntimePixmapData::scroll(int, int, class QRect const &) + ?buffer@QRuntimePixmapData@@UAEPAVQImage@@XZ @ 12828 NONAME ; class QImage * QRuntimePixmapData::buffer(void) + ?copy@QRuntimePixmapData@@UAEXPBVQPixmapData@@ABVQRect@@@Z @ 12829 NONAME ; void QRuntimePixmapData::copy(class QPixmapData const *, class QRect const &) + ?fromData@QRuntimePixmapData@@UAE_NPBEIPBDV?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12830 NONAME ; bool QRuntimePixmapData::fromData(unsigned char const *, unsigned int, char const *, class QFlags) + ?readBackInfo@QRuntimePixmapData@@QAEXXZ @ 12831 NONAME ; void QRuntimePixmapData::readBackInfo(void) + ??_EQRuntimePixmapData@@UAE@I@Z @ 12832 NONAME ; QRuntimePixmapData::~QRuntimePixmapData(unsigned int) + ?paintEngine@QRuntimePixmapData@@UBEPAVQPaintEngine@@XZ @ 12833 NONAME ; class QPaintEngine * QRuntimePixmapData::paintEngine(void) const + ?memoryUsage@QRuntimePixmapData@@UBEIXZ @ 12834 NONAME ABSENT ; unsigned int QRuntimePixmapData::memoryUsage(void) const + ?toImage@QRasterPixmapData@@UBE?AVQImage@@ABVQRect@@@Z @ 12835 NONAME ; class QImage QRasterPixmapData::toImage(class QRect const &) const + ?fromImageReader@QRasterPixmapData@@UAEXPAVQImageReader@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12836 NONAME ; void QRasterPixmapData::fromImageReader(class QImageReader *, class QFlags) + ?fill@QRuntimePixmapData@@UAEXABVQColor@@@Z @ 12837 NONAME ; void QRuntimePixmapData::fill(class QColor const &) + ?alphaChannel@QRuntimePixmapData@@UBE?AVQPixmap@@XZ @ 12838 NONAME ; class QPixmap QRuntimePixmapData::alphaChannel(void) const + ?createCompatiblePixmapData@QRuntimePixmapData@@UBEPAVQPixmapData@@XZ @ 12839 NONAME ; class QPixmapData * QRuntimePixmapData::createCompatiblePixmapData(void) const + ?toImage@QRuntimePixmapData@@UBE?AVQImage@@XZ @ 12840 NONAME ; class QImage QRuntimePixmapData::toImage(void) const + ?resize@QRuntimePixmapData@@UAEXHH@Z @ 12841 NONAME ; void QRuntimePixmapData::resize(int, int) + ?fromNativeType@QRuntimePixmapData@@UAEXPAXW4NativeType@QPixmapData@@@Z @ 12842 NONAME ; void QRuntimePixmapData::fromNativeType(void *, enum QPixmapData::NativeType) + ?fromFile@QRuntimePixmapData@@UAE_NABVQString@@PBDV?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12843 NONAME ; bool QRuntimePixmapData::fromFile(class QString const &, char const *, class QFlags) + ?setAlphaChannel@QRuntimePixmapData@@UAEXABVQPixmap@@@Z @ 12844 NONAME ; void QRuntimePixmapData::setAlphaChannel(class QPixmap const &) + ?fromImageReader@QPixmapData@@UAEXPAVQImageReader@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12845 NONAME ; void QPixmapData::fromImageReader(class QImageReader *, class QFlags) + ?toImage@QPixmapData@@UBE?AVQImage@@ABVQRect@@@Z @ 12846 NONAME ; class QImage QPixmapData::toImage(class QRect const &) const + ?fromImageReader@QPixmap@@SA?AV1@PAVQImageReader@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12847 NONAME ; class QPixmap QPixmap::fromImageReader(class QImageReader *, class QFlags) + ?fromImage@QRuntimePixmapData@@UAEXABVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12848 NONAME ; void QRuntimePixmapData::fromImage(class QImage const &, class QFlags) + ?setMask@QRuntimePixmapData@@UAEXABVQBitmap@@@Z @ 12849 NONAME ; void QRuntimePixmapData::setMask(class QBitmap const &) + ?mask@QRuntimePixmapData@@UBE?AVQBitmap@@XZ @ 12850 NONAME ; class QBitmap QRuntimePixmapData::mask(void) const + ?createPixmapData@QGraphicsSystem@@UAEPAVQPixmapData@@PAV2@@Z @ 12851 NONAME ; class QPixmapData * QGraphicsSystem::createPixmapData(class QPixmapData *) + ?metric@QRuntimePixmapData@@UBEHW4PaintDeviceMetric@QPaintDevice@@@Z @ 12852 NONAME ; int QRuntimePixmapData::metric(enum QPaintDevice::PaintDeviceMetric) const + ??1QRuntimePixmapData@@UAE@XZ @ 12853 NONAME ; QRuntimePixmapData::~QRuntimePixmapData(void) + ??0QRuntimePixmapData@@QAE@PBVQRuntimeGraphicsSystem@@W4PixelType@QPixmapData@@@Z @ 12854 NONAME ; QRuntimePixmapData::QRuntimePixmapData(class QRuntimeGraphicsSystem const *, enum QPixmapData::PixelType) + ?hasAlphaChannel@QRuntimePixmapData@@UBE_NXZ @ 12855 NONAME ; bool QRuntimePixmapData::hasAlphaChannel(void) const + ?runtimeData@QRuntimePixmapData@@UBEPAVQPixmapData@@XZ @ 12856 NONAME ; class QPixmapData * QRuntimePixmapData::runtimeData(void) const + ?toNativeType@QRuntimePixmapData@@UAEPAXW4NativeType@QPixmapData@@@Z @ 12857 NONAME ; void * QRuntimePixmapData::toNativeType(enum QPixmapData::NativeType) + ?copy@QRasterPixmapData@@UAEXPBVQPixmapData@@ABVQRect@@@Z @ 12858 NONAME ; void QRasterPixmapData::copy(class QPixmapData const *, class QRect const &) + ?eglSwapBuffersRegion2NOK@QEgl@@YAHHHHPBH@Z @ 12859 NONAME ; int QEgl::eglSwapBuffersRegion2NOK(int, int, int, int const *) + ?swapBuffersRegion2NOK@QEglContext@@QAE_NHPBVQRegion@@@Z @ 12860 NONAME ; bool QEglContext::swapBuffersRegion2NOK(int, class QRegion const *) + ?OpenIniFileLC@QS60MainApplication@@UBEPAVCDictionaryStore@@AAVRFs@@@Z @ 12861 NONAME ; class CDictionaryStore * QS60MainApplication::OpenIniFileLC(class RFs &) const + ?Reserved_MtsmObject@QS60MainAppUi@@MAEXXZ @ 12862 NONAME ; void QS60MainAppUi::Reserved_MtsmObject(void) + ?HandleForegroundEventL@QS60MainAppUi@@MAEXH@Z @ 12863 NONAME ; void QS60MainAppUi::HandleForegroundEventL(int) + ?OpenFileL@QS60MainDocument@@UAEPAVCFileStore@@HABVTDesC16@@AAVRFs@@@Z @ 12864 NONAME ; class CFileStore * QS60MainDocument::OpenFileL(int, class TDesC16 const &, class RFs &) + ?HandleTouchPaneSizeChange@QS60MainAppUi@@UAEXXZ @ 12865 NONAME ; void QS60MainAppUi::HandleTouchPaneSizeChange(void) + ?Reserved_MtsmPosition@QS60MainAppUi@@MAEXXZ @ 12866 NONAME ; void QS60MainAppUi::Reserved_MtsmPosition(void) + ?ApplicationRect@QS60MainAppUi@@UBE?AVTRect@@XZ @ 12867 NONAME ; class TRect QS60MainAppUi::ApplicationRect(void) const + ?HandleSystemEventL@QS60MainAppUi@@MAEXABVTWsEvent@@@Z @ 12868 NONAME ; void QS60MainAppUi::HandleSystemEventL(class TWsEvent const &) + ?HandleApplicationSpecificEventL@QS60MainAppUi@@MAEXHABVTWsEvent@@@Z @ 12869 NONAME ; void QS60MainAppUi::HandleApplicationSpecificEventL(int, class TWsEvent const &) + ?HandleError@QS60MainAppUi@@UAE?AW4TErrorHandlerResponse@@HABUSExtendedError@@AAVTDes16@@1@Z @ 12870 NONAME ; enum TErrorHandlerResponse QS60MainAppUi::HandleError(int, struct SExtendedError const &, class TDes16 &, class TDes16 &) + ?PrepareToExit@QS60MainAppUi@@UAEXXZ @ 12871 NONAME ; void QS60MainAppUi::PrepareToExit(void) ?MopSupplyObject@QS60MainAppUi@@MAE?AVPtr@TTypeUid@@V3@@Z @ 12872 NONAME ; class TTypeUid::Ptr QS60MainAppUi::MopSupplyObject(class TTypeUid) - ??0QRuntimePixmapData@@QAE@PBVQRuntimeGraphicsSystem@@W4PixelType@QPixmapData@@@Z @ 12873 NONAME ; QRuntimePixmapData::QRuntimePixmapData(class QRuntimeGraphicsSystem const *, enum QPixmapData::PixelType) - ??0Tab@QTextOption@@QAE@MW4TabType@1@VQChar@@@Z @ 12874 NONAME ; QTextOption::Tab::Tab(float, enum QTextOption::TabType, class QChar) - ?mask@QRuntimePixmapData@@UBE?AVQBitmap@@XZ @ 12875 NONAME ; class QBitmap QRuntimePixmapData::mask(void) const - ?setMask@QRuntimePixmapData@@UAEXABVQBitmap@@@Z @ 12876 NONAME ; void QRuntimePixmapData::setMask(class QBitmap const &) - ?SetFadedL@QS60MainAppUi@@UAEXH@Z @ 12877 NONAME ; void QS60MainAppUi::SetFadedL(int) - ?fromImageReader@QPixmap@@SA?AV1@PAVQImageReader@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12878 NONAME ; class QPixmap QPixmap::fromImageReader(class QImageReader *, class QFlags) - ?Exit@QS60MainAppUi@@UAEXXZ @ 12879 NONAME ; void QS60MainAppUi::Exit(void) - ??_EQRuntimePixmapData@@UAE@I@Z @ 12880 NONAME ; QRuntimePixmapData::~QRuntimePixmapData(unsigned int) - ?resize@QRuntimePixmapData@@UAEXHH@Z @ 12881 NONAME ; void QRuntimePixmapData::resize(int, int) - ?ProcessCommandL@QS60MainAppUi@@UAEXH@Z @ 12882 NONAME ; void QS60MainAppUi::ProcessCommandL(int) - ?fromImageReader@QPixmapData@@UAEXPAVQImageReader@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12883 NONAME ; void QPixmapData::fromImageReader(class QImageReader *, class QFlags) - ?OpenFileL@QS60MainDocument@@UAEXAAPAVCFileStore@@AAVRFile@@@Z @ 12884 NONAME ; void QS60MainDocument::OpenFileL(class CFileStore * &, class RFile &) - ?fromImageReader@QRasterPixmapData@@UAEXPAVQImageReader@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12885 NONAME ; void QRasterPixmapData::fromImageReader(class QImageReader *, class QFlags) - ?createPixmapForImage@QRasterPixmapData@@IAEXAAVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@_N@Z @ 12886 NONAME ; void QRasterPixmapData::createPixmapForImage(class QImage &, class QFlags, bool) - ?HandleScreenDeviceChangedL@QS60MainAppUi@@MAEXXZ @ 12887 NONAME ; void QS60MainAppUi::HandleScreenDeviceChangedL(void) - ?scroll@QRuntimePixmapData@@UAE_NHHABVQRect@@@Z @ 12888 NONAME ; bool QRuntimePixmapData::scroll(int, int, class QRect const &) - ?PreDocConstructL@QS60MainApplication@@UAEXXZ @ 12889 NONAME ; void QS60MainApplication::PreDocConstructL(void) - ?NewAppServerL@QS60MainApplication@@UAEXAAPAVCApaAppServer@@@Z @ 12890 NONAME ; void QS60MainApplication::NewAppServerL(class CApaAppServer * &) - ?createPixmapData@QGraphicsSystem@@UAEPAVQPixmapData@@PAV2@@Z @ 12891 NONAME ; class QPixmapData * QGraphicsSystem::createPixmapData(class QPixmapData *) - ?convertInPlace@QImageData@@QAE_NW4Format@QImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12892 NONAME ; bool QImageData::convertInPlace(enum QImage::Format, class QFlags) - ?copy@QRasterPixmapData@@UAEXPBVQPixmapData@@ABVQRect@@@Z @ 12893 NONAME ; void QRasterPixmapData::copy(class QPixmapData const *, class QRect const &) - ?eglSwapBuffersRegion2NOK@QEgl@@YAHHHHPBH@Z @ 12894 NONAME ; int QEgl::eglSwapBuffersRegion2NOK(int, int, int, int const *) - ?HandleViewDeactivation@QS60MainAppUi@@UAEXABVTVwsViewId@@0@Z @ 12895 NONAME ; void QS60MainAppUi::HandleViewDeactivation(class TVwsViewId const &, class TVwsViewId const &) - ?fill@QRuntimePixmapData@@UAEXABVQColor@@@Z @ 12896 NONAME ; void QRuntimePixmapData::fill(class QColor const &) - ?timeout@QTapAndHoldGesture@@SAHXZ @ 12897 NONAME ; int QTapAndHoldGesture::timeout(void) - ?focusScopeItemChange@QGraphicsItemPrivate@@UAEX_N@Z @ 12898 NONAME ; void QGraphicsItemPrivate::focusScopeItemChange(bool) - ?setTimeout@QTapAndHoldGesture@@SAXH@Z @ 12899 NONAME ; void QTapAndHoldGesture::setTimeout(int) + ?SetFadedL@QS60MainAppUi@@UAEXH@Z @ 12873 NONAME ; void QS60MainAppUi::SetFadedL(int) + ?Exit@QS60MainAppUi@@UAEXXZ @ 12874 NONAME ; void QS60MainAppUi::Exit(void) + ?ProcessCommandL@QS60MainAppUi@@UAEXH@Z @ 12875 NONAME ; void QS60MainAppUi::ProcessCommandL(int) + ?OpenFileL@QS60MainDocument@@UAEXAAPAVCFileStore@@AAVRFile@@@Z @ 12876 NONAME ; void QS60MainDocument::OpenFileL(class CFileStore * &, class RFile &) + ?HandleScreenDeviceChangedL@QS60MainAppUi@@MAEXXZ @ 12877 NONAME ; void QS60MainAppUi::HandleScreenDeviceChangedL(void) + ?PreDocConstructL@QS60MainApplication@@UAEXXZ @ 12878 NONAME ; void QS60MainApplication::PreDocConstructL(void) + ?NewAppServerL@QS60MainApplication@@UAEXAAPAVCApaAppServer@@@Z @ 12879 NONAME ; void QS60MainApplication::NewAppServerL(class CApaAppServer * &) + ?HandleViewDeactivation@QS60MainAppUi@@UAEXABVTVwsViewId@@0@Z @ 12880 NONAME ; void QS60MainAppUi::HandleViewDeactivation(class TVwsViewId const &, class TVwsViewId const &) + ?timeout@QTapAndHoldGesture@@SAHXZ @ 12881 NONAME ; int QTapAndHoldGesture::timeout(void) + ?focusScopeItemChange@QGraphicsItemPrivate@@UAEX_N@Z @ 12882 NONAME ; void QGraphicsItemPrivate::focusScopeItemChange(bool) + ?setTimeout@QTapAndHoldGesture@@SAXH@Z @ 12883 NONAME ; void QTapAndHoldGesture::setTimeout(int) + ?childrenBoundingRectHelper@QGraphicsItemPrivate@@QAEXPAVQTransform@@PAVQRectF@@_N@Z @ 12884 NONAME ; void QGraphicsItemPrivate::childrenBoundingRectHelper(class QTransform *, class QRectF *, bool) + ?zScaleChanged@QGraphicsScale@@IAEXXZ @ 12885 NONAME ; void QGraphicsScale::zScaleChanged(void) + ?xScaleChanged@QGraphicsScale@@IAEXXZ @ 12886 NONAME ; void QGraphicsScale::xScaleChanged(void) + ?yScaleChanged@QGraphicsScale@@IAEXXZ @ 12887 NONAME ; void QGraphicsScale::yScaleChanged(void) + ?_q_aboutToQuit@QApplicationPrivate@@QAEXXZ @ 12888 NONAME ; void QApplicationPrivate::_q_aboutToQuit(void) + ?ensureSpace@QTextEngine@@QBE_NH@Z @ 12889 NONAME ; bool QTextEngine::ensureSpace(int) const diff -r ef0373b55136 -r 758a864f9613 src/s60installs/bwins/QtNetworku.def --- a/src/s60installs/bwins/QtNetworku.def Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/bwins/QtNetworku.def Mon Oct 04 01:19:32 2010 +0300 @@ -962,189 +962,187 @@ ?staticMetaObject@QTcpServer@@2UQMetaObject@@B @ 961 NONAME ; struct QMetaObject const QTcpServer::staticMetaObject ?staticMetaObject@QUdpSocket@@2UQMetaObject@@B @ 962 NONAME ; struct QMetaObject const QUdpSocket::staticMetaObject ?staticMetaObject@QAbstractSocket@@2UQMetaObject@@B @ 963 NONAME ; struct QMetaObject const QAbstractSocket::staticMetaObject - ??0QBearerEngine@@QAE@PAVQObject@@@Z @ 964 NONAME ; QBearerEngine::QBearerEngine(class QObject *) - ??0QBearerEnginePlugin@@QAE@PAVQObject@@@Z @ 965 NONAME ; QBearerEnginePlugin::QBearerEnginePlugin(class QObject *) - ??0QNetworkConfiguration@@QAE@ABV0@@Z @ 966 NONAME ; QNetworkConfiguration::QNetworkConfiguration(class QNetworkConfiguration const &) - ??0QNetworkConfiguration@@QAE@XZ @ 967 NONAME ; QNetworkConfiguration::QNetworkConfiguration(void) - ??0QNetworkConfigurationManager@@QAE@PAVQObject@@@Z @ 968 NONAME ; QNetworkConfigurationManager::QNetworkConfigurationManager(class QObject *) - ??0QNetworkConfigurationManagerPrivate@@QAE@XZ @ 969 NONAME ; QNetworkConfigurationManagerPrivate::QNetworkConfigurationManagerPrivate(void) - ??0QNetworkSession@@QAE@ABVQNetworkConfiguration@@PAVQObject@@@Z @ 970 NONAME ; QNetworkSession::QNetworkSession(class QNetworkConfiguration const &, class QObject *) - ??0QNetworkSessionPrivate@@QAE@XZ @ 971 NONAME ; QNetworkSessionPrivate::QNetworkSessionPrivate(void) - ??1QBearerEngine@@UAE@XZ @ 972 NONAME ; QBearerEngine::~QBearerEngine(void) - ??1QBearerEngineFactoryInterface@@UAE@XZ @ 973 NONAME ; QBearerEngineFactoryInterface::~QBearerEngineFactoryInterface(void) - ??1QBearerEnginePlugin@@UAE@XZ @ 974 NONAME ; QBearerEnginePlugin::~QBearerEnginePlugin(void) - ??1QNetworkConfiguration@@QAE@XZ @ 975 NONAME ; QNetworkConfiguration::~QNetworkConfiguration(void) - ??1QNetworkConfigurationManager@@UAE@XZ @ 976 NONAME ; QNetworkConfigurationManager::~QNetworkConfigurationManager(void) - ??1QNetworkConfigurationManagerPrivate@@UAE@XZ @ 977 NONAME ; QNetworkConfigurationManagerPrivate::~QNetworkConfigurationManagerPrivate(void) - ??1QNetworkSession@@UAE@XZ @ 978 NONAME ; QNetworkSession::~QNetworkSession(void) - ??1QNetworkSessionPrivate@@UAE@XZ @ 979 NONAME ; QNetworkSessionPrivate::~QNetworkSessionPrivate(void) - ??4QNetworkConfiguration@@QAEAAV0@ABV0@@Z @ 980 NONAME ; class QNetworkConfiguration & QNetworkConfiguration::operator=(class QNetworkConfiguration const &) - ??8QNetworkConfiguration@@QBE_NABV0@@Z @ 981 NONAME ; bool QNetworkConfiguration::operator==(class QNetworkConfiguration const &) const - ??9QNetworkConfiguration@@QBE_NABV0@@Z @ 982 NONAME ; bool QNetworkConfiguration::operator!=(class QNetworkConfiguration const &) const - ??_EQBearerEngine@@UAE@I@Z @ 983 NONAME ; QBearerEngine::~QBearerEngine(unsigned int) - ??_EQBearerEngineFactoryInterface@@UAE@I@Z @ 984 NONAME ; QBearerEngineFactoryInterface::~QBearerEngineFactoryInterface(unsigned int) - ??_EQBearerEnginePlugin@@UAE@I@Z @ 985 NONAME ; QBearerEnginePlugin::~QBearerEnginePlugin(unsigned int) - ??_EQNetworkConfigurationManager@@UAE@I@Z @ 986 NONAME ; QNetworkConfigurationManager::~QNetworkConfigurationManager(unsigned int) - ??_EQNetworkConfigurationManagerPrivate@@UAE@I@Z @ 987 NONAME ; QNetworkConfigurationManagerPrivate::~QNetworkConfigurationManagerPrivate(unsigned int) - ??_EQNetworkSession@@UAE@I@Z @ 988 NONAME ; QNetworkSession::~QNetworkSession(unsigned int) - ??_EQNetworkSessionPrivate@@UAE@I@Z @ 989 NONAME ; QNetworkSessionPrivate::~QNetworkSessionPrivate(unsigned int) - ?abort@QNetworkConfigurationManagerPrivate@@IAEXXZ @ 990 NONAME ; void QNetworkConfigurationManagerPrivate::abort(void) - ?accept@QNetworkSession@@QAEXXZ @ 991 NONAME ; void QNetworkSession::accept(void) - ?activeConfiguration@QNetworkAccessManager@@QBE?AVQNetworkConfiguration@@XZ @ 992 NONAME ; class QNetworkConfiguration QNetworkAccessManager::activeConfiguration(void) const - ?activeTime@QNetworkSession@@QBE_KXZ @ 993 NONAME ; unsigned long long QNetworkSession::activeTime(void) const - ?allConfigurations@QNetworkConfigurationManager@@QBE?AV?$QList@VQNetworkConfiguration@@@@V?$QFlags@W4StateFlag@QNetworkConfiguration@@@@@Z @ 994 NONAME ; class QList QNetworkConfigurationManager::allConfigurations(class QFlags) const - ?bearerName@QNetworkConfiguration@@QBE?AVQString@@XZ @ 995 NONAME ; class QString QNetworkConfiguration::bearerName(void) const - ?bytesReceived@QNetworkSession@@QBE_KXZ @ 996 NONAME ; unsigned long long QNetworkSession::bytesReceived(void) const - ?bytesWritten@QNetworkSession@@QBE_KXZ @ 997 NONAME ; unsigned long long QNetworkSession::bytesWritten(void) const - ?capabilities@QNetworkConfigurationManager@@QBE?AV?$QFlags@W4Capability@QNetworkConfigurationManager@@@@XZ @ 998 NONAME ; class QFlags QNetworkConfigurationManager::capabilities(void) const - ?children@QNetworkConfiguration@@QBE?AV?$QList@VQNetworkConfiguration@@@@XZ @ 999 NONAME ; class QList QNetworkConfiguration::children(void) const - ?close@QNetworkSession@@QAEXXZ @ 1000 NONAME ; void QNetworkSession::close(void) - ?closed@QNetworkSession@@IAEXXZ @ 1001 NONAME ; void QNetworkSession::closed(void) - ?closed@QNetworkSessionPrivate@@IAEXXZ @ 1002 NONAME ; void QNetworkSessionPrivate::closed(void) - ?configuration@QNetworkAccessManager@@QBE?AVQNetworkConfiguration@@XZ @ 1003 NONAME ; class QNetworkConfiguration QNetworkAccessManager::configuration(void) const - ?configuration@QNetworkSession@@QBE?AVQNetworkConfiguration@@XZ @ 1004 NONAME ; class QNetworkConfiguration QNetworkSession::configuration(void) const - ?configurationAdded@QBearerEngine@@IAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1005 NONAME ; void QBearerEngine::configurationAdded(class QExplicitlySharedDataPointer) - ?configurationAdded@QNetworkConfigurationManager@@IAEXABVQNetworkConfiguration@@@Z @ 1006 NONAME ; void QNetworkConfigurationManager::configurationAdded(class QNetworkConfiguration const &) - ?configurationAdded@QNetworkConfigurationManagerPrivate@@AAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1007 NONAME ; void QNetworkConfigurationManagerPrivate::configurationAdded(class QExplicitlySharedDataPointer) - ?configurationAdded@QNetworkConfigurationManagerPrivate@@IAEXABVQNetworkConfiguration@@@Z @ 1008 NONAME ; void QNetworkConfigurationManagerPrivate::configurationAdded(class QNetworkConfiguration const &) - ?configurationChanged@QBearerEngine@@IAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1009 NONAME ; void QBearerEngine::configurationChanged(class QExplicitlySharedDataPointer) - ?configurationChanged@QNetworkConfigurationManager@@IAEXABVQNetworkConfiguration@@@Z @ 1010 NONAME ; void QNetworkConfigurationManager::configurationChanged(class QNetworkConfiguration const &) - ?configurationChanged@QNetworkConfigurationManagerPrivate@@AAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1011 NONAME ; void QNetworkConfigurationManagerPrivate::configurationChanged(class QExplicitlySharedDataPointer) - ?configurationChanged@QNetworkConfigurationManagerPrivate@@IAEXABVQNetworkConfiguration@@@Z @ 1012 NONAME ; void QNetworkConfigurationManagerPrivate::configurationChanged(class QNetworkConfiguration const &) - ?configurationFromIdentifier@QNetworkConfigurationManager@@QBE?AVQNetworkConfiguration@@ABVQString@@@Z @ 1013 NONAME ; class QNetworkConfiguration QNetworkConfigurationManager::configurationFromIdentifier(class QString const &) const - ?configurationRemoved@QBearerEngine@@IAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1014 NONAME ; void QBearerEngine::configurationRemoved(class QExplicitlySharedDataPointer) - ?configurationRemoved@QNetworkConfigurationManager@@IAEXABVQNetworkConfiguration@@@Z @ 1015 NONAME ; void QNetworkConfigurationManager::configurationRemoved(class QNetworkConfiguration const &) - ?configurationRemoved@QNetworkConfigurationManagerPrivate@@AAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1016 NONAME ; void QNetworkConfigurationManagerPrivate::configurationRemoved(class QExplicitlySharedDataPointer) - ?configurationRemoved@QNetworkConfigurationManagerPrivate@@IAEXABVQNetworkConfiguration@@@Z @ 1017 NONAME ; void QNetworkConfigurationManagerPrivate::configurationRemoved(class QNetworkConfiguration const &) - ?configurationUpdateComplete@QNetworkConfigurationManagerPrivate@@IAEXXZ @ 1018 NONAME ; void QNetworkConfigurationManagerPrivate::configurationUpdateComplete(void) - ?connectNotify@QNetworkSession@@MAEXPBD@Z @ 1019 NONAME ; void QNetworkSession::connectNotify(char const *) - ?defaultConfiguration@QNetworkConfigurationManager@@QBE?AVQNetworkConfiguration@@XZ @ 1020 NONAME ; class QNetworkConfiguration QNetworkConfigurationManager::defaultConfiguration(void) const - ?disconnectNotify@QNetworkSession@@MAEXPBD@Z @ 1021 NONAME ; void QNetworkSession::disconnectNotify(char const *) - ?engines@QNetworkConfigurationManagerPrivate@@QAE?AV?$QList@PAVQBearerEngine@@@@XZ @ 1022 NONAME ; class QList QNetworkConfigurationManagerPrivate::engines(void) - ?error@QNetworkSession@@IAEXW4SessionError@1@@Z @ 1023 NONAME ; void QNetworkSession::error(enum QNetworkSession::SessionError) - ?error@QNetworkSession@@QBE?AW4SessionError@1@XZ @ 1024 NONAME ; enum QNetworkSession::SessionError QNetworkSession::error(void) const - ?error@QNetworkSessionPrivate@@IAEXW4SessionError@QNetworkSession@@@Z @ 1025 NONAME ; void QNetworkSessionPrivate::error(enum QNetworkSession::SessionError) - ?errorString@QNetworkSession@@QBE?AVQString@@XZ @ 1026 NONAME ; class QString QNetworkSession::errorString(void) const - ?getStaticMetaObject@QBearerEngine@@SAABUQMetaObject@@XZ @ 1027 NONAME ; struct QMetaObject const & QBearerEngine::getStaticMetaObject(void) - ?getStaticMetaObject@QBearerEnginePlugin@@SAABUQMetaObject@@XZ @ 1028 NONAME ; struct QMetaObject const & QBearerEnginePlugin::getStaticMetaObject(void) - ?getStaticMetaObject@QNetworkConfigurationManager@@SAABUQMetaObject@@XZ @ 1029 NONAME ; struct QMetaObject const & QNetworkConfigurationManager::getStaticMetaObject(void) - ?getStaticMetaObject@QNetworkConfigurationManagerPrivate@@SAABUQMetaObject@@XZ @ 1030 NONAME ; struct QMetaObject const & QNetworkConfigurationManagerPrivate::getStaticMetaObject(void) - ?getStaticMetaObject@QNetworkSession@@SAABUQMetaObject@@XZ @ 1031 NONAME ; struct QMetaObject const & QNetworkSession::getStaticMetaObject(void) - ?getStaticMetaObject@QNetworkSessionPrivate@@SAABUQMetaObject@@XZ @ 1032 NONAME ; struct QMetaObject const & QNetworkSessionPrivate::getStaticMetaObject(void) - ?identifier@QNetworkConfiguration@@QBE?AVQString@@XZ @ 1033 NONAME ; class QString QNetworkConfiguration::identifier(void) const - ?ignore@QNetworkSession@@QAEXXZ @ 1034 NONAME ; void QNetworkSession::ignore(void) - ?interface@QNetworkSession@@QBE?AVQNetworkInterface@@XZ @ 1035 NONAME ; class QNetworkInterface QNetworkSession::interface(void) const - ?isOnline@QNetworkConfigurationManager@@QBE_NXZ @ 1036 NONAME ; bool QNetworkConfigurationManager::isOnline(void) const - ?isOpen@QNetworkSession@@QBE_NXZ @ 1037 NONAME ; bool QNetworkSession::isOpen(void) const - ?isRoamingAvailable@QNetworkConfiguration@@QBE_NXZ @ 1038 NONAME ; bool QNetworkConfiguration::isRoamingAvailable(void) const - ?isValid@QNetworkConfiguration@@QBE_NXZ @ 1039 NONAME ; bool QNetworkConfiguration::isValid(void) const - ?metaObject@QBearerEngine@@UBEPBUQMetaObject@@XZ @ 1040 NONAME ; struct QMetaObject const * QBearerEngine::metaObject(void) const - ?metaObject@QBearerEnginePlugin@@UBEPBUQMetaObject@@XZ @ 1041 NONAME ; struct QMetaObject const * QBearerEnginePlugin::metaObject(void) const - ?metaObject@QNetworkConfigurationManager@@UBEPBUQMetaObject@@XZ @ 1042 NONAME ; struct QMetaObject const * QNetworkConfigurationManager::metaObject(void) const - ?metaObject@QNetworkConfigurationManagerPrivate@@UBEPBUQMetaObject@@XZ @ 1043 NONAME ; struct QMetaObject const * QNetworkConfigurationManagerPrivate::metaObject(void) const - ?metaObject@QNetworkSession@@UBEPBUQMetaObject@@XZ @ 1044 NONAME ; struct QMetaObject const * QNetworkSession::metaObject(void) const - ?metaObject@QNetworkSessionPrivate@@UBEPBUQMetaObject@@XZ @ 1045 NONAME ; struct QMetaObject const * QNetworkSessionPrivate::metaObject(void) const - ?migrate@QNetworkSession@@QAEXXZ @ 1046 NONAME ; void QNetworkSession::migrate(void) - ?name@QNetworkConfiguration@@QBE?AVQString@@XZ @ 1047 NONAME ; class QString QNetworkConfiguration::name(void) const - ?networkAccessChanged@QNetworkAccessManager@@IAEX_N@Z @ 1048 NONAME ABSENT ; void QNetworkAccessManager::networkAccessChanged(bool) - ?networkAccessEnabled@QNetworkAccessManager@@QBE_NXZ @ 1049 NONAME ABSENT ; bool QNetworkAccessManager::networkAccessEnabled(void) const - ?networkSessionOnline@QNetworkAccessManager@@IAEXXZ @ 1050 NONAME ABSENT ; void QNetworkAccessManager::networkSessionOnline(void) - ?newConfigurationActivated@QNetworkSession@@IAEXXZ @ 1051 NONAME ; void QNetworkSession::newConfigurationActivated(void) - ?newConfigurationActivated@QNetworkSessionPrivate@@IAEXXZ @ 1052 NONAME ; void QNetworkSessionPrivate::newConfigurationActivated(void) - ?onlineStateChanged@QNetworkConfigurationManager@@IAEX_N@Z @ 1053 NONAME ; void QNetworkConfigurationManager::onlineStateChanged(bool) - ?onlineStateChanged@QNetworkConfigurationManagerPrivate@@IAEX_N@Z @ 1054 NONAME ; void QNetworkConfigurationManagerPrivate::onlineStateChanged(bool) - ?open@QNetworkSession@@QAEXXZ @ 1055 NONAME ; void QNetworkSession::open(void) - ?opened@QNetworkSession@@IAEXXZ @ 1056 NONAME ; void QNetworkSession::opened(void) - ?performAsyncConfigurationUpdate@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1057 NONAME ; void QNetworkConfigurationManagerPrivate::performAsyncConfigurationUpdate(void) - ?preferredConfigurationChanged@QNetworkSession@@IAEXABVQNetworkConfiguration@@_N@Z @ 1058 NONAME ; void QNetworkSession::preferredConfigurationChanged(class QNetworkConfiguration const &, bool) - ?preferredConfigurationChanged@QNetworkSessionPrivate@@IAEXABVQNetworkConfiguration@@_N@Z @ 1059 NONAME ; void QNetworkSessionPrivate::preferredConfigurationChanged(class QNetworkConfiguration const &, bool) - ?priority@QNetworkRequest@@QBE?AW4Priority@1@XZ @ 1060 NONAME ; enum QNetworkRequest::Priority QNetworkRequest::priority(void) const - ?privateConfiguration@QNetworkSessionPrivate@@IBE?AV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@ABVQNetworkConfiguration@@@Z @ 1061 NONAME ; class QExplicitlySharedDataPointer QNetworkSessionPrivate::privateConfiguration(class QNetworkConfiguration const &) const - ?purpose@QNetworkConfiguration@@QBE?AW4Purpose@1@XZ @ 1062 NONAME ; enum QNetworkConfiguration::Purpose QNetworkConfiguration::purpose(void) const - ?qNetworkConfigurationManagerPrivate@@YAPAVQNetworkConfigurationManagerPrivate@@XZ @ 1063 NONAME ; class QNetworkConfigurationManagerPrivate * qNetworkConfigurationManagerPrivate(void) - ?qt_metacall@QBearerEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1064 NONAME ; int QBearerEngine::qt_metacall(enum QMetaObject::Call, int, void * *) - ?qt_metacall@QBearerEnginePlugin@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1065 NONAME ; int QBearerEnginePlugin::qt_metacall(enum QMetaObject::Call, int, void * *) - ?qt_metacall@QNetworkConfigurationManager@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1066 NONAME ; int QNetworkConfigurationManager::qt_metacall(enum QMetaObject::Call, int, void * *) - ?qt_metacall@QNetworkConfigurationManagerPrivate@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1067 NONAME ; int QNetworkConfigurationManagerPrivate::qt_metacall(enum QMetaObject::Call, int, void * *) - ?qt_metacall@QNetworkSession@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1068 NONAME ; int QNetworkSession::qt_metacall(enum QMetaObject::Call, int, void * *) - ?qt_metacall@QNetworkSessionPrivate@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1069 NONAME ; int QNetworkSessionPrivate::qt_metacall(enum QMetaObject::Call, int, void * *) - ?qt_metacast@QBearerEngine@@UAEPAXPBD@Z @ 1070 NONAME ; void * QBearerEngine::qt_metacast(char const *) - ?qt_metacast@QBearerEnginePlugin@@UAEPAXPBD@Z @ 1071 NONAME ; void * QBearerEnginePlugin::qt_metacast(char const *) - ?qt_metacast@QNetworkConfigurationManager@@UAEPAXPBD@Z @ 1072 NONAME ; void * QNetworkConfigurationManager::qt_metacast(char const *) - ?qt_metacast@QNetworkConfigurationManagerPrivate@@UAEPAXPBD@Z @ 1073 NONAME ; void * QNetworkConfigurationManagerPrivate::qt_metacast(char const *) - ?qt_metacast@QNetworkSession@@UAEPAXPBD@Z @ 1074 NONAME ; void * QNetworkSession::qt_metacast(char const *) - ?qt_metacast@QNetworkSessionPrivate@@UAEPAXPBD@Z @ 1075 NONAME ; void * QNetworkSessionPrivate::qt_metacast(char const *) - ?quitPendingWaitsForOpened@QNetworkSessionPrivate@@IAEXXZ @ 1076 NONAME ; void QNetworkSessionPrivate::quitPendingWaitsForOpened(void) - ?rawHeaderPairs@QNetworkReply@@QBEABV?$QList@U?$QPair@VQByteArray@@V1@@@@@XZ @ 1077 NONAME ; class QList > const & QNetworkReply::rawHeaderPairs(void) const - ?reject@QNetworkSession@@QAEXXZ @ 1078 NONAME ; void QNetworkSession::reject(void) - ?sendCustomRequest@QNetworkAccessManager@@QAEPAVQNetworkReply@@ABVQNetworkRequest@@ABVQByteArray@@PAVQIODevice@@@Z @ 1079 NONAME ; class QNetworkReply * QNetworkAccessManager::sendCustomRequest(class QNetworkRequest const &, class QByteArray const &, class QIODevice *) - ?sessionProperty@QNetworkSession@@QBE?AVQVariant@@ABVQString@@@Z @ 1080 NONAME ; class QVariant QNetworkSession::sessionProperty(class QString const &) const - ?setALREnabled@QNetworkSessionPrivate@@UAEX_N@Z @ 1081 NONAME ; void QNetworkSessionPrivate::setALREnabled(bool) - ?setConfiguration@QNetworkAccessManager@@QAEXABVQNetworkConfiguration@@@Z @ 1082 NONAME ; void QNetworkAccessManager::setConfiguration(class QNetworkConfiguration const &) - ?setNetworkAccessEnabled@QNetworkAccessManager@@QAEX_N@Z @ 1083 NONAME ABSENT ; void QNetworkAccessManager::setNetworkAccessEnabled(bool) - ?setPriority@QNetworkRequest@@QAEXW4Priority@1@@Z @ 1084 NONAME ; void QNetworkRequest::setPriority(enum QNetworkRequest::Priority) - ?setPrivateConfiguration@QNetworkSessionPrivate@@IBEXAAVQNetworkConfiguration@@V?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1085 NONAME ; void QNetworkSessionPrivate::setPrivateConfiguration(class QNetworkConfiguration &, class QExplicitlySharedDataPointer) const - ?setSessionProperty@QNetworkSession@@QAEXABVQString@@ABVQVariant@@@Z @ 1086 NONAME ; void QNetworkSession::setSessionProperty(class QString const &, class QVariant const &) - ?state@QNetworkConfiguration@@QBE?AV?$QFlags@W4StateFlag@QNetworkConfiguration@@@@XZ @ 1087 NONAME ; class QFlags QNetworkConfiguration::state(void) const - ?state@QNetworkSession@@QBE?AW4State@1@XZ @ 1088 NONAME ; enum QNetworkSession::State QNetworkSession::state(void) const - ?stateChanged@QNetworkSession@@IAEXW4State@1@@Z @ 1089 NONAME ; void QNetworkSession::stateChanged(enum QNetworkSession::State) - ?stateChanged@QNetworkSessionPrivate@@IAEXW4State@QNetworkSession@@@Z @ 1090 NONAME ; void QNetworkSessionPrivate::stateChanged(enum QNetworkSession::State) - ?stop@QNetworkSession@@QAEXXZ @ 1091 NONAME ; void QNetworkSession::stop(void) - ?tr@QBearerEngine@@SA?AVQString@@PBD0@Z @ 1092 NONAME ; class QString QBearerEngine::tr(char const *, char const *) - ?tr@QBearerEngine@@SA?AVQString@@PBD0H@Z @ 1093 NONAME ; class QString QBearerEngine::tr(char const *, char const *, int) - ?tr@QBearerEnginePlugin@@SA?AVQString@@PBD0@Z @ 1094 NONAME ; class QString QBearerEnginePlugin::tr(char const *, char const *) - ?tr@QBearerEnginePlugin@@SA?AVQString@@PBD0H@Z @ 1095 NONAME ; class QString QBearerEnginePlugin::tr(char const *, char const *, int) - ?tr@QNetworkConfigurationManager@@SA?AVQString@@PBD0@Z @ 1096 NONAME ; class QString QNetworkConfigurationManager::tr(char const *, char const *) - ?tr@QNetworkConfigurationManager@@SA?AVQString@@PBD0H@Z @ 1097 NONAME ; class QString QNetworkConfigurationManager::tr(char const *, char const *, int) - ?tr@QNetworkConfigurationManagerPrivate@@SA?AVQString@@PBD0@Z @ 1098 NONAME ; class QString QNetworkConfigurationManagerPrivate::tr(char const *, char const *) - ?tr@QNetworkConfigurationManagerPrivate@@SA?AVQString@@PBD0H@Z @ 1099 NONAME ; class QString QNetworkConfigurationManagerPrivate::tr(char const *, char const *, int) - ?tr@QNetworkSession@@SA?AVQString@@PBD0@Z @ 1100 NONAME ; class QString QNetworkSession::tr(char const *, char const *) - ?tr@QNetworkSession@@SA?AVQString@@PBD0H@Z @ 1101 NONAME ; class QString QNetworkSession::tr(char const *, char const *, int) - ?tr@QNetworkSessionPrivate@@SA?AVQString@@PBD0@Z @ 1102 NONAME ; class QString QNetworkSessionPrivate::tr(char const *, char const *) - ?tr@QNetworkSessionPrivate@@SA?AVQString@@PBD0H@Z @ 1103 NONAME ; class QString QNetworkSessionPrivate::tr(char const *, char const *, int) - ?trUtf8@QBearerEngine@@SA?AVQString@@PBD0@Z @ 1104 NONAME ; class QString QBearerEngine::trUtf8(char const *, char const *) - ?trUtf8@QBearerEngine@@SA?AVQString@@PBD0H@Z @ 1105 NONAME ; class QString QBearerEngine::trUtf8(char const *, char const *, int) - ?trUtf8@QBearerEnginePlugin@@SA?AVQString@@PBD0@Z @ 1106 NONAME ; class QString QBearerEnginePlugin::trUtf8(char const *, char const *) - ?trUtf8@QBearerEnginePlugin@@SA?AVQString@@PBD0H@Z @ 1107 NONAME ; class QString QBearerEnginePlugin::trUtf8(char const *, char const *, int) - ?trUtf8@QNetworkConfigurationManager@@SA?AVQString@@PBD0@Z @ 1108 NONAME ; class QString QNetworkConfigurationManager::trUtf8(char const *, char const *) - ?trUtf8@QNetworkConfigurationManager@@SA?AVQString@@PBD0H@Z @ 1109 NONAME ; class QString QNetworkConfigurationManager::trUtf8(char const *, char const *, int) - ?trUtf8@QNetworkConfigurationManagerPrivate@@SA?AVQString@@PBD0@Z @ 1110 NONAME ; class QString QNetworkConfigurationManagerPrivate::trUtf8(char const *, char const *) - ?trUtf8@QNetworkConfigurationManagerPrivate@@SA?AVQString@@PBD0H@Z @ 1111 NONAME ; class QString QNetworkConfigurationManagerPrivate::trUtf8(char const *, char const *, int) - ?trUtf8@QNetworkSession@@SA?AVQString@@PBD0@Z @ 1112 NONAME ; class QString QNetworkSession::trUtf8(char const *, char const *) - ?trUtf8@QNetworkSession@@SA?AVQString@@PBD0H@Z @ 1113 NONAME ; class QString QNetworkSession::trUtf8(char const *, char const *, int) - ?trUtf8@QNetworkSessionPrivate@@SA?AVQString@@PBD0@Z @ 1114 NONAME ; class QString QNetworkSessionPrivate::trUtf8(char const *, char const *) - ?trUtf8@QNetworkSessionPrivate@@SA?AVQString@@PBD0H@Z @ 1115 NONAME ; class QString QNetworkSessionPrivate::trUtf8(char const *, char const *, int) - ?type@QNetworkConfiguration@@QBE?AW4Type@1@XZ @ 1116 NONAME ; enum QNetworkConfiguration::Type QNetworkConfiguration::type(void) const - ?updateCompleted@QBearerEngine@@IAEXXZ @ 1117 NONAME ; void QBearerEngine::updateCompleted(void) - ?updateCompleted@QNetworkConfigurationManager@@IAEXXZ @ 1118 NONAME ; void QNetworkConfigurationManager::updateCompleted(void) - ?updateConfigurations@QNetworkConfigurationManager@@QAEXXZ @ 1119 NONAME ; void QNetworkConfigurationManager::updateConfigurations(void) - ?updateConfigurations@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1120 NONAME ; void QNetworkConfigurationManagerPrivate::updateConfigurations(void) - ?waitForOpened@QNetworkSession@@QAE_NH@Z @ 1121 NONAME ; bool QNetworkSession::waitForOpened(int) - ?staticMetaObject@QNetworkSessionPrivate@@2UQMetaObject@@B @ 1122 NONAME ; struct QMetaObject const QNetworkSessionPrivate::staticMetaObject - ?staticMetaObject@QBearerEngine@@2UQMetaObject@@B @ 1123 NONAME ; struct QMetaObject const QBearerEngine::staticMetaObject - ?staticMetaObject@QNetworkSession@@2UQMetaObject@@B @ 1124 NONAME ; struct QMetaObject const QNetworkSession::staticMetaObject - ?staticMetaObject@QNetworkConfigurationManager@@2UQMetaObject@@B @ 1125 NONAME ; struct QMetaObject const QNetworkConfigurationManager::staticMetaObject - ?staticMetaObject@QBearerEnginePlugin@@2UQMetaObject@@B @ 1126 NONAME ; struct QMetaObject const QBearerEnginePlugin::staticMetaObject - ?staticMetaObject@QNetworkConfigurationManagerPrivate@@2UQMetaObject@@B @ 1127 NONAME ; struct QMetaObject const QNetworkConfigurationManagerPrivate::staticMetaObject - ?allConfigurations@QNetworkConfigurationManagerPrivate@@QAE?AV?$QList@VQNetworkConfiguration@@@@V?$QFlags@W4StateFlag@QNetworkConfiguration@@@@@Z @ 1128 NONAME ; class QList QNetworkConfigurationManagerPrivate::allConfigurations(class QFlags) - ?configurationFromIdentifier@QNetworkConfigurationManagerPrivate@@QAE?AVQNetworkConfiguration@@ABVQString@@@Z @ 1129 NONAME ; class QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIdentifier(class QString const &) - ?configurationsInUse@QBearerEngine@@QBE_NXZ @ 1130 NONAME ; bool QBearerEngine::configurationsInUse(void) const - ?defaultConfiguration@QNetworkConfigurationManagerPrivate@@QAE?AVQNetworkConfiguration@@XZ @ 1131 NONAME ; class QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration(void) - ?disablePolling@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1132 NONAME ; void QNetworkConfigurationManagerPrivate::disablePolling(void) - ?enablePolling@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1133 NONAME ; void QNetworkConfigurationManagerPrivate::enablePolling(void) - ?isOnline@QNetworkConfigurationManagerPrivate@@QAE_NXZ @ 1134 NONAME ; bool QNetworkConfigurationManagerPrivate::isOnline(void) - ?networkAccessible@QNetworkAccessManager@@QBE?AW4NetworkAccessibility@1@XZ @ 1135 NONAME ; enum QNetworkAccessManager::NetworkAccessibility QNetworkAccessManager::networkAccessible(void) const - ?networkAccessibleChanged@QNetworkAccessManager@@IAEXW4NetworkAccessibility@1@@Z @ 1136 NONAME ; void QNetworkAccessManager::networkAccessibleChanged(enum QNetworkAccessManager::NetworkAccessibility) - ?networkSessionConnected@QNetworkAccessManager@@IAEXXZ @ 1137 NONAME ; void QNetworkAccessManager::networkSessionConnected(void) - ?pollEngines@QNetworkConfigurationManagerPrivate@@AAEXXZ @ 1138 NONAME ; void QNetworkConfigurationManagerPrivate::pollEngines(void) - ?qt_qhostinfo_clear_cache@@YAXXZ @ 1139 NONAME ABSENT ; void qt_qhostinfo_clear_cache(void) - ?qt_qhostinfo_lookup@@YA?AVQHostInfo@@ABVQString@@PAVQObject@@PBDPA_NPAH@Z @ 1140 NONAME ; class QHostInfo qt_qhostinfo_lookup(class QString const &, class QObject *, char const *, bool *, int *) - ?requiresPolling@QBearerEngine@@UBE_NXZ @ 1141 NONAME ; bool QBearerEngine::requiresPolling(void) const + ?qt_qhostinfo_clear_cache@@YAXXZ @ 964 NONAME ABSENT ; void qt_qhostinfo_clear_cache(void) + ?qt_qhostinfo_lookup@@YA?AVQHostInfo@@ABVQString@@PAVQObject@@PBDPA_NPAH@Z @ 965 NONAME ; class QHostInfo qt_qhostinfo_lookup(class QString const &, class QObject *, char const *, bool *, int *) + ?rawHeaderPairs@QNetworkReply@@QBEABV?$QList@U?$QPair@VQByteArray@@V1@@@@@XZ @ 966 NONAME ; class QList > const & QNetworkReply::rawHeaderPairs(void) const + ?tr@QBearerEnginePlugin@@SA?AVQString@@PBD0H@Z @ 967 NONAME ; class QString QBearerEnginePlugin::tr(char const *, char const *, int) + ?qt_metacall@QNetworkConfigurationManager@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 968 NONAME ; int QNetworkConfigurationManager::qt_metacall(enum QMetaObject::Call, int, void * *) + ?configurationAdded@QNetworkConfigurationManagerPrivate@@AAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 969 NONAME ; void QNetworkConfigurationManagerPrivate::configurationAdded(class QExplicitlySharedDataPointer) + ?metaObject@QNetworkConfigurationManagerPrivate@@UBEPBUQMetaObject@@XZ @ 970 NONAME ; struct QMetaObject const * QNetworkConfigurationManagerPrivate::metaObject(void) const + ??1QBearerEngineFactoryInterface@@UAE@XZ @ 971 NONAME ; QBearerEngineFactoryInterface::~QBearerEngineFactoryInterface(void) + ?setConfiguration@QNetworkAccessManager@@QAEXABVQNetworkConfiguration@@@Z @ 972 NONAME ; void QNetworkAccessManager::setConfiguration(class QNetworkConfiguration const &) + ?identifier@QNetworkConfiguration@@QBE?AVQString@@XZ @ 973 NONAME ; class QString QNetworkConfiguration::identifier(void) const + ??0QBearerEngine@@QAE@PAVQObject@@@Z @ 974 NONAME ; QBearerEngine::QBearerEngine(class QObject *) + ?isRoamingAvailable@QNetworkConfiguration@@QBE_NXZ @ 975 NONAME ; bool QNetworkConfiguration::isRoamingAvailable(void) const + ?quitPendingWaitsForOpened@QNetworkSessionPrivate@@IAEXXZ @ 976 NONAME ; void QNetworkSessionPrivate::quitPendingWaitsForOpened(void) + ?trUtf8@QNetworkSessionPrivate@@SA?AVQString@@PBD0H@Z @ 977 NONAME ; class QString QNetworkSessionPrivate::trUtf8(char const *, char const *, int) + ?setPrivateConfiguration@QNetworkSessionPrivate@@IBEXAAVQNetworkConfiguration@@V?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 978 NONAME ; void QNetworkSessionPrivate::setPrivateConfiguration(class QNetworkConfiguration &, class QExplicitlySharedDataPointer) const + ?trUtf8@QNetworkConfigurationManager@@SA?AVQString@@PBD0H@Z @ 979 NONAME ; class QString QNetworkConfigurationManager::trUtf8(char const *, char const *, int) + ?stateChanged@QNetworkSession@@IAEXW4State@1@@Z @ 980 NONAME ; void QNetworkSession::stateChanged(enum QNetworkSession::State) + ??1QNetworkConfigurationManagerPrivate@@UAE@XZ @ 981 NONAME ; QNetworkConfigurationManagerPrivate::~QNetworkConfigurationManagerPrivate(void) + ?getStaticMetaObject@QBearerEnginePlugin@@SAABUQMetaObject@@XZ @ 982 NONAME ; struct QMetaObject const & QBearerEnginePlugin::getStaticMetaObject(void) + ?getStaticMetaObject@QNetworkConfigurationManagerPrivate@@SAABUQMetaObject@@XZ @ 983 NONAME ; struct QMetaObject const & QNetworkConfigurationManagerPrivate::getStaticMetaObject(void) + ??_EQNetworkConfigurationManagerPrivate@@UAE@I@Z @ 984 NONAME ; QNetworkConfigurationManagerPrivate::~QNetworkConfigurationManagerPrivate(unsigned int) + ?metaObject@QBearerEnginePlugin@@UBEPBUQMetaObject@@XZ @ 985 NONAME ; struct QMetaObject const * QBearerEnginePlugin::metaObject(void) const + ??4QNetworkConfiguration@@QAEAAV0@ABV0@@Z @ 986 NONAME ; class QNetworkConfiguration & QNetworkConfiguration::operator=(class QNetworkConfiguration const &) + ?metaObject@QBearerEngine@@UBEPBUQMetaObject@@XZ @ 987 NONAME ; struct QMetaObject const * QBearerEngine::metaObject(void) const + ?getStaticMetaObject@QBearerEngine@@SAABUQMetaObject@@XZ @ 988 NONAME ; struct QMetaObject const & QBearerEngine::getStaticMetaObject(void) + ?waitForOpened@QNetworkSession@@QAE_NH@Z @ 989 NONAME ; bool QNetworkSession::waitForOpened(int) + ??_EQBearerEngine@@UAE@I@Z @ 990 NONAME ; QBearerEngine::~QBearerEngine(unsigned int) + ?error@QNetworkSession@@IAEXW4SessionError@1@@Z @ 991 NONAME ; void QNetworkSession::error(enum QNetworkSession::SessionError) + ?stop@QNetworkSession@@QAEXXZ @ 992 NONAME ; void QNetworkSession::stop(void) + ?accept@QNetworkSession@@QAEXXZ @ 993 NONAME ; void QNetworkSession::accept(void) + ?qNetworkConfigurationManagerPrivate@@YAPAVQNetworkConfigurationManagerPrivate@@XZ @ 994 NONAME ; class QNetworkConfigurationManagerPrivate * qNetworkConfigurationManagerPrivate(void) + ?open@QNetworkSession@@QAEXXZ @ 995 NONAME ; void QNetworkSession::open(void) + ?newConfigurationActivated@QNetworkSession@@IAEXXZ @ 996 NONAME ; void QNetworkSession::newConfigurationActivated(void) + ?staticMetaObject@QNetworkSessionPrivate@@2UQMetaObject@@B @ 997 NONAME ; struct QMetaObject const QNetworkSessionPrivate::staticMetaObject + ?error@QNetworkSession@@QBE?AW4SessionError@1@XZ @ 998 NONAME ; enum QNetworkSession::SessionError QNetworkSession::error(void) const + ?qt_metacast@QBearerEngine@@UAEPAXPBD@Z @ 999 NONAME ; void * QBearerEngine::qt_metacast(char const *) + ?staticMetaObject@QNetworkSession@@2UQMetaObject@@B @ 1000 NONAME ; struct QMetaObject const QNetworkSession::staticMetaObject + ?trUtf8@QBearerEngine@@SA?AVQString@@PBD0@Z @ 1001 NONAME ; class QString QBearerEngine::trUtf8(char const *, char const *) + ?privateConfiguration@QNetworkSessionPrivate@@IBE?AV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@ABVQNetworkConfiguration@@@Z @ 1002 NONAME ; class QExplicitlySharedDataPointer QNetworkSessionPrivate::privateConfiguration(class QNetworkConfiguration const &) const + ?isOnline@QNetworkConfigurationManagerPrivate@@QAE_NXZ @ 1003 NONAME ; bool QNetworkConfigurationManagerPrivate::isOnline(void) + ?state@QNetworkConfiguration@@QBE?AV?$QFlags@W4StateFlag@QNetworkConfiguration@@@@XZ @ 1004 NONAME ; class QFlags QNetworkConfiguration::state(void) const + ?configurationAdded@QNetworkConfigurationManagerPrivate@@IAEXABVQNetworkConfiguration@@@Z @ 1005 NONAME ; void QNetworkConfigurationManagerPrivate::configurationAdded(class QNetworkConfiguration const &) + ?defaultConfiguration@QNetworkConfigurationManager@@QBE?AVQNetworkConfiguration@@XZ @ 1006 NONAME ; class QNetworkConfiguration QNetworkConfigurationManager::defaultConfiguration(void) const + ?bytesReceived@QNetworkSession@@QBE_KXZ @ 1007 NONAME ; unsigned long long QNetworkSession::bytesReceived(void) const + ?updateConfigurations@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1008 NONAME ; void QNetworkConfigurationManagerPrivate::updateConfigurations(void) + ?errorString@QNetworkSession@@QBE?AVQString@@XZ @ 1009 NONAME ; class QString QNetworkSession::errorString(void) const + ?tr@QNetworkSession@@SA?AVQString@@PBD0H@Z @ 1010 NONAME ; class QString QNetworkSession::tr(char const *, char const *, int) + ??1QNetworkConfigurationManager@@UAE@XZ @ 1011 NONAME ; QNetworkConfigurationManager::~QNetworkConfigurationManager(void) + ?isOpen@QNetworkSession@@QBE_NXZ @ 1012 NONAME ; bool QNetworkSession::isOpen(void) const + ?configurationChanged@QNetworkConfigurationManager@@IAEXABVQNetworkConfiguration@@@Z @ 1013 NONAME ; void QNetworkConfigurationManager::configurationChanged(class QNetworkConfiguration const &) + ?configurationChanged@QNetworkConfigurationManagerPrivate@@AAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1014 NONAME ; void QNetworkConfigurationManagerPrivate::configurationChanged(class QExplicitlySharedDataPointer) + ?configurationRemoved@QBearerEngine@@IAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1015 NONAME ; void QBearerEngine::configurationRemoved(class QExplicitlySharedDataPointer) + ?qt_metacall@QBearerEnginePlugin@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1016 NONAME ; int QBearerEnginePlugin::qt_metacall(enum QMetaObject::Call, int, void * *) + ??0QBearerEnginePlugin@@QAE@PAVQObject@@@Z @ 1017 NONAME ; QBearerEnginePlugin::QBearerEnginePlugin(class QObject *) + ?trUtf8@QNetworkSession@@SA?AVQString@@PBD0@Z @ 1018 NONAME ; class QString QNetworkSession::trUtf8(char const *, char const *) + ?metaObject@QNetworkSessionPrivate@@UBEPBUQMetaObject@@XZ @ 1019 NONAME ; struct QMetaObject const * QNetworkSessionPrivate::metaObject(void) const + ??_EQNetworkConfigurationManager@@UAE@I@Z @ 1020 NONAME ; QNetworkConfigurationManager::~QNetworkConfigurationManager(unsigned int) + ?trUtf8@QNetworkSessionPrivate@@SA?AVQString@@PBD0@Z @ 1021 NONAME ; class QString QNetworkSessionPrivate::trUtf8(char const *, char const *) + ?bearerName@QNetworkConfiguration@@QBE?AVQString@@XZ @ 1022 NONAME ; class QString QNetworkConfiguration::bearerName(void) const + ?trUtf8@QNetworkConfigurationManagerPrivate@@SA?AVQString@@PBD0H@Z @ 1023 NONAME ; class QString QNetworkConfigurationManagerPrivate::trUtf8(char const *, char const *, int) + ?setSessionProperty@QNetworkSession@@QAEXABVQString@@ABVQVariant@@@Z @ 1024 NONAME ; void QNetworkSession::setSessionProperty(class QString const &, class QVariant const &) + ?qt_metacall@QNetworkSession@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1025 NONAME ; int QNetworkSession::qt_metacall(enum QMetaObject::Call, int, void * *) + ?staticMetaObject@QBearerEngine@@2UQMetaObject@@B @ 1026 NONAME ; struct QMetaObject const QBearerEngine::staticMetaObject + ?networkSessionConnected@QNetworkAccessManager@@IAEXXZ @ 1027 NONAME ; void QNetworkAccessManager::networkSessionConnected(void) + ??1QBearerEngine@@UAE@XZ @ 1028 NONAME ; QBearerEngine::~QBearerEngine(void) + ?capabilities@QNetworkConfigurationManagerPrivate@@QAE?AV?$QFlags@W4Capability@QNetworkConfigurationManager@@@@XZ @ 1029 NONAME ; class QFlags QNetworkConfigurationManagerPrivate::capabilities(void) + ??1QNetworkConfiguration@@QAE@XZ @ 1030 NONAME ; QNetworkConfiguration::~QNetworkConfiguration(void) + ??0QNetworkConfigurationManagerPrivate@@QAE@XZ @ 1031 NONAME ; QNetworkConfigurationManagerPrivate::QNetworkConfigurationManagerPrivate(void) + ?preferredConfigurationChanged@QNetworkSession@@IAEXABVQNetworkConfiguration@@_N@Z @ 1032 NONAME ; void QNetworkSession::preferredConfigurationChanged(class QNetworkConfiguration const &, bool) + ?isValid@QNetworkConfiguration@@QBE_NXZ @ 1033 NONAME ; bool QNetworkConfiguration::isValid(void) const + ?configurationAdded@QBearerEngine@@IAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1034 NONAME ; void QBearerEngine::configurationAdded(class QExplicitlySharedDataPointer) + ??1QNetworkSession@@UAE@XZ @ 1035 NONAME ; QNetworkSession::~QNetworkSession(void) + ?qt_metacast@QBearerEnginePlugin@@UAEPAXPBD@Z @ 1036 NONAME ; void * QBearerEnginePlugin::qt_metacast(char const *) + ??0QNetworkSession@@QAE@ABVQNetworkConfiguration@@PAVQObject@@@Z @ 1037 NONAME ; QNetworkSession::QNetworkSession(class QNetworkConfiguration const &, class QObject *) + ?error@QNetworkSessionPrivate@@IAEXW4SessionError@QNetworkSession@@@Z @ 1038 NONAME ; void QNetworkSessionPrivate::error(enum QNetworkSession::SessionError) + ?name@QNetworkConfiguration@@QBE?AVQString@@XZ @ 1039 NONAME ; class QString QNetworkConfiguration::name(void) const + ?close@QNetworkSession@@QAEXXZ @ 1040 NONAME ; void QNetworkSession::close(void) + ?sessionProperty@QNetworkSession@@QBE?AVQVariant@@ABVQString@@@Z @ 1041 NONAME ; class QVariant QNetworkSession::sessionProperty(class QString const &) const + ?engines@QNetworkConfigurationManagerPrivate@@QAE?AV?$QList@PAVQBearerEngine@@@@XZ @ 1042 NONAME ; class QList QNetworkConfigurationManagerPrivate::engines(void) + ?isOnline@QNetworkConfigurationManager@@QBE_NXZ @ 1043 NONAME ; bool QNetworkConfigurationManager::isOnline(void) const + ?capabilities@QNetworkConfigurationManager@@QBE?AV?$QFlags@W4Capability@QNetworkConfigurationManager@@@@XZ @ 1044 NONAME ; class QFlags QNetworkConfigurationManager::capabilities(void) const + ?configurationRemoved@QNetworkConfigurationManagerPrivate@@AAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1045 NONAME ; void QNetworkConfigurationManagerPrivate::configurationRemoved(class QExplicitlySharedDataPointer) + ??0QNetworkConfiguration@@QAE@ABV0@@Z @ 1046 NONAME ; QNetworkConfiguration::QNetworkConfiguration(class QNetworkConfiguration const &) + ?setPriority@QNetworkRequest@@QAEXW4Priority@1@@Z @ 1047 NONAME ; void QNetworkRequest::setPriority(enum QNetworkRequest::Priority) + ?disconnectNotify@QNetworkSession@@MAEXPBD@Z @ 1048 NONAME ; void QNetworkSession::disconnectNotify(char const *) + ?metaObject@QNetworkSession@@UBEPBUQMetaObject@@XZ @ 1049 NONAME ; struct QMetaObject const * QNetworkSession::metaObject(void) const + ?trUtf8@QBearerEngine@@SA?AVQString@@PBD0H@Z @ 1050 NONAME ; class QString QBearerEngine::trUtf8(char const *, char const *, int) + ?configuration@QNetworkSession@@QBE?AVQNetworkConfiguration@@XZ @ 1051 NONAME ; class QNetworkConfiguration QNetworkSession::configuration(void) const + ?closed@QNetworkSessionPrivate@@IAEXXZ @ 1052 NONAME ; void QNetworkSessionPrivate::closed(void) + ??1QNetworkSessionPrivate@@UAE@XZ @ 1053 NONAME ; QNetworkSessionPrivate::~QNetworkSessionPrivate(void) + ?staticMetaObject@QNetworkConfigurationManager@@2UQMetaObject@@B @ 1054 NONAME ; struct QMetaObject const QNetworkConfigurationManager::staticMetaObject + ?tr@QNetworkConfigurationManager@@SA?AVQString@@PBD0H@Z @ 1055 NONAME ; class QString QNetworkConfigurationManager::tr(char const *, char const *, int) + ?tr@QNetworkConfigurationManagerPrivate@@SA?AVQString@@PBD0H@Z @ 1056 NONAME ; class QString QNetworkConfigurationManagerPrivate::tr(char const *, char const *, int) + ?configurationChanged@QBearerEngine@@IAEXV?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1057 NONAME ; void QBearerEngine::configurationChanged(class QExplicitlySharedDataPointer) + ?tr@QBearerEngine@@SA?AVQString@@PBD0@Z @ 1058 NONAME ; class QString QBearerEngine::tr(char const *, char const *) + ??0QNetworkConfiguration@@QAE@XZ @ 1059 NONAME ; QNetworkConfiguration::QNetworkConfiguration(void) + ?configurationRemoved@QNetworkConfigurationManager@@IAEXABVQNetworkConfiguration@@@Z @ 1060 NONAME ; void QNetworkConfigurationManager::configurationRemoved(class QNetworkConfiguration const &) + ?preferredConfigurationChanged@QNetworkSessionPrivate@@IAEXABVQNetworkConfiguration@@_N@Z @ 1061 NONAME ; void QNetworkSessionPrivate::preferredConfigurationChanged(class QNetworkConfiguration const &, bool) + ??1QBearerEnginePlugin@@UAE@XZ @ 1062 NONAME ; QBearerEnginePlugin::~QBearerEnginePlugin(void) + ?tr@QNetworkSession@@SA?AVQString@@PBD0@Z @ 1063 NONAME ; class QString QNetworkSession::tr(char const *, char const *) + ??0QNetworkConfigurationManager@@QAE@PAVQObject@@@Z @ 1064 NONAME ; QNetworkConfigurationManager::QNetworkConfigurationManager(class QObject *) + ?qt_metacall@QNetworkConfigurationManagerPrivate@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1065 NONAME ; int QNetworkConfigurationManagerPrivate::qt_metacall(enum QMetaObject::Call, int, void * *) + ??_EQNetworkSession@@UAE@I@Z @ 1066 NONAME ; QNetworkSession::~QNetworkSession(unsigned int) + ??9QNetworkConfiguration@@QBE_NABV0@@Z @ 1067 NONAME ; bool QNetworkConfiguration::operator!=(class QNetworkConfiguration const &) const + ?configurationsInUse@QBearerEngine@@QBE_NXZ @ 1068 NONAME ; bool QBearerEngine::configurationsInUse(void) const + ?tr@QBearerEngine@@SA?AVQString@@PBD0H@Z @ 1069 NONAME ; class QString QBearerEngine::tr(char const *, char const *, int) + ?configuration@QNetworkAccessManager@@QBE?AVQNetworkConfiguration@@XZ @ 1070 NONAME ; class QNetworkConfiguration QNetworkAccessManager::configuration(void) const + ?tr@QNetworkSessionPrivate@@SA?AVQString@@PBD0@Z @ 1071 NONAME ; class QString QNetworkSessionPrivate::tr(char const *, char const *) + ?activeTime@QNetworkSession@@QBE_KXZ @ 1072 NONAME ; unsigned long long QNetworkSession::activeTime(void) const + ?state@QNetworkSession@@QBE?AW4State@1@XZ @ 1073 NONAME ; enum QNetworkSession::State QNetworkSession::state(void) const + ?disablePolling@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1074 NONAME ; void QNetworkConfigurationManagerPrivate::disablePolling(void) + ?getStaticMetaObject@QNetworkSessionPrivate@@SAABUQMetaObject@@XZ @ 1075 NONAME ; struct QMetaObject const & QNetworkSessionPrivate::getStaticMetaObject(void) + ?configurationAdded@QNetworkConfigurationManager@@IAEXABVQNetworkConfiguration@@@Z @ 1076 NONAME ; void QNetworkConfigurationManager::configurationAdded(class QNetworkConfiguration const &) + ?tr@QNetworkSessionPrivate@@SA?AVQString@@PBD0H@Z @ 1077 NONAME ; class QString QNetworkSessionPrivate::tr(char const *, char const *, int) + ?performAsyncConfigurationUpdate@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1078 NONAME ; void QNetworkConfigurationManagerPrivate::performAsyncConfigurationUpdate(void) + ?trUtf8@QNetworkConfigurationManagerPrivate@@SA?AVQString@@PBD0@Z @ 1079 NONAME ; class QString QNetworkConfigurationManagerPrivate::trUtf8(char const *, char const *) + ?networkAccessible@QNetworkAccessManager@@QBE?AW4NetworkAccessibility@1@XZ @ 1080 NONAME ; enum QNetworkAccessManager::NetworkAccessibility QNetworkAccessManager::networkAccessible(void) const + ?setOption@QAuthenticator@@QAEXABVQString@@ABVQVariant@@@Z @ 1081 NONAME ; void QAuthenticator::setOption(class QString const &, class QVariant const &) + ?trUtf8@QBearerEnginePlugin@@SA?AVQString@@PBD0H@Z @ 1082 NONAME ; class QString QBearerEnginePlugin::trUtf8(char const *, char const *, int) + ?trUtf8@QNetworkConfigurationManager@@SA?AVQString@@PBD0@Z @ 1083 NONAME ; class QString QNetworkConfigurationManager::trUtf8(char const *, char const *) + ?allConfigurations@QNetworkConfigurationManager@@QBE?AV?$QList@VQNetworkConfiguration@@@@V?$QFlags@W4StateFlag@QNetworkConfiguration@@@@@Z @ 1084 NONAME ; class QList QNetworkConfigurationManager::allConfigurations(class QFlags) const + ?requiresPolling@QBearerEngine@@UBE_NXZ @ 1085 NONAME ; bool QBearerEngine::requiresPolling(void) const + ?priority@QNetworkRequest@@QBE?AW4Priority@1@XZ @ 1086 NONAME ; enum QNetworkRequest::Priority QNetworkRequest::priority(void) const + ?networkAccessibleChanged@QNetworkAccessManager@@IAEXW4NetworkAccessibility@1@@Z @ 1087 NONAME ; void QNetworkAccessManager::networkAccessibleChanged(enum QNetworkAccessManager::NetworkAccessibility) + ??8QNetworkConfiguration@@QBE_NABV0@@Z @ 1088 NONAME ; bool QNetworkConfiguration::operator==(class QNetworkConfiguration const &) const + ?option@QAuthenticator@@QBE?AVQVariant@@ABVQString@@@Z @ 1089 NONAME ; class QVariant QAuthenticator::option(class QString const &) const + ?tr@QBearerEnginePlugin@@SA?AVQString@@PBD0@Z @ 1090 NONAME ; class QString QBearerEnginePlugin::tr(char const *, char const *) + ?configurationFromIdentifier@QNetworkConfigurationManager@@QBE?AVQNetworkConfiguration@@ABVQString@@@Z @ 1091 NONAME ; class QNetworkConfiguration QNetworkConfigurationManager::configurationFromIdentifier(class QString const &) const + ??_EQBearerEnginePlugin@@UAE@I@Z @ 1092 NONAME ; QBearerEnginePlugin::~QBearerEnginePlugin(unsigned int) + ?children@QNetworkConfiguration@@QBE?AV?$QList@VQNetworkConfiguration@@@@XZ @ 1093 NONAME ; class QList QNetworkConfiguration::children(void) const + ?activeConfiguration@QNetworkAccessManager@@QBE?AVQNetworkConfiguration@@XZ @ 1094 NONAME ; class QNetworkConfiguration QNetworkAccessManager::activeConfiguration(void) const + ?defaultConfiguration@QNetworkConfigurationManagerPrivate@@QAE?AVQNetworkConfiguration@@XZ @ 1095 NONAME ; class QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration(void) + ?getStaticMetaObject@QNetworkSession@@SAABUQMetaObject@@XZ @ 1096 NONAME ; struct QMetaObject const & QNetworkSession::getStaticMetaObject(void) + ?qt_metacast@QNetworkSession@@UAEPAXPBD@Z @ 1097 NONAME ; void * QNetworkSession::qt_metacast(char const *) + ?updateCompleted@QBearerEngine@@IAEXXZ @ 1098 NONAME ; void QBearerEngine::updateCompleted(void) + ?qt_metacall@QNetworkSessionPrivate@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1099 NONAME ; int QNetworkSessionPrivate::qt_metacall(enum QMetaObject::Call, int, void * *) + ?onlineStateChanged@QNetworkConfigurationManager@@IAEX_N@Z @ 1100 NONAME ; void QNetworkConfigurationManager::onlineStateChanged(bool) + ?getStaticMetaObject@QNetworkConfigurationManager@@SAABUQMetaObject@@XZ @ 1101 NONAME ; struct QMetaObject const & QNetworkConfigurationManager::getStaticMetaObject(void) + ??0QNetworkSessionPrivate@@QAE@XZ @ 1102 NONAME ; QNetworkSessionPrivate::QNetworkSessionPrivate(void) + ?qt_metacast@QNetworkConfigurationManager@@UAEPAXPBD@Z @ 1103 NONAME ; void * QNetworkConfigurationManager::qt_metacast(char const *) + ?configurationChanged@QNetworkConfigurationManagerPrivate@@IAEXABVQNetworkConfiguration@@@Z @ 1104 NONAME ; void QNetworkConfigurationManagerPrivate::configurationChanged(class QNetworkConfiguration const &) + ?staticMetaObject@QBearerEnginePlugin@@2UQMetaObject@@B @ 1105 NONAME ; struct QMetaObject const QBearerEnginePlugin::staticMetaObject + ?qt_metacast@QNetworkConfigurationManagerPrivate@@UAEPAXPBD@Z @ 1106 NONAME ; void * QNetworkConfigurationManagerPrivate::qt_metacast(char const *) + ?newConfigurationActivated@QNetworkSessionPrivate@@IAEXXZ @ 1107 NONAME ; void QNetworkSessionPrivate::newConfigurationActivated(void) + ?qt_metacast@QNetworkSessionPrivate@@UAEPAXPBD@Z @ 1108 NONAME ; void * QNetworkSessionPrivate::qt_metacast(char const *) + ?startPolling@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1109 NONAME ; void QNetworkConfigurationManagerPrivate::startPolling(void) + ?allConfigurations@QNetworkConfigurationManagerPrivate@@QAE?AV?$QList@VQNetworkConfiguration@@@@V?$QFlags@W4StateFlag@QNetworkConfiguration@@@@@Z @ 1110 NONAME ; class QList QNetworkConfigurationManagerPrivate::allConfigurations(class QFlags) + ?connectNotify@QNetworkSession@@MAEXPBD@Z @ 1111 NONAME ; void QNetworkSession::connectNotify(char const *) + ?onlineStateChanged@QNetworkConfigurationManagerPrivate@@IAEX_N@Z @ 1112 NONAME ; void QNetworkConfigurationManagerPrivate::onlineStateChanged(bool) + ?bytesWritten@QNetworkSession@@QBE_KXZ @ 1113 NONAME ; unsigned long long QNetworkSession::bytesWritten(void) const + ?sendCustomRequest@QNetworkAccessManager@@QAEPAVQNetworkReply@@ABVQNetworkRequest@@ABVQByteArray@@PAVQIODevice@@@Z @ 1114 NONAME ; class QNetworkReply * QNetworkAccessManager::sendCustomRequest(class QNetworkRequest const &, class QByteArray const &, class QIODevice *) + ?addPendingConnection@QTcpServer@@IAEXPAVQTcpSocket@@@Z @ 1115 NONAME ; void QTcpServer::addPendingConnection(class QTcpSocket *) + ?ignore@QNetworkSession@@QAEXXZ @ 1116 NONAME ; void QNetworkSession::ignore(void) + ?updateConfigurations@QNetworkConfigurationManager@@QAEXXZ @ 1117 NONAME ; void QNetworkConfigurationManager::updateConfigurations(void) + ?stateChanged@QNetworkSessionPrivate@@IAEXW4State@QNetworkSession@@@Z @ 1118 NONAME ; void QNetworkSessionPrivate::stateChanged(enum QNetworkSession::State) + ?setALREnabled@QNetworkSessionPrivate@@UAEX_N@Z @ 1119 NONAME ; void QNetworkSessionPrivate::setALREnabled(bool) + ?configurationRemoved@QNetworkConfigurationManagerPrivate@@IAEXABVQNetworkConfiguration@@@Z @ 1120 NONAME ; void QNetworkConfigurationManagerPrivate::configurationRemoved(class QNetworkConfiguration const &) + ?qt_metacall@QBearerEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1121 NONAME ; int QBearerEngine::qt_metacall(enum QMetaObject::Call, int, void * *) + ?interface@QNetworkSession@@QBE?AVQNetworkInterface@@XZ @ 1122 NONAME ; class QNetworkInterface QNetworkSession::interface(void) const + ?opened@QNetworkSession@@IAEXXZ @ 1123 NONAME ; void QNetworkSession::opened(void) + ?type@QNetworkConfiguration@@QBE?AW4Type@1@XZ @ 1124 NONAME ; enum QNetworkConfiguration::Type QNetworkConfiguration::type(void) const + ?migrate@QNetworkSession@@QAEXXZ @ 1125 NONAME ; void QNetworkSession::migrate(void) + ?closed@QNetworkSession@@IAEXXZ @ 1126 NONAME ; void QNetworkSession::closed(void) + ?pollEngines@QNetworkConfigurationManagerPrivate@@AAEXXZ @ 1127 NONAME ; void QNetworkConfigurationManagerPrivate::pollEngines(void) + ?staticMetaObject@QNetworkConfigurationManagerPrivate@@2UQMetaObject@@B @ 1128 NONAME ; struct QMetaObject const QNetworkConfigurationManagerPrivate::staticMetaObject + ?reject@QNetworkSession@@QAEXXZ @ 1129 NONAME ; void QNetworkSession::reject(void) + ?options@QAuthenticator@@QBE?AV?$QHash@VQString@@VQVariant@@@@XZ @ 1130 NONAME ; class QHash QAuthenticator::options(void) const + ?purpose@QNetworkConfiguration@@QBE?AW4Purpose@1@XZ @ 1131 NONAME ; enum QNetworkConfiguration::Purpose QNetworkConfiguration::purpose(void) const + ?configurationFromIdentifier@QNetworkConfigurationManagerPrivate@@QAE?AVQNetworkConfiguration@@ABVQString@@@Z @ 1132 NONAME ; class QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIdentifier(class QString const &) + ?abort@QNetworkConfigurationManagerPrivate@@IAEXXZ @ 1133 NONAME ; void QNetworkConfigurationManagerPrivate::abort(void) + ?tr@QNetworkConfigurationManager@@SA?AVQString@@PBD0@Z @ 1134 NONAME ; class QString QNetworkConfigurationManager::tr(char const *, char const *) + ?trUtf8@QNetworkSession@@SA?AVQString@@PBD0H@Z @ 1135 NONAME ; class QString QNetworkSession::trUtf8(char const *, char const *, int) + ?trUtf8@QBearerEnginePlugin@@SA?AVQString@@PBD0@Z @ 1136 NONAME ; class QString QBearerEnginePlugin::trUtf8(char const *, char const *) + ??_EQNetworkSessionPrivate@@UAE@I@Z @ 1137 NONAME ; QNetworkSessionPrivate::~QNetworkSessionPrivate(unsigned int) + ?configurationUpdateComplete@QNetworkConfigurationManagerPrivate@@IAEXXZ @ 1138 NONAME ; void QNetworkConfigurationManagerPrivate::configurationUpdateComplete(void) + ?metaObject@QNetworkConfigurationManager@@UBEPBUQMetaObject@@XZ @ 1139 NONAME ; struct QMetaObject const * QNetworkConfigurationManager::metaObject(void) const + ?tr@QNetworkConfigurationManagerPrivate@@SA?AVQString@@PBD0@Z @ 1140 NONAME ; class QString QNetworkConfigurationManagerPrivate::tr(char const *, char const *) + ?updateCompleted@QNetworkConfigurationManager@@IAEXXZ @ 1141 NONAME ; void QNetworkConfigurationManager::updateCompleted(void) ?setNetworkAccessible@QNetworkAccessManager@@QAEXW4NetworkAccessibility@1@@Z @ 1142 NONAME ; void QNetworkAccessManager::setNetworkAccessible(enum QNetworkAccessManager::NetworkAccessibility) - ?startPolling@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1143 NONAME ; void QNetworkConfigurationManagerPrivate::startPolling(void) - ?capabilities@QNetworkConfigurationManagerPrivate@@QAE?AV?$QFlags@W4Capability@QNetworkConfigurationManager@@@@XZ @ 1144 NONAME ; class QFlags QNetworkConfigurationManagerPrivate::capabilities(void) - ?addPendingConnection@QTcpServer@@IAEXPAVQTcpSocket@@@Z @ 1145 NONAME ; void QTcpServer::addPendingConnection(class QTcpSocket *) - ?setOption@QAuthenticator@@QAEXABVQString@@ABVQVariant@@@Z @ 1146 NONAME ; void QAuthenticator::setOption(class QString const &, class QVariant const &) - ?option@QAuthenticator@@QBE?AVQVariant@@ABVQString@@@Z @ 1147 NONAME ; class QVariant QAuthenticator::option(class QString const &) const - ?options@QAuthenticator@@QBE?AV?$QHash@VQString@@VQVariant@@@@XZ @ 1148 NONAME ; class QHash QAuthenticator::options(void) const + ??_EQBearerEngineFactoryInterface@@UAE@I@Z @ 1143 NONAME ; QBearerEngineFactoryInterface::~QBearerEngineFactoryInterface(unsigned int) + ?enablePolling@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1144 NONAME ; void QNetworkConfigurationManagerPrivate::enablePolling(void) + ?bearerTypeName@QNetworkConfiguration@@QBE?AVQString@@XZ @ 1145 NONAME ; class QString QNetworkConfiguration::bearerTypeName(void) const + ?bearerType@QNetworkConfiguration@@QBE?AW4BearerType@1@XZ @ 1146 NONAME ; enum QNetworkConfiguration::BearerType QNetworkConfiguration::bearerType(void) const diff -r ef0373b55136 -r 758a864f9613 src/s60installs/bwins/QtOpenVGu.def --- a/src/s60installs/bwins/QtOpenVGu.def Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/bwins/QtOpenVGu.def Mon Oct 04 01:19:32 2010 +0300 @@ -164,12 +164,11 @@ ?qt_vg_create_context@@YAPAVQEglContext@@PAVQPaintDevice@@H@Z @ 163 NONAME ; class QEglContext * qt_vg_create_context(class QPaintDevice *, int) ?reclaimImages@QVGPixmapData@@UAEXXZ @ 164 NONAME ; void QVGPixmapData::reclaimImages(void) ?hibernate@QVGPixmapData@@UAEXXZ @ 165 NONAME ; void QVGPixmapData::hibernate(void) - ?drawStaticTextItem@QVGPaintEngine@@UAEXPAVQStaticTextItem@@@Z @ 166 NONAME ; void QVGPaintEngine::drawStaticTextItem(class QStaticTextItem *) - ?drawPixmapFragments@QVGPaintEngine@@UAEXPBVPixmapFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 167 NONAME ; void QVGPaintEngine::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags) - ?drawCachedGlyphs@QVGPaintEngine@@QAE_NHPBIABVQFont@@PAVQFontEngine@@ABVQPointF@@@Z @ 168 NONAME ABSENT ; bool QVGPaintEngine::drawCachedGlyphs(int, unsigned int const *, class QFont const &, class QFontEngine *, class QPointF const &) - ?supportsStaticContents@QVGEGLWindowSurfaceDirect@@UBE_NXZ @ 169 NONAME ; bool QVGEGLWindowSurfaceDirect::supportsStaticContents(void) const - ?scroll@QVGEGLWindowSurfacePrivate@@UAE_NPAVQWidget@@ABVQRegion@@HH@Z @ 170 NONAME ; bool QVGEGLWindowSurfacePrivate::scroll(class QWidget *, class QRegion const &, int, int) - ?scroll@QVGEGLWindowSurfaceDirect@@UAE_NPAVQWidget@@ABVQRegion@@HH@Z @ 171 NONAME ; bool QVGEGLWindowSurfaceDirect::scroll(class QWidget *, class QRegion const &, int, int) - ?supportsStaticContents@QVGEGLWindowSurfacePrivate@@UBE_NXZ @ 172 NONAME ; bool QVGEGLWindowSurfacePrivate::supportsStaticContents(void) const - ?drawCachedGlyphs@QVGPaintEngine@@QAE_NHPBIABVQFont@@PAVQFontEngine@@ABVQPointF@@PBUQFixedPoint@@@Z @ 173 NONAME ; bool QVGPaintEngine::drawCachedGlyphs(int, unsigned int const *, class QFont const &, class QFontEngine *, class QPointF const &, struct QFixedPoint const *) + ?supportsStaticContents@QVGEGLWindowSurfaceDirect@@UBE_NXZ @ 166 NONAME ; bool QVGEGLWindowSurfaceDirect::supportsStaticContents(void) const + ?scroll@QVGEGLWindowSurfacePrivate@@UAE_NPAVQWidget@@ABVQRegion@@HH@Z @ 167 NONAME ; bool QVGEGLWindowSurfacePrivate::scroll(class QWidget *, class QRegion const &, int, int) + ?scroll@QVGEGLWindowSurfaceDirect@@UAE_NPAVQWidget@@ABVQRegion@@HH@Z @ 168 NONAME ; bool QVGEGLWindowSurfaceDirect::scroll(class QWidget *, class QRegion const &, int, int) + ?supportsStaticContents@QVGEGLWindowSurfacePrivate@@UBE_NXZ @ 169 NONAME ; bool QVGEGLWindowSurfacePrivate::supportsStaticContents(void) const + ?drawCachedGlyphs@QVGPaintEngine@@QAE_NHPBIABVQFont@@PAVQFontEngine@@ABVQPointF@@PBUQFixedPoint@@@Z @ 170 NONAME ; bool QVGPaintEngine::drawCachedGlyphs(int, unsigned int const *, class QFont const &, class QFontEngine *, class QPointF const &, struct QFixedPoint const *) + ?drawPixmapFragments@QVGPaintEngine@@UAEXPBVPixmapFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 171 NONAME ; void QVGPaintEngine::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags) + ?drawStaticTextItem@QVGPaintEngine@@UAEXPAVQStaticTextItem@@@Z @ 172 NONAME ; void QVGPaintEngine::drawStaticTextItem(class QStaticTextItem *) diff -r ef0373b55136 -r 758a864f9613 src/s60installs/deviceconfiguration/bld.inf --- a/src/s60installs/deviceconfiguration/bld.inf Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/deviceconfiguration/bld.inf Mon Oct 04 01:19:32 2010 +0300 @@ -38,6 +38,15 @@ ../../../content/apps/qt.sisx CRML_EXPORT_PATH(../content/sis/,uda_content) ../../../content/apps/qt_stub.sis /epoc32/data/z/system/install/qt_stub.sis +//tools +../../../bin/createpackage.bat /epoc32/tools/createpackage.bat +../../../bin/createpackage.pl /epoc32/tools/createpackage.pl +../../../bin/patch_capabilities.bat /epoc32/tools/patch_capabilities.bat +../../../bin/patch_capabilities.pl /epoc32/tools/patch_capabilities.pl + + + + PRJ_MMPFILES @@ -47,5 +56,9 @@ PRJ_EXTENSIONS START EXTENSION qt/qtconfig OPTION QT_ROOT .. +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS /* Flag for 10.1 */ OPTION OPTIONS -opensource -confirm-license -openvg -script -no-scripttools -no-webkit -make make -graphicssystem openvg -no-phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools -END +#else +OPTION OPTIONS -opensource -confirm-license -openvg -script -no-scripttools -no-webkit -make make -graphicssystem openvg -no-phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools +#endif +END \ No newline at end of file diff -r ef0373b55136 -r 758a864f9613 src/s60installs/eabi/QtCoreu.def --- a/src/s60installs/eabi/QtCoreu.def Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/eabi/QtCoreu.def Mon Oct 04 01:19:32 2010 +0300 @@ -3652,65 +3652,63 @@ _Z40QBasicAtomicPointer_fetchAndStoreAcquirePVPvS_ @ 3651 NONAME _Z40QBasicAtomicPointer_fetchAndStoreRelaxedPVPvS_ @ 3652 NONAME _Z40QBasicAtomicPointer_fetchAndStoreReleasePVPvS_ @ 3653 NONAME - _Z14qDecodeDataUrlRK4QUrl @ 3654 NONAME - _Z18qDetectCPUFeaturesv @ 3655 NONAME - _ZN10QByteArray7replaceEiiPKci @ 3656 NONAME - _ZN12QTextDecoderC1EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3657 NONAME - _ZN12QTextDecoderC2EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3658 NONAME - _ZN12QTextEncoderC1EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3659 NONAME - _ZN12QTextEncoderC2EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3660 NONAME - _ZN13QElapsedTimer10invalidateEv @ 3661 NONAME - _ZN13QElapsedTimer11isMonotonicEv @ 3662 NONAME - _ZN13QElapsedTimer5startEv @ 3663 NONAME - _ZN13QElapsedTimer7restartEv @ 3664 NONAME - _ZN13QElapsedTimer9clockTypeEv @ 3665 NONAME - _ZN20QStateMachinePrivate12clearHistoryEv @ 3666 NONAME - _ZN7QStringC1EPK5QChar @ 3667 NONAME - _ZN7QStringC2EPK5QChar @ 3668 NONAME - _ZN8QVariantC1ERK12QEasingCurve @ 3669 NONAME - _ZN8QVariantC2ERK12QEasingCurve @ 3670 NONAME - _ZN9QDateTime18currentDateTimeUtcEv @ 3671 NONAME - _ZN9QDateTime22currentMSecsSinceEpochEv @ 3672 NONAME - _ZN9QListData11detach_growEPii @ 3673 NONAME - _ZN9QListData6appendEi @ 3674 NONAME - _ZN9QListData6detachEi @ 3675 NONAME - _ZN9QMetaType15registerTypedefEPKci @ 3676 NONAME - _ZN9QMetaType23registerStreamOperatorsEiPFvR11QDataStreamPKvEPFvS1_PvE @ 3677 NONAME - _ZNK10QTextCodec11makeDecoderE6QFlagsINS_14ConversionFlagEE @ 3678 NONAME - _ZNK10QTextCodec11makeEncoderE6QFlagsINS_14ConversionFlagEE @ 3679 NONAME - _ZNK13QElapsedTimer10hasExpiredEx @ 3680 NONAME - _ZNK13QElapsedTimer19msecsSinceReferenceEv @ 3681 NONAME - _ZNK13QElapsedTimer6secsToERKS_ @ 3682 NONAME - _ZNK13QElapsedTimer7elapsedEv @ 3683 NONAME - _ZNK13QElapsedTimer7isValidEv @ 3684 NONAME - _ZNK13QElapsedTimer7msecsToERKS_ @ 3685 NONAME - _ZNK6QState11transitionsEv @ 3686 NONAME - _ZNK8QVariant13toEasingCurveEv @ 3687 NONAME - _ZlsR11QDataStreamRK12QEasingCurve @ 3688 NONAME - _ZltRK13QElapsedTimerS1_ @ 3689 NONAME - _ZrsR11QDataStreamR12QEasingCurve @ 3690 NONAME - _ZN9QDateTime18setMSecsSinceEpochEx @ 3691 NONAME - _ZN9QDateTime19fromMSecsSinceEpochEx @ 3692 NONAME - _ZNK9QDateTime17toMSecsSinceEpochEv @ 3693 NONAME - _ZN10QTextCodec11validCodecsEv @ 3694 NONAME - _ZN16QDeclarativeData13parentChangedE @ 3695 NONAME DATA 4 ABSENT - _ZN16QDeclarativeData9destroyedE @ 3696 NONAME DATA 4 ABSENT - _ZN24QAbstractDeclarativeData13parentChangedE @ 3697 NONAME DATA 4 - _ZN24QAbstractDeclarativeData9destroyedE @ 3698 NONAME DATA 4 - _ZN23QEventDispatcherSymbian12selectThreadEv @ 3699 NONAME - _ZN10QByteArray10setRawDataEPKcj @ 3700 NONAME - _ZN7QString10setRawDataEPK5QChari @ 3701 NONAME - _ZN23QCoreApplicationPrivate11symbianInitEv @ 3702 NONAME - _ZN23QEventDispatcherSymbian11qt_metacallEN11QMetaObject4CallEiPPv @ 3703 NONAME - _ZN23QEventDispatcherSymbian11qt_metacastEPKc @ 3704 NONAME - _ZN23QEventDispatcherSymbian16staticMetaObjectE @ 3705 NONAME DATA 16 - _ZN23QEventDispatcherSymbian19getStaticMetaObjectEv @ 3706 NONAME - _ZNK23QEventDispatcherSymbian10metaObjectEv @ 3707 NONAME - _ZNK9QDateTime7msecsToERKS_ @ 3708 NONAME - _ZNK7QLocale13textDirectionEv @ 3709 NONAME - _ZNK7QString13isRightToLeftEv @ 3710 NONAME - _ZN16QIODevicePrivate4peekEPcx @ 3711 NONAME - _ZN16QIODevicePrivate4peekEx @ 3712 NONAME - _ZN8QProcess18setNativeArgumentsERK7QString @ 3713 NONAME - _ZNK8QProcess15nativeArgumentsEv @ 3714 NONAME + _ZN10QTextCodec11validCodecsEv @ 3654 NONAME + _ZN20QStateMachinePrivate12clearHistoryEv @ 3655 NONAME + _Z14qDecodeDataUrlRK4QUrl @ 3656 NONAME + _Z18qDetectCPUFeaturesv @ 3657 NONAME + _ZN10QByteArray10setRawDataEPKcj @ 3658 NONAME + _ZN10QByteArray7replaceEiiPKci @ 3659 NONAME + _ZN12QTextDecoderC1EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3660 NONAME + _ZN12QTextDecoderC2EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3661 NONAME + _ZN12QTextEncoderC1EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3662 NONAME + _ZN12QTextEncoderC2EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3663 NONAME + _ZN13QElapsedTimer10invalidateEv @ 3664 NONAME + _ZN13QElapsedTimer11isMonotonicEv @ 3665 NONAME + _ZN13QElapsedTimer5startEv @ 3666 NONAME + _ZN13QElapsedTimer7restartEv @ 3667 NONAME + _ZN13QElapsedTimer9clockTypeEv @ 3668 NONAME + _ZN23QCoreApplicationPrivate11symbianInitEv @ 3669 NONAME + _ZN23QEventDispatcherSymbian11qt_metacallEN11QMetaObject4CallEiPPv @ 3670 NONAME + _ZN23QEventDispatcherSymbian11qt_metacastEPKc @ 3671 NONAME + _ZN23QEventDispatcherSymbian12selectThreadEv @ 3672 NONAME + _ZN23QEventDispatcherSymbian16staticMetaObjectE @ 3673 NONAME DATA 16 + _ZN23QEventDispatcherSymbian19getStaticMetaObjectEv @ 3674 NONAME + _ZN24QAbstractDeclarativeData13parentChangedE @ 3675 NONAME DATA 4 + _ZN24QAbstractDeclarativeData9destroyedE @ 3676 NONAME DATA 4 + _ZN7QString10setRawDataEPK5QChari @ 3677 NONAME + _ZN7QStringC1EPK5QChar @ 3678 NONAME + _ZN7QStringC2EPK5QChar @ 3679 NONAME + _ZN8QVariantC1ERK12QEasingCurve @ 3680 NONAME + _ZN8QVariantC2ERK12QEasingCurve @ 3681 NONAME + _ZN9QDateTime18currentDateTimeUtcEv @ 3682 NONAME + _ZN9QDateTime18setMSecsSinceEpochEx @ 3683 NONAME + _ZN9QDateTime19fromMSecsSinceEpochEx @ 3684 NONAME + _ZN9QDateTime22currentMSecsSinceEpochEv @ 3685 NONAME + _ZN9QListData11detach_growEPii @ 3686 NONAME + _ZN9QListData6appendEi @ 3687 NONAME + _ZN9QListData6detachEi @ 3688 NONAME + _ZN9QMetaType15registerTypedefEPKci @ 3689 NONAME + _ZN9QMetaType23registerStreamOperatorsEiPFvR11QDataStreamPKvEPFvS1_PvE @ 3690 NONAME + _ZNK10QTextCodec11makeDecoderE6QFlagsINS_14ConversionFlagEE @ 3691 NONAME + _ZNK10QTextCodec11makeEncoderE6QFlagsINS_14ConversionFlagEE @ 3692 NONAME + _ZNK13QElapsedTimer10hasExpiredEx @ 3693 NONAME + _ZNK13QElapsedTimer19msecsSinceReferenceEv @ 3694 NONAME + _ZNK13QElapsedTimer6secsToERKS_ @ 3695 NONAME + _ZNK13QElapsedTimer7elapsedEv @ 3696 NONAME + _ZNK13QElapsedTimer7isValidEv @ 3697 NONAME + _ZNK13QElapsedTimer7msecsToERKS_ @ 3698 NONAME + _ZNK23QEventDispatcherSymbian10metaObjectEv @ 3699 NONAME + _ZNK6QState11transitionsEv @ 3700 NONAME + _ZNK8QVariant13toEasingCurveEv @ 3701 NONAME + _ZNK9QDateTime17toMSecsSinceEpochEv @ 3702 NONAME + _ZNK9QDateTime7msecsToERKS_ @ 3703 NONAME + _ZlsR11QDataStreamRK12QEasingCurve @ 3704 NONAME + _ZltRK13QElapsedTimerS1_ @ 3705 NONAME + _ZrsR11QDataStreamR12QEasingCurve @ 3706 NONAME + _ZNK7QLocale13textDirectionEv @ 3707 NONAME + _ZNK7QString13isRightToLeftEv @ 3708 NONAME + _ZN16QIODevicePrivate4peekEPcx @ 3709 NONAME + _ZN16QIODevicePrivate4peekEx @ 3710 NONAME + _ZN8QProcess18setNativeArgumentsERK7QString @ 3711 NONAME + _ZNK8QProcess15nativeArgumentsEv @ 3712 NONAME diff -r ef0373b55136 -r 758a864f9613 src/s60installs/eabi/QtDeclarativeu.def --- a/src/s60installs/eabi/QtDeclarativeu.def Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/eabi/QtDeclarativeu.def Mon Oct 04 01:19:32 2010 +0300 @@ -1706,13 +1706,13 @@ _ZN25QDeclarativeImageProviderC1ENS_9ImageTypeE @ 1705 NONAME _ZN25QDeclarativeImageProviderC2ENS_9ImageTypeE @ 1706 NONAME _ZNK25QDeclarativeImageProvider9imageTypeEv @ 1707 NONAME - _ZN16QDeclarativeItem16forceActiveFocusEv @ 1708 NONAME - _ZN16QDeclarativeItem18activeFocusChangedEb @ 1709 NONAME - _ZN19QDeclarativePrivate11qmlregisterENS_16RegistrationTypeEPv @ 1710 NONAME - _ZN23QDeclarativeEngineDebug21resetBindingForObjectEiRK7QString @ 1711 NONAME - _ZNK16QDeclarativeItem14hasActiveFocusEv @ 1712 NONAME - _ZNK16QDeclarativeView11rootContextEv @ 1713 NONAME - _ZNK16QDeclarativeView6engineEv @ 1714 NONAME - _ZNK18QDeclarativeEngine11rootContextEv @ 1715 NONAME - _Z12registerTypeRKN19QDeclarativePrivate12RegisterTypeE @ 1716 NONAME + _ZN23QDeclarativeEngineDebug21resetBindingForObjectEiRK7QString @ 1708 NONAME + _ZN16QDeclarativeItem16forceActiveFocusEv @ 1709 NONAME + _ZN16QDeclarativeItem18activeFocusChangedEb @ 1710 NONAME + _ZNK16QDeclarativeItem14hasActiveFocusEv @ 1711 NONAME + _ZNK16QDeclarativeView11rootContextEv @ 1712 NONAME + _ZNK16QDeclarativeView6engineEv @ 1713 NONAME + _ZNK18QDeclarativeEngine11rootContextEv @ 1714 NONAME + _ZN19QDeclarativePrivate11qmlregisterENS_16RegistrationTypeEPv @ 1715 NONAME + _ZNK26QDeclarativeOpenMetaObject8hasValueEi @ 1716 NONAME diff -r ef0373b55136 -r 758a864f9613 src/s60installs/eabi/QtGuiu.def --- a/src/s60installs/eabi/QtGuiu.def Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/eabi/QtGuiu.def Mon Oct 04 01:19:32 2010 +0300 @@ -4294,7 +4294,7 @@ _ZN19QApplicationPrivate13animate_comboE @ 4293 NONAME DATA 1 _ZN19QApplicationPrivate13mouse_buttonsE @ 4294 NONAME DATA 4 _ZN19QApplicationPrivate13notify_helperEP7QObjectP6QEvent @ 4295 NONAME - _ZN19QApplicationPrivate13scanCodeCacheE @ 4296 NONAME DATA 4 + _ZN19QApplicationPrivate13scanCodeCacheE @ 4296 NONAME DATA 4 ABSENT _ZN19QApplicationPrivate13setSystemFontERK5QFont @ 4297 NONAME _ZN19QApplicationPrivate13styleOverrideE @ 4298 NONAME DATA 4 _ZN19QApplicationPrivate14autoSipEnabledE @ 4299 NONAME DATA 1 @@ -5957,7 +5957,7 @@ _ZN7QDialog16staticMetaObjectE @ 5956 NONAME DATA 16 _ZN7QDialog18setSizeGripEnabledEb @ 5957 NONAME _ZN7QDialog19getStaticMetaObjectEv @ 5958 NONAME - _ZN7QDialog19s60AdjustedPositionEv @ 5959 NONAME ABSENT + _ZN7QDialog23symbianAdjustedPositionEv @ 5959 NONAME _ZN7QDialog4doneEi @ 5960 NONAME _ZN7QDialog4execEv @ 5961 NONAME _ZN7QDialog4openEv @ 5962 NONAME @@ -11805,294 +11805,291 @@ _ZN24QImagePixmapCleanupHooks34executePixmapDataModificationHooksEP11QPixmapData @ 11804 NONAME _ZN9QS60Style10timerEventEP11QTimerEvent @ 11805 NONAME _ZN9QS60Style11eventFilterEP7QObjectP6QEvent @ 11806 NONAME - _ZN13QFontDatabase25removeAllApplicationFontsEv @ 11807 NONAME - _ZN10QZipReader5closeEv @ 11808 NONAME - _ZN10QZipReader8FileInfoC1ERKS0_ @ 11809 NONAME - _ZN10QZipReader8FileInfoC1Ev @ 11810 NONAME - _ZN10QZipReader8FileInfoC2ERKS0_ @ 11811 NONAME - _ZN10QZipReader8FileInfoC2Ev @ 11812 NONAME - _ZN10QZipReader8FileInfoD1Ev @ 11813 NONAME - _ZN10QZipReader8FileInfoD2Ev @ 11814 NONAME - _ZN10QZipReader8FileInfoaSERKS0_ @ 11815 NONAME - _ZN10QZipReaderC1EP9QIODevice @ 11816 NONAME - _ZN10QZipReaderC1ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 11817 NONAME - _ZN10QZipReaderC2EP9QIODevice @ 11818 NONAME - _ZN10QZipReaderC2ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 11819 NONAME - _ZN10QZipReaderD1Ev @ 11820 NONAME - _ZN10QZipReaderD2Ev @ 11821 NONAME - _ZN11QStaticText13setTextFormatEN2Qt10TextFormatE @ 11822 NONAME - _ZN11QStaticText14setMaximumSizeERK6QSizeF @ 11823 NONAME ABSENT - _ZN11QStaticText18setPerformanceHintENS_15PerformanceHintE @ 11824 NONAME - _ZN11QStaticText6detachEv @ 11825 NONAME - _ZN11QStaticText7prepareERK10QTransformRK5QFont @ 11826 NONAME - _ZN11QStaticText7setTextERK7QString @ 11827 NONAME - _ZN11QStaticTextC1ERK7QString @ 11828 NONAME - _ZN11QStaticTextC1ERKS_ @ 11829 NONAME - _ZN11QStaticTextC1Ev @ 11830 NONAME - _ZN11QStaticTextC2ERK7QString @ 11831 NONAME - _ZN11QStaticTextC2ERKS_ @ 11832 NONAME - _ZN11QStaticTextC2Ev @ 11833 NONAME - _ZN11QStaticTextD1Ev @ 11834 NONAME - _ZN11QStaticTextD2Ev @ 11835 NONAME - _ZN11QStaticTextaSERKS_ @ 11836 NONAME - _ZN12QKeySequence6assignERK7QStringNS_14SequenceFormatE @ 11837 NONAME - _ZN12QKeySequenceC1ERK7QStringNS_14SequenceFormatE @ 11838 NONAME - _ZN12QKeySequenceC2ERK7QStringNS_14SequenceFormatE @ 11839 NONAME - _ZN13QTextDocument19clearUndoRedoStacksENS_6StacksE @ 11840 NONAME - _ZN14QPaintEngineEx19drawPixmapFragmentsEPKN8QPainter8FragmentEiRK7QPixmap6QFlagsINS0_12FragmentHintEE @ 11841 NONAME ABSENT - _ZN14QWidgetPrivate11inTabWidgetEP7QWidget @ 11842 NONAME - _ZN14QWidgetPrivate17canKeypadNavigateEN2Qt11OrientationE @ 11843 NONAME - _ZN14QWidgetPrivate6renderEP12QPaintDeviceRK6QPointRK7QRegion6QFlagsIN7QWidget10RenderFlagEEb @ 11844 NONAME - _ZN15QGraphicsWidget21setAutoFillBackgroundEb @ 11845 NONAME - _ZN16QFileSystemModel15directoryLoadedERK7QString @ 11846 NONAME - _ZN18QTextureGlyphCache8populateEP11QFontEngineiPKjPK11QFixedPoint @ 11847 NONAME - _ZN19QApplicationPrivate15getPixmapCursorEN2Qt11CursorShapeE @ 11848 NONAME - _ZN20QGraphicsViewPrivate10centerViewEN13QGraphicsView14ViewportAnchorE @ 11849 NONAME - _ZN20QGraphicsViewPrivate10updateRectERK5QRect @ 11850 NONAME - _ZN20QGraphicsViewPrivate12updateRegionERK7QRegion @ 11851 NONAME ABSENT - _ZN20QGraphicsViewPrivate12updateScrollEv @ 11852 NONAME - _ZN20QGraphicsViewPrivate15storeMouseEventEP11QMouseEvent @ 11853 NONAME - _ZN20QGraphicsViewPrivate18storeDragDropEventEPK27QGraphicsSceneDragDropEvent @ 11854 NONAME - _ZN20QGraphicsViewPrivate19translateTouchEventEPS_P11QTouchEvent @ 11855 NONAME - _ZN20QGraphicsViewPrivate20_q_setViewportCursorERK7QCursor @ 11856 NONAME - _ZN20QGraphicsViewPrivate20replayLastMouseEventEv @ 11857 NONAME - _ZN20QGraphicsViewPrivate21freeStyleOptionsArrayEP24QStyleOptionGraphicsItem @ 11858 NONAME - _ZN20QGraphicsViewPrivate21mouseMoveEventHandlerEP11QMouseEvent @ 11859 NONAME - _ZN20QGraphicsViewPrivate21processPendingUpdatesEv @ 11860 NONAME - _ZN20QGraphicsViewPrivate21updateLastCenterPointEv @ 11861 NONAME - _ZN20QGraphicsViewPrivate22_q_unsetViewportCursorEv @ 11862 NONAME - _ZN20QGraphicsViewPrivate22allocStyleOptionsArrayEi @ 11863 NONAME - _ZN20QGraphicsViewPrivate22recalculateContentSizeEv @ 11864 NONAME - _ZN20QGraphicsViewPrivate26populateSceneDragDropEventEP27QGraphicsSceneDragDropEventP10QDropEvent @ 11865 NONAME - _ZN20QGraphicsViewPrivate28updateInputMethodSensitivityEv @ 11866 NONAME - _ZN20QGraphicsViewPrivateC1Ev @ 11867 NONAME - _ZN20QGraphicsViewPrivateC2Ev @ 11868 NONAME - _ZN24QImagePixmapCleanupHooks13isImageCachedERK6QImage @ 11869 NONAME - _ZN24QImagePixmapCleanupHooks14isPixmapCachedERK7QPixmap @ 11870 NONAME - _ZN26QAbstractScrollAreaPrivate14layoutChildrenEv @ 11871 NONAME - _ZN26QAbstractScrollAreaPrivate16replaceScrollBarEP10QScrollBarN2Qt11OrientationE @ 11872 NONAME - _ZN26QAbstractScrollAreaPrivate23_q_showOrHideScrollBarsEv @ 11873 NONAME - _ZN26QAbstractScrollAreaPrivate4initEv @ 11874 NONAME - _ZN26QAbstractScrollAreaPrivate9_q_hslideEi @ 11875 NONAME - _ZN26QAbstractScrollAreaPrivate9_q_vslideEi @ 11876 NONAME - _ZN26QAbstractScrollAreaPrivateC1Ev @ 11877 NONAME - _ZN26QAbstractScrollAreaPrivateC2Ev @ 11878 NONAME - _ZN6QColor12isValidColorERK7QString @ 11879 NONAME - _ZN6QColor18setColorFromStringERK7QString @ 11880 NONAME - _ZN6QLabel12setSelectionEii @ 11881 NONAME - _ZN7QPixmap16convertFromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 11882 NONAME - _ZN8QPainter14drawStaticTextERK7QPointFRK11QStaticText @ 11883 NONAME - _ZN8QPainter19drawPixmapFragmentsEPKNS_8FragmentEiRK7QPixmap6QFlagsINS_12FragmentHintEE @ 11884 NONAME ABSENT - _ZN8QPainter8Fragment6createERK7QPointFRK6QRectFffff @ 11885 NONAME ABSENT - _ZN8QToolBar17visibilityChangedEb @ 11886 NONAME - _ZNK10QZipReader10extractAllERK7QString @ 11887 NONAME - _ZNK10QZipReader10isReadableEv @ 11888 NONAME - _ZNK10QZipReader11entryInfoAtEi @ 11889 NONAME - _ZNK10QZipReader12fileInfoListEv @ 11890 NONAME - _ZNK10QZipReader5countEv @ 11891 NONAME - _ZNK10QZipReader6existsEv @ 11892 NONAME - _ZNK10QZipReader6statusEv @ 11893 NONAME - _ZNK10QZipReader8fileDataERK7QString @ 11894 NONAME - _ZNK11QStaticText10textFormatEv @ 11895 NONAME - _ZNK11QStaticText11maximumSizeEv @ 11896 NONAME ABSENT - _ZNK11QStaticText15performanceHintEv @ 11897 NONAME - _ZNK11QStaticText4sizeEv @ 11898 NONAME - _ZNK11QStaticText4textEv @ 11899 NONAME - _ZNK11QStaticTexteqERKS_ @ 11900 NONAME - _ZNK11QStaticTextneERKS_ @ 11901 NONAME - _ZNK11QTextCursor15positionInBlockEv @ 11902 NONAME - _ZNK13QIntValidator5fixupER7QString @ 11903 NONAME - _ZNK14QPlainTextEdit8anchorAtERK6QPoint @ 11904 NONAME - _ZNK15QGraphicsWidget18autoFillBackgroundEv @ 11905 NONAME - _ZNK20QGraphicsViewPrivate10mapToSceneERK6QRectF @ 11906 NONAME - _ZNK20QGraphicsViewPrivate10mapToSceneERK7QPointF @ 11907 NONAME - _ZNK20QGraphicsViewPrivate13mapToViewRectEPK13QGraphicsItemRK6QRectF @ 11908 NONAME - _ZNK20QGraphicsViewPrivate14mapRectToSceneERK5QRect @ 11909 NONAME - _ZNK20QGraphicsViewPrivate14verticalScrollEv @ 11910 NONAME - _ZNK20QGraphicsViewPrivate15mapToViewRegionEPK13QGraphicsItemRK6QRectF @ 11911 NONAME - _ZNK20QGraphicsViewPrivate16horizontalScrollEv @ 11912 NONAME - _ZNK20QGraphicsViewPrivate16mapRectFromSceneERK6QRectF @ 11913 NONAME - _ZNK20QGraphicsViewPrivate16rubberBandRegionEPK7QWidgetRK5QRect @ 11914 NONAME - _ZNK20QGraphicsViewPrivate9findItemsERK7QRegionPbRK10QTransform @ 11915 NONAME - _ZNK26QAbstractScrollAreaPrivate14contentsOffsetEv @ 11916 NONAME - _ZNK6QImage13constScanLineEi @ 11917 NONAME - _ZNK6QImage9constBitsEv @ 11918 NONAME - _ZNK6QLabel12selectedTextEv @ 11919 NONAME - _ZNK6QLabel14selectionStartEv @ 11920 NONAME - _ZNK6QLabel15hasSelectedTextEv @ 11921 NONAME - _ZNK7QBezier11getSubRangeEff @ 11922 NONAME - _ZNK7QBezier5mapByERK10QTransform @ 11923 NONAME - _ZTI20QGraphicsViewPrivate @ 11924 NONAME - _ZTI26QAbstractScrollAreaPrivate @ 11925 NONAME - _ZTV20QGraphicsViewPrivate @ 11926 NONAME - _ZTV26QAbstractScrollAreaPrivate @ 11927 NONAME - _Z14qt_draw_glyphsP8QPainterPKjPK7QPointFi @ 11928 NONAME - _ZN11QFontEngine16getGlyphBearingsEjPfS0_ @ 11929 NONAME - _ZN12QLineControl17updateDisplayTextEb @ 11930 NONAME - _ZN12QLineControl5pasteEN10QClipboard4ModeE @ 11931 NONAME - _ZN12QTextControl5pasteEN10QClipboard4ModeE @ 11932 NONAME - _ZN14QPaintEngineEx19drawPixmapFragmentsEPKN8QPainter14PixmapFragmentEiRK7QPixmap6QFlagsINS0_18PixmapFragmentHintEE @ 11933 NONAME - _ZN15QGraphicsObject12widthChangedEv @ 11934 NONAME - _ZN15QGraphicsObject13heightChangedEv @ 11935 NONAME - _ZN15QGraphicsObject15childrenChangedEv @ 11936 NONAME - _ZN15QGraphicsWidget15geometryChangedEv @ 11937 NONAME - _ZN15QSplitterHandle11resizeEventEP12QResizeEvent @ 11938 NONAME - _ZN20QGraphicsItemPrivate10resetWidthEv @ 11939 NONAME - _ZN20QGraphicsItemPrivate11resetHeightEv @ 11940 NONAME - _ZN20QGraphicsItemPrivate12childrenListEv @ 11941 NONAME - _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEbb @ 11942 NONAME - _ZN20QGraphicsItemPrivate16clearFocusHelperEb @ 11943 NONAME - _ZN20QGraphicsItemPrivate24prependGraphicsTransformEP18QGraphicsTransform @ 11944 NONAME - _ZN20QGraphicsItemPrivate6appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11945 NONAME ABSENT - _ZN20QGraphicsItemPrivate8setWidthEf @ 11946 NONAME - _ZN20QGraphicsItemPrivate9setHeightEf @ 11947 NONAME - _ZN7QWizard11pageRemovedEi @ 11948 NONAME - _ZN7QWizard13setSideWidgetEP7QWidget @ 11949 NONAME - _ZN7QWizard9pageAddedEi @ 11950 NONAME - _ZN8QPainter14PixmapFragment6createERK7QPointFRK6QRectFffff @ 11951 NONAME - _ZN8QPainter19drawPixmapFragmentsEPKNS_14PixmapFragmentEiRK7QPixmap6QFlagsINS_18PixmapFragmentHintEE @ 11952 NONAME - _ZN9QLineEdit18setPlaceholderTextERK7QString @ 11953 NONAME - _ZNK10QZipReader6deviceEv @ 11954 NONAME - _ZNK10QZipReader8FileInfo7isValidEv @ 11955 NONAME - _ZNK20QGraphicsItemPrivate5widthEv @ 11956 NONAME - _ZNK20QGraphicsItemPrivate6heightEv @ 11957 NONAME - _ZNK6QImage13bitPlaneCountEv @ 11958 NONAME - _ZNK7QWizard10sideWidgetEv @ 11959 NONAME - _ZNK9QLineEdit15placeholderTextEv @ 11960 NONAME - _ZNK9QTextLine17horizontalAdvanceEv @ 11961 NONAME - _ZN11QStaticText12setTextWidthEf @ 11962 NONAME - _ZN13QGraphicsItem16updateMicroFocusEv @ 11963 NONAME - _ZN15QGraphicsObject16updateMicroFocusEv @ 11964 NONAME - _ZN15QGraphicsWidget13layoutChangedEv @ 11965 NONAME - _ZN16QPainterReplayer15processCommandsERK12QPaintBufferP8QPainterii @ 11966 NONAME - _ZNK11QStaticText9textWidthEv @ 11967 NONAME - _ZNK12QPaintBuffer13frameEndIndexEi @ 11968 NONAME - _ZNK12QPaintBuffer15frameStartIndexEi @ 11969 NONAME - _ZNK12QPaintBuffer15processCommandsEP8QPainterii @ 11970 NONAME - _ZNK12QPaintBuffer18commandDescriptionEi @ 11971 NONAME - _ZN20QGraphicsItemPrivate11children_atEP24QDeclarativeListPropertyI15QGraphicsObjectEi @ 11972 NONAME - _ZN20QGraphicsItemPrivate14children_countEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 11973 NONAME - _ZN20QGraphicsItemPrivate15children_appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11974 NONAME - _ZN11QEglContext14destroyContextEv @ 11975 NONAME - _ZN14QEglProperties13setDeviceTypeEi @ 11976 NONAME - _ZN4QEgl10clearErrorEv @ 11977 NONAME ABSENT - _ZN4QEgl10extensionsEv @ 11978 NONAME - _ZN4QEgl11errorStringEi @ 11979 NONAME - _ZN4QEgl11errorStringEv @ 11980 NONAME ABSENT - _ZN4QEgl12chooseConfigEPK14QEglPropertiesNS_16PixelFormatMatchE @ 11981 NONAME - _ZN4QEgl12hasExtensionEPKc @ 11982 NONAME - _ZN4QEgl12nativePixmapEP7QPixmap @ 11983 NONAME - _ZN4QEgl12nativeWindowEP7QWidget @ 11984 NONAME - _ZN4QEgl13createSurfaceEP12QPaintDeviceiPK14QEglProperties @ 11985 NONAME - _ZN4QEgl13defaultConfigEiNS_3APIE6QFlagsINS_12ConfigOptionEE @ 11986 NONAME - _ZN4QEgl13nativeDisplayEv @ 11987 NONAME - _ZN4QEgl14dumpAllConfigsEv @ 11988 NONAME - _ZN4QEgl17eglCreateImageKHREiiiiPKi @ 11989 NONAME - _ZN4QEgl18eglDestroyImageKHREii @ 11990 NONAME - _ZN4QEgl5errorEv @ 11991 NONAME ABSENT - _ZN4QEgl7displayEv @ 11992 NONAME - _ZNK11QEglContext12configAttribEi @ 11993 NONAME - _ZNK11QEglContext16configPropertiesEv @ 11994 NONAME ABSENT - _ZNK19QItemSelectionRange7isEmptyEv @ 11995 NONAME - _ZN13QIconEngineV28iconNameEv @ 11996 NONAME - _ZN14QWindowSurface23setPartialUpdateSupportEb @ 11997 NONAME - _ZNK14QWindowSurface23hasPartialUpdateSupportEv @ 11998 NONAME - _ZNK5QIcon4nameEv @ 11999 NONAME - _ZN20QGraphicsViewPrivate12updateRegionERK6QRectFRK10QTransform @ 12000 NONAME - _ZN12QPixmapCache10allPixmapsEv @ 12001 NONAME - _ZN12QPixmapCache20flushDetachedPixmapsEv @ 12002 NONAME - _ZN12QPixmapCache9totalUsedEv @ 12003 NONAME - _ZN20QGraphicsItemPrivate30updatePaintedViewBoundingRectsEb @ 12004 NONAME - _ZN20QGraphicsViewPrivate13setUpdateClipEP13QGraphicsItem @ 12005 NONAME - _ZN23QImageTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj @ 12006 NONAME - _ZN23QImageTextureGlyphCache17createTextureDataEii @ 12007 NONAME - _ZN23QImageTextureGlyphCache17resizeTextureDataEii @ 12008 NONAME - _ZNK23QImageTextureGlyphCache11glyphMarginEv @ 12009 NONAME - _ZNK7QBezier12addToPolygonEP9QPolygonFf @ 12010 NONAME - _ZNK7QBezier9toPolygonEf @ 12011 NONAME - _ZTI23QImageTextureGlyphCache @ 12012 NONAME - _ZTV23QImageTextureGlyphCache @ 12013 NONAME - _ZN11QTextCursor20setVerticalMovementXEi @ 12014 NONAME - _ZN11QTextCursor23setKeepPositionOnInsertEb @ 12015 NONAME - _ZN19QApplicationPrivate23runtime_graphics_systemE @ 12016 NONAME DATA 1 - _ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFb @ 12017 NONAME - _ZNK10QTextBlock13textDirectionEv @ 12018 NONAME - _ZNK11QTextCursor17verticalMovementXEv @ 12019 NONAME - _ZNK11QTextCursor20keepPositionOnInsertEv @ 12020 NONAME - _ZNK11QTextEngine13isRightToLeftEv @ 12021 NONAME - _ZNK12QFontMetrics5widthERK7QStringii @ 12022 NONAME - _ZNK14QWidgetPrivate22childAtRecursiveHelperERK6QPointbb @ 12023 NONAME - _ZN10QImageData14convertInPlaceEN6QImage6FormatE6QFlagsIN2Qt19ImageConversionFlagEE @ 12024 NONAME - _ZN11QEglContext21swapBuffersRegion2NOKEiPK7QRegion @ 12025 NONAME - _ZN11QPixmapData15fromImageReaderEP12QImageReader6QFlagsIN2Qt19ImageConversionFlagEE @ 12026 NONAME - _ZN11QStaticText13setTextOptionERK11QTextOption @ 12027 NONAME - _ZN13QS60MainAppUi11HandleErrorEiRK14SExtendedErrorR6TDes16S4_ @ 12028 NONAME - _ZN13QS60MainAppUi13PrepareToExitEv @ 12029 NONAME - _ZN13QS60MainAppUi15MopSupplyObjectE8TTypeUid @ 12030 NONAME - _ZN13QS60MainAppUi15ProcessCommandLEi @ 12031 NONAME - _ZN13QS60MainAppUi18HandleSystemEventLERK8TWsEvent @ 12032 NONAME - _ZN13QS60MainAppUi19Reserved_MtsmObjectEv @ 12033 NONAME - _ZN13QS60MainAppUi21Reserved_MtsmPositionEv @ 12034 NONAME - _ZN13QS60MainAppUi22HandleForegroundEventLEi @ 12035 NONAME - _ZN13QS60MainAppUi22HandleViewDeactivationERK10TVwsViewIdS2_ @ 12036 NONAME - _ZN13QS60MainAppUi25HandleTouchPaneSizeChangeEv @ 12037 NONAME - _ZN13QS60MainAppUi26HandleScreenDeviceChangedLEv @ 12038 NONAME - _ZN13QS60MainAppUi31HandleApplicationSpecificEventLEiRK8TWsEvent @ 12039 NONAME - _ZN13QS60MainAppUi4ExitEv @ 12040 NONAME - _ZN13QS60MainAppUi9SetFadedLEi @ 12041 NONAME - _ZN15QGraphicsSystem16createPixmapDataEP11QPixmapData @ 12042 NONAME - _ZN16QS60MainDocument9OpenFileLERP10CFileStoreR5RFile @ 12043 NONAME - _ZN16QS60MainDocument9OpenFileLEiRK7TDesC16R3RFs @ 12044 NONAME - _ZN17QRasterPixmapData15fromImageReaderEP12QImageReader6QFlagsIN2Qt19ImageConversionFlagEE @ 12045 NONAME - _ZN17QRasterPixmapData20createPixmapForImageER6QImage6QFlagsIN2Qt19ImageConversionFlagEEb @ 12046 NONAME - _ZN17QRasterPixmapData4copyEPK11QPixmapDataRK5QRect @ 12047 NONAME - _ZN17QRasterPixmapData8fromDataEPKhjPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 12048 NONAME - _ZN18QRuntimePixmapData12readBackInfoEv @ 12049 NONAME - _ZN18QRuntimePixmapData12toNativeTypeEN11QPixmapData10NativeTypeE @ 12050 NONAME - _ZN18QRuntimePixmapData14fromNativeTypeEPvN11QPixmapData10NativeTypeE @ 12051 NONAME - _ZN18QRuntimePixmapData15setAlphaChannelERK7QPixmap @ 12052 NONAME - _ZN18QRuntimePixmapData4copyEPK11QPixmapDataRK5QRect @ 12053 NONAME - _ZN18QRuntimePixmapData4fillERK6QColor @ 12054 NONAME - _ZN18QRuntimePixmapData6bufferEv @ 12055 NONAME - _ZN18QRuntimePixmapData6resizeEii @ 12056 NONAME - _ZN18QRuntimePixmapData6scrollEiiRK5QRect @ 12057 NONAME - _ZN18QRuntimePixmapData7setMaskERK7QBitmap @ 12058 NONAME - _ZN18QRuntimePixmapData8fromDataEPKhjPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 12059 NONAME - _ZN18QRuntimePixmapData8fromFileERK7QStringPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 12060 NONAME - _ZN18QRuntimePixmapData9fromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 12061 NONAME - _ZN18QRuntimePixmapDataC1EPK22QRuntimeGraphicsSystemN11QPixmapData9PixelTypeE @ 12062 NONAME - _ZN18QRuntimePixmapDataC2EPK22QRuntimeGraphicsSystemN11QPixmapData9PixelTypeE @ 12063 NONAME - _ZN18QRuntimePixmapDataD0Ev @ 12064 NONAME - _ZN18QRuntimePixmapDataD1Ev @ 12065 NONAME - _ZN18QRuntimePixmapDataD2Ev @ 12066 NONAME - _ZN19QS60MainApplication13NewAppServerLERP13CApaAppServer @ 12067 NONAME - _ZN19QS60MainApplication16PreDocConstructLEv @ 12068 NONAME - _ZN4QEgl24eglSwapBuffersRegion2NOKEiiiPKi @ 12069 NONAME - _ZN7QDialog23symbianAdjustedPositionEv @ 12070 NONAME - _ZN7QPixmap15fromImageReaderEP12QImageReader6QFlagsIN2Qt19ImageConversionFlagEE @ 12071 NONAME - _ZNK11QPixmapData7toImageERK5QRect @ 12072 NONAME - _ZNK11QStaticText10textOptionEv @ 12073 NONAME - _ZNK13QS60MainAppUi15ApplicationRectEv @ 12074 NONAME - _ZNK17QRasterPixmapData7toImageERK5QRect @ 12075 NONAME - _ZNK18QRuntimePixmapData11memoryUsageEv @ 12076 NONAME - _ZNK18QRuntimePixmapData11paintEngineEv @ 12077 NONAME - _ZNK18QRuntimePixmapData11runtimeDataEv @ 12078 NONAME - _ZNK18QRuntimePixmapData11transformedERK10QTransformN2Qt18TransformationModeE @ 12079 NONAME - _ZNK18QRuntimePixmapData12alphaChannelEv @ 12080 NONAME - _ZNK18QRuntimePixmapData15hasAlphaChannelEv @ 12081 NONAME - _ZNK18QRuntimePixmapData26createCompatiblePixmapDataEv @ 12082 NONAME - _ZNK18QRuntimePixmapData4maskEv @ 12083 NONAME - _ZNK18QRuntimePixmapData6metricEN12QPaintDevice17PaintDeviceMetricE @ 12084 NONAME - _ZNK18QRuntimePixmapData7toImageEv @ 12085 NONAME - _ZNK19QS60MainApplication13OpenIniFileLCER3RFs @ 12086 NONAME - _ZTI18QRuntimePixmapData @ 12087 NONAME - _ZTV15QGraphicsSystem @ 12088 NONAME - _ZTV18QRuntimePixmapData @ 12089 NONAME - _ZThn100_N13QS60MainAppUi25HandleTouchPaneSizeChangeEv @ 12090 NONAME - _ZThn24_N13QS60MainAppUi15ProcessCommandLEi @ 12091 NONAME - _ZThn40_N13QS60MainAppUi15MopSupplyObjectE8TTypeUid @ 12092 NONAME - _ZThn92_N13QS60MainAppUi22HandleViewDeactivationERK10TVwsViewIdS2_ @ 12093 NONAME - _ZN18QTapAndHoldGesture10setTimeoutEi @ 12094 NONAME - _ZN18QTapAndHoldGesture7timeoutEv @ 12095 NONAME - _ZN20QGraphicsItemPrivate20focusScopeItemChangeEb @ 12096 NONAME + _ZN11QEglContext10clearErrorEv @ 11807 NONAME ABSENT + _ZN11QEglContext13nativeDisplayEv @ 11808 NONAME ABSENT + _ZN11QEglContext14destroyContextEv @ 11809 NONAME + _ZN11QEglContext3dpyE @ 11810 NONAME DATA 4 ABSENT + _ZN11QEglContext5errorEv @ 11811 NONAME ABSENT + _ZN11QEglContext7displayEv @ 11812 NONAME ABSENT + _ZN11QFontEngine16getGlyphBearingsEjPfS0_ @ 11813 NONAME + _ZN12QLineControl17updateDisplayTextEb @ 11814 NONAME + _ZN13QFontDatabase25removeAllApplicationFontsEv @ 11815 NONAME + _ZN14QWidgetPrivate11inTabWidgetEP7QWidget @ 11816 NONAME + _ZN14QWidgetPrivate17canKeypadNavigateEN2Qt11OrientationE @ 11817 NONAME + _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEbb @ 11818 NONAME + _ZN20QGraphicsItemPrivate16clearFocusHelperEb @ 11819 NONAME + _ZN24QImagePixmapCleanupHooks13isImageCachedERK6QImage @ 11820 NONAME + _ZN24QImagePixmapCleanupHooks14isPixmapCachedERK7QPixmap @ 11821 NONAME + _Z14qt_draw_glyphsP8QPainterPKjPK7QPointFi @ 11822 NONAME + _ZN10QZipReader5closeEv @ 11823 NONAME + _ZN10QZipReader8FileInfoC1ERKS0_ @ 11824 NONAME + _ZN10QZipReader8FileInfoC1Ev @ 11825 NONAME + _ZN10QZipReader8FileInfoC2ERKS0_ @ 11826 NONAME + _ZN10QZipReader8FileInfoC2Ev @ 11827 NONAME + _ZN10QZipReader8FileInfoD1Ev @ 11828 NONAME + _ZN10QZipReader8FileInfoD2Ev @ 11829 NONAME + _ZN10QZipReader8FileInfoaSERKS0_ @ 11830 NONAME + _ZN10QZipReaderC1EP9QIODevice @ 11831 NONAME + _ZN10QZipReaderC1ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 11832 NONAME + _ZN10QZipReaderC2EP9QIODevice @ 11833 NONAME + _ZN10QZipReaderC2ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 11834 NONAME + _ZN10QZipReaderD1Ev @ 11835 NONAME + _ZN10QZipReaderD2Ev @ 11836 NONAME + _ZN11QStaticText12setTextWidthEf @ 11837 NONAME + _ZN11QStaticText13setTextFormatEN2Qt10TextFormatE @ 11838 NONAME + _ZN11QStaticText18setPerformanceHintENS_15PerformanceHintE @ 11839 NONAME + _ZN11QStaticText6detachEv @ 11840 NONAME + _ZN11QStaticText7prepareERK10QTransformRK5QFont @ 11841 NONAME + _ZN11QStaticText7setTextERK7QString @ 11842 NONAME + _ZN11QStaticTextC1ERK7QString @ 11843 NONAME + _ZN11QStaticTextC1ERKS_ @ 11844 NONAME + _ZN11QStaticTextC1Ev @ 11845 NONAME + _ZN11QStaticTextC2ERK7QString @ 11846 NONAME + _ZN11QStaticTextC2ERKS_ @ 11847 NONAME + _ZN11QStaticTextC2Ev @ 11848 NONAME + _ZN11QStaticTextD1Ev @ 11849 NONAME + _ZN11QStaticTextD2Ev @ 11850 NONAME + _ZN11QStaticTextaSERKS_ @ 11851 NONAME + _ZN12QKeySequence6assignERK7QStringNS_14SequenceFormatE @ 11852 NONAME + _ZN12QKeySequenceC1ERK7QStringNS_14SequenceFormatE @ 11853 NONAME + _ZN12QKeySequenceC2ERK7QStringNS_14SequenceFormatE @ 11854 NONAME + _ZN12QLineControl5pasteEN10QClipboard4ModeE @ 11855 NONAME + _ZN12QPixmapCache10allPixmapsEv @ 11856 NONAME + _ZN12QPixmapCache20flushDetachedPixmapsEv @ 11857 NONAME + _ZN12QPixmapCache9totalUsedEv @ 11858 NONAME + _ZN12QTextControl5pasteEN10QClipboard4ModeE @ 11859 NONAME + _ZN13QGraphicsItem16updateMicroFocusEv @ 11860 NONAME + _ZN13QIconEngineV28iconNameEv @ 11861 NONAME + _ZN13QTextDocument19clearUndoRedoStacksENS_6StacksE @ 11862 NONAME + _ZN14QEglProperties13setDeviceTypeEi @ 11863 NONAME + _ZN14QPaintEngineEx19drawPixmapFragmentsEPKN8QPainter14PixmapFragmentEiRK7QPixmap6QFlagsINS0_18PixmapFragmentHintEE @ 11864 NONAME + _ZN14QWidgetPrivate6renderEP12QPaintDeviceRK6QPointRK7QRegion6QFlagsIN7QWidget10RenderFlagEEb @ 11865 NONAME + _ZN14QWindowSurface23setPartialUpdateSupportEb @ 11866 NONAME + _ZN15QGraphicsObject12widthChangedEv @ 11867 NONAME + _ZN15QGraphicsObject13heightChangedEv @ 11868 NONAME + _ZN15QGraphicsObject15childrenChangedEv @ 11869 NONAME + _ZN15QGraphicsObject16updateMicroFocusEv @ 11870 NONAME + _ZN15QGraphicsWidget13layoutChangedEv @ 11871 NONAME + _ZN15QGraphicsWidget15geometryChangedEv @ 11872 NONAME + _ZN15QGraphicsWidget21setAutoFillBackgroundEb @ 11873 NONAME + _ZN15QSplitterHandle11resizeEventEP12QResizeEvent @ 11874 NONAME + _ZN16QFileSystemModel15directoryLoadedERK7QString @ 11875 NONAME + _ZN16QPainterReplayer15processCommandsERK12QPaintBufferP8QPainterii @ 11876 NONAME + _ZN18QTextureGlyphCache8populateEP11QFontEngineiPKjPK11QFixedPoint @ 11877 NONAME + _ZN19QApplicationPrivate15getPixmapCursorEN2Qt11CursorShapeE @ 11878 NONAME + _ZN20QGraphicsItemPrivate10resetWidthEv @ 11879 NONAME + _ZN20QGraphicsItemPrivate11children_atEP24QDeclarativeListPropertyI15QGraphicsObjectEi @ 11880 NONAME + _ZN20QGraphicsItemPrivate11resetHeightEv @ 11881 NONAME + _ZN20QGraphicsItemPrivate12childrenListEv @ 11882 NONAME + _ZN20QGraphicsItemPrivate14children_countEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 11883 NONAME + _ZN20QGraphicsItemPrivate15children_appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11884 NONAME + _ZN20QGraphicsItemPrivate24prependGraphicsTransformEP18QGraphicsTransform @ 11885 NONAME + _ZN20QGraphicsItemPrivate30updatePaintedViewBoundingRectsEb @ 11886 NONAME + _ZN20QGraphicsItemPrivate8setWidthEf @ 11887 NONAME + _ZN20QGraphicsItemPrivate9setHeightEf @ 11888 NONAME + _ZN20QGraphicsViewPrivate10centerViewEN13QGraphicsView14ViewportAnchorE @ 11889 NONAME + _ZN20QGraphicsViewPrivate10updateRectERK5QRect @ 11890 NONAME + _ZN20QGraphicsViewPrivate12updateRegionERK6QRectFRK10QTransform @ 11891 NONAME + _ZN20QGraphicsViewPrivate12updateScrollEv @ 11892 NONAME + _ZN20QGraphicsViewPrivate13setUpdateClipEP13QGraphicsItem @ 11893 NONAME + _ZN20QGraphicsViewPrivate15storeMouseEventEP11QMouseEvent @ 11894 NONAME + _ZN20QGraphicsViewPrivate18storeDragDropEventEPK27QGraphicsSceneDragDropEvent @ 11895 NONAME + _ZN20QGraphicsViewPrivate19translateTouchEventEPS_P11QTouchEvent @ 11896 NONAME + _ZN20QGraphicsViewPrivate20_q_setViewportCursorERK7QCursor @ 11897 NONAME + _ZN20QGraphicsViewPrivate20replayLastMouseEventEv @ 11898 NONAME + _ZN20QGraphicsViewPrivate21freeStyleOptionsArrayEP24QStyleOptionGraphicsItem @ 11899 NONAME + _ZN20QGraphicsViewPrivate21mouseMoveEventHandlerEP11QMouseEvent @ 11900 NONAME + _ZN20QGraphicsViewPrivate21processPendingUpdatesEv @ 11901 NONAME + _ZN20QGraphicsViewPrivate21updateLastCenterPointEv @ 11902 NONAME + _ZN20QGraphicsViewPrivate22_q_unsetViewportCursorEv @ 11903 NONAME + _ZN20QGraphicsViewPrivate22allocStyleOptionsArrayEi @ 11904 NONAME + _ZN20QGraphicsViewPrivate22recalculateContentSizeEv @ 11905 NONAME + _ZN20QGraphicsViewPrivate26populateSceneDragDropEventEP27QGraphicsSceneDragDropEventP10QDropEvent @ 11906 NONAME + _ZN20QGraphicsViewPrivate28updateInputMethodSensitivityEv @ 11907 NONAME + _ZN20QGraphicsViewPrivateC1Ev @ 11908 NONAME + _ZN20QGraphicsViewPrivateC2Ev @ 11909 NONAME + _ZN23QImageTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj @ 11910 NONAME + _ZN23QImageTextureGlyphCache17createTextureDataEii @ 11911 NONAME + _ZN23QImageTextureGlyphCache17resizeTextureDataEii @ 11912 NONAME + _ZN26QAbstractScrollAreaPrivate14layoutChildrenEv @ 11913 NONAME + _ZN26QAbstractScrollAreaPrivate16replaceScrollBarEP10QScrollBarN2Qt11OrientationE @ 11914 NONAME + _ZN26QAbstractScrollAreaPrivate23_q_showOrHideScrollBarsEv @ 11915 NONAME + _ZN26QAbstractScrollAreaPrivate4initEv @ 11916 NONAME + _ZN26QAbstractScrollAreaPrivate9_q_hslideEi @ 11917 NONAME + _ZN26QAbstractScrollAreaPrivate9_q_vslideEi @ 11918 NONAME + _ZN26QAbstractScrollAreaPrivateC1Ev @ 11919 NONAME + _ZN26QAbstractScrollAreaPrivateC2Ev @ 11920 NONAME + _ZN4QEgl10extensionsEv @ 11921 NONAME + _ZN4QEgl11errorStringEi @ 11922 NONAME + _ZN4QEgl12chooseConfigEPK14QEglPropertiesNS_16PixelFormatMatchE @ 11923 NONAME + _ZN4QEgl12hasExtensionEPKc @ 11924 NONAME + _ZN4QEgl12nativePixmapEP7QPixmap @ 11925 NONAME + _ZN4QEgl12nativeWindowEP7QWidget @ 11926 NONAME + _ZN4QEgl13createSurfaceEP12QPaintDeviceiPK14QEglProperties @ 11927 NONAME + _ZN4QEgl13defaultConfigEiNS_3APIE6QFlagsINS_12ConfigOptionEE @ 11928 NONAME + _ZN4QEgl13nativeDisplayEv @ 11929 NONAME + _ZN4QEgl14dumpAllConfigsEv @ 11930 NONAME + _ZN4QEgl17eglCreateImageKHREiiiiPKi @ 11931 NONAME + _ZN4QEgl18eglDestroyImageKHREii @ 11932 NONAME + _ZN4QEgl7displayEv @ 11933 NONAME + _ZN6QColor12isValidColorERK7QString @ 11934 NONAME + _ZN6QColor18setColorFromStringERK7QString @ 11935 NONAME + _ZN6QLabel12setSelectionEii @ 11936 NONAME + _ZN7QPixmap16convertFromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 11937 NONAME + _ZN7QWizard11pageRemovedEi @ 11938 NONAME + _ZN7QWizard13setSideWidgetEP7QWidget @ 11939 NONAME + _ZN7QWizard9pageAddedEi @ 11940 NONAME + _ZN8QPainter14PixmapFragment6createERK7QPointFRK6QRectFffff @ 11941 NONAME + _ZN8QPainter14drawStaticTextERK7QPointFRK11QStaticText @ 11942 NONAME + _ZN8QPainter19drawPixmapFragmentsEPKNS_14PixmapFragmentEiRK7QPixmap6QFlagsINS_18PixmapFragmentHintEE @ 11943 NONAME + _ZN8QToolBar17visibilityChangedEb @ 11944 NONAME + _ZN9QLineEdit18setPlaceholderTextERK7QString @ 11945 NONAME + _ZNK10QZipReader10extractAllERK7QString @ 11946 NONAME + _ZNK10QZipReader10isReadableEv @ 11947 NONAME + _ZNK10QZipReader11entryInfoAtEi @ 11948 NONAME + _ZNK10QZipReader12fileInfoListEv @ 11949 NONAME + _ZNK10QZipReader5countEv @ 11950 NONAME + _ZNK10QZipReader6deviceEv @ 11951 NONAME + _ZNK10QZipReader6existsEv @ 11952 NONAME + _ZNK10QZipReader6statusEv @ 11953 NONAME + _ZNK10QZipReader8FileInfo7isValidEv @ 11954 NONAME + _ZNK10QZipReader8fileDataERK7QString @ 11955 NONAME + _ZNK11QEglContext12configAttribEi @ 11956 NONAME + _ZNK11QStaticText10textFormatEv @ 11957 NONAME + _ZNK11QStaticText15performanceHintEv @ 11958 NONAME + _ZNK11QStaticText4sizeEv @ 11959 NONAME + _ZNK11QStaticText4textEv @ 11960 NONAME + _ZNK11QStaticText9textWidthEv @ 11961 NONAME + _ZNK11QStaticTexteqERKS_ @ 11962 NONAME + _ZNK11QStaticTextneERKS_ @ 11963 NONAME + _ZNK11QTextCursor15positionInBlockEv @ 11964 NONAME + _ZNK12QPaintBuffer13frameEndIndexEi @ 11965 NONAME + _ZNK12QPaintBuffer15frameStartIndexEi @ 11966 NONAME + _ZNK12QPaintBuffer15processCommandsEP8QPainterii @ 11967 NONAME + _ZNK12QPaintBuffer18commandDescriptionEi @ 11968 NONAME + _ZNK13QIntValidator5fixupER7QString @ 11969 NONAME + _ZNK14QPlainTextEdit8anchorAtERK6QPoint @ 11970 NONAME + _ZNK14QWindowSurface23hasPartialUpdateSupportEv @ 11971 NONAME + _ZNK15QGraphicsWidget18autoFillBackgroundEv @ 11972 NONAME + _ZNK19QItemSelectionRange7isEmptyEv @ 11973 NONAME + _ZNK20QGraphicsItemPrivate5widthEv @ 11974 NONAME + _ZNK20QGraphicsItemPrivate6heightEv @ 11975 NONAME + _ZNK20QGraphicsViewPrivate10mapToSceneERK6QRectF @ 11976 NONAME + _ZNK20QGraphicsViewPrivate10mapToSceneERK7QPointF @ 11977 NONAME + _ZNK20QGraphicsViewPrivate13mapToViewRectEPK13QGraphicsItemRK6QRectF @ 11978 NONAME + _ZNK20QGraphicsViewPrivate14mapRectToSceneERK5QRect @ 11979 NONAME + _ZNK20QGraphicsViewPrivate14verticalScrollEv @ 11980 NONAME + _ZNK20QGraphicsViewPrivate15mapToViewRegionEPK13QGraphicsItemRK6QRectF @ 11981 NONAME + _ZNK20QGraphicsViewPrivate16horizontalScrollEv @ 11982 NONAME + _ZNK20QGraphicsViewPrivate16mapRectFromSceneERK6QRectF @ 11983 NONAME + _ZNK20QGraphicsViewPrivate16rubberBandRegionEPK7QWidgetRK5QRect @ 11984 NONAME + _ZNK20QGraphicsViewPrivate9findItemsERK7QRegionPbRK10QTransform @ 11985 NONAME + _ZNK23QImageTextureGlyphCache11glyphMarginEv @ 11986 NONAME + _ZNK26QAbstractScrollAreaPrivate14contentsOffsetEv @ 11987 NONAME + _ZNK5QIcon4nameEv @ 11988 NONAME + _ZNK6QImage13bitPlaneCountEv @ 11989 NONAME + _ZNK6QImage13constScanLineEi @ 11990 NONAME + _ZNK6QImage9constBitsEv @ 11991 NONAME + _ZNK6QLabel12selectedTextEv @ 11992 NONAME + _ZNK6QLabel14selectionStartEv @ 11993 NONAME + _ZNK6QLabel15hasSelectedTextEv @ 11994 NONAME + _ZNK7QBezier11getSubRangeEff @ 11995 NONAME + _ZNK7QBezier12addToPolygonEP9QPolygonFf @ 11996 NONAME + _ZNK7QBezier5mapByERK10QTransform @ 11997 NONAME + _ZNK7QBezier9toPolygonEf @ 11998 NONAME + _ZNK7QWizard10sideWidgetEv @ 11999 NONAME + _ZNK9QLineEdit15placeholderTextEv @ 12000 NONAME + _ZNK9QTextLine17horizontalAdvanceEv @ 12001 NONAME + _ZTI20QGraphicsViewPrivate @ 12002 NONAME + _ZTI23QImageTextureGlyphCache @ 12003 NONAME + _ZTI26QAbstractScrollAreaPrivate @ 12004 NONAME + _ZTV20QGraphicsViewPrivate @ 12005 NONAME + _ZTV23QImageTextureGlyphCache @ 12006 NONAME + _ZTV26QAbstractScrollAreaPrivate @ 12007 NONAME + _ZN11QTextCursor20setVerticalMovementXEi @ 12008 NONAME + _ZN11QTextCursor23setKeepPositionOnInsertEb @ 12009 NONAME + _ZN19QApplicationPrivate23runtime_graphics_systemE @ 12010 NONAME DATA 1 + _ZNK11QTextCursor17verticalMovementXEv @ 12011 NONAME + _ZNK11QTextCursor20keepPositionOnInsertEv @ 12012 NONAME + _ZNK12QFontMetrics5widthERK7QStringii @ 12013 NONAME + _ZN11QStaticText13setTextOptionERK11QTextOption @ 12014 NONAME + _ZNK10QTextBlock13textDirectionEv @ 12015 NONAME + _ZNK11QStaticText10textOptionEv @ 12016 NONAME + _ZNK11QTextEngine13isRightToLeftEv @ 12017 NONAME + _ZNK14QWidgetPrivate22childAtRecursiveHelperERK6QPointbb @ 12018 NONAME + _ZN10QImageData14convertInPlaceEN6QImage6FormatE6QFlagsIN2Qt19ImageConversionFlagEE @ 12019 NONAME + _ZN17QRasterPixmapData20createPixmapForImageER6QImage6QFlagsIN2Qt19ImageConversionFlagEEb @ 12020 NONAME + _ZN17QRasterPixmapData8fromDataEPKhjPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 12021 NONAME + _ZN15QGraphicsSystem16createPixmapDataEP11QPixmapData @ 12022 NONAME + _ZN17QRasterPixmapData4copyEPK11QPixmapDataRK5QRect @ 12023 NONAME + _ZNK11QPixmapData7toImageERK5QRect @ 12024 NONAME + _ZNK17QRasterPixmapData7toImageERK5QRect @ 12025 NONAME + _ZTV15QGraphicsSystem @ 12026 NONAME + _ZN11QPixmapData15fromImageReaderEP12QImageReader6QFlagsIN2Qt19ImageConversionFlagEE @ 12027 NONAME + _ZN17QRasterPixmapData15fromImageReaderEP12QImageReader6QFlagsIN2Qt19ImageConversionFlagEE @ 12028 NONAME + _ZN18QRuntimePixmapData12readBackInfoEv @ 12029 NONAME + _ZN18QRuntimePixmapData12toNativeTypeEN11QPixmapData10NativeTypeE @ 12030 NONAME + _ZN18QRuntimePixmapData14fromNativeTypeEPvN11QPixmapData10NativeTypeE @ 12031 NONAME + _ZN18QRuntimePixmapData15setAlphaChannelERK7QPixmap @ 12032 NONAME + _ZN18QRuntimePixmapData4copyEPK11QPixmapDataRK5QRect @ 12033 NONAME + _ZN18QRuntimePixmapData4fillERK6QColor @ 12034 NONAME + _ZN18QRuntimePixmapData6bufferEv @ 12035 NONAME + _ZN18QRuntimePixmapData6resizeEii @ 12036 NONAME + _ZN18QRuntimePixmapData6scrollEiiRK5QRect @ 12037 NONAME + _ZN18QRuntimePixmapData7setMaskERK7QBitmap @ 12038 NONAME + _ZN18QRuntimePixmapData8fromDataEPKhjPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 12039 NONAME + _ZN18QRuntimePixmapData8fromFileERK7QStringPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 12040 NONAME + _ZN18QRuntimePixmapData9fromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 12041 NONAME + _ZN18QRuntimePixmapDataC1EPK22QRuntimeGraphicsSystemN11QPixmapData9PixelTypeE @ 12042 NONAME + _ZN18QRuntimePixmapDataC2EPK22QRuntimeGraphicsSystemN11QPixmapData9PixelTypeE @ 12043 NONAME + _ZN18QRuntimePixmapDataD0Ev @ 12044 NONAME + _ZN18QRuntimePixmapDataD1Ev @ 12045 NONAME + _ZN18QRuntimePixmapDataD2Ev @ 12046 NONAME + _ZN7QPixmap15fromImageReaderEP12QImageReader6QFlagsIN2Qt19ImageConversionFlagEE @ 12047 NONAME + _ZNK18QRuntimePixmapData11memoryUsageEv @ 12048 NONAME ABSENT + _ZNK18QRuntimePixmapData11paintEngineEv @ 12049 NONAME + _ZNK18QRuntimePixmapData11runtimeDataEv @ 12050 NONAME + _ZNK18QRuntimePixmapData11transformedERK10QTransformN2Qt18TransformationModeE @ 12051 NONAME + _ZNK18QRuntimePixmapData12alphaChannelEv @ 12052 NONAME + _ZNK18QRuntimePixmapData15hasAlphaChannelEv @ 12053 NONAME + _ZNK18QRuntimePixmapData26createCompatiblePixmapDataEv @ 12054 NONAME + _ZNK18QRuntimePixmapData4maskEv @ 12055 NONAME + _ZNK18QRuntimePixmapData6metricEN12QPaintDevice17PaintDeviceMetricE @ 12056 NONAME + _ZNK18QRuntimePixmapData7toImageEv @ 12057 NONAME + _ZTI18QRuntimePixmapData @ 12058 NONAME + _ZTV18QRuntimePixmapData @ 12059 NONAME + _ZN11QEglContext21swapBuffersRegion2NOKEiPK7QRegion @ 12060 NONAME + _ZN4QEgl24eglSwapBuffersRegion2NOKEiiiPKi @ 12061 NONAME + _ZN13QS60MainAppUi11HandleErrorEiRK14SExtendedErrorR6TDes16S4_ @ 12062 NONAME + _ZN13QS60MainAppUi13PrepareToExitEv @ 12063 NONAME + _ZN13QS60MainAppUi15MopSupplyObjectE8TTypeUid @ 12064 NONAME + _ZN13QS60MainAppUi15ProcessCommandLEi @ 12065 NONAME + _ZN13QS60MainAppUi18HandleSystemEventLERK8TWsEvent @ 12066 NONAME + _ZN13QS60MainAppUi19Reserved_MtsmObjectEv @ 12067 NONAME + _ZN13QS60MainAppUi21Reserved_MtsmPositionEv @ 12068 NONAME + _ZN13QS60MainAppUi22HandleForegroundEventLEi @ 12069 NONAME + _ZN13QS60MainAppUi22HandleViewDeactivationERK10TVwsViewIdS2_ @ 12070 NONAME + _ZN13QS60MainAppUi25HandleTouchPaneSizeChangeEv @ 12071 NONAME + _ZN13QS60MainAppUi26HandleScreenDeviceChangedLEv @ 12072 NONAME + _ZN13QS60MainAppUi31HandleApplicationSpecificEventLEiRK8TWsEvent @ 12073 NONAME + _ZN13QS60MainAppUi4ExitEv @ 12074 NONAME + _ZN13QS60MainAppUi9SetFadedLEi @ 12075 NONAME + _ZN16QS60MainDocument9OpenFileLERP10CFileStoreR5RFile @ 12076 NONAME + _ZN16QS60MainDocument9OpenFileLEiRK7TDesC16R3RFs @ 12077 NONAME + _ZN19QS60MainApplication13NewAppServerLERP13CApaAppServer @ 12078 NONAME + _ZN19QS60MainApplication16PreDocConstructLEv @ 12079 NONAME + _ZNK13QS60MainAppUi15ApplicationRectEv @ 12080 NONAME + _ZNK19QS60MainApplication13OpenIniFileLCER3RFs @ 12081 NONAME + _ZThn100_N13QS60MainAppUi25HandleTouchPaneSizeChangeEv @ 12082 NONAME + _ZThn24_N13QS60MainAppUi15ProcessCommandLEi @ 12083 NONAME + _ZThn40_N13QS60MainAppUi15MopSupplyObjectE8TTypeUid @ 12084 NONAME + _ZThn92_N13QS60MainAppUi22HandleViewDeactivationERK10TVwsViewIdS2_ @ 12085 NONAME + _ZN18QTapAndHoldGesture10setTimeoutEi @ 12086 NONAME + _ZN18QTapAndHoldGesture7timeoutEv @ 12087 NONAME + _ZN20QGraphicsItemPrivate20focusScopeItemChangeEb @ 12088 NONAME + _ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFb @ 12089 NONAME + _ZN14QGraphicsScale13xScaleChangedEv @ 12090 NONAME + _ZN14QGraphicsScale13yScaleChangedEv @ 12091 NONAME + _ZN14QGraphicsScale13zScaleChangedEv @ 12092 NONAME + _ZN19QApplicationPrivate14_q_aboutToQuitEv @ 12093 NONAME diff -r ef0373b55136 -r 758a864f9613 src/s60installs/eabi/QtNetworku.def --- a/src/s60installs/eabi/QtNetworku.def Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/eabi/QtNetworku.def Mon Oct 04 01:19:32 2010 +0300 @@ -993,182 +993,180 @@ _ZN10QSslSocket15setSocketOptionEN15QAbstractSocket12SocketOptionERK8QVariant @ 992 NONAME _ZN15QNetworkRequest20setOriginatingObjectEP7QObject @ 993 NONAME _ZNK15QNetworkRequest17originatingObjectEv @ 994 NONAME - _Z35qNetworkConfigurationManagerPrivatev @ 995 NONAME - _ZN13QBearerEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 996 NONAME - _ZN13QBearerEngine11qt_metacastEPKc @ 997 NONAME - _ZN13QBearerEngine15updateCompletedEv @ 998 NONAME - _ZN13QBearerEngine16staticMetaObjectE @ 999 NONAME DATA 16 - _ZN13QBearerEngine18configurationAddedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1000 NONAME - _ZN13QBearerEngine19getStaticMetaObjectEv @ 1001 NONAME - _ZN13QBearerEngine20configurationChangedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1002 NONAME - _ZN13QBearerEngine20configurationRemovedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1003 NONAME - _ZN13QBearerEngineC2EP7QObject @ 1004 NONAME - _ZN13QBearerEngineD0Ev @ 1005 NONAME - _ZN13QBearerEngineD1Ev @ 1006 NONAME - _ZN13QBearerEngineD2Ev @ 1007 NONAME - _ZN15QNetworkRequest11setPriorityENS_8PriorityE @ 1008 NONAME - _ZN15QNetworkSession11qt_metacallEN11QMetaObject4CallEiPPv @ 1009 NONAME - _ZN15QNetworkSession11qt_metacastEPKc @ 1010 NONAME - _ZN15QNetworkSession12stateChangedENS_5StateE @ 1011 NONAME - _ZN15QNetworkSession13connectNotifyEPKc @ 1012 NONAME - _ZN15QNetworkSession13waitForOpenedEi @ 1013 NONAME - _ZN15QNetworkSession16disconnectNotifyEPKc @ 1014 NONAME - _ZN15QNetworkSession16staticMetaObjectE @ 1015 NONAME DATA 16 - _ZN15QNetworkSession18setSessionPropertyERK7QStringRK8QVariant @ 1016 NONAME - _ZN15QNetworkSession19getStaticMetaObjectEv @ 1017 NONAME - _ZN15QNetworkSession25newConfigurationActivatedEv @ 1018 NONAME - _ZN15QNetworkSession29preferredConfigurationChangedERK21QNetworkConfigurationb @ 1019 NONAME - _ZN15QNetworkSession4openEv @ 1020 NONAME - _ZN15QNetworkSession4stopEv @ 1021 NONAME - _ZN15QNetworkSession5closeEv @ 1022 NONAME - _ZN15QNetworkSession5errorENS_12SessionErrorE @ 1023 NONAME - _ZN15QNetworkSession6acceptEv @ 1024 NONAME - _ZN15QNetworkSession6closedEv @ 1025 NONAME - _ZN15QNetworkSession6ignoreEv @ 1026 NONAME - _ZN15QNetworkSession6openedEv @ 1027 NONAME - _ZN15QNetworkSession6rejectEv @ 1028 NONAME - _ZN15QNetworkSession7migrateEv @ 1029 NONAME - _ZN15QNetworkSessionC1ERK21QNetworkConfigurationP7QObject @ 1030 NONAME - _ZN15QNetworkSessionC2ERK21QNetworkConfigurationP7QObject @ 1031 NONAME - _ZN15QNetworkSessionD0Ev @ 1032 NONAME - _ZN15QNetworkSessionD1Ev @ 1033 NONAME - _ZN15QNetworkSessionD2Ev @ 1034 NONAME - _ZN19QBearerEnginePlugin11qt_metacallEN11QMetaObject4CallEiPPv @ 1035 NONAME - _ZN19QBearerEnginePlugin11qt_metacastEPKc @ 1036 NONAME - _ZN19QBearerEnginePlugin16staticMetaObjectE @ 1037 NONAME DATA 16 - _ZN19QBearerEnginePlugin19getStaticMetaObjectEv @ 1038 NONAME - _ZN19QBearerEnginePluginC2EP7QObject @ 1039 NONAME - _ZN19QBearerEnginePluginD0Ev @ 1040 NONAME - _ZN19QBearerEnginePluginD1Ev @ 1041 NONAME - _ZN19QBearerEnginePluginD2Ev @ 1042 NONAME - _ZN21QNetworkAccessManager16setConfigurationERK21QNetworkConfiguration @ 1043 NONAME - _ZN21QNetworkAccessManager17sendCustomRequestERK15QNetworkRequestRK10QByteArrayP9QIODevice @ 1044 NONAME - _ZN21QNetworkAccessManager20networkAccessChangedEb @ 1045 NONAME ABSENT - _ZN21QNetworkAccessManager20networkSessionOnlineEv @ 1046 NONAME ABSENT - _ZN21QNetworkAccessManager23setNetworkAccessEnabledEb @ 1047 NONAME ABSENT - _ZN21QNetworkConfigurationC1ERKS_ @ 1048 NONAME - _ZN21QNetworkConfigurationC1Ev @ 1049 NONAME - _ZN21QNetworkConfigurationC2ERKS_ @ 1050 NONAME - _ZN21QNetworkConfigurationC2Ev @ 1051 NONAME - _ZN21QNetworkConfigurationD1Ev @ 1052 NONAME - _ZN21QNetworkConfigurationD2Ev @ 1053 NONAME - _ZN21QNetworkConfigurationaSERKS_ @ 1054 NONAME - _ZN22QNetworkSessionPrivate11qt_metacallEN11QMetaObject4CallEiPPv @ 1055 NONAME - _ZN22QNetworkSessionPrivate11qt_metacastEPKc @ 1056 NONAME - _ZN22QNetworkSessionPrivate12stateChangedEN15QNetworkSession5StateE @ 1057 NONAME - _ZN22QNetworkSessionPrivate16staticMetaObjectE @ 1058 NONAME DATA 16 - _ZN22QNetworkSessionPrivate19getStaticMetaObjectEv @ 1059 NONAME - _ZN22QNetworkSessionPrivate25newConfigurationActivatedEv @ 1060 NONAME - _ZN22QNetworkSessionPrivate25quitPendingWaitsForOpenedEv @ 1061 NONAME - _ZN22QNetworkSessionPrivate29preferredConfigurationChangedERK21QNetworkConfigurationb @ 1062 NONAME - _ZN22QNetworkSessionPrivate5errorEN15QNetworkSession12SessionErrorE @ 1063 NONAME - _ZN22QNetworkSessionPrivate6closedEv @ 1064 NONAME - _ZN28QNetworkConfigurationManager11qt_metacallEN11QMetaObject4CallEiPPv @ 1065 NONAME - _ZN28QNetworkConfigurationManager11qt_metacastEPKc @ 1066 NONAME - _ZN28QNetworkConfigurationManager15updateCompletedEv @ 1067 NONAME - _ZN28QNetworkConfigurationManager16staticMetaObjectE @ 1068 NONAME DATA 16 - _ZN28QNetworkConfigurationManager18configurationAddedERK21QNetworkConfiguration @ 1069 NONAME - _ZN28QNetworkConfigurationManager18onlineStateChangedEb @ 1070 NONAME - _ZN28QNetworkConfigurationManager19getStaticMetaObjectEv @ 1071 NONAME - _ZN28QNetworkConfigurationManager20configurationChangedERK21QNetworkConfiguration @ 1072 NONAME - _ZN28QNetworkConfigurationManager20configurationRemovedERK21QNetworkConfiguration @ 1073 NONAME - _ZN28QNetworkConfigurationManager20updateConfigurationsEv @ 1074 NONAME - _ZN28QNetworkConfigurationManagerC1EP7QObject @ 1075 NONAME - _ZN28QNetworkConfigurationManagerC2EP7QObject @ 1076 NONAME - _ZN28QNetworkConfigurationManagerD0Ev @ 1077 NONAME - _ZN28QNetworkConfigurationManagerD1Ev @ 1078 NONAME - _ZN28QNetworkConfigurationManagerD2Ev @ 1079 NONAME - _ZN35QNetworkConfigurationManagerPrivate11qt_metacallEN11QMetaObject4CallEiPPv @ 1080 NONAME - _ZN35QNetworkConfigurationManagerPrivate11qt_metacastEPKc @ 1081 NONAME - _ZN35QNetworkConfigurationManagerPrivate16staticMetaObjectE @ 1082 NONAME DATA 16 - _ZN35QNetworkConfigurationManagerPrivate18configurationAddedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1083 NONAME - _ZN35QNetworkConfigurationManagerPrivate18configurationAddedERK21QNetworkConfiguration @ 1084 NONAME - _ZN35QNetworkConfigurationManagerPrivate18onlineStateChangedEb @ 1085 NONAME - _ZN35QNetworkConfigurationManagerPrivate19getStaticMetaObjectEv @ 1086 NONAME - _ZN35QNetworkConfigurationManagerPrivate20configurationChangedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1087 NONAME - _ZN35QNetworkConfigurationManagerPrivate20configurationChangedERK21QNetworkConfiguration @ 1088 NONAME - _ZN35QNetworkConfigurationManagerPrivate20configurationRemovedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1089 NONAME - _ZN35QNetworkConfigurationManagerPrivate20configurationRemovedERK21QNetworkConfiguration @ 1090 NONAME - _ZN35QNetworkConfigurationManagerPrivate20updateConfigurationsEv @ 1091 NONAME - _ZN35QNetworkConfigurationManagerPrivate27configurationUpdateCompleteEv @ 1092 NONAME - _ZN35QNetworkConfigurationManagerPrivate31performAsyncConfigurationUpdateEv @ 1093 NONAME - _ZN35QNetworkConfigurationManagerPrivate5abortEv @ 1094 NONAME - _ZN35QNetworkConfigurationManagerPrivate7enginesEv @ 1095 NONAME - _ZN35QNetworkConfigurationManagerPrivateC1Ev @ 1096 NONAME - _ZN35QNetworkConfigurationManagerPrivateC2Ev @ 1097 NONAME - _ZN35QNetworkConfigurationManagerPrivateD0Ev @ 1098 NONAME - _ZN35QNetworkConfigurationManagerPrivateD1Ev @ 1099 NONAME - _ZN35QNetworkConfigurationManagerPrivateD2Ev @ 1100 NONAME - _ZNK13QBearerEngine10metaObjectEv @ 1101 NONAME - _ZNK13QNetworkReply14rawHeaderPairsEv @ 1102 NONAME - _ZNK15QNetworkRequest8priorityEv @ 1103 NONAME - _ZNK15QNetworkSession10activeTimeEv @ 1104 NONAME - _ZNK15QNetworkSession10metaObjectEv @ 1105 NONAME - _ZNK15QNetworkSession11errorStringEv @ 1106 NONAME - _ZNK15QNetworkSession12bytesWrittenEv @ 1107 NONAME - _ZNK15QNetworkSession13bytesReceivedEv @ 1108 NONAME - _ZNK15QNetworkSession13configurationEv @ 1109 NONAME - _ZNK15QNetworkSession15sessionPropertyERK7QString @ 1110 NONAME - _ZNK15QNetworkSession5errorEv @ 1111 NONAME - _ZNK15QNetworkSession5stateEv @ 1112 NONAME - _ZNK15QNetworkSession6isOpenEv @ 1113 NONAME - _ZNK15QNetworkSession9interfaceEv @ 1114 NONAME - _ZNK19QBearerEnginePlugin10metaObjectEv @ 1115 NONAME - _ZNK21QNetworkAccessManager13configurationEv @ 1116 NONAME - _ZNK21QNetworkAccessManager19activeConfigurationEv @ 1117 NONAME - _ZNK21QNetworkAccessManager20networkAccessEnabledEv @ 1118 NONAME ABSENT - _ZNK21QNetworkConfiguration10bearerNameEv @ 1119 NONAME - _ZNK21QNetworkConfiguration10identifierEv @ 1120 NONAME - _ZNK21QNetworkConfiguration18isRoamingAvailableEv @ 1121 NONAME - _ZNK21QNetworkConfiguration4nameEv @ 1122 NONAME - _ZNK21QNetworkConfiguration4typeEv @ 1123 NONAME - _ZNK21QNetworkConfiguration5stateEv @ 1124 NONAME - _ZNK21QNetworkConfiguration7isValidEv @ 1125 NONAME - _ZNK21QNetworkConfiguration7purposeEv @ 1126 NONAME - _ZNK21QNetworkConfiguration8childrenEv @ 1127 NONAME - _ZNK21QNetworkConfigurationeqERKS_ @ 1128 NONAME - _ZNK22QNetworkSessionPrivate10metaObjectEv @ 1129 NONAME - _ZNK28QNetworkConfigurationManager10metaObjectEv @ 1130 NONAME - _ZNK28QNetworkConfigurationManager12capabilitiesEv @ 1131 NONAME - _ZNK28QNetworkConfigurationManager17allConfigurationsE6QFlagsIN21QNetworkConfiguration9StateFlagEE @ 1132 NONAME - _ZNK28QNetworkConfigurationManager20defaultConfigurationEv @ 1133 NONAME - _ZNK28QNetworkConfigurationManager27configurationFromIdentifierERK7QString @ 1134 NONAME - _ZNK28QNetworkConfigurationManager8isOnlineEv @ 1135 NONAME - _ZNK35QNetworkConfigurationManagerPrivate10metaObjectEv @ 1136 NONAME - _ZTI13QBearerEngine @ 1137 NONAME - _ZTI15QNetworkSession @ 1138 NONAME - _ZTI19QBearerEnginePlugin @ 1139 NONAME - _ZTI22QNetworkSessionPrivate @ 1140 NONAME - _ZTI28QNetworkConfigurationManager @ 1141 NONAME - _ZTI29QBearerEngineFactoryInterface @ 1142 NONAME - _ZTI35QNetworkConfigurationManagerPrivate @ 1143 NONAME - _ZTV13QBearerEngine @ 1144 NONAME - _ZTV15QNetworkSession @ 1145 NONAME - _ZTV19QBearerEnginePlugin @ 1146 NONAME - _ZTV22QNetworkSessionPrivate @ 1147 NONAME - _ZTV28QNetworkConfigurationManager @ 1148 NONAME - _ZTV35QNetworkConfigurationManagerPrivate @ 1149 NONAME - _ZThn8_N19QBearerEnginePluginD0Ev @ 1150 NONAME - _ZThn8_N19QBearerEnginePluginD1Ev @ 1151 NONAME - _Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi @ 1152 NONAME - _Z24qt_qhostinfo_clear_cachev @ 1153 NONAME ABSENT - _ZN21QNetworkAccessManager20setNetworkAccessibleENS_20NetworkAccessibilityE @ 1154 NONAME - _ZN21QNetworkAccessManager23networkSessionConnectedEv @ 1155 NONAME - _ZN21QNetworkAccessManager24networkAccessibleChangedENS_20NetworkAccessibilityE @ 1156 NONAME - _ZN35QNetworkConfigurationManagerPrivate11pollEnginesEv @ 1157 NONAME - _ZN35QNetworkConfigurationManagerPrivate12startPollingEv @ 1158 NONAME - _ZN35QNetworkConfigurationManagerPrivate13enablePollingEv @ 1159 NONAME - _ZN35QNetworkConfigurationManagerPrivate14disablePollingEv @ 1160 NONAME - _ZN35QNetworkConfigurationManagerPrivate17allConfigurationsE6QFlagsIN21QNetworkConfiguration9StateFlagEE @ 1161 NONAME - _ZN35QNetworkConfigurationManagerPrivate20defaultConfigurationEv @ 1162 NONAME - _ZN35QNetworkConfigurationManagerPrivate27configurationFromIdentifierERK7QString @ 1163 NONAME - _ZN35QNetworkConfigurationManagerPrivate8isOnlineEv @ 1164 NONAME - _ZNK13QBearerEngine15requiresPollingEv @ 1165 NONAME - _ZNK13QBearerEngine19configurationsInUseEv @ 1166 NONAME - _ZNK21QNetworkAccessManager17networkAccessibleEv @ 1167 NONAME - _ZN35QNetworkConfigurationManagerPrivate12capabilitiesEv @ 1168 NONAME - _ZN10QTcpServer20addPendingConnectionEP10QTcpSocket @ 1169 NONAME - _ZN14QAuthenticator9setOptionERK7QStringRK8QVariant @ 1170 NONAME - _ZNK14QAuthenticator6optionERK7QString @ 1171 NONAME - _ZNK14QAuthenticator7optionsEv @ 1172 NONAME + _Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi @ 995 NONAME + _Z24qt_qhostinfo_clear_cachev @ 996 NONAME ABSENT + _Z35qNetworkConfigurationManagerPrivatev @ 997 NONAME + _ZN10QTcpServer20addPendingConnectionEP10QTcpSocket @ 998 NONAME + _ZN13QBearerEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 999 NONAME + _ZN13QBearerEngine11qt_metacastEPKc @ 1000 NONAME + _ZN13QBearerEngine15updateCompletedEv @ 1001 NONAME + _ZN13QBearerEngine16staticMetaObjectE @ 1002 NONAME DATA 16 + _ZN13QBearerEngine18configurationAddedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1003 NONAME + _ZN13QBearerEngine19getStaticMetaObjectEv @ 1004 NONAME + _ZN13QBearerEngine20configurationChangedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1005 NONAME + _ZN13QBearerEngine20configurationRemovedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1006 NONAME + _ZN13QBearerEngineC2EP7QObject @ 1007 NONAME + _ZN13QBearerEngineD0Ev @ 1008 NONAME + _ZN13QBearerEngineD1Ev @ 1009 NONAME + _ZN13QBearerEngineD2Ev @ 1010 NONAME + _ZN15QNetworkRequest11setPriorityENS_8PriorityE @ 1011 NONAME + _ZN15QNetworkSession11qt_metacallEN11QMetaObject4CallEiPPv @ 1012 NONAME + _ZN15QNetworkSession11qt_metacastEPKc @ 1013 NONAME + _ZN15QNetworkSession12stateChangedENS_5StateE @ 1014 NONAME + _ZN15QNetworkSession13connectNotifyEPKc @ 1015 NONAME + _ZN15QNetworkSession13waitForOpenedEi @ 1016 NONAME + _ZN15QNetworkSession16disconnectNotifyEPKc @ 1017 NONAME + _ZN15QNetworkSession16staticMetaObjectE @ 1018 NONAME DATA 16 + _ZN15QNetworkSession18setSessionPropertyERK7QStringRK8QVariant @ 1019 NONAME + _ZN15QNetworkSession19getStaticMetaObjectEv @ 1020 NONAME + _ZN15QNetworkSession25newConfigurationActivatedEv @ 1021 NONAME + _ZN15QNetworkSession29preferredConfigurationChangedERK21QNetworkConfigurationb @ 1022 NONAME + _ZN15QNetworkSession4openEv @ 1023 NONAME + _ZN15QNetworkSession4stopEv @ 1024 NONAME + _ZN15QNetworkSession5closeEv @ 1025 NONAME + _ZN15QNetworkSession5errorENS_12SessionErrorE @ 1026 NONAME + _ZN15QNetworkSession6acceptEv @ 1027 NONAME + _ZN15QNetworkSession6closedEv @ 1028 NONAME + _ZN15QNetworkSession6ignoreEv @ 1029 NONAME + _ZN15QNetworkSession6openedEv @ 1030 NONAME + _ZN15QNetworkSession6rejectEv @ 1031 NONAME + _ZN15QNetworkSession7migrateEv @ 1032 NONAME + _ZN15QNetworkSessionC1ERK21QNetworkConfigurationP7QObject @ 1033 NONAME + _ZN15QNetworkSessionC2ERK21QNetworkConfigurationP7QObject @ 1034 NONAME + _ZN15QNetworkSessionD0Ev @ 1035 NONAME + _ZN15QNetworkSessionD1Ev @ 1036 NONAME + _ZN15QNetworkSessionD2Ev @ 1037 NONAME + _ZN19QBearerEnginePlugin11qt_metacallEN11QMetaObject4CallEiPPv @ 1038 NONAME + _ZN19QBearerEnginePlugin11qt_metacastEPKc @ 1039 NONAME + _ZN19QBearerEnginePlugin16staticMetaObjectE @ 1040 NONAME DATA 16 + _ZN19QBearerEnginePlugin19getStaticMetaObjectEv @ 1041 NONAME + _ZN19QBearerEnginePluginC2EP7QObject @ 1042 NONAME + _ZN19QBearerEnginePluginD0Ev @ 1043 NONAME + _ZN19QBearerEnginePluginD1Ev @ 1044 NONAME + _ZN19QBearerEnginePluginD2Ev @ 1045 NONAME + _ZN21QNetworkAccessManager16setConfigurationERK21QNetworkConfiguration @ 1046 NONAME + _ZN21QNetworkAccessManager17sendCustomRequestERK15QNetworkRequestRK10QByteArrayP9QIODevice @ 1047 NONAME + _ZN21QNetworkAccessManager20setNetworkAccessibleENS_20NetworkAccessibilityE @ 1048 NONAME + _ZN21QNetworkAccessManager23networkSessionConnectedEv @ 1049 NONAME + _ZN21QNetworkAccessManager24networkAccessibleChangedENS_20NetworkAccessibilityE @ 1050 NONAME + _ZN21QNetworkConfigurationC1ERKS_ @ 1051 NONAME + _ZN21QNetworkConfigurationC1Ev @ 1052 NONAME + _ZN21QNetworkConfigurationC2ERKS_ @ 1053 NONAME + _ZN21QNetworkConfigurationC2Ev @ 1054 NONAME + _ZN21QNetworkConfigurationD1Ev @ 1055 NONAME + _ZN21QNetworkConfigurationD2Ev @ 1056 NONAME + _ZN21QNetworkConfigurationaSERKS_ @ 1057 NONAME + _ZN22QNetworkSessionPrivate11qt_metacallEN11QMetaObject4CallEiPPv @ 1058 NONAME + _ZN22QNetworkSessionPrivate11qt_metacastEPKc @ 1059 NONAME + _ZN22QNetworkSessionPrivate12stateChangedEN15QNetworkSession5StateE @ 1060 NONAME + _ZN22QNetworkSessionPrivate16staticMetaObjectE @ 1061 NONAME DATA 16 + _ZN22QNetworkSessionPrivate19getStaticMetaObjectEv @ 1062 NONAME + _ZN22QNetworkSessionPrivate25newConfigurationActivatedEv @ 1063 NONAME + _ZN22QNetworkSessionPrivate25quitPendingWaitsForOpenedEv @ 1064 NONAME + _ZN22QNetworkSessionPrivate29preferredConfigurationChangedERK21QNetworkConfigurationb @ 1065 NONAME + _ZN22QNetworkSessionPrivate5errorEN15QNetworkSession12SessionErrorE @ 1066 NONAME + _ZN22QNetworkSessionPrivate6closedEv @ 1067 NONAME + _ZN28QNetworkConfigurationManager11qt_metacallEN11QMetaObject4CallEiPPv @ 1068 NONAME + _ZN28QNetworkConfigurationManager11qt_metacastEPKc @ 1069 NONAME + _ZN28QNetworkConfigurationManager15updateCompletedEv @ 1070 NONAME + _ZN28QNetworkConfigurationManager16staticMetaObjectE @ 1071 NONAME DATA 16 + _ZN28QNetworkConfigurationManager18configurationAddedERK21QNetworkConfiguration @ 1072 NONAME + _ZN28QNetworkConfigurationManager18onlineStateChangedEb @ 1073 NONAME + _ZN28QNetworkConfigurationManager19getStaticMetaObjectEv @ 1074 NONAME + _ZN28QNetworkConfigurationManager20configurationChangedERK21QNetworkConfiguration @ 1075 NONAME + _ZN28QNetworkConfigurationManager20configurationRemovedERK21QNetworkConfiguration @ 1076 NONAME + _ZN28QNetworkConfigurationManager20updateConfigurationsEv @ 1077 NONAME + _ZN28QNetworkConfigurationManagerC1EP7QObject @ 1078 NONAME + _ZN28QNetworkConfigurationManagerC2EP7QObject @ 1079 NONAME + _ZN28QNetworkConfigurationManagerD0Ev @ 1080 NONAME + _ZN28QNetworkConfigurationManagerD1Ev @ 1081 NONAME + _ZN28QNetworkConfigurationManagerD2Ev @ 1082 NONAME + _ZN35QNetworkConfigurationManagerPrivate11pollEnginesEv @ 1083 NONAME + _ZN35QNetworkConfigurationManagerPrivate11qt_metacallEN11QMetaObject4CallEiPPv @ 1084 NONAME + _ZN35QNetworkConfigurationManagerPrivate11qt_metacastEPKc @ 1085 NONAME + _ZN35QNetworkConfigurationManagerPrivate12capabilitiesEv @ 1086 NONAME + _ZN35QNetworkConfigurationManagerPrivate12startPollingEv @ 1087 NONAME + _ZN35QNetworkConfigurationManagerPrivate13enablePollingEv @ 1088 NONAME + _ZN35QNetworkConfigurationManagerPrivate14disablePollingEv @ 1089 NONAME + _ZN35QNetworkConfigurationManagerPrivate16staticMetaObjectE @ 1090 NONAME DATA 16 + _ZN35QNetworkConfigurationManagerPrivate17allConfigurationsE6QFlagsIN21QNetworkConfiguration9StateFlagEE @ 1091 NONAME + _ZN35QNetworkConfigurationManagerPrivate18configurationAddedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1092 NONAME + _ZN35QNetworkConfigurationManagerPrivate18configurationAddedERK21QNetworkConfiguration @ 1093 NONAME + _ZN35QNetworkConfigurationManagerPrivate18onlineStateChangedEb @ 1094 NONAME + _ZN35QNetworkConfigurationManagerPrivate19getStaticMetaObjectEv @ 1095 NONAME + _ZN35QNetworkConfigurationManagerPrivate20configurationChangedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1096 NONAME + _ZN35QNetworkConfigurationManagerPrivate20configurationChangedERK21QNetworkConfiguration @ 1097 NONAME + _ZN35QNetworkConfigurationManagerPrivate20configurationRemovedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1098 NONAME + _ZN35QNetworkConfigurationManagerPrivate20configurationRemovedERK21QNetworkConfiguration @ 1099 NONAME + _ZN35QNetworkConfigurationManagerPrivate20defaultConfigurationEv @ 1100 NONAME + _ZN35QNetworkConfigurationManagerPrivate20updateConfigurationsEv @ 1101 NONAME + _ZN35QNetworkConfigurationManagerPrivate27configurationFromIdentifierERK7QString @ 1102 NONAME + _ZN35QNetworkConfigurationManagerPrivate27configurationUpdateCompleteEv @ 1103 NONAME + _ZN35QNetworkConfigurationManagerPrivate31performAsyncConfigurationUpdateEv @ 1104 NONAME + _ZN35QNetworkConfigurationManagerPrivate5abortEv @ 1105 NONAME + _ZN35QNetworkConfigurationManagerPrivate7enginesEv @ 1106 NONAME + _ZN35QNetworkConfigurationManagerPrivate8isOnlineEv @ 1107 NONAME + _ZN35QNetworkConfigurationManagerPrivateC1Ev @ 1108 NONAME + _ZN35QNetworkConfigurationManagerPrivateC2Ev @ 1109 NONAME + _ZN35QNetworkConfigurationManagerPrivateD0Ev @ 1110 NONAME + _ZN35QNetworkConfigurationManagerPrivateD1Ev @ 1111 NONAME + _ZN35QNetworkConfigurationManagerPrivateD2Ev @ 1112 NONAME + _ZNK13QBearerEngine10metaObjectEv @ 1113 NONAME + _ZNK13QBearerEngine15requiresPollingEv @ 1114 NONAME + _ZNK13QBearerEngine19configurationsInUseEv @ 1115 NONAME + _ZNK13QNetworkReply14rawHeaderPairsEv @ 1116 NONAME + _ZNK15QNetworkRequest8priorityEv @ 1117 NONAME + _ZNK15QNetworkSession10activeTimeEv @ 1118 NONAME + _ZNK15QNetworkSession10metaObjectEv @ 1119 NONAME + _ZNK15QNetworkSession11errorStringEv @ 1120 NONAME + _ZNK15QNetworkSession12bytesWrittenEv @ 1121 NONAME + _ZNK15QNetworkSession13bytesReceivedEv @ 1122 NONAME + _ZNK15QNetworkSession13configurationEv @ 1123 NONAME + _ZNK15QNetworkSession15sessionPropertyERK7QString @ 1124 NONAME + _ZNK15QNetworkSession5errorEv @ 1125 NONAME + _ZNK15QNetworkSession5stateEv @ 1126 NONAME + _ZNK15QNetworkSession6isOpenEv @ 1127 NONAME + _ZNK15QNetworkSession9interfaceEv @ 1128 NONAME + _ZNK19QBearerEnginePlugin10metaObjectEv @ 1129 NONAME + _ZNK21QNetworkAccessManager13configurationEv @ 1130 NONAME + _ZNK21QNetworkAccessManager17networkAccessibleEv @ 1131 NONAME + _ZNK21QNetworkAccessManager19activeConfigurationEv @ 1132 NONAME + _ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME ABSENT + _ZNK21QNetworkConfiguration10identifierEv @ 1134 NONAME + _ZNK21QNetworkConfiguration18isRoamingAvailableEv @ 1135 NONAME + _ZNK21QNetworkConfiguration4nameEv @ 1136 NONAME + _ZNK21QNetworkConfiguration4typeEv @ 1137 NONAME + _ZNK21QNetworkConfiguration5stateEv @ 1138 NONAME + _ZNK21QNetworkConfiguration7isValidEv @ 1139 NONAME + _ZNK21QNetworkConfiguration7purposeEv @ 1140 NONAME + _ZNK21QNetworkConfiguration8childrenEv @ 1141 NONAME + _ZNK21QNetworkConfigurationeqERKS_ @ 1142 NONAME + _ZNK22QNetworkSessionPrivate10metaObjectEv @ 1143 NONAME + _ZNK28QNetworkConfigurationManager10metaObjectEv @ 1144 NONAME + _ZNK28QNetworkConfigurationManager12capabilitiesEv @ 1145 NONAME + _ZNK28QNetworkConfigurationManager17allConfigurationsE6QFlagsIN21QNetworkConfiguration9StateFlagEE @ 1146 NONAME + _ZNK28QNetworkConfigurationManager20defaultConfigurationEv @ 1147 NONAME + _ZNK28QNetworkConfigurationManager27configurationFromIdentifierERK7QString @ 1148 NONAME + _ZNK28QNetworkConfigurationManager8isOnlineEv @ 1149 NONAME + _ZNK35QNetworkConfigurationManagerPrivate10metaObjectEv @ 1150 NONAME + _ZTI13QBearerEngine @ 1151 NONAME + _ZTI15QNetworkSession @ 1152 NONAME + _ZTI19QBearerEnginePlugin @ 1153 NONAME + _ZTI22QNetworkSessionPrivate @ 1154 NONAME + _ZTI28QNetworkConfigurationManager @ 1155 NONAME + _ZTI29QBearerEngineFactoryInterface @ 1156 NONAME + _ZTI35QNetworkConfigurationManagerPrivate @ 1157 NONAME + _ZTV13QBearerEngine @ 1158 NONAME + _ZTV15QNetworkSession @ 1159 NONAME + _ZTV19QBearerEnginePlugin @ 1160 NONAME + _ZTV22QNetworkSessionPrivate @ 1161 NONAME + _ZTV28QNetworkConfigurationManager @ 1162 NONAME + _ZTV35QNetworkConfigurationManagerPrivate @ 1163 NONAME + _ZThn8_N19QBearerEnginePluginD0Ev @ 1164 NONAME + _ZThn8_N19QBearerEnginePluginD1Ev @ 1165 NONAME + _ZN14QAuthenticator9setOptionERK7QStringRK8QVariant @ 1166 NONAME + _ZNK14QAuthenticator6optionERK7QString @ 1167 NONAME + _ZNK14QAuthenticator7optionsEv @ 1168 NONAME + _ZNK21QNetworkConfiguration10bearerTypeEv @ 1169 NONAME + _ZNK21QNetworkConfiguration14bearerTypeNameEv @ 1170 NONAME diff -r ef0373b55136 -r 758a864f9613 src/s60installs/eabi/QtOpenVGu.def --- a/src/s60installs/eabi/QtOpenVGu.def Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/eabi/QtOpenVGu.def Mon Oct 04 01:19:32 2010 +0300 @@ -196,10 +196,9 @@ _ZN13QVGPixmapData19detachImageFromPoolEv @ 195 NONAME _ZTI12QVGImagePool @ 196 NONAME _ZTV12QVGImagePool @ 197 NONAME - _ZN14QVGPaintEngine16drawCachedGlyphsEiPKjRK5QFontP11QFontEngineRK7QPointF @ 198 NONAME ABSENT - _ZN14QVGPaintEngine18drawStaticTextItemEP15QStaticTextItem @ 199 NONAME - _ZN14QVGPaintEngine19drawPixmapFragmentsEPKN8QPainter14PixmapFragmentEiRK7QPixmap6QFlagsINS0_18PixmapFragmentHintEE @ 200 NONAME - _ZN25QVGEGLWindowSurfaceDirect6scrollEP7QWidgetRK7QRegionii @ 201 NONAME - _ZNK25QVGEGLWindowSurfaceDirect22supportsStaticContentsEv @ 202 NONAME - _ZN14QVGPaintEngine16drawCachedGlyphsEiPKjRK5QFontP11QFontEngineRK7QPointFPK11QFixedPoint @ 203 NONAME + _ZN25QVGEGLWindowSurfaceDirect6scrollEP7QWidgetRK7QRegionii @ 198 NONAME + _ZNK25QVGEGLWindowSurfaceDirect22supportsStaticContentsEv @ 199 NONAME + _ZN14QVGPaintEngine16drawCachedGlyphsEiPKjRK5QFontP11QFontEngineRK7QPointFPK11QFixedPoint @ 200 NONAME + _ZN14QVGPaintEngine18drawStaticTextItemEP15QStaticTextItem @ 201 NONAME + _ZN14QVGPaintEngine19drawPixmapFragmentsEPKN8QPainter14PixmapFragmentEiRK7QPixmap6QFlagsINS0_18PixmapFragmentHintEE @ 202 NONAME diff -r ef0373b55136 -r 758a864f9613 src/s60installs/qt.iby --- a/src/s60installs/qt.iby Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/qt.iby Mon Oct 04 01:19:32 2010 +0300 @@ -13,6 +13,7 @@ file=ABI_DIR\BUILD_DIR\QtSql.dll SHARED_LIB_DIR\QtSql.dll file=ABI_DIR\BUILD_DIR\QtXml.dll SHARED_LIB_DIR\QtXml.dll file=ABI_DIR\BUILD_DIR\QtNetwork.dll SHARED_LIB_DIR\QtNetwork.dll +file=ABI_DIR\BUILD_DIR\QSymbianBearer.dll SHARED_LIB_DIR\QSymbianBearer.dll file=ABI_DIR\BUILD_DIR\QtScript.dll SHARED_LIB_DIR\QtScript.dll file=ABI_DIR\BUILD_DIR\QtTest.dll SHARED_LIB_DIR\QtTest.dll file=ABI_DIR\BUILD_DIR\QtWebKit.dll SHARED_LIB_DIR\QtWebKit.dll @@ -20,6 +21,7 @@ file=ABI_DIR\BUILD_DIR\QtMultimedia.dll SHARED_LIB_DIR\QtMultimedia.dll file=ABI_DIR\BUILD_DIR\QtXmlPatterns.dll SHARED_LIB_DIR\QtXmlPatterns.dll file=ABI_DIR\BUILD_DIR\QtDeclarative.dll SHARED_LIB_DIR\QtDeclarative.dll +file=ABI_DIR\BUILD_DIR\QtOpenGL.dll SHARED_LIB_DIR\QtOpenGL.dll // imageformats file=ABI_DIR\BUILD_DIR\qgif.dll SHARED_LIB_DIR\qgif.dll @@ -50,6 +52,7 @@ // graphicssystems file=ABI_DIR\BUILD_DIR\qvggraphicssystem.dll SHARED_LIB_DIR\qvggraphicssystem.dll +file=ABI_DIR\BUILD_DIR\qglgraphicssystem.dll SHARED_LIB_DIR\qglgraphicssystem.dll // S60 version compatibility plugins for 5.0 (3.1 and 3.2 devices are never likely to have this in ROM, // so don't bother including those plugins @@ -95,6 +98,9 @@ // graphicssystems data=\epoc32\data\z\resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin +data=\epoc32\data\z\resource\qt\plugins\graphicssystems\qglgraphicssystem.qtplugin resource\qt\plugins\graphicssystems\qglgraphicssystem.qtplugin + +data=\epoc32\data\z\resource\qt\plugins\bearer\qsymbianbearer.qtplugin resource\qt\plugins\bearer\qsymbianbearer.qtplugin // Stub sis file data=ZSYSTEM\install\qt_stub.sis System\Install\qt_stub.sis diff -r ef0373b55136 -r 758a864f9613 src/s60installs/qt.pkg --- a/src/s60installs/qt.pkg Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/qt.pkg Mon Oct 04 01:19:32 2010 +0300 @@ -29,6 +29,7 @@ "/epoc32/release/armv5/urel/QtXml.dll" - "!:\sys\bin\QtXml.dll" "/epoc32/release/armv5/urel/QtGui.dll" - "!:\sys\bin\QtGui.dll" "/epoc32/release/armv5/urel/QtNetwork.dll" - "!:\sys\bin\QtNetwork.dll" +"/epoc32/release/armv5/urel/qsymbianbearer.dll" - "!:\sys\bin\qsymbianbearer.dll" "/epoc32/release/armv5/urel/QtTest.dll" - "!:\sys\bin\QtTest.dll" "/epoc32/release/armv5/urel/QtSql.dll" - "!:\sys\bin\QtSql.dll" "/epoc32/release/armv5/urel/QtSvg.dll" - "!:\sys\bin\QtSvg.dll" @@ -63,6 +64,7 @@ "/epoc32/data/z/resource/qt/plugins/graphicssystems/qvggraphicssystem.qtplugin" - "!:\resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin" "/epoc32/release/armv5/urel/qsvgicon.dll" - "!:\sys\bin\qsvgicon.dll" "/epoc32/data/z/resource/qt/plugins/iconengines/qsvgicon.qtplugin" - "!:\resource\qt\plugins\iconengines\qsvgicon.qtplugin" + "/epoc32/data/z/resource/qt/plugins/bearer/qsymbianbearer.qtplugin" - "c:\resource\qt\plugins\bearer\qsymbianbearer.qtplugin" ; Manual PKG post-rules from PRO files IF package(0x1028315F) diff -r ef0373b55136 -r 758a864f9613 src/s60installs/qtdemoapps.iby --- a/src/s60installs/qtdemoapps.iby Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/qtdemoapps.iby Mon Oct 04 01:19:32 2010 +0300 @@ -112,4 +112,150 @@ S60_APP_RESOURCE(anomaly) data=\epoc32\data\Z\private\10003a3f\import\Apps\anomaly_reg.rsc \private\10003a3f\import\apps\anomaly_reg.rsc +//Qml Apps +//qmlcalculator +// Executable and default resource files +S60_APP_EXE(qmlcalculator) +S60_APP_RESOURCE(qmlcalculator) +data =\epoc32\data\z\private\10003a3f\import\apps\qmlcalculator_reg.rsc \private\10003a3f\import\apps\qmlcalculator_reg.rsc +data =\epoc32\data\z\resource\apps\qmlcalculator.mif \resource\apps\qmlcalculator.mif + +// DEPLOYMENT +data =\epoc32\data\z\private\A000E3FB\calculator.qml \private\A000E3FB\calculator.qml +data =\epoc32\data\z\private\A000E3FB\Core\Button.qml \private\A000E3FB\Core\Button.qml +data =\epoc32\data\z\private\A000E3FB\Core\calculator.js \private\A000E3FB\Core\calculator.js +data =\epoc32\data\z\private\A000E3FB\Core\Display.qml \private\A000E3FB\Core\Display.qml +data =\epoc32\data\z\private\A000E3FB\Core\images\button-.png \private\A000E3FB\Core\images\button-.png +data =\epoc32\data\z\private\A000E3FB\Core\images\button-blue.png \private\A000E3FB\Core\images\button-blue.png +data =\epoc32\data\z\private\A000E3FB\Core\images\button-green.png \private\A000E3FB\Core\images\button-green.png +data =\epoc32\data\z\private\A000E3FB\Core\images\button-purple.png \private\A000E3FB\Core\images\button-purple.png +data =\epoc32\data\z\private\A000E3FB\Core\images\button-red.png \private\A000E3FB\Core\images\button-red.png +data =\epoc32\data\z\private\A000E3FB\Core\images\display.png \private\A000E3FB\Core\images\display.png +data =\epoc32\data\z\private\A000E3FB\Core\qmldir \private\A000E3FB\Core\qmldir + +//qmlclocks +// Executable and default resource files +S60_APP_EXE(qmlclocks) +S60_APP_RESOURCE(qmlclocks) +data=\epoc32\data\Z\private\10003a3f\import\Apps\qmlclocks_reg.rsc \private\10003a3f\import\apps\qmlclocks_reg.rsc +data=\epoc32\data\z\resource\apps\qmlclocks.mif \resource\apps\qmlclocks.mif +//DEPLOYMENT +data =\epoc32\data\z\private\A000E3FC\clocks.qml \private\A000E3FC\clocks.qml +data =\epoc32\data\z\private\A000E3FC\content\background.png \private\A000E3FC\content\background.png +data =\epoc32\data\z\private\A000E3FC\content\center.png \private\A000E3FC\content\center.png +data =\epoc32\data\z\private\A000E3FC\content\clock-night.png \private\A000E3FC\content\clock-night.png +data =\epoc32\data\z\private\A000E3FC\content\clock.png \private\A000E3FC\content\clock.png +data =\epoc32\data\z\private\A000E3FC\content\Clock.qml \private\A000E3FC\content\Clock.qml +data =\epoc32\data\z\private\A000E3FC\content\hour.png \private\A000E3FC\content\hour.png +data =\epoc32\data\z\private\A000E3FC\content\minute.png \private\A000E3FC\content\minute.png +data =\epoc32\data\z\private\A000E3FC\content\second.png \private\A000E3FC\content\second.png + +//qmldialcontrol +// Executable and default resource files +S60_APP_EXE(qmldialcontrol) +S60_APP_RESOURCE(qmldialcontrol) +data =\epoc32\data\z\private\10003a3f\import\apps\qmldialcontrol_reg.rsc \private\10003a3f\import\apps\qmldialcontrol_reg.rsc +data =\epoc32\data\z\resource\apps\qmldialcontrol.mif \resource\apps\qmldialcontrol.mif + +// DEPLOYMENT +data =\epoc32\data\z\private\A000E3FD\dialcontrol.qml \private\A000E3FD\dialcontrol.qml +data =\epoc32\data\z\private\A000E3FD\content\background.png \private\A000E3FD\content\background.png +data =\epoc32\data\z\private\A000E3FD\content\Dial.qml \private\A000E3FD\content\Dial.qml +data =\epoc32\data\z\private\A000E3FD\content\needle.png \private\A000E3FD\content\needle.png +data =\epoc32\data\z\private\A000E3FD\content\needle_shadow.png \private\A000E3FD\content\needle_shadow.png +data =\epoc32\data\z\private\A000E3FD\content\overlay.png \private\A000E3FD\content\overlay.png + +//qmleasing +// Executable and default resource files +S60_APP_EXE(qmleasing) +S60_APP_RESOURCE(qmleasing) +data =\epoc32\data\z\private\10003a3f\import\apps\qmleasing_reg.rsc \private\10003a3f\import\apps\qmleasing_reg.rsc +data =\epoc32\data\z\resource\apps\qmleasing.mif \resource\apps\qmleasing.mif + +// DEPLOYMENT +data =\epoc32\data\z\private\A000E3FE\easing.qml \private\A000E3FE\easing.qml + +//qmlflickr +// Executable and default resource files +S60_APP_EXE(qmlflickr) +S60_APP_RESOURCE(qmlflickr) +data =\epoc32\data\z\private\10003a3f\import\apps\qmlflickr_reg.rsc \private\10003a3f\import\apps\qmlflickr_reg.rsc +data =\epoc32\data\z\resource\apps\qmlflickr.mif \resource\apps\qmlflickr.mif + +// DEPLOYMENT +data =\epoc32\data\z\private\A000E3FF\flickr.qml \private\A000E3FF\flickr.qml +data =\epoc32\data\z\private\A000E3FF\common\Progress.qml \private\A000E3FF\common\Progress.qml +data =\epoc32\data\z\private\A000E3FF\common\qmldir \private\A000E3FF\common\qmldir +data =\epoc32\data\z\private\A000E3FF\common\RssModel.qml \private\A000E3FF\common\RssModel.qml +data =\epoc32\data\z\private\A000E3FF\common\ScrollBar.qml \private\A000E3FF\common\ScrollBar.qml +data =\epoc32\data\z\private\A000E3FF\common\Slider.qml \private\A000E3FF\common\Slider.qml +data =\epoc32\data\z\private\A000E3FF\mobile\Button.qml \private\A000E3FF\mobile\Button.qml +data =\epoc32\data\z\private\A000E3FF\mobile\GridDelegate.qml \private\A000E3FF\mobile\GridDelegate.qml +data =\epoc32\data\z\private\A000E3FF\mobile\ImageDetails.qml \private\A000E3FF\mobile\ImageDetails.qml +data =\epoc32\data\z\private\A000E3FF\mobile\images\gloss.png \private\A000E3FF\mobile\images\gloss.png +data =\epoc32\data\z\private\A000E3FF\mobile\images\lineedit.png \private\A000E3FF\mobile\images\lineedit.png +data =\epoc32\data\z\private\A000E3FF\mobile\images\lineedit.sci \private\A000E3FF\mobile\images\lineedit.sci +data =\epoc32\data\z\private\A000E3FF\mobile\images\quit.png \private\A000E3FF\mobile\images\quit.png +data =\epoc32\data\z\private\A000E3FF\mobile\images\stripes.png \private\A000E3FF\mobile\images\stripes.png +data =\epoc32\data\z\private\A000E3FF\mobile\images\titlebar.png \private\A000E3FF\mobile\images\titlebar.png +data =\epoc32\data\z\private\A000E3FF\mobile\images\titlebar.sci \private\A000E3FF\mobile\images\titlebar.sci +data =\epoc32\data\z\private\A000E3FF\mobile\images\toolbutton.png \private\A000E3FF\mobile\images\toolbutton.png +data =\epoc32\data\z\private\A000E3FF\mobile\images\toolbutton.sci \private\A000E3FF\mobile\images\toolbutton.sci +data =\epoc32\data\z\private\A000E3FF\mobile\ListDelegate.qml \private\A000E3FF\mobile\ListDelegate.qml +data =\epoc32\data\z\private\A000E3FF\mobile\TitleBar.qml \private\A000E3FF\mobile\TitleBar.qml +data =\epoc32\data\z\private\A000E3FF\mobile\ToolBar.qml \private\A000E3FF\mobile\ToolBar.qml + +//qmlphotoviewer +// Executable and default resource files +S60_APP_EXE(qmlphotoviewer) +S60_APP_RESOURCE(qmlphotoviewer) +data =\epoc32\data\z\private\10003a3f\import\apps\qmlphotoviewer_reg.rsc \private\10003a3f\import\apps\qmlphotoviewer_reg.rsc +data =\epoc32\data\z\resource\apps\qmlphotoviewer.mif \resource\apps\qmlphotoviewer.mif + +// DEPLOYMENT +data =\epoc32\data\z\private\A000E400\photoviewer.qml \private\A000E400\photoviewer.qml +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\AlbumDelegate.qml \private\A000E400\PhotoViewerCore\AlbumDelegate.qml +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\BusyIndicator.qml \private\A000E400\PhotoViewerCore\BusyIndicator.qml +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\Button.qml \private\A000E400\PhotoViewerCore\Button.qml +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\EditableButton.qml \private\A000E400\PhotoViewerCore\EditableButton.qml +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\images\box-shadow.png \private\A000E400\PhotoViewerCore\images\box-shadow.png +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\images\busy.png \private\A000E400\PhotoViewerCore\images\busy.png +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\images\cardboard.png \private\A000E400\PhotoViewerCore\images\cardboard.png +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\PhotoDelegate.qml \private\A000E400\PhotoViewerCore\PhotoDelegate.qml +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\ProgressBar.qml \private\A000E400\PhotoViewerCore\ProgressBar.qml +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\qmldir \private\A000E400\PhotoViewerCore\qmldir +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\RssModel.qml \private\A000E400\PhotoViewerCore\RssModel.qml +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\script\script.js \private\A000E400\PhotoViewerCore\script\script.js +data =\epoc32\data\z\private\A000E400\PhotoViewerCore\Tag.qml \private\A000E400\PhotoViewerCore\Tag.qml + +// qmltwitter +// Executable and default resource files +S60_APP_EXE(qmltwitter) +S60_APP_RESOURCE(qmltwitter) +data =\epoc32\data\z\private\10003a3f\import\apps\qmltwitter_reg.rsc \private\10003a3f\import\apps\qmltwitter_reg.rsc +data =\epoc32\data\z\resource\apps\qmltwitter.mif \resource\apps\qmltwitter.mif + +// DEPLOYMENT +data =\epoc32\data\z\private\A000E401\twitter.qml \private\A000E401\twitter.qml +data =\epoc32\data\z\private\A000E401\TwitterCore\AuthView.qml \private\A000E401\TwitterCore\AuthView.qml +data =\epoc32\data\z\private\A000E401\TwitterCore\Button.qml \private\A000E401\TwitterCore\Button.qml +data =\epoc32\data\z\private\A000E401\TwitterCore\FatDelegate.qml \private\A000E401\TwitterCore\FatDelegate.qml +data =\epoc32\data\z\private\A000E401\TwitterCore\HomeTitleBar.qml \private\A000E401\TwitterCore\HomeTitleBar.qml +data =\epoc32\data\z\private\A000E401\TwitterCore\images\gloss.png \private\A000E401\TwitterCore\images\gloss.png +data =\epoc32\data\z\private\A000E401\TwitterCore\images\lineedit.png \private\A000E401\TwitterCore\images\lineedit.png +data =\epoc32\data\z\private\A000E401\TwitterCore\images\lineedit.sci \private\A000E401\TwitterCore\images\lineedit.sci +data =\epoc32\data\z\private\A000E401\TwitterCore\images\loading.png \private\A000E401\TwitterCore\images\loading.png +data =\epoc32\data\z\private\A000E401\TwitterCore\images\stripes.png \private\A000E401\TwitterCore\images\stripes.png +data =\epoc32\data\z\private\A000E401\TwitterCore\images\titlebar.png \private\A000E401\TwitterCore\images\titlebar.png +data =\epoc32\data\z\private\A000E401\TwitterCore\images\titlebar.sci \private\A000E401\TwitterCore\images\titlebar.sci +data =\epoc32\data\z\private\A000E401\TwitterCore\images\toolbutton.png \private\A000E401\TwitterCore\images\toolbutton.png +data =\epoc32\data\z\private\A000E401\TwitterCore\images\toolbutton.sci \private\A000E401\TwitterCore\images\toolbutton.sci +data =\epoc32\data\z\private\A000E401\TwitterCore\Loading.qml \private\A000E401\TwitterCore\Loading.qml +data =\epoc32\data\z\private\A000E401\TwitterCore\MultiTitleBar.qml \private\A000E401\TwitterCore\MultiTitleBar.qml +data =\epoc32\data\z\private\A000E401\TwitterCore\qmldir \private\A000E401\TwitterCore\qmldir +data =\epoc32\data\z\private\A000E401\TwitterCore\RssModel.qml \private\A000E401\TwitterCore\RssModel.qml +data =\epoc32\data\z\private\A000E401\TwitterCore\TitleBar.qml \private\A000E401\TwitterCore\TitleBar.qml +data =\epoc32\data\z\private\A000E401\TwitterCore\ToolBar.qml \private\A000E401\TwitterCore\ToolBar.qml +data =\epoc32\data\z\private\A000E401\TwitterCore\UserModel.qml \private\A000E401\TwitterCore\UserModel.qml + #endif // QTDEMOAPPS_IBY diff -r ef0373b55136 -r 758a864f9613 src/s60installs/qtdemoapps.pkg --- a/src/s60installs/qtdemoapps.pkg Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/qtdemoapps.pkg Mon Oct 04 01:19:32 2010 +0300 @@ -57,3 +57,149 @@ "/epoc32/release/armv5/urel/anomaly.exe" - "!:\sys\bin\anomaly.exe" "/epoc32/data/z/resource/apps/anomaly.rsc" - "!:\resource\apps\anomaly.rsc" "/epoc32/data/Z/private/10003a3f/import/Apps/anomaly_reg.rsc" - "!:\private\10003a3f\import\apps\anomaly_reg.rsc" + +;qmlcalculator +; Executable and default resource files +"/epoc32/release/armv5/urel/qmlcalculator.exe" - "!:\sys\bin\qmlcalculator.exe" +"/epoc32/data/z/resource/apps/qmlcalculator.rsc" - "!:\resource\apps\qmlcalculator.rsc" +"/epoc32/data/z/private/10003a3f/import/apps/qmlcalculator_reg.rsc" - "!:\private\10003a3f\import\apps\qmlcalculator_reg.rsc" +"/epoc32/data/z/resource/apps/qmlcalculator.mif" - "!:\resource\apps\qmlcalculator.mif" + +; DEPLOYMENT +"/epoc32/data/z/private/A000E3FB/calculator.qml" - "!:\private\A000E3FB\calculator.qml" +"/epoc32/data/z/private/A000E3FB/Core/Button.qml" - "!:\private\A000E3FB\Core\Button.qml" +"/epoc32/data/z/private/A000E3FB/Core/calculator.js" - "!:\private\A000E3FB\Core\calculator.js" +"/epoc32/data/z/private/A000E3FB/Core/Display.qml" - "!:\private\A000E3FB\Core\Display.qml" +"/epoc32/data/z/private/A000E3FB/Core/images/button-.png" - "!:\private\A000E3FB\Core\images\button-.png" +"/epoc32/data/z/private/A000E3FB/Core/images/button-blue.png" - "!:\private\A000E3FB\Core\images\button-blue.png" +"/epoc32/data/z/private/A000E3FB/Core/images/button-green.png" - "!:\private\A000E3FB\Core\images\button-green.png" +"/epoc32/data/z/private/A000E3FB/Core/images/button-purple.png" - "!:\private\A000E3FB\Core\images\button-purple.png" +"/epoc32/data/z/private/A000E3FB/Core/images/button-red.png" - "!:\private\A000E3FB\Core\images\button-red.png" +"/epoc32/data/z/private/A000E3FB/Core/images/display.png" - "!:\private\A000E3FB\Core\images\display.png" +"/epoc32/data/z/private/A000E3FB/Core/qmldir" - "!:\private\A000E3FB\Core\qmldir" + +;qmlclocks +; Executable and default resource files +"/epoc32/release/armv5/urel/qmlclocks.exe" - "!:\sys\bin\qmlclocks.exe" +"/epoc32/data/z/resource/apps/qmlclocks.rsc" - "!:\resource\apps\qmlclocks.rsc" +"/epoc32/data/z/private/10003a3f/import/apps/qmlclocks_reg.rsc" - "!:\private\10003a3f\import\apps\qmlclocks_reg.rsc" +"/epoc32/data/z/resource/apps/qmlclocks.mif" - "!:\resource\apps\qmlclocks.mif" + +; DEPLOYMENT +"/epoc32/data/z/private/A000E3FC/clocks.qml" - "!:\private\A000E3FC\clocks.qml" +"/epoc32/data/z/private/A000E3FC/content/background.png" - "!:\private\A000E3FC\content\background.png" +"/epoc32/data/z/private/A000E3FC/content/center.png" - "!:\private\A000E3FC\content\center.png" +"/epoc32/data/z/private/A000E3FC/content/clock-night.png" - "!:\private\A000E3FC\content\clock-night.png" +"/epoc32/data/z/private/A000E3FC/content/clock.png" - "!:\private\A000E3FC\content\clock.png" +"/epoc32/data/z/private/A000E3FC/content/Clock.qml" - "!:\private\A000E3FC\content\Clock.qml" +"/epoc32/data/z/private/A000E3FC/content/hour.png" - "!:\private\A000E3FC\content\hour.png" +"/epoc32/data/z/private/A000E3FC/content/minute.png" - "!:\private\A000E3FC\content\minute.png" +"/epoc32/data/z/private/A000E3FC/content/second.png" - "!:\private\A000E3FC\content\second.png" + +;qmldialcontrol +; Executable and default resource files +"/epoc32/release/armv5/urel/qmldialcontrol.exe" - "!:\sys\bin\qmldialcontrol.exe" +"/epoc32/data/z/resource/apps/qmldialcontrol.rsc" - "!:\resource\apps\qmldialcontrol.rsc" +"/epoc32/data/z/private/10003a3f/import/apps/qmldialcontrol_reg.rsc" - "!:\private\10003a3f\import\apps\qmldialcontrol_reg.rsc" +"/epoc32/data/z/resource/apps/qmldialcontrol.mif" - "!:\resource\apps\qmldialcontrol.mif" + +; DEPLOYMENT +"/epoc32/data/z/private/A000E3FD/dialcontrol.qml" - "!:\private\A000E3FD\dialcontrol.qml" +"/epoc32/data/z/private/A000E3FD/content/background.png" - "!:\private\A000E3FD\content\background.png" +"/epoc32/data/z/private/A000E3FD/content/Dial.qml" - "!:\private\A000E3FD\content\Dial.qml" +"/epoc32/data/z/private/A000E3FD/content/needle.png" - "!:\private\A000E3FD\content\needle.png" +"/epoc32/data/z/private/A000E3FD/content/needle_shadow.png" - "!:\private\A000E3FD\content\needle_shadow.png" +"/epoc32/data/z/private/A000E3FD/content/overlay.png" - "!:\private\A000E3FD\content\overlay.png" + +;qmleasing +; Executable and default resource files +"/epoc32/release/armv5/urel/qmleasing.exe" - "!:\sys\bin\qmleasing.exe" +"/epoc32/data/z/resource/apps/qmleasing.rsc" - "!:\resource\apps\qmleasing.rsc" +"/epoc32/data/z/private/10003a3f/import/apps/qmleasing_reg.rsc" - "!:\private\10003a3f\import\apps\qmleasing_reg.rsc" +"/epoc32/data/z/resource/apps/qmleasing.mif" - "!:\resource\apps\qmleasing.mif" + +; DEPLOYMENT +"/epoc32/data/z/private/A000E3FE/easing.qml" - "!:\private\A000E3FE\easing.qml" + +;qmlflickr +; Executable and default resource files +"/epoc32/release/armv5/urel/qmlflickr.exe" - "!:\sys\bin\qmlflickr.exe" +"/epoc32/data/z/resource/apps/qmlflickr.rsc" - "!:\resource\apps\qmlflickr.rsc" +"/epoc32/data/z/private/10003a3f/import/apps/qmlflickr_reg.rsc" - "!:\private\10003a3f\import\apps\qmlflickr_reg.rsc" +"/epoc32/data/z/resource/apps/qmlflickr.mif" - "!:\resource\apps\qmlflickr.mif" + +; DEPLOYMENT +"/epoc32/data/z/private/A000E3FF/flickr.qml" - "!:\private\A000E3FF\flickr.qml" +"/epoc32/data/z/private/A000E3FF/common/Progress.qml" - "!:\private\A000E3FF\common\Progress.qml" +"/epoc32/data/z/private/A000E3FF/common/qmldir" - "!:\private\A000E3FF\common\qmldir" +"/epoc32/data/z/private/A000E3FF/common/RssModel.qml" - "!:\private\A000E3FF\common\RssModel.qml" +"/epoc32/data/z/private/A000E3FF/common/ScrollBar.qml" - "!:\private\A000E3FF\common\ScrollBar.qml" +"/epoc32/data/z/private/A000E3FF/common/Slider.qml" - "!:\private\A000E3FF\common\Slider.qml" +"/epoc32/data/z/private/A000E3FF/mobile/Button.qml" - "!:\private\A000E3FF\mobile\Button.qml" +"/epoc32/data/z/private/A000E3FF/mobile/GridDelegate.qml" - "!:\private\A000E3FF\mobile\GridDelegate.qml" +"/epoc32/data/z/private/A000E3FF/mobile/ImageDetails.qml" - "!:\private\A000E3FF\mobile\ImageDetails.qml" +"/epoc32/data/z/private/A000E3FF/mobile/images/gloss.png" - "!:\private\A000E3FF\mobile\images\gloss.png" +"/epoc32/data/z/private/A000E3FF/mobile/images/lineedit.png" - "!:\private\A000E3FF\mobile\images\lineedit.png" +"/epoc32/data/z/private/A000E3FF/mobile/images/lineedit.sci" - "!:\private\A000E3FF\mobile\images\lineedit.sci" +"/epoc32/data/z/private/A000E3FF/mobile/images/quit.png" - "!:\private\A000E3FF\mobile\images\quit.png" +"/epoc32/data/z/private/A000E3FF/mobile/images/stripes.png" - "!:\private\A000E3FF\mobile\images\stripes.png" +"/epoc32/data/z/private/A000E3FF/mobile/images/titlebar.png" - "!:\private\A000E3FF\mobile\images\titlebar.png" +"/epoc32/data/z/private/A000E3FF/mobile/images/titlebar.sci" - "!:\private\A000E3FF\mobile\images\titlebar.sci" +"/epoc32/data/z/private/A000E3FF/mobile/images/toolbutton.png" - "!:\private\A000E3FF\mobile\images\toolbutton.png" +"/epoc32/data/z/private/A000E3FF/mobile/images/toolbutton.sci" - "!:\private\A000E3FF\mobile\images\toolbutton.sci" +"/epoc32/data/z/private/A000E3FF/mobile/ListDelegate.qml" - "!:\private\A000E3FF\mobile\ListDelegate.qml" +"/epoc32/data/z/private/A000E3FF/mobile/TitleBar.qml" - "!:\private\A000E3FF\mobile\TitleBar.qml" +"/epoc32/data/z/private/A000E3FF/mobile/ToolBar.qml" - "!:\private\A000E3FF\mobile\ToolBar.qml" + +;qmlphotoviewer +; Executable and default resource files +"/epoc32/release/armv5/urel/qmlphotoviewer.exe" - "!:\sys\bin\qmlphotoviewer.exe" +"/epoc32/data/z/resource/apps/qmlphotoviewer.rsc" - "!:\resource\apps\qmlphotoviewer.rsc" +"/epoc32/data/z/private/10003a3f/import/apps/qmlphotoviewer_reg.rsc" - "!:\private\10003a3f\import\apps\qmlphotoviewer_reg.rsc" +"/epoc32/data/z/resource/apps/qmlphotoviewer.mif" - "!:\resource\apps\qmlphotoviewer.mif" + +; DEPLOYMENT +"/epoc32/data/z/private/A000E400/photoviewer.qml" - "!:\private\A000E400\photoviewer.qml" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/AlbumDelegate.qml" - "!:\private\A000E400\PhotoViewerCore\AlbumDelegate.qml" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/BusyIndicator.qml" - "!:\private\A000E400\PhotoViewerCore\BusyIndicator.qml" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/Button.qml" - "!:\private\A000E400\PhotoViewerCore\Button.qml" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/EditableButton.qml" - "!:\private\A000E400\PhotoViewerCore\EditableButton.qml" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/images/box-shadow.png" - "!:\private\A000E400\PhotoViewerCore\images\box-shadow.png" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/images/busy.png" - "!:\private\A000E400\PhotoViewerCore\images\busy.png" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/images/cardboard.png" - "!:\private\A000E400\PhotoViewerCore\images\cardboard.png" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/PhotoDelegate.qml" - "!:\private\A000E400\PhotoViewerCore\PhotoDelegate.qml" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/ProgressBar.qml" - "!:\private\A000E400\PhotoViewerCore\ProgressBar.qml" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/qmldir" - "!:\private\A000E400\PhotoViewerCore\qmldir" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/RssModel.qml" - "!:\private\A000E400\PhotoViewerCore\RssModel.qml" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/script/script.js" - "!:\private\A000E400\PhotoViewerCore\script\script.js" +"/epoc32/data/z/private/A000E400/PhotoViewerCore/Tag.qml" - "!:\private\A000E400\PhotoViewerCore\Tag.qml" + +; qmltwitter +; Executable and default resource files +"/epoc32/release/armv5/urel/qmltwitter.exe" - "!:\sys\bin\qmltwitter.exe" +"/epoc32/data/z/resource/apps/qmltwitter.rsc" - "!:\resource\apps\qmltwitter.rsc" +"/epoc32/data/z/private/10003a3f/import/apps/qmltwitter_reg.rsc" - "!:\private\10003a3f\import\apps\qmltwitter_reg.rsc" +"/epoc32/data/z/resource/apps/qmltwitter.mif" - "!:\resource\apps\qmltwitter.mif" + +; DEPLOYMENT +"/epoc32/data/z/private/A000E401/twitter.qml" - "!:\private\A000E401\twitter.qml" +"/epoc32/data/z/private/A000E401/TwitterCore/AuthView.qml" - "!:\private\A000E401\TwitterCore\AuthView.qml" +"/epoc32/data/z/private/A000E401/TwitterCore/Button.qml" - "!:\private\A000E401\TwitterCore\Button.qml" +"/epoc32/data/z/private/A000E401/TwitterCore/FatDelegate.qml" - "!:\private\A000E401\TwitterCore\FatDelegate.qml" +"/epoc32/data/z/private/A000E401/TwitterCore/HomeTitleBar.qml" - "!:\private\A000E401\TwitterCore\HomeTitleBar.qml" +"/epoc32/data/z/private/A000E401/TwitterCore/images/gloss.png" - "!:\private\A000E401\TwitterCore\images\gloss.png" +"/epoc32/data/z/private/A000E401/TwitterCore/images/lineedit.png" - "!:\private\A000E401\TwitterCore\images\lineedit.png" +"/epoc32/data/z/private/A000E401/TwitterCore/images/lineedit.sci" - "!:\private\A000E401\TwitterCore\images\lineedit.sci" +"/epoc32/data/z/private/A000E401/TwitterCore/images/loading.png" - "!:\private\A000E401\TwitterCore\images\loading.png" +"/epoc32/data/z/private/A000E401/TwitterCore/images/stripes.png" - "!:\private\A000E401\TwitterCore\images\stripes.png" +"/epoc32/data/z/private/A000E401/TwitterCore/images/titlebar.png" - "!:\private\A000E401\TwitterCore\images\titlebar.png" +"/epoc32/data/z/private/A000E401/TwitterCore/images/titlebar.sci" - "!:\private\A000E401\TwitterCore\images\titlebar.sci" +"/epoc32/data/z/private/A000E401/TwitterCore/images/toolbutton.png" - "!:\private\A000E401\TwitterCore\images\toolbutton.png" +"/epoc32/data/z/private/A000E401/TwitterCore/images/toolbutton.sci" - "!:\private\A000E401\TwitterCore\images\toolbutton.sci" +"/epoc32/data/z/private/A000E401/TwitterCore/Loading.qml" - "!:\private\A000E401\TwitterCore\Loading.qml" +"/epoc32/data/z/private/A000E401/TwitterCore/MultiTitleBar.qml" - "!:\private\A000E401\TwitterCore\MultiTitleBar.qml" +"/epoc32/data/z/private/A000E401/TwitterCore/qmldir" - "!:\private\A000E401\TwitterCore\qmldir" +"/epoc32/data/z/private/A000E401/TwitterCore/RssModel.qml" - "!:\private\A000E401\TwitterCore\RssModel.qml" +"/epoc32/data/z/private/A000E401/TwitterCore/TitleBar.qml" - "!:\private\A000E401\TwitterCore\TitleBar.qml" +"/epoc32/data/z/private/A000E401/TwitterCore/ToolBar.qml" - "!:\private\A000E401\TwitterCore\ToolBar.qml" +"/epoc32/data/z/private/A000E401/TwitterCore/UserModel.qml" - "!:\private\A000E401\TwitterCore\UserModel.qml" diff -r ef0373b55136 -r 758a864f9613 src/s60installs/s60installs.pro --- a/src/s60installs/s60installs.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60installs/s60installs.pro Mon Oct 04 01:19:32 2010 +0300 @@ -57,8 +57,8 @@ bearerPluginLocation = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET) bearerStubZ = $${EPOCROOT}$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin BLD_INF_RULES.prj_exports += \ - "qsymbianbearer.qtplugin $$bearerStubZ" \ - "qsymbianbearer.qtplugin $${EPOCROOT}epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" + "qsymbianbearer.qtplugin /$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" \ + "qsymbianbearer.qtplugin /epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" } else { pluginLocations = $$QT_BUILD_TREE/plugins/s60 bearerPluginLocation = $$QT_BUILD_TREE/plugins/bearer @@ -189,6 +189,11 @@ "[0x1028315F],0,0,0,{\"S60ProductID\"}" } + contains(QT_CONFIG, opengl) { + qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtOpenGL$${QT_LIBINFIX}.dll + graphicssystems_plugins.sources += $$QT_BUILD_TREE/plugins/graphicssystems/qglgraphicssystem$${QT_LIBINFIX}.dll + } + contains(QT_CONFIG, multimedia){ qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMultimedia$${QT_LIBINFIX}.dll } diff -r ef0373b55136 -r 758a864f9613 src/s60main/s60main.pro --- a/src/s60main/s60main.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/s60main/s60main.pro Mon Oct 04 01:19:32 2010 +0300 @@ -29,6 +29,7 @@ # Having MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA will cause s60main.lib be unlinkable # against GCCE apps, so remove it MMP_RULES -= $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA + linux-armcc:QMAKE_CXXFLAGS *= --export_all_vtbl } else { error("$$_FILE_ is intended only for Symbian!") } diff -r ef0373b55136 -r 758a864f9613 src/script/api/qscriptcontext.cpp --- a/src/script/api/qscriptcontext.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/script/api/qscriptcontext.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -323,6 +323,9 @@ When a function is called as constructor, the thisObject() contains the newly constructed object to be initialized. + + \note This function is only guaranteed to work for a context + corresponding to native functions. */ bool QScriptContext::isCalledAsConstructor() const { @@ -413,6 +416,9 @@ object provides access to the local variables associated with this context. + \note The activation object might not be available if there is no + active QScriptEngineAgent, as it might be optimized. + \sa argument(), argumentsObject() */ @@ -472,6 +478,10 @@ activation. If \a activation is not an object, this function does nothing. + + \note For a context corresponding to a JavaScript function, this is only + guarenteed to work if there was an QScriptEngineAgent active on the + engine while the function was evaluated. */ void QScriptContext::setActivationObject(const QScriptValue &activation) { diff -r ef0373b55136 -r 758a864f9613 src/script/api/qscriptcontextinfo.cpp --- a/src/script/api/qscriptcontextinfo.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/script/api/qscriptcontextinfo.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -53,8 +53,7 @@ current statement. If the called function is executing Qt Script code, you can obtain - the script location with the functions fileName(), lineNumber() and - columnNumber(). + the script location with the functions fileName() and lineNumber(). You can obtain the starting line number and ending line number of a Qt Script function definition with functionStartLineNumber() and @@ -317,13 +316,7 @@ } /*! - Returns the column number corresponding to the statement being - executed, or -1 if the column number is not available. - - The column number is only available if Qt Script code is being - executed. - - \sa lineNumber(), fileName() + \obsolete */ int QScriptContextInfo::columnNumber() const { diff -r ef0373b55136 -r 758a864f9613 src/script/api/qscriptcontextinfo.h --- a/src/script/api/qscriptcontextinfo.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/script/api/qscriptcontextinfo.h Mon Oct 04 01:19:32 2010 +0300 @@ -69,7 +69,9 @@ qint64 scriptId() const; QString fileName() const; int lineNumber() const; - int columnNumber() const; +#ifdef QT_DEPRECATED + QT_DEPRECATED int columnNumber() const; +#endif QString functionName() const; FunctionType functionType() const; diff -r ef0373b55136 -r 758a864f9613 src/script/api/qscriptengine.cpp --- a/src/script/api/qscriptengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/script/api/qscriptengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -44,7 +44,6 @@ #include "CodeBlock.h" #include "Error.h" -#include "JSLock.h" #include "Interpreter.h" #include "PrototypeFunction.h" @@ -152,8 +151,7 @@ evaluation caused an exception by calling hasUncaughtException(). In that case, you can call toString() on the error object to obtain an error message. The current uncaught exception is also available - through uncaughtException(). You can obtain a human-readable - backtrace of the exception with uncaughtExceptionBacktrace(). + through uncaughtException(). Calling clearExceptions() will cause any uncaught exceptions to be cleared. @@ -784,6 +782,8 @@ static JSC::JSValue JSC_HOST_CALL functionQsTranslateNoOp(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); static JSC::JSValue JSC_HOST_CALL functionQsTr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); static JSC::JSValue JSC_HOST_CALL functionQsTrNoOp(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +static JSC::JSValue JSC_HOST_CALL functionQsTrId(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +static JSC::JSValue JSC_HOST_CALL functionQsTrIdNoOp(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); JSC::JSValue JSC_HOST_CALL functionQsTranslate(JSC::ExecState *exec, JSC::JSObject*, JSC::JSValue, const JSC::ArgList &args) { @@ -894,6 +894,28 @@ return args.at(0); } +JSC::JSValue JSC_HOST_CALL functionQsTrId(JSC::ExecState *exec, JSC::JSObject*, JSC::JSValue, const JSC::ArgList &args) +{ + if (args.size() < 1) + return JSC::throwError(exec, JSC::GeneralError, "qsTrId() requires at least one argument"); + if (!args.at(0).isString()) + return JSC::throwError(exec, JSC::TypeError, "qsTrId(): first argument (id) must be a string"); + if ((args.size() > 1) && !args.at(1).isNumber()) + return JSC::throwError(exec, JSC::TypeError, "qsTrId(): second argument (n) must be a number"); + JSC::UString id = args.at(0).toString(exec); + int n = -1; + if (args.size() > 1) + n = args.at(1).toInt32(exec); + return JSC::jsString(exec, qtTrId(QScript::convertToLatin1(id).constData(), n)); +} + +JSC::JSValue JSC_HOST_CALL functionQsTrIdNoOp(JSC::ExecState *, JSC::JSObject*, JSC::JSValue, const JSC::ArgList &args) +{ + if (args.size() < 1) + return JSC::jsUndefined(); + return args.at(0); +} + static JSC::JSValue JSC_HOST_CALL stringProtoFuncArg(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); JSC::JSValue JSC_HOST_CALL stringProtoFuncArg(JSC::ExecState *exec, JSC::JSObject*, JSC::JSValue thisObject, const JSC::ArgList &args) @@ -1003,7 +1025,6 @@ detachAllRegisteredScriptStrings(); qDeleteAll(m_qobjectData); qDeleteAll(m_typeInfos); - JSC::JSLock lock(false); globalData->heap.destroy(); globalData->deref(); while (freeScriptValues) { @@ -1292,7 +1313,6 @@ void QScriptEnginePrivate::collectGarbage() { - JSC::JSLock lock(false); QScript::APIShim shim(this); globalData->heap.collectAllGarbage(); } @@ -1322,7 +1342,6 @@ bool &compile) { Q_Q(QScriptEngine); - JSC::JSLock lock(false); // ### hmmm QBoolBlocker inEvalBlocker(inEval, true); q->currentContext()->activationObject(); //force the creation of a context for native function; @@ -2607,8 +2626,7 @@ } /*! - \internal - \since 4.6 + \since 4.7 Evaluates the given \a program and returns the result of the evaluation. @@ -2800,8 +2818,7 @@ The exception state is cleared when evaluate() is called. - \sa uncaughtException(), uncaughtExceptionLineNumber(), - uncaughtExceptionBacktrace() + \sa uncaughtException(), uncaughtExceptionLineNumber() */ bool QScriptEngine::hasUncaughtException() const { @@ -2819,7 +2836,6 @@ message. \sa hasUncaughtException(), uncaughtExceptionLineNumber(), - uncaughtExceptionBacktrace() */ QScriptValue QScriptEngine::uncaughtException() const { @@ -2839,7 +2855,7 @@ Line numbers are 1-based, unless a different base was specified as the second argument to evaluate(). - \sa hasUncaughtException(), uncaughtExceptionBacktrace() + \sa hasUncaughtException() */ int QScriptEngine::uncaughtExceptionLineNumber() const { @@ -2851,7 +2867,7 @@ /*! Returns a human-readable backtrace of the last uncaught exception. - Each line is of the form \c{()@:}. + It is in the form \c{()@:}. \sa uncaughtException() */ @@ -3442,6 +3458,8 @@ \row \o QT_TR_NOOP() \o QT_TR_NOOP() \row \o qsTranslate() \o QCoreApplication::translate() \row \o QT_TRANSLATE_NOOP() \o QT_TRANSLATE_NOOP() + \row \o qsTrId() (since 4.7) \o qtTrId() + \row \o QT_TRID_NOOP() (since 4.7) \o QT_TRID_NOOP() \endtable \sa {Internationalization with Qt} @@ -3460,6 +3478,8 @@ JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 2, JSC::Identifier(exec, "QT_TRANSLATE_NOOP"), QScript::functionQsTranslateNoOp)); JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 3, JSC::Identifier(exec, "qsTr"), QScript::functionQsTr)); JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "QT_TR_NOOP"), QScript::functionQsTrNoOp)); + JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "qsTrId"), QScript::functionQsTrId)); + JSC::asObject(jscObject)->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "QT_TRID_NOOP"), QScript::functionQsTrIdNoOp)); glob->stringPrototype()->putDirectFunction(exec, new (exec)JSC::NativeFunctionWrapper(exec, glob->prototypeFunctionStructure(), 1, JSC::Identifier(exec, "arg"), QScript::stringProtoFuncArg)); } @@ -4196,6 +4216,7 @@ "cannot set agent belonging to different engine"); return; } + QScript::APIShim shim(d); if (d->activeAgent) QScriptEngineAgentPrivate::get(d->activeAgent)->detach(); d->activeAgent = agent; diff -r ef0373b55136 -r 758a864f9613 src/script/api/qscriptengineagent.cpp --- a/src/script/api/qscriptengineagent.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/script/api/qscriptengineagent.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -117,6 +117,8 @@ if (engine->originalGlobalObject()->debugger()) engine->originalGlobalObject()->setDebugger(0); JSC::Debugger::attach(engine->originalGlobalObject()); + if (!QScriptEnginePrivate::get(engine)->isEvaluating()) + JSC::Debugger::recompileAllJSFunctions(engine->globalData); } void QScriptEngineAgentPrivate::detach() @@ -134,9 +136,12 @@ void QScriptEngineAgentPrivate::exceptionThrow(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, bool hasHandler) { JSC::CallFrame *oldFrame = engine->currentFrame; + int oldAgentLineNumber = engine->agentLineNumber; engine->currentFrame = frame.callFrame(); QScriptValue value(engine->scriptValueFromJSCValue(frame.exception())); + engine->agentLineNumber = value.property(QLatin1String("lineNumber")).toInt32(); q_ptr->exceptionThrow(sourceID, value, hasHandler); + engine->agentLineNumber = oldAgentLineNumber; engine->currentFrame = oldFrame; engine->setCurrentException(value); }; @@ -367,9 +372,8 @@ /*! This function is called when the engine is about to execute a new statement in the script identified by \a scriptId. The statement - begins on the line and column specified by \a lineNumber and \a - columnNumber. This event is not generated for native Qt Script - functions. + begins on the line and column specified by \a lineNumber + This event is not generated for native Qt Script functions. Reimplement this function to handle this event. For example, a debugger implementation could reimplement this function to provide @@ -378,6 +382,8 @@ The default implementation does nothing. + \note \a columnNumber is undefined + \sa scriptLoad(), functionEntry() */ void QScriptEngineAgent::positionChange(qint64 scriptId, diff -r ef0373b55136 -r 758a864f9613 src/script/api/qscriptprogram.cpp --- a/src/script/api/qscriptprogram.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/script/api/qscriptprogram.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -32,9 +32,7 @@ QT_BEGIN_NAMESPACE /*! - \internal - - \since 4.6 + \since 4.7 \class QScriptProgram \brief The QScriptProgram class encapsulates a Qt Script program. diff -r ef0373b55136 -r 758a864f9613 src/script/api/qscriptvalue_p.h --- a/src/script/api/qscriptvalue_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/script/api/qscriptvalue_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -103,7 +103,7 @@ qint64 objectId() { - if ( (type == JavaScriptCore) && (engine) ) + if ( (type == JavaScriptCore) && (engine) && jscValue.isCell() ) return (qint64)jscValue.asCell(); else return -1; diff -r ef0373b55136 -r 758a864f9613 src/script/bridge/qscriptactivationobject.cpp --- a/src/script/bridge/qscriptactivationobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/script/bridge/qscriptactivationobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -53,7 +53,7 @@ QScriptActivationObject::~QScriptActivationObject() { - delete d; + delete d_ptr(); } bool QScriptActivationObject::getOwnPropertySlot(JSC::ExecState* exec, const JSC::Identifier& propertyName, JSC::PropertySlot& slot) diff -r ef0373b55136 -r 758a864f9613 src/script/bridge/qscriptdeclarativeobject.cpp --- a/src/script/bridge/qscriptdeclarativeobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/script/bridge/qscriptdeclarativeobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -88,6 +88,7 @@ JSC::JSValue value, JSC::PutPropertySlot &slot) { QScriptEnginePrivate *engine = scriptEngineFromExec(exec); + QScript::SaveFrameHelper saveFrame(engine, exec); QScriptDeclarativeClass::Identifier identifier = (void *)propertyName.ustring().rep(); QScriptDeclarativeClassPrivate *p = QScriptDeclarativeClassPrivate::get(m_class); @@ -144,7 +145,7 @@ QScriptDeclarativeClass *scriptClass = static_cast(delegate)->m_class; QScriptEnginePrivate *eng_p = scriptEngineFromExec(exec); - JSC::ExecState *oldFrame = eng_p->currentFrame; + QScript::SaveFrameHelper saveFrame(eng_p, exec); eng_p->pushContext(exec, thisValue, args, callee); QScriptContext *ctxt = eng_p->contextForFrame(eng_p->currentFrame); @@ -153,7 +154,6 @@ scriptClass->call(static_cast(delegate)->m_object, ctxt); eng_p->popContext(); - eng_p->currentFrame = oldFrame; return (JSC::JSValue &)(result); } diff -r ef0373b55136 -r 758a864f9613 src/script/bridge/qscriptstaticscopeobject.cpp --- a/src/script/bridge/qscriptstaticscopeobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/script/bridge/qscriptstaticscopeobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -87,7 +87,7 @@ QScriptStaticScopeObject::~QScriptStaticScopeObject() { - delete d; + delete d_ptr(); } bool QScriptStaticScopeObject::getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot& slot) diff -r ef0373b55136 -r 758a864f9613 src/script/script.pro --- a/src/script/script.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/script/script.pro Mon Oct 04 01:19:32 2010 +0300 @@ -79,7 +79,10 @@ include(script.pri) -symbian:TARGET.UID3=0x2001B2E1 +symbian { + TARGET.UID3=0x2001B2E1 + LIBS += -lhal +} # :QTP:Fix header file clashes symbian: { diff -r ef0373b55136 -r 758a864f9613 src/sql/drivers/odbc/qsql_odbc.cpp --- a/src/sql/drivers/odbc/qsql_odbc.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/sql/drivers/odbc/qsql_odbc.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -2106,7 +2106,7 @@ serverType = QString::fromUtf8((const char *)serverString.constData(), t); #endif isFreeTDSDriver = serverType.contains(QLatin1String("tdsodbc"), Qt::CaseInsensitive); - unicode = isFreeTDSDriver == false; + unicode = unicode && !isFreeTDSDriver; } } diff -r ef0373b55136 -r 758a864f9613 src/sql/drivers/psql/qsql_psql.pri --- a/src/sql/drivers/psql/qsql_psql.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/src/sql/drivers/psql/qsql_psql.pri Mon Oct 04 01:19:32 2010 +0300 @@ -2,12 +2,9 @@ SOURCES += $$PWD/qsql_psql.cpp unix|win32-g++* { - !static:!isEmpty(QT_LFLAGS_PSQL) { - !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz - LIBS *= $$QT_LFLAGS_PSQL - QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL - } + LIBS *= $$QT_LFLAGS_PSQL !contains(LIBS, .*pq.*):LIBS += -lpq + QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL } else { !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32 } diff -r ef0373b55136 -r 758a864f9613 src/sql/drivers/tds/qsql_tds.h --- a/src/sql/drivers/tds/qsql_tds.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/sql/drivers/tds/qsql_tds.h Mon Oct 04 01:19:32 2010 +0300 @@ -48,7 +48,10 @@ #ifdef Q_OS_WIN32 #define WIN32_LEAN_AND_MEAN +#ifndef Q_USE_SYBASE #define DBNTWIN32 // indicates 32bit windows dblib +#endif +#include #include #include #include diff -r ef0373b55136 -r 758a864f9613 src/sql/drivers/tds/qsql_tds.pri --- a/src/sql/drivers/tds/qsql_tds.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/src/sql/drivers/tds/qsql_tds.pri Mon Oct 04 01:19:32 2010 +0300 @@ -1,8 +1,10 @@ HEADERS += $$PWD/qsql_tds.h SOURCES += $$PWD/qsql_tds.cpp -unix { +unix|win32-g++*: { + LIBS *= $$QT_LFLAGS_TDS !contains(LIBS, .*sybdb.*):LIBS += -lsybdb + QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS } else:win32-borland { LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB } else { diff -r ef0373b55136 -r 758a864f9613 src/sql/kernel/qsqldatabase.cpp --- a/src/sql/kernel/qsqldatabase.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/sql/kernel/qsqldatabase.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -60,7 +60,10 @@ #include "../drivers/oci/qsql_oci.h" #endif #ifdef QT_SQL_TDS +// conflicting RETCODE typedef between odbc and freetds +#define RETCODE DBRETCODE #include "../drivers/tds/qsql_tds.h" +#undef RETCODE #endif #ifdef QT_SQL_DB2 #include "../drivers/db2/qsql_db2.h" diff -r ef0373b55136 -r 758a864f9613 src/src.pro --- a/src/src.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/src/src.pro Mon Oct 04 01:19:32 2010 +0300 @@ -112,6 +112,7 @@ src_declarative.depends = src_gui src_script src_network src_plugins.depends = src_gui src_sql src_svg src_multimedia src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS + src_s60installs.depends -= src_s60installs src_imports.depends = src_gui src_declarative contains(QT_CONFIG, webkit) { src_webkit.depends = src_gui src_sql src_network diff -r ef0373b55136 -r 758a864f9613 src/svg/qsvghandler.cpp --- a/src/svg/qsvghandler.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/svg/qsvghandler.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -74,7 +74,7 @@ static const char *qt_inherit_text = "inherit"; #define QT_INHERIT QLatin1String(qt_inherit_text) -Q_DECL_IMPORT double qstrtod(const char *s00, char const **se, bool *ok); +Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); // ======== duplicated from qcolor_p diff -r ef0373b55136 -r 758a864f9613 src/testlib/qbenchmarkmeasurement_p.h --- a/src/testlib/qbenchmarkmeasurement_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/testlib/qbenchmarkmeasurement_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -53,7 +53,7 @@ // We mean it. // -#include +#include #include "3rdparty/cycle_p.h" #include "qbenchmark.h" @@ -87,7 +87,7 @@ bool needsWarmupIteration(); QTest::QBenchmarkMetric metricType(); private: - QTime time; + QElapsedTimer time; }; #ifdef HAVE_TICK_COUNTER // defined in 3rdparty/cycle_p.h diff -r ef0373b55136 -r 758a864f9613 src/testlib/qtestfilelogger.cpp --- a/src/testlib/qtestfilelogger.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/testlib/qtestfilelogger.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -44,6 +44,8 @@ #include "QtTest/private/qtestlog_p.h" #include "QtTest/private/qtestresult_p.h" +#include + #include #include @@ -69,11 +71,19 @@ void QTestFileLogger::init() { char filename[100]; + int index = 0; +#if defined(Q_OS_SYMBIAN) + QByteArray ba(QDir::toNativeSeparators(QString(QDir::homePath()+QDir::separator())).toUtf8()); + index = ba.length(); + QTest::qt_snprintf(filename, sizeof(filename), "%s%s.log", + ba.constData(), QTestResult::currentTestObjectName()); +#else QTest::qt_snprintf(filename, sizeof(filename), "%s.log", QTestResult::currentTestObjectName()); - - // Keep filenames simple - for (uint i = 0; i < sizeof(filename) && filename[i]; ++i) { +#endif + + // Keep filenames simple + for (uint i = index; i < sizeof(filename) && filename[i]; ++i) { char& c = filename[i]; if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '.')) { diff -r ef0373b55136 -r 758a864f9613 src/tools/moc/generator.cpp --- a/src/tools/moc/generator.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/tools/moc/generator.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -483,54 +483,6 @@ void Generator::generateProperties() { // - // specify get function, for compatibiliy we accept functions - // returning pointers, or const char * for QByteArray. - // - for (int i = 0; i < cdef->propertyList.count(); ++i) { - PropertyDef &p = cdef->propertyList[i]; - if (p.read.isEmpty()) - continue; - for (int j = 0; j < cdef->publicList.count(); ++j) { - const FunctionDef &f = cdef->publicList.at(j); - if (f.name != p.read) - continue; - if (!f.isConst) // get functions must be const - continue; - if (f.arguments.size()) // and must not take any arguments - continue; - PropertyDef::Specification spec = PropertyDef::ValueSpec; - QByteArray tmp = f.normalizedType; - if (p.type == "QByteArray" && tmp == "const char *") - tmp = "QByteArray"; - if (tmp.left(6) == "const ") - tmp = tmp.mid(6); - if (p.type != tmp && tmp.endsWith('*')) { - tmp.chop(1); - spec = PropertyDef::PointerSpec; - } else if (f.type.name.endsWith('&')) { // raw type, not normalized type - spec = PropertyDef::ReferenceSpec; - } - if (p.type != tmp) - continue; - p.gspec = spec; - break; - } - if(!p.notify.isEmpty()) { - int notifyId = -1; - for (int j = 0; j < cdef->signalList.count(); ++j) { - const FunctionDef &f = cdef->signalList.at(j); - if(f.name != p.notify) { - continue; - } else { - notifyId = j /* Signal indexes start from 0 */; - break; - } - } - p.notifyId = notifyId; - } - } - - // // Create meta data // diff -r ef0373b55136 -r 758a864f9613 src/tools/moc/moc.cpp --- a/src/tools/moc/moc.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/tools/moc/moc.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -727,6 +727,7 @@ error("Class declarations lacks Q_OBJECT macro."); checkSuperClasses(&def); + checkProperties(&def); classList += def; knownQObjectClasses.insert(def.classname); @@ -1211,7 +1212,7 @@ //when searching commas within the default argument, we should take care of template depth (anglecount) // unfortunatelly, we do not have enough semantic information to know if '<' is the operator< or - // the begining of a template type. so we just use heuristics. + // the beginning of a template type. so we just use heuristics. int possible = -1; while (index < symbols.size()) { @@ -1312,5 +1313,62 @@ } } +void Moc::checkProperties(ClassDef *cdef) +{ + // + // specify get function, for compatibiliy we accept functions + // returning pointers, or const char * for QByteArray. + // + for (int i = 0; i < cdef->propertyList.count(); ++i) { + PropertyDef &p = cdef->propertyList[i]; + if (p.read.isEmpty()) + continue; + for (int j = 0; j < cdef->publicList.count(); ++j) { + const FunctionDef &f = cdef->publicList.at(j); + if (f.name != p.read) + continue; + if (!f.isConst) // get functions must be const + continue; + if (f.arguments.size()) // and must not take any arguments + continue; + PropertyDef::Specification spec = PropertyDef::ValueSpec; + QByteArray tmp = f.normalizedType; + if (p.type == "QByteArray" && tmp == "const char *") + tmp = "QByteArray"; + if (tmp.left(6) == "const ") + tmp = tmp.mid(6); + if (p.type != tmp && tmp.endsWith('*')) { + tmp.chop(1); + spec = PropertyDef::PointerSpec; + } else if (f.type.name.endsWith('&')) { // raw type, not normalized type + spec = PropertyDef::ReferenceSpec; + } + if (p.type != tmp) + continue; + p.gspec = spec; + break; + } + if(!p.notify.isEmpty()) { + int notifyId = -1; + for (int j = 0; j < cdef->signalList.count(); ++j) { + const FunctionDef &f = cdef->signalList.at(j); + if(f.name != p.notify) { + continue; + } else { + notifyId = j /* Signal indexes start from 0 */; + break; + } + } + p.notifyId = notifyId; + if (notifyId == -1) { + QByteArray msg = "NOTIFY signal '" + p.notify + "' of property '" + p.name + + "' does not exist in class " + cdef->classname + "."; + error(msg.constData()); + } + } + } +} + + QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 src/tools/moc/moc.h --- a/src/tools/moc/moc.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/tools/moc/moc.h Mon Oct 04 01:19:32 2010 +0300 @@ -238,6 +238,7 @@ bool testFunctionAttribute(Token tok, FunctionDef *def); void checkSuperClasses(ClassDef *def); + void checkProperties(ClassDef* cdef); }; inline QByteArray noRef(const QByteArray &type) diff -r ef0373b55136 -r 758a864f9613 src/xml/dom/qdom.cpp --- a/src/xml/dom/qdom.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/xml/dom/qdom.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -7418,8 +7418,10 @@ n = doc->createElement(qName); } - if (n) - n->setLocation(locator->lineNumber(), locator->columnNumber()); + if (!n) + return false; + + n->setLocation(locator->lineNumber(), locator->columnNumber()); node->appendChild(n); node = n; diff -r ef0373b55136 -r 758a864f9613 src/xmlpatterns/api/qabstractxmlnodemodel.cpp --- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1355,7 +1355,7 @@ QAbstractXmlNodeModel for its existence, the only way you can create an instance of QXmlNodeModelIndex is by asking the node model to create one for you with QAbstractXmlNodeModel::createIndex(). Since - that function is protected, it is usually a good ide to write a + that function is protected, it is usually a good idea to write a public function that creates a QXmlNodeModelIndex from arguments that are appropriate for your particular node model. diff -r ef0373b55136 -r 758a864f9613 src/xmlpatterns/api/qxmlquery.cpp --- a/src/xmlpatterns/api/qxmlquery.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/xmlpatterns/api/qxmlquery.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -151,8 +151,8 @@ \endcode \note For the current release, XSLT support should be considered - experimental. See section \l{Using XML technologies#XSLT - 2.0}{XSLT conformance} for details. + experimental. See section \l{XQuery#XSLT 2.0} {XSLT conformance} for + details. Stylesheet parameters are bound using bindVariable(). @@ -291,8 +291,7 @@ create instances of QXmlQuery for running XQueries. \note The XSL-T support in this release is considered experimental. - See the \l{Using XML technologies#XSLT 2.0}{XSLT conformance} for - details. + See the \l{XQuery#XSLT 2.0} {XSLT conformance} for details. \since 4.5 \sa queryLanguage() diff -r ef0373b55136 -r 758a864f9613 src/xmlpatterns/data/qabstractdatetime.cpp --- a/src/xmlpatterns/data/qabstractdatetime.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/xmlpatterns/data/qabstractdatetime.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -163,7 +163,7 @@ QString msecondsStr(getSafeCapt(mseconds)); if(!msecondsStr.isEmpty()) - msecondsStr = msecondsStr.leftJustified(3, QLatin1Char('0')); + msecondsStr = msecondsStr.leftJustified(3, QLatin1Char('0'), true); const MSecondProperty msecs = msecondsStr.toInt(); if(hour == 24) diff -r ef0373b55136 -r 758a864f9613 tests/auto/collections/tst_collections.cpp --- a/tests/auto/collections/tst_collections.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/collections/tst_collections.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -165,6 +165,7 @@ void containerTypedefs(); void forwardDeclared(); void alignment(); + void QTBUG13079_collectionInsideCollection(); }; struct LargeStatic { @@ -3589,5 +3590,133 @@ } #endif +#ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS + +template class C> +struct QTBUG13079_Node { + C children; + QString s; + + ~QTBUG13079_Node() { + children.begin(); //play with memory + } +}; +template class C> void QTBUG13079_collectionInsideCollectionImpl() +{ + C > nodeList; + nodeList << QTBUG13079_Node(); + nodeList.first().s = "parent"; + nodeList.first().children << QTBUG13079_Node(); + nodeList.first().children.first().s = "child"; + + nodeList = nodeList.first().children; + QCOMPARE(nodeList.first().s, QString::fromLatin1("child")); + + nodeList = nodeList.first().children; + QCOMPARE(nodeList.count(), 0); + nodeList << QTBUG13079_Node(); +} + +template class C> +struct QTBUG13079_NodeAssoc { + C children; + QString s; + + ~QTBUG13079_NodeAssoc() { + children.begin(); //play with memory + } +}; +template class C> void QTBUG13079_collectionInsideCollectionAssocImpl() +{ + C > nodeMap; + nodeMap[18] = QTBUG13079_NodeAssoc(); + nodeMap[18].s = "parent"; + nodeMap[18].children[12] = QTBUG13079_NodeAssoc(); + nodeMap[18].children[12].s = "child"; + + nodeMap = nodeMap[18].children; + QCOMPARE(nodeMap[12].s, QString::fromLatin1("child")); + + nodeMap = nodeMap[12].children; + QCOMPARE(nodeMap.count(), 0); + nodeMap[42] = QTBUG13079_NodeAssoc(); +} + + +static quint32 qHash(const QTBUG13079_Node &) +{ + return 0; +} + +bool operator==(const QTBUG13079_Node &a, const QTBUG13079_Node &b) +{ + return a.s == b.s && a.children == b.children; +} + +template class C> +struct QTBUG13079_NodePtr : QSharedData { + C child; + QTBUG13079_NodePtr *next; + QString s; + + QTBUG13079_NodePtr() : next(0) {} + ~QTBUG13079_NodePtr() { + next = child.data(); //play with memory + } +}; +template class C> void QTBUG13079_collectionInsidePtrImpl() +{ + typedef C > Ptr; + { + Ptr nodePtr; + nodePtr = Ptr(new QTBUG13079_NodePtr()); + nodePtr->s = "parent"; + nodePtr->child = Ptr(new QTBUG13079_NodePtr()); + nodePtr->child->s = "child"; + nodePtr = nodePtr->child; + QCOMPARE(nodePtr->s, QString::fromLatin1("child")); + nodePtr = nodePtr->child; + QVERIFY(!nodePtr); + } + { + Ptr nodePtr; + nodePtr = Ptr(new QTBUG13079_NodePtr()); + nodePtr->s = "parent"; + nodePtr->next = new QTBUG13079_NodePtr(); + nodePtr->next->s = "next"; + nodePtr = Ptr(nodePtr->next); + QCOMPARE(nodePtr->s, QString::fromLatin1("next")); + nodePtr = Ptr(nodePtr->next); + QVERIFY(!nodePtr); + } +} + +#endif + +void tst_Collections::QTBUG13079_collectionInsideCollection() +{ +#ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS + QTBUG13079_collectionInsideCollectionImpl(); + QTBUG13079_collectionInsideCollectionImpl(); + QTBUG13079_collectionInsideCollectionImpl(); + QTBUG13079_collectionInsideCollectionImpl(); + QTBUG13079_collectionInsideCollectionImpl(); + + { + QSet > nodeSet; + nodeSet << QTBUG13079_Node(); + nodeSet = nodeSet.begin()->children; + QCOMPARE(nodeSet.count(), 0); + } + + QTBUG13079_collectionInsideCollectionAssocImpl(); + QTBUG13079_collectionInsideCollectionAssocImpl(); + + QTBUG13079_collectionInsidePtrImpl(); + QTBUG13079_collectionInsidePtrImpl(); + QTBUG13079_collectionInsidePtrImpl(); +#endif +} + QTEST_APPLESS_MAIN(tst_Collections) #include "tst_collections.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/compilerwarnings/test_cpp.txt --- a/tests/auto/compilerwarnings/test_cpp.txt Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/compilerwarnings/test_cpp.txt Mon Oct 04 01:19:32 2010 +0300 @@ -58,6 +58,9 @@ #include #endif +#include + + #ifndef Q_OS_MAC int main(int, char **) { diff -r ef0373b55136 -r 758a864f9613 tests/auto/compilerwarnings/tst_compilerwarnings.cpp --- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -114,6 +114,9 @@ QTest::addColumn("cflags"); QTest::newRow("standard") << QStringList(); + QTest::newRow("warn deprecated, fast plus, no debug") << (QStringList() << "-DQT_DEPRECATED_WARNINGS" + << "-DQT_USE_FAST_OPERATOR_PLUS" << "-DQT_NU_DEBUG" << "-DQT_NO_DEBUG_STREAM" << "-DQT_NO_WARNING_OUTPUT"); + QTest::newRow("no deprecated, no keywords") << (QStringList() << "-DQT_NO_DEPRECATED" << "-DQT_NO_KEYWORDS"); #if 0 #ifdef Q_WS_QWS @@ -136,14 +139,14 @@ QSKIP("gcc 3.x outputs too many bogus warnings", SkipAll); #endif - static QString tmpFile; + /*static*/ QString tmpFile; if (tmpFile.isEmpty()) { QTemporaryFile tmpQFile; tmpQFile.open(); tmpFile = tmpQFile.fileName(); tmpQFile.close(); } - static QString tmpSourceFile; + /*static*/ QString tmpSourceFile; bool openResult = true; const QString tmpBaseName("XXXXXX-test.cpp"); QString templatePath = QDir::temp().absoluteFilePath(tmpBaseName); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,30 @@ +import Qt 4.7 + +Rectangle { + id: root + width: 200 + height: 200 + + Rectangle { + id: mover + objectName: "mover" + } + + states: [ + State { + name: "free" + }, + State { + name: "left" + PropertyChanges { + restoreEntryValues: false + target: mover + x: 0 + } + } + ] + + transitions: Transition { + PropertyAnimation { properties: "x"; duration: 50 } + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,29 @@ +import Qt 4.7 + +Rectangle { + width: 400 + height: 400 + Rectangle { + id: theRect + objectName: "TheRect" + color: "red" + width: 50; height: 50 + x: 100; y: 100 + } + + states: State { + name: "moved" + PropertyChanges { + target: theRect + x: 200 + } + } + transitions: Transition { + SpringAnimation { targets: theRect; properties: "x"; velocity: 10000 } + } + + MouseArea { + anchors.fill: parent + onClicked: parent.state = "moved" + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp --- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -48,6 +48,8 @@ #include #include +#include "../../../shared/util.h" + #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir #define SRCDIR "." @@ -82,6 +84,7 @@ void easingProperties(); void rotation(); void runningTrueBug(); + void nonTransitionBug(); }; #define QTIMED_COMPARE(lhs, rhs) do { \ @@ -551,6 +554,20 @@ QTest::qWait(waitDuration); QTIMED_COMPARE(myRect->x(),qreal(100)); }*/ + + { + QDeclarativeEngine engine; + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition7.qml")); + QDeclarativeRectangle *rect = qobject_cast(c.create()); + QVERIFY(rect); + + QDeclarativeItemPrivate::get(rect)->setState("moved"); + QDeclarativeRectangle *myRect = rect->findChild("TheRect"); + QVERIFY(myRect); + QTest::qWait(waitDuration); + QTIMED_COMPARE(myRect->x(),qreal(200)); + } + } void tst_qdeclarativeanimations::invalidDuration() @@ -748,6 +765,34 @@ QVERIFY(cloud->x() > qreal(0)); } +//QTBUG-12805 +void tst_qdeclarativeanimations::nonTransitionBug() +{ + //tests that the animation values from the previous transition are properly cleared + //in the case where an animation in the transition doesn't match anything (but previously did) + QDeclarativeEngine engine; + + QDeclarativeComponent c(&engine, SRCDIR "/data/nonTransitionBug.qml"); + QDeclarativeRectangle *rect = qobject_cast(c.create()); + QVERIFY(rect != 0); + QDeclarativeItemPrivate *rectPrivate = QDeclarativeItemPrivate::get(rect); + QDeclarativeRectangle *mover = rect->findChild("mover"); + + mover->setX(100); + QCOMPARE(mover->x(), qreal(100)); + + rectPrivate->setState("left"); + QTRY_COMPARE(mover->x(), qreal(0)); + + mover->setX(100); + QCOMPARE(mover->x(), qreal(100)); + + //make sure we don't try to animate back to 0 + rectPrivate->setState("free"); + QTest::qWait(300); + QCOMPARE(mover->x(), qreal(100)); +} + QTEST_MAIN(tst_qdeclarativeanimations) #include "tst_qdeclarativeanimations.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml --- a/tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml Mon Oct 04 01:19:32 2010 +0300 @@ -11,7 +11,7 @@ width: 100 height: 100 Behavior on x { - NumberAnimation {} + NumberAnimation { duration: 500 } } } } diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -636,7 +636,7 @@ QCOMPARE(context.objects()[0].properties().count(), 0); QCOMPARE(context.objects()[0].children().count(), 0); - QCOMPARE(context.contexts().count(), 1); + QCOMPARE(context.contexts().count(), 4); QVERIFY(context.contexts()[0].debugId() >= 0); QCOMPARE(context.contexts()[0].name(), QString("tst_QDeclarativeDebug_childContext")); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp --- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -480,7 +480,7 @@ DP_TEST(0, a, QVariant::Int, 25, 14, "int"); DP_TEST(1, b, QVariant::Bool, 44, 15, "bool"); - DP_TEST(2, c, QVariant::Double, 64, 17, "double"); + DP_TEST(2, c, QMetaType::QReal, 64, 17, "double"); DP_TEST(3, d, QMetaType::QReal, 86, 15, "real"); DP_TEST(4, e, QVariant::String, 106, 17, "string"); DP_TEST(5, f, QVariant::Url, 128, 14, "url"); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,14 @@ +import Qt 4.7 + +QtObject { + id: root + property bool test: false + + Component.onCompleted: { + try { + root.deleteLater() + } catch(e) { + test = true; + } + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeecmascript/data/in.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativeecmascript/data/in.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,7 @@ +import Qt 4.7 + +Item { + id: root + property bool test1: "x" in root + property bool test2: !("foo" in root) +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectArg.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectArg.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,9 @@ +import Qt.test 1.0 +import Qt 4.7 + +MyQmlObject { + id: root + Component.onCompleted: { + root.myinvokable(root); + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectRet.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectRet.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,11 @@ +import Qt.test 1.0 +import Qt 4.7 + +MyQmlObject { + id: root + property bool test: false + Component.onCompleted: { + test = (root.returnme() == root) + } +} + diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,19 @@ +import Qt.test 1.0 +import Qt 4.7 + +MyQmlObject { + id: root + + property bool readOk: false; + property bool writeOk: false + + Component.onCompleted: { + readOk = (root.nonscriptable == undefined); + + try { + root.nonscriptable = 10 + } catch (e) { + writeOk = true; + } + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeecmascript/testtypes.h --- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h Mon Oct 04 01:19:32 2010 +0300 @@ -92,9 +92,10 @@ Q_PROPERTY(QDeclarativeListProperty objectListProperty READ objectListProperty CONSTANT) Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty) Q_PROPERTY(QRegExp regExp READ regExp WRITE setRegExp) + Q_PROPERTY(int nonscriptable READ nonscriptable WRITE setNonscriptable SCRIPTABLE false); public: - MyQmlObject(): m_methodCalled(false), m_methodIntCalled(false), m_object(0), m_value(0), m_resetProperty(13) {} + MyQmlObject(): myinvokableObject(0), m_methodCalled(false), m_methodIntCalled(false), m_object(0), m_value(0), m_resetProperty(13) {} enum MyEnum { EnumValue1 = 0, EnumValue2 = 1 }; enum MyEnum2 { EnumValue3 = 2, EnumValue4 = 3 }; @@ -144,6 +145,13 @@ void setRegExp(const QRegExp ®Exp) { m_regExp = regExp; } int console() const { return 11; } + + int nonscriptable() const { return 0; } + void setNonscriptable(int) {} + + MyQmlObject *myinvokableObject; + Q_INVOKABLE MyQmlObject *returnme() { return this; } + signals: void basicSignal(); void argumentSignal(int a, QString b, qreal c); @@ -157,6 +165,7 @@ void methodNoArgs() { m_methodCalled = true; } void method(int a) { if(a == 163) m_methodIntCalled = true; } void setString(const QString &s) { m_string = s; } + void myinvokable(MyQmlObject *o) { myinvokableObject = o; } private: friend class tst_qdeclarativeecmascript; @@ -604,62 +613,62 @@ { Q_OBJECT public: - Q_PROPERTY(qreal test1 READ test1 WRITE setTest1); + Q_PROPERTY(qreal test1 READ test1 WRITE setTest1) qreal _test1; qreal test1() const { return _test1; } void setTest1(qreal v) { _test1 = v; } - Q_PROPERTY(qreal test2 READ test2 WRITE setTest2); + Q_PROPERTY(qreal test2 READ test2 WRITE setTest2) qreal _test2; qreal test2() const { return _test2; } void setTest2(qreal v) { _test2 = v; } - Q_PROPERTY(qreal test3 READ test3 WRITE setTest3); + Q_PROPERTY(qreal test3 READ test3 WRITE setTest3) qreal _test3; qreal test3() const { return _test3; } void setTest3(qreal v) { _test3 = v; } - Q_PROPERTY(qreal test4 READ test4 WRITE setTest4); + Q_PROPERTY(qreal test4 READ test4 WRITE setTest4) qreal _test4; qreal test4() const { return _test4; } void setTest4(qreal v) { _test4 = v; } - Q_PROPERTY(int test5 READ test5 WRITE setTest5); + Q_PROPERTY(int test5 READ test5 WRITE setTest5) int _test5; int test5() const { return _test5; } void setTest5(int v) { _test5 = v; } - Q_PROPERTY(int test6 READ test6 WRITE setTest6); + Q_PROPERTY(int test6 READ test6 WRITE setTest6) int _test6; int test6() const { return _test6; } void setTest6(int v) { _test6 = v; } - Q_PROPERTY(int test7 READ test7 WRITE setTest7); + Q_PROPERTY(int test7 READ test7 WRITE setTest7) int _test7; int test7() const { return _test7; } void setTest7(int v) { _test7 = v; } - Q_PROPERTY(int test8 READ test8 WRITE setTest8); + Q_PROPERTY(int test8 READ test8 WRITE setTest8) int _test8; int test8() const { return _test8; } void setTest8(int v) { _test8 = v; } - Q_PROPERTY(unsigned int test9 READ test9 WRITE setTest9); + Q_PROPERTY(unsigned int test9 READ test9 WRITE setTest9) unsigned int _test9; unsigned int test9() const { return _test9; } void setTest9(unsigned int v) { _test9 = v; } - Q_PROPERTY(unsigned int test10 READ test10 WRITE setTest10); + Q_PROPERTY(unsigned int test10 READ test10 WRITE setTest10) unsigned int _test10; unsigned int test10() const { return _test10; } void setTest10(unsigned int v) { _test10 = v; } - Q_PROPERTY(unsigned int test11 READ test11 WRITE setTest11); + Q_PROPERTY(unsigned int test11 READ test11 WRITE setTest11) unsigned int _test11; unsigned int test11() const { return _test11; } void setTest11(unsigned int v) { _test11 = v; } - Q_PROPERTY(unsigned int test12 READ test12 WRITE setTest12); + Q_PROPERTY(unsigned int test12 READ test12 WRITE setTest12) unsigned int _test12; unsigned int test12() const { return _test12; } void setTest12(unsigned int v) { _test12 = v; } diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -157,10 +157,15 @@ void qtbug_10696(); void qtbug_11606(); void qtbug_11600(); + void nonscriptable(); + void deleteLater(); + void in(); void include(); void callQtInvokables(); + void invokableObjectArg(); + void invokableObjectRet(); private: QDeclarativeEngine engine; }; @@ -1730,6 +1735,31 @@ QCOMPARE(o.actuals().at(0), QVariant(9)); } +// QTBUG-13047 (check that you can pass registered object types as args) +void tst_qdeclarativeecmascript::invokableObjectArg() +{ + QDeclarativeComponent component(&engine, TEST_FILE("invokableObjectArg.qml")); + + QObject *o = component.create(); + QVERIFY(o); + MyQmlObject *qmlobject = qobject_cast(o); + QVERIFY(qmlobject); + QCOMPARE(qmlobject->myinvokableObject, qmlobject); + + delete o; +} + +// QTBUG-13047 (check that you can return registered object types from methods) +void tst_qdeclarativeecmascript::invokableObjectRet() +{ + QDeclarativeComponent component(&engine, TEST_FILE("invokableObjectRet.qml")); + + QObject *o = component.create(); + QVERIFY(o); + QCOMPARE(o->property("test").toBool(), true); + delete o; +} + // QTBUG-5675 void tst_qdeclarativeecmascript::listToVariant() { @@ -2530,6 +2560,36 @@ delete o; } +// Reading and writing non-scriptable properties should fail +void tst_qdeclarativeecmascript::nonscriptable() +{ + QDeclarativeComponent component(&engine, TEST_FILE("nonscriptable.qml")); + QObject *o = component.create(); + QVERIFY(o != 0); + QCOMPARE(o->property("readOk").toBool(), true); + QCOMPARE(o->property("writeOk").toBool(), true); + delete o; +} + +// deleteLater() should not be callable from QML +void tst_qdeclarativeecmascript::deleteLater() +{ + QDeclarativeComponent component(&engine, TEST_FILE("deleteLater.qml")); + QObject *o = component.create(); + QVERIFY(o != 0); + QCOMPARE(o->property("test").toBool(), true); + delete o; +} + +void tst_qdeclarativeecmascript::in() +{ + QDeclarativeComponent component(&engine, TEST_FILE("in.qml")); + QObject *o = component.create(); + QVERIFY(o != 0); + QCOMPARE(o->property("test1").toBool(), true); + QCOMPARE(o->property("test2").toBool(), true); + delete o; +} QTEST_MAIN(tst_qdeclarativeecmascript) diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,7 @@ +import Qt 4.7 + +Flickable { + width: 100; height: 100 + + QGraphicsWidget { objectName: "widget1"; width: 200; height: 300 } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp --- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -44,6 +44,7 @@ #include #include #include +#include #include #ifdef Q_OS_SYMBIAN @@ -67,9 +68,13 @@ void flickDeceleration(); void pressDelay(); void flickableDirection(); + void qgraphicswidget(); private: QDeclarativeEngine engine; + + template + T *findItem(QGraphicsObject *parent, const QString &objectName); }; tst_qdeclarativeflickable::tst_qdeclarativeflickable() @@ -261,6 +266,38 @@ QCOMPARE(spy.count(),3); } +void tst_qdeclarativeflickable::qgraphicswidget() +{ + QDeclarativeEngine engine; + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickableqgraphicswidget.qml")); + QDeclarativeFlickable *flickable = qobject_cast(c.create()); + + QVERIFY(flickable != 0); + QGraphicsWidget *widget = findItem(flickable->contentItem(), "widget1"); + QVERIFY(widget); +} + +template +T *tst_qdeclarativeflickable::findItem(QGraphicsObject *parent, const QString &objectName) +{ + const QMetaObject &mo = T::staticMetaObject; + //qDebug() << parent->childItems().count() << "children"; + for (int i = 0; i < parent->childItems().count(); ++i) { + QGraphicsObject *item = qobject_cast(parent->childItems().at(i)); + if(!item) + continue; + //qDebug() << "try" << item; + if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) { + return static_cast(item); + } + item = findItem(item, objectName); + if (item) + return static_cast(item); + } + + return 0; +} + QTEST_MAIN(tst_qdeclarativeflickable) #include "tst_qdeclarativeflickable.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativefocusscope/data/signalEmission.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativefocusscope/data/signalEmission.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,33 @@ +import Qt 4.7 + +Rectangle { + width: 200 + height: 200 + + FocusScope { + focus: true + Rectangle { + objectName: "item1" + color: "blue" + onFocusChanged: focus ? color = "red" : color = "blue" + } + Rectangle { + objectName: "item2" + color: "blue" + onFocusChanged: focus ? color = "red" : color = "blue" + } + } + + FocusScope { + Rectangle { + objectName: "item3" + color: "blue" + onFocusChanged: focus ? color = "red" : color = "blue" + } + Rectangle { + objectName: "item4" + color: "blue" + onFocusChanged: focus ? color = "red" : color = "blue" + } + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp --- a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -69,6 +69,7 @@ void textEdit(); void forceFocus(); void noParentFocus(); + void signalEmission(); }; /* @@ -335,7 +336,7 @@ view->setSource(QUrl::fromLocalFile(SRCDIR "/data/chain.qml")); QVERIFY(view->rootObject()); - QVERIFY(view->rootObject()->property("focus1") == true); + QVERIFY(view->rootObject()->property("focus1") == false); QVERIFY(view->rootObject()->property("focus2") == false); QVERIFY(view->rootObject()->property("focus3") == true); QVERIFY(view->rootObject()->property("focus4") == true); @@ -344,6 +345,61 @@ delete view; } +void tst_qdeclarativefocusscope::signalEmission() +{ + QDeclarativeView *view = new QDeclarativeView; + view->setSource(QUrl::fromLocalFile(SRCDIR "/data/signalEmission.qml")); + + QDeclarativeRectangle *item1 = findItem(view->rootObject(), QLatin1String("item1")); + QDeclarativeRectangle *item2 = findItem(view->rootObject(), QLatin1String("item2")); + QDeclarativeRectangle *item3 = findItem(view->rootObject(), QLatin1String("item3")); + QDeclarativeRectangle *item4 = findItem(view->rootObject(), QLatin1String("item4")); + QVERIFY(item1 != 0); + QVERIFY(item2 != 0); + QVERIFY(item3 != 0); + QVERIFY(item4 != 0); + + view->show(); + qApp->setActiveWindow(view); + qApp->processEvents(); + +#ifdef Q_WS_X11 + // to be safe and avoid failing setFocus with window managers + qt_x11_wait_for_window_manager(view); +#endif + + QVariant blue(QColor("blue")); + QVariant red(QColor("red")); + + QVERIFY(view->hasFocus()); + QVERIFY(view->scene()->hasFocus()); + item1->setFocus(true); + QCOMPARE(item1->property("color"), red); + QCOMPARE(item2->property("color"), blue); + QCOMPARE(item3->property("color"), blue); + QCOMPARE(item4->property("color"), blue); + + item2->setFocus(true); + QCOMPARE(item1->property("color"), blue); + QCOMPARE(item2->property("color"), red); + QCOMPARE(item3->property("color"), blue); + QCOMPARE(item4->property("color"), blue); + + item3->setFocus(true); + QCOMPARE(item1->property("color"), blue); + QCOMPARE(item2->property("color"), red); + QCOMPARE(item3->property("color"), red); + QCOMPARE(item4->property("color"), blue); + + item4->setFocus(true); + QCOMPARE(item1->property("color"), blue); + QCOMPARE(item2->property("color"), red); + QCOMPARE(item3->property("color"), blue); + QCOMPARE(item4->property("color"), red); + + delete view; +} + QTEST_MAIN(tst_qdeclarativefocusscope) #include "tst_qdeclarativefocusscope.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp --- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -590,7 +590,7 @@ QCOMPARE(gridview->currentIndex(), 35); QCOMPARE(gridview->currentItem(), findItem(contentItem, "wrapper", 35)); QCOMPARE(gridview->currentItem()->y(), gridview->highlightItem()->y()); - QCOMPARE(gridview->contentY(), 399.0); + QCOMPARE(gridview->contentY(), 400.0); gridview->moveCurrentIndexRight(); QCOMPARE(gridview->currentIndex(), 36); @@ -629,7 +629,7 @@ gridview->moveCurrentIndexLeft(); QCOMPARE(gridview->currentIndex(), model.count()-1); - QTRY_COMPARE(gridview->contentY(), 879.0); + QTRY_COMPARE(gridview->contentY(), 880.0); gridview->moveCurrentIndexRight(); QCOMPARE(gridview->currentIndex(), 0); @@ -655,6 +655,15 @@ gridview->setFlow(QDeclarativeGridView::TopToBottom); + qApp->setActiveWindow(canvas); +#ifdef Q_WS_X11 + // to be safe and avoid failing setFocus with window managers + qt_x11_wait_for_window_manager(canvas); +#endif + QTRY_VERIFY(canvas->hasFocus()); + QTRY_VERIFY(canvas->scene()->hasFocus()); + qApp->processEvents(); + QTest::keyClick(canvas, Qt::Key_Right); QCOMPARE(gridview->currentIndex(), 5); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeimage/data/heart-arm.png Binary file tests/auto/declarative/qdeclarativeimage/data/heart-arm.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeimage/data/heart-mac.png Binary file tests/auto/declarative/qdeclarativeimage/data/heart-mac.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeimage/data/heart-win32.png Binary file tests/auto/declarative/qdeclarativeimage/data/heart-win32.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeimage/data/heart.png Binary file tests/auto/declarative/qdeclarativeimage/data/heart.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeimage/data/heart200-arm.png Binary file tests/auto/declarative/qdeclarativeimage/data/heart200-arm.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeimage/data/heart200-mac.png Binary file tests/auto/declarative/qdeclarativeimage/data/heart200-mac.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png Binary file tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeimage/data/heart200.png Binary file tests/auto/declarative/qdeclarativeimage/data/heart200.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -272,32 +272,24 @@ QVERIFY(obj != 0); QCOMPARE(obj->pixmap().width(), 300); QCOMPARE(obj->pixmap().height(), 300); - QCOMPARE(obj->width(), 550.0); - QCOMPARE(obj->height(), 500.0); -#if defined(Q_OS_MAC) - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart-mac.png")); + QCOMPARE(obj->width(), 300.0); + QCOMPARE(obj->height(), 300.0); +#if defined(Q_OS_LINUX) + QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart.png")); #elif defined(Q_OS_WIN32) QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart-win32.png")); -#elif defined(QT_ARCH_ARM) - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart-arm.png")); -#else - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart.png")); #endif obj->setSourceSize(QSize(200,200)); QCOMPARE(obj->pixmap().width(), 200); QCOMPARE(obj->pixmap().height(), 200); - QCOMPARE(obj->width(), 550.0); - QCOMPARE(obj->height(), 500.0); -#if defined(Q_OS_MAC) - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200-mac.png")); + QCOMPARE(obj->width(), 200.0); + QCOMPARE(obj->height(), 200.0); +#if defined(Q_OS_LINUX) + QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200.png")); #elif defined(Q_OS_WIN32) QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200-win32.png")); -#elif defined(QT_ARCH_ARM) - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200-arm.png")); -#else - QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/heart200.png")); #endif delete obj; } @@ -308,7 +300,7 @@ // have to build a 400 MB image. That would be a bug in the JPEG loader. QString src = QUrl::fromLocalFile(SRCDIR "/data/big.jpeg").toString(); - QString componentStr = "import Qt 4.7\nImage { source: \"" + src + "\"; sourceSize.width: 256; sourceSize.height: 256 }"; + QString componentStr = "import Qt 4.7\nImage { source: \"" + src + "\"; width: 100; sourceSize.height: 256 }"; QDeclarativeComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -316,8 +308,8 @@ QVERIFY(obj != 0); QCOMPARE(obj->pixmap().width(), 256); QCOMPARE(obj->pixmap().height(), 256); - QCOMPARE(obj->width(), 10240.0); - QCOMPARE(obj->height(), 10240.0); + QCOMPARE(obj->width(), 100.0); + QCOMPARE(obj->height(), 256.0); QCOMPARE(obj->pixmap(), QPixmap(SRCDIR "/data/big256.png")); delete obj; diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp --- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -44,6 +44,7 @@ #include #include #include +#include #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir @@ -85,6 +86,8 @@ void removeProvider_data(); void removeProvider(); + void threadTest(); + private: QString newImageFileName() const; void fillRequestTestsData(const QString &id); @@ -95,11 +98,17 @@ class TestQImageProvider : public QDeclarativeImageProvider { public: - TestQImageProvider() - : QDeclarativeImageProvider(Image) + TestQImageProvider(bool *deleteWatch = 0) + : QDeclarativeImageProvider(Image), deleteWatch(deleteWatch) { } + ~TestQImageProvider() + { + if (deleteWatch) + *deleteWatch = true; + } + QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize) { if (id == QLatin1String("no-such-file.png")) @@ -114,6 +123,8 @@ image = image.scaled(requestedSize); return image; } + + bool *deleteWatch; }; Q_DECLARE_METATYPE(TestQImageProvider*); @@ -121,11 +132,17 @@ class TestQPixmapProvider : public QDeclarativeImageProvider { public: - TestQPixmapProvider() - : QDeclarativeImageProvider(Pixmap) + TestQPixmapProvider(bool *deleteWatch = 0) + : QDeclarativeImageProvider(Pixmap), deleteWatch(deleteWatch) { } + ~TestQPixmapProvider() + { + if (deleteWatch) + *deleteWatch = true; + } + QPixmap requestPixmap(const QString &id, QSize *size, const QSize& requestedSize) { if (id == QLatin1String("no-such-file.png")) @@ -140,6 +157,8 @@ image = image.scaled(requestedSize); return image; } + + bool *deleteWatch; }; Q_DECLARE_METATYPE(TestQPixmapProvider*); @@ -202,8 +221,8 @@ TRY_WAIT(obj->status() == QDeclarativeImage::Ready); else QVERIFY(obj->status() == QDeclarativeImage::Ready); - QCOMPARE(obj->width(), 100.0); - QCOMPARE(obj->height(), 100.0); + QCOMPARE(obj->width(), qreal(size.width())); + QCOMPARE(obj->height(), qreal(size.height())); QCOMPARE(obj->pixmap().width(), size.width()); QCOMPARE(obj->pixmap().height(), size.height()); QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch); @@ -225,7 +244,9 @@ void tst_qdeclarativeimageprovider::requestImage_sync() { - runTest(false, new TestQImageProvider); + bool deleteWatch = false; + runTest(false, new TestQImageProvider(&deleteWatch)); + QVERIFY(deleteWatch); } void tst_qdeclarativeimageprovider::requestImage_async_data() @@ -235,7 +256,9 @@ void tst_qdeclarativeimageprovider::requestImage_async() { - runTest(true, new TestQImageProvider); + bool deleteWatch = false; + runTest(true, new TestQImageProvider(&deleteWatch)); + QVERIFY(deleteWatch); } void tst_qdeclarativeimageprovider::requestPixmap_sync_data() @@ -245,13 +268,15 @@ void tst_qdeclarativeimageprovider::requestPixmap_sync() { - runTest(false, new TestQPixmapProvider); + bool deleteWatch = false; + runTest(false, new TestQPixmapProvider(&deleteWatch)); + QVERIFY(deleteWatch); } void tst_qdeclarativeimageprovider::requestPixmap_async() { QDeclarativeEngine engine; - QDeclarativeImageProvider *provider = new TestQPixmapProvider; + QDeclarativeImageProvider *provider = new TestQPixmapProvider(); engine.addImageProvider("test", provider); QVERIFY(engine.imageProvider("test") != 0); @@ -305,6 +330,71 @@ delete obj; } +class TestThreadProvider : public QDeclarativeImageProvider +{ + public: + TestThreadProvider() : QDeclarativeImageProvider(Image), ok(false) {} + + ~TestThreadProvider() {} + + QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize) + { + mutex.lock(); + if (!ok) + cond.wait(&mutex); + mutex.unlock(); + QVector v; + for (int i = 0; i < 10000; i++) + v.prepend(i); //do some computation + QImage image(50,50, QImage::Format_RGB32); + image.fill(QColor(id).rgb()); + if (size) + *size = image.size(); + if (requestedSize.isValid()) + image = image.scaled(requestedSize); + return image; + } + + QWaitCondition cond; + QMutex mutex; + bool ok; +}; + + +void tst_qdeclarativeimageprovider::threadTest() +{ + QDeclarativeEngine engine; + + TestThreadProvider *provider = new TestThreadProvider; + + engine.addImageProvider("test_thread", provider); + QVERIFY(engine.imageProvider("test_thread") != 0); + + QString componentStr = "import Qt 4.7\nItem { \n" + "Image { source: \"image://test_thread/blue\"; asynchronous: true; }\n" + "Image { source: \"image://test_thread/red\"; asynchronous: true; }\n" + "Image { source: \"image://test_thread/green\"; asynchronous: true; }\n" + "Image { source: \"image://test_thread/yellow\"; asynchronous: true; }\n" + " }"; + QDeclarativeComponent component(&engine); + component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); + QObject *obj = component.create(); + //MUST not deadlock + QVERIFY(obj != 0); + QList images = obj->findChildren(); + QCOMPARE(images.count(), 4); + QTest::qWait(100); + foreach(QDeclarativeImage *img, images) { + QCOMPARE(img->status(), QDeclarativeImage::Loading); + } + provider->ok = true; + provider->cond.wakeAll(); + QTest::qWait(250); + foreach(QDeclarativeImage *img, images) { + TRY_WAIT(img->status() == QDeclarativeImage::Ready); + } +} + QTEST_MAIN(tst_qdeclarativeimageprovider) diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp --- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -585,7 +585,7 @@ << "45\t\t48\tDEFER\t\t\t7" << "46\t\tNA\tDEFER\t\t\t7" << "47\t\t48\tSTORE_IMPORTED_SCRIPT\t2" - << "48\t\t50\tXXX UNKOWN INSTRUCTION\t1234" + << "48\t\t50\tXXX UNKNOWN INSTRUCTION\t1234" << "49\t\t51\tSTORE_VARIANT_INTEGER\t\t32\t11" << "50\t\t52\tSTORE_VARIANT_DOUBLE\t\t19\t33.7" << "-------------------------------------------------------------------------------"; diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,15 @@ +import Qt 4.7 + +Rectangle { + width: 300 + height: 300 + + Rectangle { + height: childrenRect.height + + Repeater { + model: 1 + Rectangle { } + } + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp --- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -75,6 +75,7 @@ void childrenRect(); void childrenRectBug(); void childrenRectBug2(); + void childrenRectBug3(); void childrenProperty(); void resourcesProperty(); @@ -780,6 +781,17 @@ delete canvas; } +// QTBUG-12722 +void tst_QDeclarativeItem::childrenRectBug3() +{ + QDeclarativeView *canvas = new QDeclarativeView(0); + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/childrenRectBug3.qml")); + canvas->show(); + + //don't crash on delete + delete canvas; +} + template T *tst_QDeclarativeItem::findItem(QGraphicsObject *parent, const QString &objectName) { diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/data/DontDoubleCallClassBeginItem.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativelanguage/data/DontDoubleCallClassBeginItem.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,4 @@ +import Test 1.0 + +MyParserStatus { +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,14 @@ +import Qt 4.7 + +QtObject { + id: root + + property bool test: false + property alias myalias: root.objectName + signal go + onGo: test = true + + Component.onCompleted: { + root.go(); + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,5 @@ +import Qt 4.7 + +Item { + property QtObject object: DontDoubleCallClassBeginItem {} +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.7.errors.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.7.errors.txt Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +5:23:Invalid alias location diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.7.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.7.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,6 @@ +import Test 1.0 + +MyTypeObject { + id: root + property alias a: root.nonScriptable +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt --- a/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt Mon Oct 04 01:19:32 2010 +0300 @@ -1,2 +1,2 @@ -4:5:Unable to create type NestedErrorsType +4:5:Type NestedErrorsType unavailable 4:8:Invalid property assignment: number expected diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/data/nonScriptableProperty.errors.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativelanguage/data/nonScriptableProperty.errors.txt Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +4:5:Cannot assign to non-existent property "nonScriptable" diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/data/nonScriptableProperty.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativelanguage/data/nonScriptableProperty.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,5 @@ +import Test 1.0 + +MyQmlObject { + nonScriptable: 11 +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,13 @@ +import Qt 4.7 + +QtObject { + property int notifyCount: 0 + + property variant foo + onFooChanged: notifyCount++ + + Component.onCompleted: { + foo = 1; + foo = 1; + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/testtypes.cpp --- a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -50,6 +50,7 @@ qmlRegisterType("Test",1,0,"MyDotPropertyObject"); qmlRegisterType("Test",1,0,"MyNamespacedType"); qmlRegisterType("Test",1,0,"MySecondNamespacedType"); + qmlRegisterType("Test",1,0,"MyParserStatus"); qmlRegisterType(); qmlRegisterCustomType("Test", 1, 0, "MyCustomParserType", new MyCustomParserTypeParser); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/testtypes.h --- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h Mon Oct 04 01:19:32 2010 +0300 @@ -112,6 +112,7 @@ Q_PROPERTY(MyCustomVariantType customType READ customType WRITE setCustomType) Q_PROPERTY(MyQmlObject *qmlobjectProperty READ qmlobject WRITE setQmlobject) Q_PROPERTY(int propertyWithNotify READ propertyWithNotify WRITE setPropertyWithNotify NOTIFY oddlyNamedNotifySignal) + Q_PROPERTY(int nonScriptable READ nonScriptable WRITE setNonScriptable SCRIPTABLE false); Q_INTERFACES(MyInterface) public: @@ -150,6 +151,9 @@ int propertyWithNotify() const { return m_propertyWithNotify; } void setPropertyWithNotify(int i) { m_propertyWithNotify = i; emit oddlyNamedNotifySignal(); } + + int nonScriptable() const { return 0; } + void setNonScriptable(int) {} public slots: void basicSlot() { qWarning("MyQmlObject::basicSlot"); } void basicSlotWithArgs(int v) { qWarning("MyQmlObject::basicSlotWithArgs(%d)", v); } @@ -170,7 +174,6 @@ QML_DECLARE_TYPE(MyQmlObject) QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES) - class MyGroupedObject : public QObject { Q_OBJECT @@ -576,6 +579,22 @@ void setCustomData(QObject *, const QByteArray &) {} }; +class MyParserStatus : public QObject, public QDeclarativeParserStatus +{ + Q_OBJECT +public: + MyParserStatus() : m_cbc(0), m_ccc(0) {} + + int classBeginCount() const { return m_cbc; } + int componentCompleteCount() const { return m_ccc; } + + virtual void classBegin() { m_cbc++; } + virtual void componentComplete() { m_ccc++; } +private: + int m_cbc; + int m_ccc; +}; + void registerTypes(); #endif // TESTTYPES_H diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -118,6 +118,7 @@ void valueTypes(); void cppnamespace(); void aliasProperties(); + void aliasPropertiesAndSignals(); void componentCompositeType(); void i18n(); void i18n_data(); @@ -126,6 +127,7 @@ void scriptString(); void defaultPropertyListOrder(); void declaredPropertyValues(); + void dontDoubleCallClassBegin(); void basicRemote_data(); void basicRemote(); @@ -141,8 +143,8 @@ void importsOrder(); void qmlAttachedPropertiesObjectMethod(); - void customOnProperty(); + void variantNotify(); // regression tests for crashes void crash1(); @@ -342,6 +344,7 @@ QTest::newRow("invalidAlias.4") << "invalidAlias.4.qml" << "invalidAlias.4.errors.txt" << false; QTest::newRow("invalidAlias.5") << "invalidAlias.5.qml" << "invalidAlias.5.errors.txt" << false; QTest::newRow("invalidAlias.6") << "invalidAlias.6.qml" << "invalidAlias.6.errors.txt" << false; + QTest::newRow("invalidAlias.7") << "invalidAlias.7.qml" << "invalidAlias.7.errors.txt" << false; QTest::newRow("invalidAttachedProperty.1") << "invalidAttachedProperty.1.qml" << "invalidAttachedProperty.1.errors.txt" << false; QTest::newRow("invalidAttachedProperty.2") << "invalidAttachedProperty.2.qml" << "invalidAttachedProperty.2.errors.txt" << false; @@ -372,6 +375,7 @@ QTest::newRow("assignToNamespace") << "assignToNamespace.qml" << "assignToNamespace.errors.txt" << false; QTest::newRow("invalidOn") << "invalidOn.qml" << "invalidOn.errors.txt" << false; QTest::newRow("invalidProperty") << "invalidProperty.qml" << "invalidProperty.errors.txt" << false; + QTest::newRow("nonScriptableProperty") << "nonScriptableProperty.qml" << "nonScriptableProperty.errors.txt" << false; } @@ -1048,6 +1052,17 @@ } } +// QTBUG-13374 Test that alias properties and signals can coexist +void tst_qdeclarativelanguage::aliasPropertiesAndSignals() +{ + QDeclarativeComponent component(&engine, TEST_FILE("aliasPropertiesAndSignals.qml")); + VERIFY_ERRORS(0); + QObject *o = component.create(); + QVERIFY(o); + QCOMPARE(o->property("test").toBool(), true); + delete o; +} + // Test that the root element in a composite type can be a Component void tst_qdeclarativelanguage::componentCompositeType() { @@ -1192,6 +1207,20 @@ VERIFY_ERRORS(0); } +void tst_qdeclarativelanguage::dontDoubleCallClassBegin() +{ + QDeclarativeComponent component(&engine, TEST_FILE("dontDoubleCallClassBegin.qml")); + QObject *o = component.create(); + QVERIFY(o); + + MyParserStatus *o2 = qobject_cast(qvariant_cast(o->property("object"))); + QVERIFY(o2); + QCOMPARE(o2->classBeginCount(), 1); + QCOMPARE(o2->componentCompleteCount(), 1); + + delete o; +} + // Check that first child of qml is of given type. Empty type insists on error. void tst_qdeclarativelanguage::testType(const QString& qml, const QString& type, const QString& expectederror) { @@ -1668,6 +1697,20 @@ delete object; } +// QTBUG-12601 +void tst_qdeclarativelanguage::variantNotify() +{ + QDeclarativeComponent component(&engine, TEST_FILE("variantNotify.qml")); + + VERIFY_ERRORS(0); + QObject *object = component.create(); + QVERIFY(object != 0); + + QCOMPARE(object->property("notifyCount").toInt(), 1); + + delete object; +} + void tst_qdeclarativelanguage::initTestCase() { registerTypes(); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -271,6 +271,9 @@ QTest::newRow("nested-insert") << "{append({'foo':123});insert(0,{'bars':[{'a':1},{'b':2},{'c':3}]});get(0).bars.get(0).a}" << 1 << ""; QTest::newRow("nested-set") << "{append({'foo':123});set(0,{'foo':[{'x':123}]});get(0).foo.get(0).x}" << 123 << ""; + QTest::newRow("nested-count") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.count}" << 3 << ""; + QTest::newRow("nested-clear") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.clear(); get(0).bars.count}" << 0 << ""; + // XXX //QTest::newRow("nested-setprop") << "{append({'foo':123});setProperty(0,'foo',[{'x':123}]);get(0).foo.get(0).x}" << 123 << ""; } @@ -344,9 +347,7 @@ waitForWorker(item); QDeclarativeExpression e(eng.rootContext(), &model, operations.last().toString()); - if (QByteArray(QTest::currentDataTag()).startsWith("nested")) - QVERIFY(e.evaluate().toInt() != result); - else + if (!QByteArray(QTest::currentDataTag()).startsWith("nested")) QCOMPARE(e.evaluate().toInt(), result); } diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelistview/data/itemlist.qml --- a/tests/auto/declarative/qdeclarativelistview/data/itemlist.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativelistview/data/itemlist.qml Mon Oct 04 01:19:32 2010 +0300 @@ -13,17 +13,17 @@ objectName: "itemModel" Rectangle { objectName: "item1" - height: view.height; width: view.width; color: "#FFFEF0" + height: ListView.view.height; width: view.width; color: "#FFFEF0" Text { objectName: "text1"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent } } Rectangle { objectName: "item2" - height: view.height; width: view.width; color: "#F0FFF7" + height: ListView.view.height; width: view.width; color: "#F0FFF7" Text { objectName: "text2"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent } } Rectangle { objectName: "item3" - height: view.height; width: view.width; color: "#F4F0FF" + height: ListView.view.height; width: view.width; color: "#F4F0FF" Text { objectName: "text3"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent } } } diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml --- a/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml Mon Oct 04 01:19:32 2010 +0300 @@ -4,6 +4,12 @@ width: 240 height: 320 color: "#ffffff" + + property real hr: list.visibleArea.heightRatio + function heightRatio() { + return list.visibleArea.heightRatio + } + function checkProperties() { testObject.error = false; if (list.model != testModel) { diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp --- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -98,6 +98,7 @@ void manualHighlight(); void QTBUG_11105(); void footer(); + void resizeView(); private: template void items(); @@ -223,6 +224,13 @@ emit itemsRemoved(index, 1); } + void removeItems(int index, int count) { + int c = count; + while (c--) + list.removeAt(index); + emit itemsRemoved(index, count); + } + void moveItem(int from, int to) { list.move(from, to); emit itemsMoved(from, to, 1); @@ -289,6 +297,13 @@ emit endRemoveRows(); } + void removeItems(int index, int count) { + emit beginRemoveRows(QModelIndex(), index, index+count-1); + while (count--) + list.removeAt(index); + emit endRemoveRows(); + } + void moveItem(int from, int to) { emit beginMoveRows(QModelIndex(), from, from, QModelIndex(), to); list.move(from, to); @@ -519,7 +534,7 @@ QDeclarativeView *canvas = createView(); T model; - for (int i = 0; i < 30; i++) + for (int i = 0; i < 50; i++) model.addItem("Item" + QString::number(i), ""); QDeclarativeContext *ctxt = canvas->rootContext(); @@ -642,6 +657,21 @@ QTRY_COMPARE(listview->currentIndex(), 7); QTRY_VERIFY(listview->currentItem() == oldCurrent); + listview->setContentY(80); + QTest::qWait(300); + + model.removeItems(1, 17); + QTest::qWait(300); + + // Confirm items positioned correctly + itemCount = findItems(contentItem, "wrapper").count(); + for (int i = 0; i < model.count() && i < itemCount-1; ++i) { + QDeclarativeItem *item = findItem(contentItem, "wrapper", i+2); + if (!item) qWarning() << "Item" << i+2 << "not found"; + QTRY_VERIFY(item); + QTRY_COMPARE(item->y(),80+i*20.0); + } + delete canvas; } @@ -979,7 +1009,7 @@ // current item should be 20th item at startup // and current item should be in view QCOMPARE(listview->currentIndex(), 20); - QCOMPARE(listview->contentY(), 99.0); + QCOMPARE(listview->contentY(), 100.0); QCOMPARE(listview->currentItem(), findItem(contentItem, "wrapper", 20)); QCOMPARE(listview->highlightItem()->y(), listview->currentItem()->y()); @@ -1002,7 +1032,7 @@ listview->decrementCurrentIndex(); QCOMPARE(listview->currentIndex(), model.count()-1); - QTRY_COMPARE(listview->contentY(), 279.0); + QTRY_COMPARE(listview->contentY(), 280.0); listview->incrementCurrentIndex(); QCOMPARE(listview->currentIndex(), 0); @@ -1066,6 +1096,7 @@ QDeclarativeItem *item = findItem(contentItem, "item1"); QTRY_VERIFY(item); QTRY_COMPARE(item->x(), 0.0); + QCOMPARE(item->height(), listview->height()); QDeclarativeText *text = findItem(contentItem, "text1"); QTRY_VERIFY(text); @@ -1590,6 +1621,48 @@ QTRY_COMPARE(footer->y(), 0.0); } +void tst_QDeclarativeListView::resizeView() +{ + QDeclarativeView *canvas = createView(); + + TestModel model; + for (int i = 0; i < 40; i++) + model.addItem("Item" + QString::number(i), ""); + + QDeclarativeContext *ctxt = canvas->rootContext(); + ctxt->setContextProperty("testModel", &model); + + TestObject *testObject = new TestObject; + ctxt->setContextProperty("testObject", testObject); + + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listviewtest.qml")); + qApp->processEvents(); + + QDeclarativeListView *listview = findItem(canvas->rootObject(), "list"); + QTRY_VERIFY(listview != 0); + + QDeclarativeItem *contentItem = listview->contentItem(); + QTRY_VERIFY(contentItem != 0); + + // Confirm items positioned correctly + int itemCount = findItems(contentItem, "wrapper").count(); + for (int i = 0; i < model.count() && i < itemCount; ++i) { + QDeclarativeItem *item = findItem(contentItem, "wrapper", i); + if (!item) qWarning() << "Item" << i << "not found"; + QTRY_VERIFY(item); + QTRY_COMPARE(item->y(), i*20.); + } + + QVariant heightRatio; + QMetaObject::invokeMethod(canvas->rootObject(), "heightRatio", Q_RETURN_ARG(QVariant, heightRatio)); + QCOMPARE(heightRatio.toReal(), 0.4); + + listview->setHeight(200); + + QMetaObject::invokeMethod(canvas->rootObject(), "heightRatio", Q_RETURN_ARG(QVariant, heightRatio)); + QCOMPARE(heightRatio.toReal(), 0.25); +} + void tst_QDeclarativeListView::qListModelInterface_items() { items(); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp --- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -146,7 +146,7 @@ void tst_QDeclarativeLoader::invalidUrl() { - QTest::ignoreMessage(QtWarningMsg, QString(": File error for URL " + QUrl::fromLocalFile(SRCDIR "/data/IDontExist.qml").toString()).toUtf8().constData()); + QTest::ignoreMessage(QtWarningMsg, QString(QUrl::fromLocalFile(SRCDIR "/data/IDontExist.qml").toString() + ": File not found").toUtf8().constData()); QDeclarativeComponent component(&engine); component.setData(QByteArray("import Qt 4.7\nLoader { source: \"IDontExist.qml\" }"), TEST_FILE("")); @@ -508,7 +508,7 @@ QVERIFY(server.isValid()); server.serveDirectory(SRCDIR "/data"); - QTest::ignoreMessage(QtWarningMsg, ": Network error for URL http://127.0.0.1:14450/IDontExist.qml"); + QTest::ignoreMessage(QtWarningMsg, "http://127.0.0.1:14450/IDontExist.qml: File not found"); QDeclarativeComponent component(&engine); component.setData(QByteArray("import Qt 4.7\nLoader { property int did_load: 123; source: \"http://127.0.0.1:14450/IDontExist.qml\"; onLoaded: did_load=456 }"), QUrl::fromLocalFile("http://127.0.0.1:14450/dummy.qml")); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp --- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -313,7 +313,7 @@ QVERIFY(reinterpret_cast((QObject *)&t) != reinterpret_cast((QDeclarativeParserStatus *)&t)); QDeclarativeParserStatus *status = reinterpret_cast(reinterpret_cast((QObject *)&t) + cast); - QCOMPARE(status, &t); + QCOMPARE(status, (QDeclarativeParserStatus*)&t); } void tst_qdeclarativemetatype::qmlPropertyValueSourceCast() @@ -333,7 +333,7 @@ QVERIFY(reinterpret_cast((QObject *)&t) != reinterpret_cast((QDeclarativePropertyValueSource *)&t)); QDeclarativePropertyValueSource *source = reinterpret_cast(reinterpret_cast((QObject *)&t) + cast); - QCOMPARE(source, &t); + QCOMPARE(source, (QDeclarativePropertyValueSource*)&t); } void tst_qdeclarativemetatype::qmlPropertyValueInterceptorCast() @@ -353,7 +353,7 @@ QVERIFY(reinterpret_cast((QObject *)&t) != reinterpret_cast((QDeclarativePropertyValueInterceptor *)&t)); QDeclarativePropertyValueInterceptor *interceptor = reinterpret_cast(reinterpret_cast((QObject *)&t) + cast); - QCOMPARE(interceptor, &t); + QCOMPARE(interceptor, (QDeclarativePropertyValueInterceptor*)&t); } void tst_qdeclarativemetatype::isList() diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativepathview/data/emptymodel.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativepathview/data/emptymodel.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,5 @@ +import Qt 4.7 + +PathView { + model: emptyModel +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp --- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -84,7 +84,7 @@ void modelChanges(); void pathUpdateOnStartChanged(); void package(); - + void emptyModel(); private: QDeclarativeView *createView(); @@ -367,9 +367,11 @@ QCOMPARE(item->y(), 10.0); model.insertItem(4, "orange", "10"); + QTest::qWait(100); - int itemCount = findItems(pathview, "wrapper").count(); - QCOMPARE(itemCount, 10); + QTRY_COMPARE(findItems(pathview, "wrapper").count(), 10); + + QVERIFY(pathview->currentIndex() == 0); QDeclarativeText *text = findItem(pathview, "myText", 4); QVERIFY(text); @@ -384,26 +386,27 @@ QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties"); QVERIFY(testObject->error() == false); - itemCount = findItems(pathview, "wrapper").count(); - QCOMPARE(itemCount, 5); + QTRY_COMPARE(findItems(pathview, "wrapper").count(), 5); QDeclarativeRectangle *testItem = findItem(pathview, "wrapper", 4); QVERIFY(testItem != 0); testItem = findItem(pathview, "wrapper", 5); QVERIFY(testItem == 0); - model.insertItem(2, "pink", "2"); + pathview->setCurrentIndex(1); - itemCount = findItems(pathview, "wrapper").count(); - QCOMPARE(itemCount, 5); + model.insertItem(2, "pink", "2"); + QTest::qWait(100); + + QTRY_COMPARE(findItems(pathview, "wrapper").count(), 5); + QVERIFY(pathview->currentIndex() == 1); text = findItem(pathview, "myText", 2); QVERIFY(text); QCOMPARE(text->text(), model.name(2)); model.removeItem(3); - itemCount = findItems(pathview, "wrapper").count(); - QCOMPARE(itemCount, 5); + QTRY_COMPARE(findItems(pathview, "wrapper").count(), 5); text = findItem(pathview, "myText", 3); QVERIFY(text); QCOMPARE(text->text(), model.name(3)); @@ -755,6 +758,28 @@ delete canvas; } +//QTBUG-13017 +void tst_QDeclarativePathView::emptyModel() +{ + QDeclarativeView *canvas = createView(); + + QStringListModel model; + + QDeclarativeContext *ctxt = canvas->rootContext(); + ctxt->setContextProperty("emptyModel", &model); + + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/emptymodel.qml")); + qApp->processEvents(); + + QDeclarativePathView *pathview = qobject_cast(canvas->rootObject()); + QVERIFY(pathview != 0); + + QCOMPARE(pathview->offset(), qreal(0.0)); + + delete canvas; +} + + QDeclarativeView *tst_QDeclarativePathView::createView() { QDeclarativeView *canvas = new QDeclarativeView(0); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativepixmapcache/data/massive.png Binary file tests/auto/declarative/qdeclarativepixmapcache/data/massive.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp --- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -42,6 +42,7 @@ #include #include #include +#include #include #include "testhttpserver.h" #include "../../../shared/util.h" @@ -70,6 +71,9 @@ void single_data(); void parallel(); void parallel_data(); + void massive(); + void cancelcrash(); + void shrinkcache(); private: QDeclarativeEngine engine; @@ -276,6 +280,79 @@ qDeleteAll(pixmaps); } +void tst_qdeclarativepixmapcache::massive() +{ + QUrl url = thisfile.resolved(QUrl("data/massive.png")); + + // Confirm that massive images remain in the cache while they are + // in use by the application. + { + qint64 cachekey = 0; + QDeclarativePixmap p(0, url); + QVERIFY(p.isReady()); + QVERIFY(p.pixmap().size() == QSize(10000, 1000)); + cachekey = p.pixmap().cacheKey(); + + QDeclarativePixmap p2(0, url); + QVERIFY(p2.isReady()); + QVERIFY(p2.pixmap().size() == QSize(10000, 1000)); + + QVERIFY(p2.pixmap().cacheKey() == cachekey); + } + + // Confirm that massive images are removed from the cache when + // they become unused + { + qint64 cachekey = 0; + { + QDeclarativePixmap p(0, url); + QVERIFY(p.isReady()); + QVERIFY(p.pixmap().size() == QSize(10000, 1000)); + cachekey = p.pixmap().cacheKey(); + } + + QDeclarativePixmap p2(0, url); + QVERIFY(p2.isReady()); + QVERIFY(p2.pixmap().size() == QSize(10000, 1000)); + + QVERIFY(p2.pixmap().cacheKey() != cachekey); + } +} + +// QTBUG-12729 +void tst_qdeclarativepixmapcache::cancelcrash() +{ + QUrl url("http://127.0.0.1:14452/cancelcrash_notexist.png"); + for (int ii = 0; ii < 1000; ++ii) { + QDeclarativePixmap pix(&engine, url); + } +} + +class MyPixmapProvider : public QDeclarativeImageProvider +{ +public: + MyPixmapProvider() + : QDeclarativeImageProvider(Pixmap) {} + + virtual QPixmap requestPixmap(const QString &d, QSize *, const QSize &) { + QPixmap pix(800, 600); + pix.fill(Qt::red); + return pix; + } +}; + +// QTBUG-13345 +void tst_qdeclarativepixmapcache::shrinkcache() +{ + QDeclarativeEngine engine; + engine.addImageProvider(QLatin1String("mypixmaps"), new MyPixmapProvider); + + for (int ii = 0; ii < 4000; ++ii) { + QUrl url("image://mypixmaps/" + QString::number(ii)); + QDeclarativePixmap p(&engine, url); + } +} + QTEST_MAIN(tst_qdeclarativepixmapcache) #include "tst_qdeclarativepixmapcache.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativepositioners/data/verticalqgraphicswidget.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativepositioners/data/verticalqgraphicswidget.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,24 @@ +import Qt 4.7 + +Item { + width: 640 + height: 480 + Column { + objectName: "column" + QGraphicsWidget { + objectName: "one" + width: 50 + height: 50 + } + QGraphicsWidget { + objectName: "two" + width: 20 + height: 10 + } + QGraphicsWidget { + objectName: "three" + width: 40 + height: 20 + } + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp --- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -46,6 +46,7 @@ #include #include #include +#include #include "../../../shared/util.h" #ifdef Q_OS_SYMBIAN @@ -77,6 +78,7 @@ void test_flow_resize(); void test_flow_implicit_resize(); void test_conflictinganchors(); + void test_vertical_qgraphicswidget(); private: QDeclarativeView *createView(const QString &filename); }; @@ -771,6 +773,48 @@ QCOMPARE(warningMessage, QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow")); } +void tst_QDeclarativePositioners::test_vertical_qgraphicswidget() +{ + QDeclarativeView *canvas = createView(SRCDIR "/data/verticalqgraphicswidget.qml"); + + QGraphicsWidget *one = canvas->rootObject()->findChild("one"); + QVERIFY(one != 0); + + QGraphicsWidget *two = canvas->rootObject()->findChild("two"); + QVERIFY(two != 0); + + QGraphicsWidget *three = canvas->rootObject()->findChild("three"); + QVERIFY(three != 0); + + QCOMPARE(one->x(), 0.0); + QCOMPARE(one->y(), 0.0); + QCOMPARE(two->x(), 0.0); + QCOMPARE(two->y(), 50.0); + QCOMPARE(three->x(), 0.0); + QCOMPARE(three->y(), 60.0); + + QDeclarativeItem *column = canvas->rootObject()->findChild("column"); + QVERIFY(column); + QCOMPARE(column->height(), 80.0); + QCOMPARE(column->width(), 50.0); + + two->resize(QSizeF(two->size().width(), 20.0)); + QCOMPARE(three->x(), 0.0); + QCOMPARE(three->y(), 70.0); + + two->setOpacity(0.0); + QCOMPARE(one->x(), 0.0); + QCOMPARE(one->y(), 0.0); + QCOMPARE(three->x(), 0.0); + QCOMPARE(three->y(), 50.0); + + one->setVisible(false); + QCOMPARE(three->x(), 0.0); + QCOMPARE(three->y(), 0.0); + + delete canvas; +} + QDeclarativeView *tst_QDeclarativePositioners::createView(const QString &filename) { QDeclarativeView *canvas = new QDeclarativeView(0); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp --- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -309,11 +309,14 @@ QCOMPARE(container->childItems().count(), 4); + QSignalSpy repeaterSpy(repeater, SIGNAL(countChanged())); testModel.addItem("four", "4"); QCOMPARE(container->childItems().count(), 5); + QCOMPARE(repeaterSpy.count(),1); testModel.removeItem(2); QCOMPARE(container->childItems().count(), 4); + QCOMPARE(repeaterSpy.count(),2); // Check that model changes are propagated QDeclarativeText *text = findItem(canvas->rootObject(), "myName", 1); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.js Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,11 @@ + +function function2InScript(a) +{ + mainRectangle.foo = a; +} + + +function functionInScript(a , b) +{ + function2InScript(a + b); +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,27 @@ +import Qt 4.7 +import Qt.test 1.0 +import "backtrace1.js" as Script + +Rectangle { + id: mainRectangle + + property string foo: "Default"; + width: 200 + height: 200 + + + MyTestObject { + + function append(a, b) { + return a + " " + b; + } + + + id: testObject; + someProperty: append("Hello", mainRectangle.foo) + + onSignaled: { + Script.functionInScript(value , "b"); + } + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,20 @@ +load(qttest_p4) +contains(QT_CONFIG,declarative): QT += declarative script +macx:CONFIG -= app_bundle + +SOURCES += tst_qdeclarativescriptdebugging.cpp +INCLUDEPATH += ../shared + +# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage +# LIBS += -lgcov + +symbian: { + importFiles.sources = data + importFiles.path = . + DEPLOYMENT = importFiles +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" +} + +CONFIG += parallel_test + diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativescriptdebugging/tst_qdeclarativescriptdebugging.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,154 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include +#include +#include +#include +#include +#include +#include +#include + +class MyTestObject : public QObject { + Q_OBJECT + Q_PROPERTY(QString someProperty READ someProperty WRITE setSomeProperty NOTIFY somePropertyChanged) + +public: + QString someProperty() { return _someProperty; } + void setSomeProperty(const QString &p) { _someProperty = p; } + QString _someProperty; + + void emitSignal(const QString &value) { emit signaled(value); } + +signals: + void signaled(const QString &value); + void somePropertyChanged(); +}; + + +class BtAgent : public QScriptEngineAgent { +public: + BtAgent(QScriptEngine *engine) : QScriptEngineAgent(engine) + { count = 0; engine->setAgent(this); } + + QStringList bt; + int count; + int breakpoint; + void positionChange(qint64 , int lineNumber, int ) + { + if(lineNumber == breakpoint) { + count++; + bt = engine()->currentContext()->backtrace(); + } + } +}; + + + +/* +This test covers evaluation of ECMAScript expressions and bindings from within +QML. This does not include static QML language issues. + +Static QML language issues are covered in qmllanguage +*/ +inline QUrl TEST_FILE(const QString &filename) +{ + QFileInfo fileInfo(__FILE__); + return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename)); +} + +inline QUrl TEST_FILE(const char *filename) +{ + return TEST_FILE(QLatin1String(filename)); +} + +class tst_qdeclarativescriptdebugging : public QObject +{ + Q_OBJECT +public: + tst_qdeclarativescriptdebugging() {} + +private slots: + void initTestCase(); + void backtrace1(); +}; + +void tst_qdeclarativescriptdebugging::initTestCase() +{ + qmlRegisterType("Qt.test", 1,0, "MyTestObject"); +} + +void tst_qdeclarativescriptdebugging::backtrace1() +{ + { + QDeclarativeEngine engine; + QUrl file = TEST_FILE("backtrace1.qml"); + QDeclarativeComponent component(&engine, file); + QDeclarativeItem *item = qobject_cast(component.create()); + QVERIFY(item); + MyTestObject *obj = item->findChild(); + QVERIFY(obj); + QCOMPARE(obj->someProperty(), QString("Hello Default")); + + QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(&engine); + BtAgent agent(&ep->scriptEngine); + agent.breakpoint = 16; + + obj->emitSignal("blah"); + QCOMPARE(obj->someProperty(), QString("Hello blahb")); + QCOMPARE(agent.count, 1); + + QStringList expected; + expected << "append(a = 'Hello', b = 'blahb') at @PREFIX@/backtrace1.qml:16" + << "$someProperty() at @PREFIX@/backtrace1.qml:21" + << "function2InScript(a = 'blahb') at @PREFIX@/backtrace1.js:4" + << "functionInScript(a = 'blah', b = 'b') at @PREFIX@/backtrace1.js:10" + << "onSignaled() at @PREFIX@/backtrace1.qml:24" + << "() at -1"; + expected.replaceInStrings("@PREFIX@", file.toString().section('/', 0, -2)); + QCOMPARE(agent.bt, expected); + } +} + + +QTEST_MAIN(tst_qdeclarativescriptdebugging) + +#include "tst_qdeclarativescriptdebugging.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativestates/data/extendsBug.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativestates/data/extendsBug.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,26 @@ +import Qt 4.7 + +Rectangle { + width: 200 + height: 200 + + Rectangle { + id: rect + objectName: "greenRect" + width: 100 + height: 100 + color: "green" + } + + states:[ + State { + name: "a" + PropertyChanges { target: rect; x: 100 } + }, + State { + name: "b" + extend:"a" + PropertyChanges { target: rect; y: 100 } + } + ] +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp --- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -139,6 +139,7 @@ void urlResolution(); void unnamedWhen(); void returnToBase(); + void extendsBug(); }; void tst_qdeclarativestates::initTestCase() @@ -1186,6 +1187,21 @@ QCOMPARE(rect->property("stateString").toString(), QLatin1String("originalState")); } +//QTBUG-12559 +void tst_qdeclarativestates::extendsBug() +{ + QDeclarativeEngine engine; + + QDeclarativeComponent c(&engine, SRCDIR "/data/extendsBug.qml"); + QDeclarativeRectangle *rect = qobject_cast(c.create()); + QVERIFY(rect != 0); + QDeclarativeItemPrivate *rectPrivate = QDeclarativeItemPrivate::get(rect); + QDeclarativeRectangle *greenRect = rect->findChild("greenRect"); + + rectPrivate->setState("b"); + QCOMPARE(greenRect->x(), qreal(100)); + QCOMPARE(greenRect->y(), qreal(100)); +} QTEST_MAIN(tst_qdeclarativestates) diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -777,7 +777,7 @@ // import installed QTest::newRow("pass") << "cursorHttpTestPass.qml" << ""; - QTest::newRow("fail1") << "cursorHttpTestFail1.qml" << ": Network error for URL http://localhost:42332/FailItem.qml "; + QTest::newRow("fail1") << "cursorHttpTestFail1.qml" << "http://localhost:42332/FailItem.qml: Remote host closed the connection "; QTest::newRow("fail2") << "cursorHttpTestFail2.qml" << "http://localhost:42332/ErrItem.qml:4:5: Fungus is not a type "; } @@ -1096,7 +1096,7 @@ QApplication::processEvents(); QCOMPARE(ic.openInputPanelReceived, true); ic.openInputPanelReceived = false; - QCOMPARE(view.inputContext(), &ic); + QCOMPARE(view.inputContext(), (QInputContext*)&ic); QVERIFY(view.testAttribute(Qt::WA_InputMethodEnabled)); // input method should be disabled if focus diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -98,6 +98,7 @@ void validators(); void inputMethods(); + void passwordCharacter(); void cursorDelegate(); void navigation(); void copyAndPaste(); @@ -193,7 +194,7 @@ QDeclarativeTextInput *textinputObject = qobject_cast(textinputComponent.create()); QVERIFY(textinputObject != 0); - int delta = abs(int(textinputObject->width()) - metricWidth); + int delta = abs(int(int(textinputObject->width()) - metricWidth)); QVERIFY(delta <= 3.0); // As best as we can hope for cross-platform. delete textinputObject; @@ -450,7 +451,7 @@ QFontMetrics fm(textinputObject->font()); int pos = textinputObject->positionAt(textinputObject->width()/2); - int diff = abs(fm.width(textinputObject->text()) - (fm.width(textinputObject->text().left(pos))+textinputObject->width()/2)); + int diff = abs(int(fm.width(textinputObject->text()) - (fm.width(textinputObject->text().left(pos))+textinputObject->width()/2))); // some tollerance for different fonts. #ifdef Q_OS_LINUX @@ -462,7 +463,7 @@ // Check without autoscroll... textinputObject->setAutoScroll(false); pos = textinputObject->positionAt(textinputObject->width()/2); - diff = abs(fm.width(textinputObject->text().left(pos))-textinputObject->width()/2); + diff = abs(int(fm.width(textinputObject->text().left(pos))-textinputObject->width()/2)); // some tollerance for different fonts. #ifdef Q_OS_LINUX @@ -741,9 +742,48 @@ textInput->paste(); QCOMPARE(textInput->text(), QString("Hello world!Hello world!")); QCOMPARE(textInput->text().length(), 24); + + // clear copy buffer + QClipboard *clipboard = QApplication::clipboard(); + QVERIFY(clipboard); + clipboard->clear(); + + // test that copy functionality is disabled + // when echo mode is set to hide text/password mode + int index = 0; + while (index < 4) { + QDeclarativeTextInput::EchoMode echoMode = QDeclarativeTextInput::EchoMode(index); + textInput->setEchoMode(echoMode); + textInput->setText("My password"); + textInput->select(0, textInput->text().length());; + textInput->copy(); + if (echoMode == QDeclarativeTextInput::Normal) { + QVERIFY(!clipboard->text().isEmpty()); + QCOMPARE(clipboard->text(), QString("My password")); + clipboard->clear(); + } else { + QVERIFY(clipboard->text().isEmpty()); + } + index++; + } #endif } +void tst_qdeclarativetextinput::passwordCharacter() +{ + QString componentStr = "import Qt 4.7\nTextInput { text: \"Hello world!\"; font.family: \"Helvetica\"; echoMode: TextInput.Password }"; + QDeclarativeComponent textInputComponent(&engine); + textInputComponent.setData(componentStr.toLatin1(), QUrl()); + QDeclarativeTextInput *textInput = qobject_cast(textInputComponent.create()); + QVERIFY(textInput != 0); + + textInput->setPasswordCharacter("X"); + QSize contentsSize = textInput->contentsSize(); + textInput->setPasswordCharacter("."); + // QTBUG-12383 content is updated and redrawn + QVERIFY(contentsSize != textInput->contentsSize()); +} + void tst_qdeclarativetextinput::cursorDelegate() { QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml"); @@ -998,7 +1038,7 @@ QApplication::processEvents(); QCOMPARE(ic.openInputPanelReceived, true); ic.openInputPanelReceived = false; - QCOMPARE(view.inputContext(), &ic); + QCOMPARE(view.inputContext(), (QInputContext*)&ic); QVERIFY(view.testAttribute(Qt::WA_InputMethodEnabled)); // input method should be disabled if focus diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp --- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -43,9 +43,11 @@ #include #include #include +#include #include #include "../../../shared/util.h" #include "qmlruntime.h" +#include "deviceorientation.h" #include "../../../shared/util.h" #ifdef Q_OS_SYMBIAN @@ -67,7 +69,7 @@ tst_QDeclarativeViewer(); private slots: - void orientation(); + void runtimeContextProperty(); void loading(); void fileBrowser(); void resizing(); @@ -94,7 +96,7 @@ QCOMPARE(viewer->size(), viewer->sizeHint()); \ } -void tst_QDeclarativeViewer::orientation() +void tst_QDeclarativeViewer::runtimeContextProperty() { QDeclarativeViewer *viewer = new QDeclarativeViewer(); QVERIFY(viewer); @@ -103,17 +105,30 @@ QVERIFY(viewer->menuBar()); QDeclarativeItem* rootItem = qobject_cast(viewer->view()->rootObject()); QVERIFY(rootItem); + QObject *runtimeObject = qvariant_cast(viewer->view()->engine()->rootContext()->contextProperty("runtime")); + QVERIFY(runtimeObject); + + // test isActiveWindow property + QVERIFY(!runtimeObject->property("isActiveWindow").toBool()); + viewer->show(); - QApplication::setActiveWindow(viewer); QTest::qWaitForWindowShown(viewer); QTRY_COMPARE(QApplication::activeWindow(), static_cast(viewer)); + QVERIFY(runtimeObject->property("isActiveWindow").toBool()); + TEST_INITIAL_SIZES(viewer); + // test orientation property + QCOMPARE(runtimeObject->property("orientation").toInt(), int(DeviceOrientation::Portrait)); + viewer->rotateOrientation(); qApp->processEvents(); + QCOMPARE(runtimeObject->property("orientation").toInt(), int(DeviceOrientation::Landscape)); + QCOMPARE(rootItem->width(), 300.0); + QCOMPARE(rootItem->width(), 300.0); QCOMPARE(rootItem->height(), 200.0); QTRY_COMPARE(viewer->view()->size(), QSize(300, 200)); @@ -124,6 +139,8 @@ viewer->rotateOrientation(); qApp->processEvents(); + QCOMPARE(runtimeObject->property("orientation").toInt(), int(DeviceOrientation::PortraitInverted)); + QCOMPARE(rootItem->width(), 200.0); QCOMPARE(rootItem->height(), 300.0); QTRY_COMPARE(viewer->view()->size(), QSize(200, 300)); @@ -131,6 +148,19 @@ QCOMPARE(viewer->size(), QSize(200, 300 + MENUBAR_HEIGHT(viewer))); QCOMPARE(viewer->size(), viewer->sizeHint()); + viewer->rotateOrientation(); + qApp->processEvents(); + + QCOMPARE(runtimeObject->property("orientation").toInt(), int(DeviceOrientation::LandscapeInverted)); + + viewer->rotateOrientation(); + qApp->processEvents(); + + QCOMPARE(runtimeObject->property("orientation").toInt(), int(DeviceOrientation::Portrait)); + + viewer->hide(); + QVERIFY(!runtimeObject->property("isActiveWindow").toBool()); + delete viewer; } diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativevisualdatamodel/data/datalist.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativevisualdatamodel/data/datalist.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,19 @@ +import Qt 4.7 + +ListView { + width: 100 + height: 100 + anchors.fill: parent + model: VisualDataModel { + id: visualModel + objectName: "visualModel" + model: myModel + delegate: Component { + Rectangle { + height: 25 + width: 100 + Text { objectName: "display"; text: display } + } + } + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp --- a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -83,6 +83,8 @@ private slots: void rootIndex(); + void updateLayout(); + void childChanged(); void objectListModel(); private: @@ -155,6 +157,100 @@ delete obj; } +void tst_qdeclarativevisualdatamodel::updateLayout() +{ + QDeclarativeView view; + + QStandardItemModel model; + initStandardTreeModel(&model); + + view.rootContext()->setContextProperty("myModel", &model); + + view.setSource(QUrl::fromLocalFile(SRCDIR "/data/datalist.qml")); + + QDeclarativeListView *listview = qobject_cast(view.rootObject()); + QVERIFY(listview != 0); + + QDeclarativeItem *contentItem = listview->contentItem(); + QVERIFY(contentItem != 0); + + QDeclarativeText *name = findItem(contentItem, "display", 0); + QVERIFY(name); + QCOMPARE(name->text(), QString("Row 1 Item")); + name = findItem(contentItem, "display", 1); + QVERIFY(name); + QCOMPARE(name->text(), QString("Row 2 Item")); + name = findItem(contentItem, "display", 2); + QVERIFY(name); + QCOMPARE(name->text(), QString("Row 3 Item")); + + model.invisibleRootItem()->sortChildren(0, Qt::DescendingOrder); + + name = findItem(contentItem, "display", 0); + QVERIFY(name); + QCOMPARE(name->text(), QString("Row 3 Item")); + name = findItem(contentItem, "display", 1); + QVERIFY(name); + QCOMPARE(name->text(), QString("Row 2 Item")); + name = findItem(contentItem, "display", 2); + QVERIFY(name); + QCOMPARE(name->text(), QString("Row 1 Item")); +} + +void tst_qdeclarativevisualdatamodel::childChanged() +{ + QDeclarativeView view; + + QStandardItemModel model; + initStandardTreeModel(&model); + + view.rootContext()->setContextProperty("myModel", &model); + + view.setSource(QUrl::fromLocalFile(SRCDIR "/data/datalist.qml")); + + QDeclarativeListView *listview = qobject_cast(view.rootObject()); + QVERIFY(listview != 0); + + QDeclarativeItem *contentItem = listview->contentItem(); + QVERIFY(contentItem != 0); + + QDeclarativeVisualDataModel *vdm = listview->findChild("visualModel"); + vdm->setRootIndex(QVariant::fromValue(model.indexFromItem(model.item(1,0)))); + + QDeclarativeText *name = findItem(contentItem, "display", 0); + QVERIFY(name); + QCOMPARE(name->text(), QString("Row 2 Child Item")); + + model.item(1,0)->child(0,0)->setText("Row 2 updated child"); + + name = findItem(contentItem, "display", 0); + QVERIFY(name); + QCOMPARE(name->text(), QString("Row 2 updated child")); + + model.item(1,0)->appendRow(new QStandardItem(QLatin1String("Row 2 Child Item 2"))); + QTest::qWait(300); + + name = findItem(contentItem, "display", 1); + QVERIFY(name != 0); + QCOMPARE(name->text(), QString("Row 2 Child Item 2")); + + model.item(1,0)->takeRow(1); + name = findItem(contentItem, "display", 1); + QVERIFY(name == 0); + + vdm->setRootIndex(QVariant::fromValue(QModelIndex())); + QTest::qWait(300); + name = findItem(contentItem, "display", 0); + QVERIFY(name); + QCOMPARE(name->text(), QString("Row 1 Item")); + name = findItem(contentItem, "display", 1); + QVERIFY(name); + QCOMPARE(name->text(), QString("Row 2 Item")); + name = findItem(contentItem, "display", 2); + QVERIFY(name); + QCOMPARE(name->text(), QString("Row 3 Item")); +} + void tst_qdeclarativevisualdatamodel::objectListModel() { QDeclarativeView view; diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativexmlhttprequest/data/utf16.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/utf16.html Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +უ Σ diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativexmlhttprequest/data/utf16.qml --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/utf16.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/utf16.qml Mon Oct 04 01:19:32 2010 +0300 @@ -3,13 +3,14 @@ QtObject { property bool dataOK: false + property string fileName property string responseText property string responseXmlRootNodeValue - Component.onCompleted: { + function startRequest() { var x = new XMLHttpRequest; - x.open("GET", "utf16.xml"); + x.open("GET", fileName); // Test to the end x.onreadystatechange = function() { diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp --- a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -104,6 +104,7 @@ void invalidMethodUsage(); void redirects(); void nonUtf8(); + void nonUtf8_data(); // Attributes void document(); @@ -919,26 +920,43 @@ void tst_qdeclarativexmlhttprequest::nonUtf8() { + QFETCH(QString, fileName); + QFETCH(QString, responseText); + QFETCH(QString, xmlRootNodeValue); + QDeclarativeComponent component(&engine, TEST_FILE("utf16.qml")); QObject *object = component.create(); QVERIFY(object != 0); + object->setProperty("fileName", fileName); + QMetaObject::invokeMethod(object, "startRequest"); + + TRY_WAIT(object->property("dataOK").toBool() == true); + + QCOMPARE(object->property("responseText").toString(), responseText); + + if (!xmlRootNodeValue.isEmpty()) { + QString rootNodeValue = object->property("responseXmlRootNodeValue").toString(); + QCOMPARE(rootNodeValue, xmlRootNodeValue); + } + + delete object; +} + +void tst_qdeclarativexmlhttprequest::nonUtf8_data() +{ + QTest::addColumn("fileName"); + QTest::addColumn("responseText"); + QTest::addColumn("xmlRootNodeValue"); + QString uc; uc.resize(3); uc[0] = QChar(0x10e3); uc[1] = QChar(' '); uc[2] = QChar(0x03a3); - QString xml = "\n\n" + uc + "\n\n"; - TRY_WAIT(object->property("dataOK").toBool() == true); - - QString responseText = object->property("responseText").toString(); - QCOMPARE(responseText, xml); - - QString responseXmlText = object->property("responseXmlRootNodeValue").toString(); - QCOMPARE(responseXmlText, '\n' + uc + '\n'); - - delete object; + QTest::newRow("responseText") << "utf16.html" << uc + '\n' << ""; + QTest::newRow("responseXML") << "utf16.xml" << "\n\n" + uc + "\n\n" << QString('\n' + uc + '\n'); } // Test that calling hte XMLHttpRequest methods on a non-XMLHttpRequest object diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp --- a/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -558,7 +558,7 @@ QVERIFY(prop1.isWritable()); QVERIFY(!prop1.isResettable()); QVERIFY(!prop1.isDesignable()); - QVERIFY(!prop1.isScriptable()); + QVERIFY(prop1.isScriptable()); QVERIFY(!prop1.isStored()); QVERIFY(!prop1.isEditable()); QVERIFY(!prop1.isUser()); @@ -577,7 +577,7 @@ QVERIFY(prop2.isWritable()); QVERIFY(!prop2.isResettable()); QVERIFY(!prop2.isDesignable()); - QVERIFY(!prop2.isScriptable()); + QVERIFY(prop2.isScriptable()); QVERIFY(!prop2.isStored()); QVERIFY(!prop2.isEditable()); QVERIFY(!prop2.isUser()); @@ -599,7 +599,7 @@ prop1.setWritable(false); prop1.setResettable(true); prop1.setDesignable(true); - prop1.setScriptable(true); + prop1.setScriptable(false); prop1.setStored(true); prop1.setEditable(true); prop1.setUser(true); @@ -614,7 +614,7 @@ QVERIFY(!prop1.isWritable()); QVERIFY(prop1.isResettable()); QVERIFY(prop1.isDesignable()); - QVERIFY(prop1.isScriptable()); + QVERIFY(!prop1.isScriptable()); QVERIFY(prop1.isStored()); QVERIFY(prop1.isEditable()); QVERIFY(prop1.isUser()); @@ -627,7 +627,7 @@ QCOMPARE(prop2.type(), QByteArray("int")); QVERIFY(!prop2.isResettable()); QVERIFY(!prop2.isDesignable()); - QVERIFY(!prop2.isScriptable()); + QVERIFY(prop2.isScriptable()); QVERIFY(!prop2.isStored()); QVERIFY(!prop2.isEditable()); QVERIFY(!prop2.isUser()); @@ -643,7 +643,7 @@ QCOMPARE(prop2.type(), QByteArray("int")); QVERIFY(!prop2.isResettable()); QVERIFY(!prop2.isDesignable()); - QVERIFY(!prop2.isScriptable()); + QVERIFY(prop2.isScriptable()); QVERIFY(!prop2.isStored()); QVERIFY(!prop2.isEditable()); QVERIFY(!prop2.isUser()); diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmlvisual/animation/qtbug13398/data/qtbug13398.0.png Binary file tests/auto/declarative/qmlvisual/animation/qtbug13398/data/qtbug13398.0.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmlvisual/animation/qtbug13398/data/qtbug13398.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qmlvisual/animation/qtbug13398/data/qtbug13398.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,447 @@ +import Qt.VisualTest 4.7 + +VisualTest { + Frame { + msec: 0 + } + Frame { + msec: 16 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 32 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 48 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 64 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 80 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 96 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 112 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 128 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 144 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 160 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 176 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 192 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 208 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 224 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 240 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 256 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 272 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 288 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 304 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 320 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 336 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 352 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 368 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 384 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 400 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 416 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 432 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 448 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 464 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 480 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 496 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Mouse { + type: 2 + button: 1 + buttons: 1 + x: 220; y: 270 + modifiers: 0 + sendToViewport: true + } + Frame { + msec: 512 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 528 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 544 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 560 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 576 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 220; y: 271 + modifiers: 0 + sendToViewport: true + } + Mouse { + type: 3 + button: 1 + buttons: 0 + x: 220; y: 271 + modifiers: 0 + sendToViewport: true + } + Frame { + msec: 592 + hash: "2452007928bf86b9c42e666c7a7afc89" + } + Frame { + msec: 608 + hash: "96e8e81d61bffe02b8f41f47a4a7e8fc" + } + Frame { + msec: 624 + hash: "75881a2779bd7d7f683f87c4a7393769" + } + Frame { + msec: 640 + hash: "2ef628328d2a6393095e78db80b0513f" + } + Frame { + msec: 656 + hash: "390926f2c2c27dfa10c9b393ee466ce6" + } + Frame { + msec: 672 + hash: "ea07d93e7d8a53f56cff19d9d3b282a4" + } + Frame { + msec: 688 + hash: "8aa6be919b1ef4b7e102a319a453707e" + } + Frame { + msec: 704 + hash: "6ebc518fb53ffe42fca20b9f16a21b36" + } + Frame { + msec: 720 + hash: "ee7a93b157e24e22efa84604e7e44fe6" + } + Frame { + msec: 736 + hash: "de3bf8f67e51b036db4976fd3b4b6c3c" + } + Frame { + msec: 752 + hash: "648be4298ebe3bbc7e5c4a4c9c46f193" + } + Frame { + msec: 768 + hash: "1ccf3b73e22a4b98ce1df098af9466f2" + } + Frame { + msec: 784 + hash: "73a2fb047728b2b8e613f0fb8dfe429d" + } + Frame { + msec: 800 + hash: "bbb4cabec4b98ea8ca94dff91a0d8c99" + } + Frame { + msec: 816 + hash: "3337e86bd9fcfbce939389928fb1fb72" + } + Frame { + msec: 832 + hash: "cb4a2a330e8470c61de9e9b6d2dc4597" + } + Frame { + msec: 848 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 864 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 880 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 896 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 912 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 928 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 944 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 960 + image: "qtbug13398.0.png" + } + Frame { + msec: 976 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 992 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1008 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1024 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1040 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1056 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1072 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1088 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1104 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1120 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1136 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1152 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1168 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1184 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1200 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1216 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1232 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Mouse { + type: 2 + button: 1 + buttons: 1 + x: 220; y: 271 + modifiers: 0 + sendToViewport: true + } + Frame { + msec: 1248 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1264 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1280 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1296 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1312 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1328 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Mouse { + type: 3 + button: 1 + buttons: 0 + x: 220; y: 271 + modifiers: 0 + sendToViewport: true + } + Frame { + msec: 1344 + hash: "e09a359578935b988ac1cc8c40b25547" + } + Frame { + msec: 1360 + hash: "697a4fd182ff90cd557f224174bad43a" + } + Frame { + msec: 1376 + hash: "99e5ca9a77df1acfed628f31b9050179" + } + Frame { + msec: 1392 + hash: "1f0dc00d3e3536b40a6becf775b31cee" + } + Frame { + msec: 1408 + hash: "5b81ddd35d74be222bc8a40d2573884b" + } + Frame { + msec: 1424 + hash: "4e236f5de69048e87add0e4380f2c3e6" + } + Frame { + msec: 1440 + hash: "a901c9c0c77e03d98a2b95267cca8514" + } + Frame { + msec: 1456 + hash: "78bbdf6781c2968c67982ffdb747dbbe" + } + Frame { + msec: 1472 + hash: "a245ca593649f60980be982eb8fda57e" + } + Frame { + msec: 1488 + hash: "c27fddc147749da24eaeb92aeaf61738" + } + Frame { + msec: 1504 + hash: "b9674af46b618dc1eedabd4f18253b11" + } + Frame { + msec: 1520 + hash: "8ae3c0cc0888fd0a607bc5b537a9ce0a" + } + Frame { + msec: 1536 + hash: "f1981bd3fb08233622a4078e2f717011" + } + Frame { + msec: 1552 + hash: "4dce834c9e3988fe535391fedc942add" + } + Frame { + msec: 1568 + hash: "ca7356dee61e156d04b0b46ea033498e" + } + Frame { + msec: 1584 + hash: "97499f6e04cbe690bc12458aef4b66a5" + } + Frame { + msec: 1600 + hash: "2452007928bf86b9c42e666c7a7afc89" + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmlvisual/animation/qtbug13398/qtbug13398.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/declarative/qmlvisual/animation/qtbug13398/qtbug13398.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,68 @@ +import Qt 4.7 + +Item { + width: 300 + height: 400 + + Rectangle { + id: root + color: "darkkhaki" + + x: 50 + y: 50 + + width: 200 + height: 300 + + Rectangle { + id: statusbar + color: "chocolate" + + height: 30 + + anchors.top: root.top + anchors.left: root.left + anchors.right: root.right + } + + Rectangle { + id: titlebar + color: "crimson" + + height: 60 + + anchors.top: statusbar.bottom + anchors.left: root.left + anchors.right: root.right + } + + MouseArea { + anchors.fill: parent + onClicked: { + root.state = root.state ? "" : "fullscreen"; + } + } + + states: [ + State { + name: "fullscreen" + AnchorChanges { + target: statusbar + anchors.top: undefined + anchors.bottom: titlebar.top + } + AnchorChanges { + target: titlebar + anchors.top: undefined + anchors.bottom: root.top + } + } + ] + + transitions: [ + Transition { + AnchorAnimation { } + } + ] + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.0.png Binary file tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.0.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.1.png Binary file tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.1.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.2.png Binary file tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.2.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.3.png Binary file tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.3.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.4.png Binary file tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.4.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.5.png Binary file tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.5.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.qml --- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.qml Mon Oct 04 01:19:32 2010 +0300 @@ -6,409 +6,289 @@ } Frame { msec: 16 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 32 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 48 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 64 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 80 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 96 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 112 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 128 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 144 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 160 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 176 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 192 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 208 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 224 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 240 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 256 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 272 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 288 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 304 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 320 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 336 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 352 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 368 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 384 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 400 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 416 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 432 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 448 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 464 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 480 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 496 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 512 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 528 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 544 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 560 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 576 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 592 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 608 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 624 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 640 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 656 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 672 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 688 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 704 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 720 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 736 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 752 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 768 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 784 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 800 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 816 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 832 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 848 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 864 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 880 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" } Frame { msec: 896 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "01b9c877f51b878ed262943aedcf89b4" + } + Mouse { + type: 2 + button: 1 + buttons: 1 + x: 623; y: 222 + modifiers: 0 + sendToViewport: true + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 621; y: 222 + modifiers: 0 + sendToViewport: true } Frame { msec: 912 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "1c2d4a99e7e2f5e945c05857d6a463a2" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 609; y: 230 + modifiers: 0 + sendToViewport: true } Frame { msec: 928 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "d69c0678ce2025a8921b089311d219ea" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 583; y: 248 + modifiers: 0 + sendToViewport: true } Frame { msec: 944 - hash: "89bb697bb7b7fab38d3ff56e23e43959" + hash: "55a852b268151d660e4945da88b04022" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 559; y: 258 + modifiers: 0 + sendToViewport: true } Frame { msec: 960 image: "test-pathview.0.png" } - Frame { - msec: 976 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Frame { - msec: 992 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Frame { - msec: 1008 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Frame { - msec: 1024 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Frame { - msec: 1040 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Frame { - msec: 1056 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Frame { - msec: 1072 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Frame { - msec: 1088 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Frame { - msec: 1104 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Frame { - msec: 1120 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Frame { - msec: 1136 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Mouse { - type: 2 - button: 1 - buttons: 1 - x: 734; y: 177 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 1152 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Frame { - msec: 1168 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 732; y: 177 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 1184 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } Mouse { type: 5 button: 0 buttons: 1 - x: 726; y: 179 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 1200 - hash: "89bb697bb7b7fab38d3ff56e23e43959" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 716; y: 183 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 1216 - hash: "42c141399fda1cbb2ae117788d87092a" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 700; y: 190 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 1232 - hash: "4d44343eb91838e3eb73e2e5326b5ac2" - } - Frame { - msec: 1248 - hash: "4d44343eb91838e3eb73e2e5326b5ac2" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 677; y: 200 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 1264 - hash: "15aaccb4f7961a4e3e6fe57260779d00" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 651; y: 209 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 1280 - hash: "5628fa3ac9893f5c9690013aad4b881a" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 619; y: 219 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 1296 - hash: "384db58b6de773ac39ae81e6af4d547d" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 579; y: 229 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 1312 - hash: "2a15a27a138b9d3d646b827d026e8843" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 535; y: 237 + x: 547; y: 264 modifiers: 0 sendToViewport: true } @@ -416,157 +296,341 @@ type: 3 button: 1 buttons: 0 - x: 535; y: 237 + x: 547; y: 264 + modifiers: 0 + sendToViewport: true + } + Frame { + msec: 976 + hash: "55ab61911405e762b39b38d1371ef845" + } + Frame { + msec: 992 + hash: "be3de45165f2f0916f734fecf3f48c47" + } + Frame { + msec: 1008 + hash: "0a523daec6b591a2b5030c6c0b95cb24" + } + Frame { + msec: 1024 + hash: "22da168e523fa385cce1f2e6a05e1332" + } + Frame { + msec: 1040 + hash: "464cb37780cf126df6dad4169445c7bc" + } + Frame { + msec: 1056 + hash: "666b06a0fbe2d10fbf3e15883a166c60" + } + Frame { + msec: 1072 + hash: "223732cd526e09155ca99c80780bc3fa" + } + Frame { + msec: 1088 + hash: "c74cc48188b05c5426a6b955ed9f09a3" + } + Frame { + msec: 1104 + hash: "8d09a95ab09f87277fcc727e9c5da0fb" + } + Frame { + msec: 1120 + hash: "71b7d4ec45270158ba4ca96817d8f231" + } + Frame { + msec: 1136 + hash: "4847a1e7d792ed58e3476112b02c6fab" + } + Frame { + msec: 1152 + hash: "ef444a3a960bdc176e004b949e5c89ce" + } + Frame { + msec: 1168 + hash: "1ebf4badb7f4ef3938868a74740fcbce" + } + Frame { + msec: 1184 + hash: "022918cd4b54750b0ad28bcb00108f51" + } + Frame { + msec: 1200 + hash: "1ea398b2b7c52b35981c98b60d5d7a02" + } + Frame { + msec: 1216 + hash: "05d7619ed0154fa414686522a7ca86c4" + } + Frame { + msec: 1232 + hash: "03274e26ea57d1264f21d306533476ef" + } + Frame { + msec: 1248 + hash: "5109372d6c62225aaf971aa53c708bee" + } + Frame { + msec: 1264 + hash: "71f10446437963eccb87dd40c172118f" + } + Mouse { + type: 2 + button: 1 + buttons: 1 + x: 708; y: 240 + modifiers: 0 + sendToViewport: true + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 707; y: 240 + modifiers: 0 + sendToViewport: true + } + Frame { + msec: 1280 + hash: "e47426491548162622f9a281c3d062ec" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 685; y: 252 + modifiers: 0 + sendToViewport: true + } + Frame { + msec: 1296 + hash: "e889fba64d9f94fe18c3750dd6ad9d00" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 635; y: 264 + modifiers: 0 + sendToViewport: true + } + Frame { + msec: 1312 + hash: "7fe200757a6bf752906d195fe341be14" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 569; y: 280 modifiers: 0 sendToViewport: true } Frame { msec: 1328 - hash: "098176f48a148eb2bc5ef67c307baa1c" + hash: "aa1f4147dc3fd66f6d9e2605d0759951" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 533; y: 294 + modifiers: 0 + sendToViewport: true + } + Mouse { + type: 3 + button: 1 + buttons: 0 + x: 533; y: 294 + modifiers: 0 + sendToViewport: true } Frame { msec: 1344 - hash: "f838ab4301bf9d3106cec529f855cecd" + hash: "2b7163ea45860cf81f208c2b68c418b5" } Frame { msec: 1360 - hash: "9725322067a04f83717b059d4970d610" + hash: "a89bd1204fb17d9d8ce7b7f4279e9b1f" } Frame { msec: 1376 - hash: "3605cfbebc3a9eb4460efb2d4b9b6da2" + hash: "683e52637fd5d96ded35f5ade9679822" } Frame { msec: 1392 - hash: "4503a368d8db25d112503dbc3934541d" + hash: "2aa16f06e8bed201746558b1003f7d63" } Frame { msec: 1408 - hash: "80894cc06c82264bf527398ea235da12" + hash: "f2e40e75ddb8004917ae5b8cf144a322" } Frame { msec: 1424 - hash: "d4f9b90f886fc667309b33c9a296410c" + hash: "0f7f64373b065a454c02c32c52a5ef79" } Frame { msec: 1440 - hash: "889d01025cff679b61bff182a1ac9cbc" + hash: "fb4fbd2b3696bfb6135797b1f0158b5c" } Frame { msec: 1456 - hash: "6147bc4455e7cb5ae55cd47be8dc4ad6" + hash: "7a8eafad65ff191a97dcf910393ba4e4" } Frame { msec: 1472 - hash: "ddd10a294eb6b19698c4e9fe4f1508fe" + hash: "3362deae62ba96853d85827f21cec589" } Frame { msec: 1488 - hash: "748e8d9c1971f6258acee5133b7f114b" + hash: "0653838fa3fb5b32e561adc20becc9d2" } Frame { msec: 1504 - hash: "1ef3f32ec9ef950588266bacbe3554a0" + hash: "482e78e6b54cabe007f7e7f4f27a07ee" } Frame { msec: 1520 - hash: "57853ff47b65aba9e76f90b2efec4f8f" + hash: "b51f60864896808c6e41d8a0a990676d" } Frame { msec: 1536 - hash: "3985fea21d89d223c1461d5e96364c76" + hash: "d77e59d69b7c21c82bce9a25d548358c" } Frame { msec: 1552 - hash: "cb5f6a3caeeaed12e91efe43867f2c1f" + hash: "b3dddbb1eee0e2f222434511073c4620" } Frame { msec: 1568 - hash: "cdd4176776d5969373e0fc9a117e3c87" + hash: "d5e0d191582291b269b9e93241d9ac03" + } + Mouse { + type: 2 + button: 1 + buttons: 1 + x: 637; y: 218 + modifiers: 0 + sendToViewport: true + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 621; y: 240 + modifiers: 0 + sendToViewport: true + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 613; y: 248 + modifiers: 0 + sendToViewport: true } Frame { msec: 1584 - hash: "3bac2e7506472db2ae11734240f1c3f4" + hash: "8c12000da88abb70cbc370d2a2ca21d7" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 551; y: 288 + modifiers: 0 + sendToViewport: true + } + Mouse { + type: 3 + button: 1 + buttons: 0 + x: 551; y: 288 + modifiers: 0 + sendToViewport: true } Frame { msec: 1600 - hash: "bb572659d79ebda7134c039e40cf2633" + hash: "2854533fd50f5ebb8fc43cf0041883e4" } Frame { msec: 1616 - hash: "e610181bfa17a85281f9c7417088f04f" + hash: "0b3782e842a6c54585d6a266314025d8" } Frame { msec: 1632 - hash: "eb23ff021909589b6d8ce47ebff2c3ed" + hash: "02409885b82ebac931df18d8e23238d7" } Frame { msec: 1648 - hash: "c321dda3878c4b97cc63246c47368224" + hash: "edcbd91ad267c125c431367be3e4a8a3" } Frame { msec: 1664 - hash: "6a65cdfd50e1455356040d4cbc09905e" + hash: "47641fd7ec919b3c041c5acc04b0d083" } Frame { msec: 1680 - hash: "f2a44b12e4e5bae8283c4d227949e4e8" + hash: "ea8f026fee0fba2c27a8df1e1e531acb" } Frame { msec: 1696 - hash: "55418d661f3257b5b79a7dbb172b5b70" + hash: "e2e8a398760be380f9b2b7dbcb03c0e8" } Frame { msec: 1712 - hash: "483d7111c86951918746d6ebe0dd9655" + hash: "a1767f2e10f9ab87050ef246a4a29bbb" } Frame { msec: 1728 - hash: "85c83ac3a294a9320bb04a6721ecf7d5" + hash: "f60cccf793bd6d356d69b1394638a201" } Frame { msec: 1744 - hash: "0d658b897b8e03397ddd8ffe475c2fc0" + hash: "31dc8c50a99164c19445a089223c8813" } Frame { msec: 1760 - hash: "6ed9d7ea344b3c1b1d9196ee36b2f89a" + hash: "78ff726b7da5ba03fa74f66b39bf1006" } Frame { msec: 1776 - hash: "6a1e7f6c03769c2c88e6343fb6c1a2a4" + hash: "6f8a540dccf7182f6aed8903a0afb109" } Frame { msec: 1792 - hash: "9dc51f46e072eac4494d7318f2ecb39b" + hash: "c914c500507b9c7180dcf25e985135e9" } Frame { msec: 1808 - hash: "59e833981c3fcd8a71f4a16d1c454b3a" + hash: "39702ce38bcfca46ef3a8dbb7299c725" } Frame { msec: 1824 - hash: "29b953efdda00548d8cf6fb49fa60d13" + hash: "969b71ee88a1d244e62af1cecc105234" } Frame { msec: 1840 - hash: "fd4611f703f94ebefcc64781993ca85c" + hash: "11c8397fb9d7b993761b08ba8c9958e5" } Frame { msec: 1856 - hash: "aa4789ede618963157b40f099ce84987" + hash: "79ad4a90ab449e3232db993b30786d89" } Frame { msec: 1872 - hash: "8a326b46ec536a67626ee2d2bc06aa9f" + hash: "daf979fd50e0860bf30f377a059d89dc" } Frame { msec: 1888 - hash: "011ff557672d47591e4f0f5c5ee418f1" + hash: "5412e7524dc22e8064c8a8c684092802" } Frame { msec: 1904 - hash: "d72fba857bdc128ddcb5971b86aadcb2" + hash: "2c3bea8bf10ecf6c19b93e94cb7ac0ea" } Frame { msec: 1920 @@ -574,807 +638,919 @@ } Frame { msec: 1936 - hash: "49182b7ae9ef5fb4b9234969abd05960" + hash: "bbfa2f8aaab0abaff9d771d5ec546d96" } Frame { msec: 1952 - hash: "53de60f682574b7a9e6ffaee175fc9ff" + hash: "be2811bf369bc9dd8c5d9deec3b84788" } Frame { msec: 1968 - hash: "2de74fe5b8848c5c781b796146871f45" + hash: "779838915f48eb917d36c3f2b65eedae" + } + Mouse { + type: 2 + button: 1 + buttons: 1 + x: 595; y: 236 + modifiers: 0 + sendToViewport: true + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 565; y: 256 + modifiers: 0 + sendToViewport: true } Frame { msec: 1984 - hash: "33c87146d8c24dd9c2271d16a8ff5b53" + hash: "d20b5fe14b47dfb1e73f8ef44802da11" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 507; y: 286 + modifiers: 0 + sendToViewport: true } Frame { msec: 2000 - hash: "fdb29214e20d744d9776907061f50358" + hash: "5312dd1f9d309ab5134b8bb67685488e" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 461; y: 288 + modifiers: 0 + sendToViewport: true + } + Mouse { + type: 3 + button: 1 + buttons: 0 + x: 461; y: 288 + modifiers: 0 + sendToViewport: true } Frame { msec: 2016 - hash: "8c7c920416c9b775e790e6da24c32927" + hash: "8d6b6cbb74cc654bc5aff10a807dd3cb" } Frame { msec: 2032 - hash: "86b456059e4701379447fffaf9e072f0" + hash: "dee717869177d1de4a26599b120f1c3d" } Frame { msec: 2048 - hash: "f92cc485ee03ef5bce3c4cdc35e00318" + hash: "2b2c60f42024784ceed5c68505dfa5ca" } Frame { msec: 2064 - hash: "2fad58883cb20273cfd79ebca345a66d" + hash: "1a6a108fd6cf607ec08dbedd804d12f7" } Frame { msec: 2080 - hash: "84505ebbc6e12817f11f64aa6f61a0bf" + hash: "10bc4d0a1dc400fedc9a68b68c6525fd" } Frame { msec: 2096 - hash: "ded83cacb89838cc0f3ba14bcc69b66b" + hash: "dc6a4abfbfb38e90af2308320d0f795b" } Frame { msec: 2112 - hash: "5bb37e75bb45eaa6067c604b83ae13d7" + hash: "82c61d8461001c19af7c2b458d427e0b" } Frame { msec: 2128 - hash: "4ee9e4c90c40dbc25a0ce884d9c2c37f" + hash: "e455d9ccffedaa708532bb69ad15871e" } Frame { msec: 2144 - hash: "cb7148ff6f611038c29af36c8552b8c2" + hash: "b9c6169ad08724fc70df30668dfe7509" } Frame { msec: 2160 - hash: "a591d8cb42570272dd264d5f1ce595ab" + hash: "a3fe5862be470470854d4157c1c027db" } Frame { msec: 2176 - hash: "4e61657405d32dbcd39d3637f8af0958" + hash: "6a3804bd5f4fd5f1c424615ceb620525" } Frame { msec: 2192 - hash: "9c7c1411dd5d3c1c8fb78e63e14061fe" + hash: "df0d72248310654a9cf47e707fe9e414" } Frame { msec: 2208 - hash: "ae83a37e99b578fa0872ed6bc2776bc0" + hash: "beb19f2b2979ab40b5ccf8c0fbe9b72f" } Frame { msec: 2224 - hash: "e8cb5a8a40c1e78c87c616f77d8de270" + hash: "be3449b49048b764bea68a76baa0fc75" } Frame { msec: 2240 - hash: "9df093e4bcfa32be5924a0ca70bdaa3b" + hash: "4a615cae9c8f85e7b8aecd4c9014f1eb" } Frame { msec: 2256 - hash: "40c358066d508143bee1446d12fe7b89" + hash: "b3c274f1a9d65684c0a55a544bf77810" } Frame { msec: 2272 - hash: "a929ed6efc7fc68b38635f3c74242f52" + hash: "31456b01fcfb60a77d2b9662c2fff7b6" } Frame { msec: 2288 - hash: "86ff721a3178b689ea47b6bc274a2b41" + hash: "2be5cf3f6158bf09659acc68b134846f" } Frame { msec: 2304 - hash: "ed1f680f6d05f54ceb75c9bae3a0716a" + hash: "5f9c725a11305f3e6c48ab332faabf50" } Frame { msec: 2320 - hash: "3f09a565df2beb51f366a1b3fb6adfe9" + hash: "277c2733c7245d045665198984b74224" } Frame { msec: 2336 - hash: "13468347bd26bab60f1db826fb17631c" + hash: "265b8342bc747fb43a5291df0f4ce48b" } Frame { msec: 2352 - hash: "9f7d085fea5788a457098973f17c36cb" + hash: "803b49ec31955b481009a51c64bcce65" } Frame { msec: 2368 - hash: "4114b93246155b3434200831b2995330" + hash: "a717b30ad50746cdf0fae82212ac88f0" } Frame { msec: 2384 - hash: "487171bd1430f74e3d51b5e215c34b5c" + hash: "65f46c8e69f24d060b5da6f866867f51" } Frame { msec: 2400 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "52f9e5d1106d00a950470076a50e4239" } Frame { msec: 2416 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "058a787aae2845308e68bb93f6a811e4" } Frame { msec: 2432 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "621985111c25994c0c0fe3635be67c1d" } Frame { msec: 2448 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2949b8185cefbaaf587a043d805cc670" } Frame { msec: 2464 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "d4a03127ae5047184c736617deeac92d" } Frame { msec: 2480 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "876c6c5ac4500de6234423bf6f3511d6" } Frame { msec: 2496 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "eb08aa172cfbdb696b6f672dfa7b6fff" } Frame { msec: 2512 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "a60c13b8f46faa0a35dbb539010550d4" } Frame { msec: 2528 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "c6f8786506e0326a5734ab8aea782f95" } Frame { msec: 2544 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "a49927f2aae24e692fc379f0ab6f4ee9" } Frame { msec: 2560 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2f1a2d50e1090b34ad1ea6a36eec4fe0" } Frame { msec: 2576 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "a5ee24d37be960a88684748b73dc75fe" } Frame { msec: 2592 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "28682389395b47ae33ceec1ba3beef4e" } Frame { msec: 2608 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "1869667b50b76d99716dd0d7849901fa" } Frame { msec: 2624 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2806ee1005193f55825aa6147583985f" } Frame { msec: 2640 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "c00589dce90e3ab2f2c8890f30f80d3d" } Frame { msec: 2656 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "1f1881f0a29525e380ecbcce15499fa4" } Frame { msec: 2672 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2a4c3ff764545a3899c864680f22f0a3" } Frame { msec: 2688 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2704 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2720 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2736 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2752 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2768 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2784 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2800 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2816 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2832 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2848 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2864 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" + hash: "2685820514ce5d5729f3761b1eaa1682" } Frame { msec: 2880 image: "test-pathview.2.png" } - Frame { - msec: 2896 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 2912 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 2928 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 2944 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 2960 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 2976 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 2992 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 3008 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 3024 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 3040 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 3056 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 3072 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 3088 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } Mouse { type: 2 button: 1 buttons: 1 - x: 728; y: 181 + x: 310; y: 277 modifiers: 0 sendToViewport: true } - Frame { - msec: 3104 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 3120 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Frame { - msec: 3136 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } Mouse { type: 5 button: 0 buttons: 1 - x: 727; y: 181 + x: 324; y: 279 modifiers: 0 sendToViewport: true } Frame { - msec: 3152 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 723; y: 181 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 3168 - hash: "7ba9783ce63db6ad6b5f725a4ecd4eb8" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 717; y: 184 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 3184 - hash: "6dcec6cdaa35eba74607ba64d6ea2ec0" + msec: 2896 + hash: "ce00c77e8ff1768b41f5585344af1c58" } Mouse { type: 5 button: 0 buttons: 1 - x: 705; y: 188 + x: 330; y: 281 modifiers: 0 sendToViewport: true } Frame { - msec: 3200 - hash: "16b7b4847fe86b25d8d6136106a4c400" + msec: 2912 + hash: "24f401275fa6ec7d26234609792fe0b8" } Mouse { type: 5 button: 0 buttons: 1 - x: 686; y: 197 + x: 346; y: 283 modifiers: 0 sendToViewport: true } Frame { - msec: 3216 - hash: "d946d55b19c99fa25bf1c04f2b71026a" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 661; y: 207 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 3232 - hash: "96f40f5071365cde769c733fd1ef5a24" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 626; y: 221 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 3248 - hash: "7004058b95b7eab3ebba5c80c0923982" + msec: 2928 + hash: "d3c74863c627a1b922a6b6c4a24f8c40" } Mouse { type: 5 button: 0 buttons: 1 - x: 582; y: 235 + x: 358; y: 285 modifiers: 0 sendToViewport: true } - Frame { - msec: 3264 - hash: "2c78880237c414182f97f1709f1eef0f" - } - Mouse { - type: 5 - button: 0 - buttons: 1 - x: 532; y: 246 - modifiers: 0 - sendToViewport: true - } - Frame { - msec: 3280 - hash: "c90a15ec9f88008ca8b0ec0185444d71" - } Mouse { type: 3 button: 1 buttons: 0 - x: 532; y: 246 + x: 358; y: 285 modifiers: 0 sendToViewport: true } Frame { + msec: 2944 + hash: "64a3209e6adc737065e5d5c3202a7283" + } + Frame { + msec: 2960 + hash: "cf936ffe4330edefddb31c59368491fc" + } + Frame { + msec: 2976 + hash: "a67213db044bb876f737cd355fe54444" + } + Frame { + msec: 2992 + hash: "0f9e97057cbbd8071e0f5f61318bdf9c" + } + Frame { + msec: 3008 + hash: "c5f38d334df86ebb6ac4600c83eced20" + } + Frame { + msec: 3024 + hash: "6d8e6049a36eac4136dbdb5fb18d0650" + } + Frame { + msec: 3040 + hash: "8ee97cff4a632e6e297bd3bdac27b8d4" + } + Frame { + msec: 3056 + hash: "aca1fcd005d211d35245e64a44002c01" + } + Frame { + msec: 3072 + hash: "7076180bf0eb14a5e733be9320f1f009" + } + Frame { + msec: 3088 + hash: "e0a0545b3a0b6a0b07d3fa987e1d58b6" + } + Frame { + msec: 3104 + hash: "0294b098ce7f0d381542776320e52d2e" + } + Frame { + msec: 3120 + hash: "36f8bcc42add38fe149e34a703cf8a02" + } + Frame { + msec: 3136 + hash: "631426bde50fd35d1da1c30d9878253e" + } + Frame { + msec: 3152 + hash: "a4d64c9d378138bedf63389e58d8f1d6" + } + Frame { + msec: 3168 + hash: "17fdf61bffd947c2e9898f5c4517fdf8" + } + Frame { + msec: 3184 + hash: "653b8c7a55bc4ca763238098711eafa1" + } + Frame { + msec: 3200 + hash: "89e15b3ee1b1fc945801e08cfcdba62c" + } + Frame { + msec: 3216 + hash: "7ea615af67336895e6cee6d3a39ff7de" + } + Frame { + msec: 3232 + hash: "88faee45db80f04ef1120c35057a5f7d" + } + Frame { + msec: 3248 + hash: "8cfe34047b29ac85e58d55e0f6e0b195" + } + Frame { + msec: 3264 + hash: "39255546502fcb882005fe4c38c21fb0" + } + Frame { + msec: 3280 + hash: "6bf7a959a05fc27f651b2a3ba07de30d" + } + Frame { msec: 3296 - hash: "c90a15ec9f88008ca8b0ec0185444d71" + hash: "c2c61cb8dbbbd38827277ab32579c6da" } Frame { msec: 3312 - hash: "36461e2a4cd860cac32223b8ee73c657" + hash: "ff370d4b4e44c4cbacca96107105df21" } Frame { msec: 3328 - hash: "5f9b3ad9202fb02a4c6fea28c248ad22" + hash: "ccadd9e070d54de21c76397d18ad3de8" } Frame { msec: 3344 - hash: "d0d23c4e1ddb2d9ffa0ecc38030ae15c" + hash: "6302c39de00070b0a23f9dc87f74dd8d" } Frame { msec: 3360 - hash: "8e2e2d3eaf557c453f34016b6614e495" + hash: "7ab69e6d9809c78dc723609bd2761206" } Frame { msec: 3376 - hash: "7402c747fa7276293a0a72d48d342782" + hash: "c429cc724b39891805cf4c1448de60b3" } Frame { msec: 3392 - hash: "6090c30e4d722a32c083a25171fb11ff" + hash: "396ddf0b01e9fe7c2bfb220e64a0c7ec" } Frame { msec: 3408 - hash: "f770d940cf287fec4b0803f7310292a8" + hash: "7a519a4efeecef5e7623a270e458fb13" } Frame { msec: 3424 - hash: "558e4ce32df69357b70a8285b00fe347" + hash: "869d174a939e0638a1a22d5c8a010c14" } Frame { msec: 3440 - hash: "8814168503c9a72ea8d3fa1e503f33d9" + hash: "9ecd2cf4e3b42ff93bcbf4db9829666c" } Frame { msec: 3456 - hash: "6f5513d22e545096fadc6f5c4112902e" + hash: "b06b58b250d3df365806a3f8991d57f3" } Frame { msec: 3472 - hash: "43f11d8ac16fd3e8199e555528817e14" + hash: "7a6fb03feb2ae0af1f143daedd22a88b" } Frame { msec: 3488 - hash: "d64bafdbd26878a323dae918d5e0a36d" + hash: "e9fe338dbe7afb69f3870743b0a18805" } Frame { msec: 3504 - hash: "1c70bdddfc3751ae3864f008170f8b06" + hash: "04b8def2085e9ce4065b02b938915557" } Frame { msec: 3520 - hash: "bb7a18691fcd371e9d382b5bba4a0573" + hash: "7e6942f72012875ba83a1c9121e1f786" } Frame { msec: 3536 - hash: "547e15f5dea2d9aa3ed44640b25028b9" + hash: "291e2d79a79959d9c8c586b6bdc31689" } Frame { msec: 3552 - hash: "c11b86a256fac6be10b9a54564903d6f" + hash: "e490bc7fd92f486b964cca967bd33b38" } Frame { msec: 3568 - hash: "0ada2dc586894d5e37de2632d2b37b15" + hash: "0c9858e0445e25d2b12c84801de441cb" } Frame { msec: 3584 - hash: "0ae1a39ea196a0e734d80dbdea67b285" + hash: "72ba7a4aacb150e1e9c6de72cff82258" } Frame { msec: 3600 - hash: "3cb70e64f9ab8aad841326dc2d2f1615" + hash: "1daca95256842545a5b77bcc46782478" } Frame { msec: 3616 - hash: "a8f8b5ff19df9163ea628b589b675a5e" + hash: "869f3d16e203ad47f1ae7ca83e369b75" } Frame { msec: 3632 - hash: "26fcc73f477db0ea731bc18b00b4c791" + hash: "9cc9cb20aab3369f4e3c5259d291708c" } Frame { msec: 3648 - hash: "8702e49f3f26e1e21970e78c8aa4040a" + hash: "a507b957bab3efe2023a65f8c8b3540a" } Frame { msec: 3664 - hash: "1a482a39d02779d8733e348b713f2312" + hash: "9fce2a6cddd8b06a80ce16599b56caa6" } Frame { msec: 3680 - hash: "c728cc4a8e4d0a8d983514f86a92eae0" + hash: "2f85d3064968e3e7b669f733fad58459" } Frame { msec: 3696 - hash: "82360ab373b08bf6a5d9e9ea9d0d18aa" + hash: "6dd6fad85dc5317a22a05a8486317767" } Frame { msec: 3712 - hash: "6231a4bce6cfc1e26a9606cc041acdbc" + hash: "b0faa2ec225cd96fb6d2fd05dc66bed1" } Frame { msec: 3728 - hash: "6e3b48862fc749f15aa2dec1c17d1de0" + hash: "3188219f095c2a9ac7c0f6034463d769" } Frame { msec: 3744 - hash: "6c9e79a5692a3810b2a9058790f54cd7" + hash: "b269e9fe4d14537c8bef0b66effe7319" } Frame { msec: 3760 - hash: "0652c67fedda0d5e55858ddefff2da9e" + hash: "b269e9fe4d14537c8bef0b66effe7319" } Frame { msec: 3776 - hash: "3b058c0efeb3a9da54a1de72a1792a83" + hash: "b269e9fe4d14537c8bef0b66effe7319" } Frame { msec: 3792 - hash: "96e6fb39c8dbfe4a00bf116bf80aac4d" + hash: "b269e9fe4d14537c8bef0b66effe7319" + } + Mouse { + type: 2 + button: 1 + buttons: 1 + x: 174; y: 234 + modifiers: 0 + sendToViewport: true } Frame { msec: 3808 - hash: "979c0c78c41e0f337cfe1b384fbbe51a" + hash: "9480eb8761d4ce90971903fcfab1e09e" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 176; y: 236 + modifiers: 0 + sendToViewport: true } Frame { msec: 3824 - hash: "8be0d6987a6d12864f30336b249e4b16" + hash: "30a6ac631e1a3433f252f56ee4337cdc" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 179; y: 238 + modifiers: 0 + sendToViewport: true } Frame { msec: 3840 image: "test-pathview.3.png" } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 184; y: 243 + modifiers: 0 + sendToViewport: true + } Frame { msec: 3856 - hash: "31e665f804a52a4dc88eab5dba78ae5a" + hash: "ed07f9eea6cd2cd78a3e2479137f843d" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 185; y: 244 + modifiers: 0 + sendToViewport: true } Frame { msec: 3872 - hash: "b7d4cf5a6a3ac79da3be101b50b38bc2" + hash: "7a5b201cc8725dbf15d89907fffd4ee3" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 197; y: 250 + modifiers: 0 + sendToViewport: true } Frame { msec: 3888 - hash: "559b1b8467b611cdeb7f2ae660e3bf51" + hash: "bc2433b9e5f03cdbd35922d145a4ce59" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 213; y: 256 + modifiers: 0 + sendToViewport: true + } + Mouse { + type: 3 + button: 1 + buttons: 0 + x: 213; y: 256 + modifiers: 0 + sendToViewport: true } Frame { msec: 3904 - hash: "66abb5af85e793569382efb04744d0de" + hash: "d443f23aa5449d5f2b11c47feab5a0ae" } Frame { msec: 3920 - hash: "b64eff8bbea5a953d146333363825724" + hash: "c43f00d3ae4c8abbd20fc7157363b19d" } Frame { msec: 3936 - hash: "47b794c971c4d47baf15e1d63d65ac03" + hash: "22d6f5e9fdfe44e73020e6f504002b7c" } Frame { msec: 3952 - hash: "b3882fa14f3cb7428c660737656d7ea2" + hash: "4a9a285834aad5795adbefbe167028e2" } Frame { msec: 3968 - hash: "a6bd71c7d3a0f3f53674ea8e1334e560" + hash: "561a6c005950830acf2a45ab9a207346" } Frame { msec: 3984 - hash: "0926d3cd53aabb789686e34d91ef23dc" + hash: "b0387e3cfd455e1144d0bce9b51d6767" } Frame { msec: 4000 - hash: "914c4fa7264111b4a42c82a60701d652" + hash: "610237f67aa7e5f8d5b363b1612b4966" } Frame { msec: 4016 - hash: "84c1fa22440a61126b79c38605b6f9ca" + hash: "8034a5a7e0558d73051ea6c5bc750866" } Frame { msec: 4032 - hash: "b684fcf9f4725cfc02af0187454dfaf8" + hash: "0e4dc8a9c124b51c5f1225f4c6a9ec63" } Frame { msec: 4048 - hash: "2e94c1ca74af4eb836a0c505d131f263" + hash: "dc4e94522e8c64e9f2dbbf12a1f1aa3e" } Frame { msec: 4064 - hash: "5f04912674e1bcdb16176976d10ce995" + hash: "7466c076a95f2f6bbc2b6ce306773337" } Frame { msec: 4080 - hash: "aaf0bcef4a15aa1c699eaa1ce817c8ed" + hash: "787e2749905b97159fd0922c6cb388e2" } Frame { msec: 4096 - hash: "97fd5bdcfa367191fbd3689658ab3273" + hash: "1e510d01afad190ec21de253bd8b4821" } Frame { msec: 4112 - hash: "d76d6c59411636a0e9ac2e0c847b3fe3" + hash: "d740f40eb21be71ec70c00411d2ee76b" } Frame { msec: 4128 - hash: "9cb88a76c962623b1a9cf4e7093d6e54" + hash: "887a6f445af8fccf4932eed575a09cbb" } Frame { msec: 4144 - hash: "ec3d7075680296905b1bdd6fdd9fcc40" + hash: "fbb7e1d8cb9dd9016df0c33c69b1451a" } Frame { msec: 4160 - hash: "43c70dabc45ed059e8b876eb2ba5c66e" + hash: "5025e5f04a0807cb298037d6dda8c3af" } Frame { msec: 4176 - hash: "8f97ca5c3092a20009c5d00139105a22" + hash: "b9924f24f60c24087be165e8e385ebb0" } Frame { msec: 4192 - hash: "d0f225d4b03495218f7916698e254338" + hash: "2bab970787ac8b056401c8a73cb1a3c5" } Frame { msec: 4208 - hash: "f8725467353a8f27bc5570af157c93c7" + hash: "bda954bfafaa2915d760cf7a602b326f" + } + Mouse { + type: 2 + button: 1 + buttons: 1 + x: 187; y: 242 + modifiers: 0 + sendToViewport: true } Frame { msec: 4224 - hash: "749c8ca5c0a7774c81805b792e6b70e3" + hash: "9b109bb9e786a45a78849436ea32a484" } Frame { msec: 4240 - hash: "d353c4a8a5eecb1dce30f4a5b85b1ef4" + hash: "9b109bb9e786a45a78849436ea32a484" } Frame { msec: 4256 - hash: "a7105f3f1ddace730d0b4a12a3560208" + hash: "9b109bb9e786a45a78849436ea32a484" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 187; y: 243 + modifiers: 0 + sendToViewport: true } Frame { msec: 4272 - hash: "918f480af8a35f6074ff1e202dae2660" + hash: "9b109bb9e786a45a78849436ea32a484" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 199; y: 252 + modifiers: 0 + sendToViewport: true } Frame { msec: 4288 - hash: "ed98d08eb30db1b41aaf2a58f3b59398" + hash: "cc3c61f49a7b3c395670b86c8078a337" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 223; y: 262 + modifiers: 0 + sendToViewport: true } Frame { msec: 4304 - hash: "c362cf053b3749a44d1fc33483f9952b" + hash: "464d09b53b78fe5474d9c1d022bee9fd" + } + Mouse { + type: 5 + button: 0 + buttons: 1 + x: 251; y: 272 + modifiers: 0 + sendToViewport: true + } + Mouse { + type: 3 + button: 1 + buttons: 0 + x: 251; y: 272 + modifiers: 0 + sendToViewport: true } Frame { msec: 4320 - hash: "9b01b2c771ef86ff4a8ee3f6a4676e3c" + hash: "aab17f48ff506cda84543cbe0d8a1ce4" } Frame { msec: 4336 - hash: "70ccec3c9db95206b5589d43dcd52b13" + hash: "b7ba6c107f4085822a738120a913ba0c" } Frame { msec: 4352 - hash: "57e7397c6aadd0d4d5c9d9d5fcdd8fde" + hash: "751b79e202a70dcc9a86c3a1450172b8" } Frame { msec: 4368 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "bb03f969fd6987255ff113ef98ed2bb1" } Frame { msec: 4384 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "c33302b366441fa2d8753d5ce314cd37" } Frame { msec: 4400 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "4cdf32004382bcaca5a68cb92761caa2" } Frame { msec: 4416 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "d3fe18ea7dcbee0709a2041e50b87154" } Frame { msec: 4432 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "ac58a7adb0e7a354a058d7e9a7010c06" } Frame { msec: 4448 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "bdf8a8934a372ab49f4b6e9c95c7f591" } Frame { msec: 4464 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "d2e8b417b74ec5f6e23f0935a4d0aa98" } Frame { msec: 4480 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "0f94c6ca3ffbd730c2d813a991d21ca3" } Frame { msec: 4496 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "fb7728eebb2fa8f5255dc7435d20bbb6" } Frame { msec: 4512 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "c8211e8adcef525c296531a3d369f717" } Frame { msec: 4528 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "f24de36c85b87953977fa8b6456209dc" } Frame { msec: 4544 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "9ce7cf389af08cb1ba2534418f51857b" } Frame { msec: 4560 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "17d1f3ae0dba0bde222bb2483a403fbd" } Frame { msec: 4576 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "1748d75e229945012ece689b3784a02c" } Frame { msec: 4592 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "6786fa9e31d6f0a71a285c790aa5b008" } Frame { msec: 4608 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "f2a2ba33b41d8d522e8aab34c7da8f7b" } Frame { msec: 4624 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "aa53142d1b433ae9f748aef5cb7bef46" } Frame { msec: 4640 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "9c6802b2b0a419a4aaf9909c0f88c66e" } Frame { msec: 4656 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "206b11f2acd742d55ddd8acf7415bbeb" } Frame { msec: 4672 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "36876cf600cbf9c3b15f243617c9474e" } Frame { msec: 4688 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "1f5daf97294b490546657c5d9e12022e" } Frame { msec: 4704 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "637fc34fc2cf6139ba8809be54a2a0fc" } Frame { msec: 4720 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "9f824bd9e156980873619b1978f226bb" } Frame { msec: 4736 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "7002444129a5077ce5be44a5e2530328" } Frame { msec: 4752 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "42b7a44030ad4fc50ceb6a60bc97991e" } Frame { msec: 4768 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "ae986cac541033398076fb918136212e" } Frame { msec: 4784 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "6bdd9f764b1675e5b0feced8c2d831a6" } Frame { msec: 4800 @@ -1382,114 +1558,278 @@ } Frame { msec: 4816 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "07dfffe85adc4b52565e9ed156fa3ed6" } Frame { msec: 4832 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "c987bbe9fbf74bb6cf2686a5ee97c59a" } Frame { msec: 4848 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "19568159ec2282d5f150583baa0a8a94" } Frame { msec: 4864 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "5b176ef6bf70ff1a9805ca85b1b0c1a2" } Frame { msec: 4880 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "de716a8c15a46bf1621878794e968c53" } Frame { msec: 4896 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "241af9ab77c86cdb75f73339548604ad" } Frame { msec: 4912 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "afc7168ecb7fa7e3310ca818b75f7a1c" } Frame { msec: 4928 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "83bff911b502a34d139a724f686bb1f9" } Frame { msec: 4944 - hash: "299b24eae7720e1711744b23335bca8c" - } - Key { - type: 6 - key: 16777249 - modifiers: 0 - text: "" - autorep: false - count: 1 + hash: "f4d3fb54ae5be2b13065cd4316b06837" } Frame { msec: 4960 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "d29c7dfedf9dd355d60e394528b3b938" } Frame { msec: 4976 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "ddf23d860ea71ab4b407de1a5f913f74" } Frame { msec: 4992 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "a0dbb6ecbfd08f9ebdd641fea5dae16c" } Frame { msec: 5008 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "7ed3170e55e3c3c9561959ad4c56d326" } Frame { msec: 5024 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "dbde5f508aabc2d1f2ccfaf135efeca9" } Frame { msec: 5040 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "72039739be41bf63b3959bdc90ce25bb" } Frame { msec: 5056 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "417789daefe6bc01320db7803ae31d61" } Frame { msec: 5072 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "7e57dbddaf379f4316182048fa9e2d6f" } Frame { msec: 5088 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "aeca9a4df94d2b9ac2a713531a7d98f1" } Frame { msec: 5104 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "98ad6694f23678819020d6ac0161651c" } Frame { msec: 5120 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "b6eba3872da19ec677eee419ae9cccbc" } Frame { msec: 5136 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "e824909bfe7b6d54773bb218ba93e884" } Frame { msec: 5152 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "3be04f3ff6d948538f4472bc6bfadb0f" } Frame { msec: 5168 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "e05ff21dda1d978a2ac2eedd3826b6f7" } Frame { msec: 5184 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "8ee970b2b197c8d879a7b1703cbd4dcd" } Frame { msec: 5200 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "e583845e7719d2776c6362c34f77937c" } Frame { msec: 5216 - hash: "299b24eae7720e1711744b23335bca8c" + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5232 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5248 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5264 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5280 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5296 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5312 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5328 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5344 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5360 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5376 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5392 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5408 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5424 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5440 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5456 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5472 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5488 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5504 + hash: "593fd590531ccfb59d890b8043eaab9c" + } + Frame { + msec: 5520 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5536 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5552 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5568 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5584 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5600 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5616 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5632 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5648 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5664 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5680 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5696 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5712 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5728 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5744 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5760 + image: "test-pathview.5.png" + } + Frame { + msec: 5776 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5792 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5808 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5824 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5840 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5856 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5872 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5888 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" + } + Frame { + msec: 5904 + hash: "c0d0f62d9078f6be493d5545a2ae78ad" } } diff -r ef0373b55136 -r 758a864f9613 tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml --- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml Mon Oct 04 01:19:32 2010 +0300 @@ -59,4 +59,9 @@ PathAttribute { name: "angle"; value: 45 } } } + + Column { + Rectangle { width: 20; height: 20; color: "red"; opacity: photoPathView.moving ? 1 : 0 } + Rectangle { width: 20; height: 20; color: "blue"; opacity: photoPathView.flicking ? 1 : 0 } + } } diff -r ef0373b55136 -r 758a864f9613 tests/auto/gestures/tst_gestures.cpp --- a/tests/auto/gestures/tst_gestures.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/gestures/tst_gestures.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -395,7 +395,12 @@ { GestureWidget widget; widget.grabGesture(CustomGesture::GestureType, Qt::DontStartGestureOnChildren); + widget.show(); + QTest::qWaitForWindowShown(&widget); + CustomEvent event; + event.hotSpot = widget.mapToGlobal(QPoint(5,5)); + event.hasHotSpot = true; sendCustomGesture(&event, &widget); static const int TotalGestureEventsCount = CustomGesture::SerialFinishedThreshold - CustomGesture::SerialStartedThreshold + 1; diff -r ef0373b55136 -r 758a864f9613 tests/auto/guiapplauncher/tst_guiapplauncher.cpp --- a/tests/auto/guiapplauncher/tst_guiapplauncher.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/guiapplauncher/tst_guiapplauncher.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -128,10 +128,10 @@ {"mainwindows/menus Example", "mainwindows/menus", "menus", 10, -1}, {"mainwindows/recentfiles Example", "mainwindows/recentfiles", "recentfiles", 10, -1}, {"mainwindows/sdi Example", "mainwindows/sdi", "sdi", 10, -1}, - {"multitouch/dials Example", "multitouch/dials", "dials", 10, -1}, - {"multitouch/fingerpaint Example", "multitouch/fingerpaint", "fingerpaint", 10, -1}, - {"multitouch/knobs Example", "multitouch/knobs", "knobs", 10, -1}, - {"multitouch/pinchzoom Example", "multitouch/pinchzoom", "pinchzoom", 10, -1}, + {"touch/dials Example", "touch/dials", "dials", 10, -1}, + {"touch/fingerpaint Example", "touch/fingerpaint", "fingerpaint", 10, -1}, + {"touch/knobs Example", "touch/knobs", "knobs", 10, -1}, + {"touch/pinchzoom Example", "touch/pinchzoom", "pinchzoom", 10, -1}, {"opengl/2dpainting Example", "opengl/2dpainting", "2dpainting", 10, -1}, {"opengl/grabber Example", "opengl/grabber", "grabber", 10, -1}, {"opengl/hellogl Example", "opengl/hellogl", "hellogl", 10, -1}, diff -r ef0373b55136 -r 758a864f9613 tests/auto/headers/tst_headers.cpp --- a/tests/auto/headers/tst_headers.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/headers/tst_headers.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -213,7 +213,8 @@ return; if (content.first().contains("generated")) { - content.takeFirst(); + // don't scan generated files + return; } if (sourceFile.endsWith("/tests/auto/linguist/lupdate/testdata/good/merge_ordering/foo.cpp") diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lconvert/data/test-refs.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/linguist/lconvert/data/test-refs.po Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,23 @@ +msgid "" +msgstr "" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Language: de_DE\n" + +#: themer/kdmlabel.cpp:285 +#, no-c-format +msgctxt "date format" +msgid "%a %d %B" +msgstr "%a %d %B" + +#: foo.bar.baz +#, no-c-format +msgid "full java class name" +msgstr "" + +#: foo.car:123 monks:here file/gar.c:17:19 no:monks:here +#, no-c-format +msgid "some excessive locations" +msgstr "" diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lconvert/data/test20.ts --- a/tests/auto/linguist/lconvert/data/test20.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/linguist/lconvert/data/test20.ts Mon Oct 04 01:19:32 2010 +0300 @@ -158,5 +158,14 @@ comment with | and ~ and so~ + + just something obsolete + translated obsoletion + + + something else obsolete + comment with | and ~ and so~ + another translated obsoletion + diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lconvert/tst_lconvert.cpp --- a/tests/auto/linguist/lconvert/tst_lconvert.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/linguist/lconvert/tst_lconvert.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -317,6 +317,8 @@ QTest::newRow("po-xliff-po (plural-2)") << "plural-2.po" << poXlfPo << noArgs; QTest::newRow("po-xliff-po (plural-3)") << "plural-3.po" << poXlfPo << noArgs; + QTest::newRow("po-ts-po (references)") << "test-refs.po" << poTsPo << noArgs; + QTest::newRow("ts20-ts11-ts20 (utf8)") << "codec-utf8.ts" << tsTs11Ts << noArgs; QTest::newRow("ts20-ts11-ts20 (cp1252)") << "codec-cp1252.ts" << tsTs11Ts << noArgs; QTest::newRow("ts20-ts11-ts20 (dual-encoding)") << "dual-encoding.ts" << tsTs11Ts << noArgs; diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lupdate/testdata/good/parsejs/main.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs/main.js Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,91 @@ +qsTr("One"); +qsTranslate("FooContext", "Two"); + +var greeting_strings = [ + QT_TR_NOOP("Hello"), + QT_TRANSLATE_NOOP("FooContext", "Goodbye") +]; + +qsTr("One", "not the same one"); + +//: My first comment. +qsTr("See comment"); + +//: My second comment. +qsTranslate("BarContext", "See other comment"); + +//: My third comment +//: spans two lines. +qsTr("The comment explains it all"); + +//: My fourth comment +//: spans a whopping +//: three lines. +qsTranslate("BazContext", "It should be clear by now"); + +/*: C-style comment. */ +qsTr("I love C++"); + +/*: Another C-style comment. */ +qsTranslate("FooContext", "I really love C++"); + +/*: C-style comment, followed by */ +/*: another one. */ +qsTr("Qt is the best"); + +/*: Another C-style comment, followed by */ +/*: yet another one. */ +qsTranslate("BarContext", "Qt is the very best"); + +// This comment doesn't have any effect. +qsTr("The comment had no effect"); + +// This comment doesn't have any effect either. +qsTranslate("BazContext", "The comment had no effect, really"); + +/* This C-style comment doesn't have any effect. */ +qsTr("No comment to your comment"); + +/* This C-style comment doesn't have any effect either. */ +qsTranslate("FooContext", "I refuse to comment on that"); + +//= id_foo +qsTr("This string has an identifier"); + +//= id_bar +qsTranslate("BarContext", "This string also has an identifier"); + +//~ loc-blank False +qsTr("This string has meta-data"); + +//~ loc-layout_id foo_dialog +qsTranslate("BazContext", "This string also has meta-data"); + +// This comment is to be ignored. +//: This is a comment for the translator. +//= id_baz +//~ foo 123 +//~ magic-stuff This means something special. +qsTr("This string has a lot of information"); + +// This comment is also to be ignored. +//: This is another comment for the translator. +//= id_babar +//~ foo-bar Important stuff +//~ needle-in-haystack Found +//~ overflow True +qsTranslate("FooContext", "This string has even more information"); + +qsTr("This string has disambiguation", "Disambiguation"); + +qsTranslate("BarContext", "This string also has disambiguation", "Another disambiguation"); + +qsTr("This string contains plurals", "", 10); + +qsTrId("qtn_foo_bar"); + +var more_greeting_strings = [ QT_TRID_NOOP("qtn_needle"), QT_TRID_NOOP("qtn_haystack") ]; + +//: qsTrId() with comment, meta-data and plurals. +//~ well-tested True +qsTrId("qtn_bar_baz", 10); diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,3 @@ +SOURCES += main.js + +TRANSLATIONS = project.ts diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lupdate/testdata/good/parsejs/project.ts.result --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs/project.ts.result Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + qsTrId() with comment, meta-data and plurals. + + + + True + + + + BarContext + + + See other comment + My second comment. + + + + + Qt is the very best + Another C-style comment, followed by yet another one. + + + + + This string also has an identifier + + + + + This string also has disambiguation + Another disambiguation + + + + + BazContext + + + It should be clear by now + My fourth comment spans a whopping three lines. + + + + + The comment had no effect, really + + + + + This string also has meta-data + + foo_dialog + + + + FooContext + + + Two + + + + + Goodbye + + + + + I really love C++ + Another C-style comment. + + + + + I refuse to comment on that + + + + + This string has even more information + This is another comment for the translator. + + Found + True + Important stuff + + + + main + + + One + + + + + Hello + + + + + One + not the same one + + + + + See comment + My first comment. + + + + + The comment explains it all + My third comment spans two lines. + + + + + I love C++ + C-style comment. + + + + + Qt is the best + C-style comment, followed by another one. + + + + + The comment had no effect + + + + + No comment to your comment + + + + + This string has an identifier + + + + + This string has meta-data + + False + + + + This string has a lot of information + This is a comment for the translator. + + 123 + This means something special. + + + + This string has disambiguation + Disambiguation + + + + + This string contains plurals + + + + + + diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lupdate/testdata/good/parsejs2/expectedoutput.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs2/expectedoutput.txt Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,29 @@ +.*/lupdate/testdata/good/parsejs2/main.js:3: qsTranslate\(\) requires at least two arguments. +.*/lupdate/testdata/good/parsejs2/main.js:4: qsTranslate\(\) requires at least two arguments. +.*/lupdate/testdata/good/parsejs2/main.js:5: qsTranslate\(\): both arguments must be literal strings. +.*/lupdate/testdata/good/parsejs2/main.js:6: qsTranslate\(\): both arguments must be literal strings. +.*/lupdate/testdata/good/parsejs2/main.js:7: qsTranslate\(\): both arguments must be literal strings. +.*/lupdate/testdata/good/parsejs2/main.js:9: QT_TRANSLATE_NOOP\(\) requires at least two arguments. +.*/lupdate/testdata/good/parsejs2/main.js:10: QT_TRANSLATE_NOOP\(\) requires at least two arguments. +.*/lupdate/testdata/good/parsejs2/main.js:11: QT_TRANSLATE_NOOP\(\): both arguments must be literal strings. +.*/lupdate/testdata/good/parsejs2/main.js:12: QT_TRANSLATE_NOOP\(\): both arguments must be literal strings. +.*/lupdate/testdata/good/parsejs2/main.js:13: QT_TRANSLATE_NOOP\(\): both arguments must be literal strings. +.*/lupdate/testdata/good/parsejs2/main.js:15: qsTr\(\) requires at least one argument. +.*/lupdate/testdata/good/parsejs2/main.js:16: qsTr\(\): text to translate must be a literal string. +.*/lupdate/testdata/good/parsejs2/main.js:18: QT_TR_NOOP\(\) requires at least one argument. +.*/lupdate/testdata/good/parsejs2/main.js:19: QT_TR_NOOP\(\): text to translate must be a literal string. +.*/lupdate/testdata/good/parsejs2/main.js:21: qsTrId\(\) requires at least one argument. +.*/lupdate/testdata/good/parsejs2/main.js:22: qsTrId\(\): identifier must be a literal string. +.*/lupdate/testdata/good/parsejs2/main.js:24: QT_TRID_NOOP\(\) requires at least one argument. +.*/lupdate/testdata/good/parsejs2/main.js:25: QT_TRID_NOOP\(\): identifier must be a literal string. +.*/lupdate/testdata/good/parsejs2/main.js:27: Unexpected character in meta string +.*/lupdate/testdata/good/parsejs2/main.js:28: Unexpected character in meta string +.*/lupdate/testdata/good/parsejs2/main.js:29: Unterminated meta string +.*/lupdate/testdata/good/parsejs2/main.js:30: Unterminated meta string +.*/lupdate/testdata/good/parsejs2/main.js:33: //% cannot be used with qsTranslate\(\). Ignoring +.*/lupdate/testdata/good/parsejs2/main.js:35: //% cannot be used with QT_TRANSLATE_NOOP\(\). Ignoring +.*/lupdate/testdata/good/parsejs2/main.js:37: //% cannot be used with qsTr\(\). Ignoring +.*/lupdate/testdata/good/parsejs2/main.js:39: //% cannot be used with QT_TR_NOOP\(\). Ignoring +.*/lupdate/testdata/good/parsejs2/main.js:42: Discarding unconsumed meta data +.*/lupdate/testdata/good/parsejs2/main.js:44: Discarding unconsumed meta data +.*/lupdate/testdata/good/parsejs2/main.js:46: Discarding unconsumed meta data diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lupdate/testdata/good/parsejs2/main.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs2/main.js Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,56 @@ +// This script exercises lupdate errors and warnings. + +qsTranslate(); +qsTranslate(10); +qsTranslate(10, 20); +qsTranslate("10", 20); +qsTranslate(10, "20"); + +QT_TRANSLATE_NOOP(); +QT_TRANSLATE_NOOP(10); +QT_TRANSLATE_NOOP(10, 20); +QT_TRANSLATE_NOOP("10", 20); +QT_TRANSLATE_NOOP(10, "20"); + +qsTr(); +qsTr(10); + +QT_TR_NOOP(); +QT_TR_NOOP(10); + +qsTrId(); +qsTrId(10); + +QT_TRID_NOOP(); +QT_TRID_NOOP(10); + +//% This is wrong +//% "This is not wrong" This is wrong +//% "I forgot to close the meta string +//% "Being evil \ + +//% "Should cause a warning" +qsTranslate("FooContext", "Hello"); +//% "Should cause a warning" +QT_TRANSLATE_NOOP("FooContext", "World"); +//% "Should cause a warning" +qsTr("Hello"); +//% "Should cause a warning" +QT_TR_NOOP("World"); + +//: This comment will be discarded. +Math.sin(1); +//= id_foobar +Math.cos(2); +//~ underflow False +Math.tan(3); + +/* +Not tested for now, because these should perhaps not cause +translation entries to be generated at all; see QTBUG-11843. + +//= qtn_foo +qsTrId("qtn_foo"); +//= qtn_bar +QT_TRID_NOOP("qtn_bar"); +*/ diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,3 @@ +SOURCES += main.js + +TRANSLATIONS = project.ts diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lupdate/testdata/good/parsejs2/project.ts.result --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.ts.result Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,30 @@ + + + + + FooContext + + + Hello + + + + + World + + + + + main + + + Hello + + + + + World + + + + diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,97 @@ +import Qt 4.7 + +QtObject { + function translate() { + qsTr("One"); + qsTranslate("FooContext", "Two"); + + var greeting_strings = [ + QT_TR_NOOP("Hello"), + QT_TRANSLATE_NOOP("FooContext", "Goodbye") + ]; + + qsTr("One", "not the same one"); + + //: My first comment. + qsTr("See comment"); + + //: My second comment. + qsTranslate("BarContext", "See other comment"); + + //: My third comment + //: spans two lines. + qsTr("The comment explains it all"); + + //: My fourth comment + //: spans a whopping + //: three lines. + qsTranslate("BazContext", "It should be clear by now"); + + /*: C-style comment. */ + qsTr("I love C++"); + + /*: Another C-style comment. */ + qsTranslate("FooContext", "I really love C++"); + + /*: C-style comment, followed by */ + /*: another one. */ + qsTr("Qt is the best"); + + /*: Another C-style comment, followed by */ + /*: yet another one. */ + qsTranslate("BarContext", "Qt is the very best"); + + // This comment doesn't have any effect. + qsTr("The comment had no effect"); + + // This comment doesn't have any effect either. + qsTranslate("BazContext", "The comment had no effect, really"); + + /* This C-style comment doesn't have any effect. */ + qsTr("No comment to your comment"); + + /* This C-style comment doesn't have any effect either. */ + qsTranslate("FooContext", "I refuse to comment on that"); + + //= id_foo + qsTr("This string has an identifier"); + + //= id_bar + qsTranslate("BarContext", "This string also has an identifier"); + + //~ loc-blank False + qsTr("This string has meta-data"); + + //~ loc-layout_id foo_dialog + qsTranslate("BazContext", "This string also has meta-data"); + + // This comment is to be ignored. + //: This is a comment for the translator. + //= id_baz + //~ foo 123 + //~ magic-stuff This means something special. + qsTr("This string has a lot of information"); + + // This comment is also to be ignored. + //: This is another comment for the translator. + //= id_babar + //~ foo-bar Important stuff + //~ needle-in-haystack Found + //~ overflow True + qsTranslate("FooContext", "This string has even more information"); + + qsTr("This string has disambiguation", "Disambiguation"); + + qsTranslate("BarContext", "This string also has disambiguation", "Another disambiguation"); + + qsTr("This string contains plurals", "", 10); + + qsTrId("qtn_foo_bar"); + + var more_greeting_strings = [ QT_TRID_NOOP("qtn_needle"), QT_TRID_NOOP("qtn_haystack") ]; + + //: qsTrId() with comment, meta-data and plurals. + //~ well-tested True + qsTrId("qtn_bar_baz", 10); + } +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,3 @@ +SOURCES += main.qml + +TRANSLATIONS = project.ts diff -r ef0373b55136 -r 758a864f9613 tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + qsTrId() with comment, meta-data and plurals. + + + + True + + + + BarContext + + + See other comment + My second comment. + + + + + Qt is the very best + Another C-style comment, followed by yet another one. + + + + + This string also has an identifier + + + + + This string also has disambiguation + Another disambiguation + + + + + BazContext + + + It should be clear by now + My fourth comment spans a whopping three lines. + + + + + The comment had no effect, really + + + + + This string also has meta-data + + foo_dialog + + + + FooContext + + + Two + + + + + Goodbye + + + + + I really love C++ + Another C-style comment. + + + + + I refuse to comment on that + + + + + This string has even more information + This is another comment for the translator. + + Found + True + Important stuff + + + + main + + + One + + + + + Hello + + + + + One + not the same one + + + + + See comment + My first comment. + + + + + The comment explains it all + My third comment spans two lines. + + + + + I love C++ + C-style comment. + + + + + Qt is the best + C-style comment, followed by another one. + + + + + The comment had no effect + + + + + No comment to your comment + + + + + This string has an identifier + + + + + This string has meta-data + + False + + + + This string has a lot of information + This is a comment for the translator. + + 123 + This means something special. + + + + This string has disambiguation + Disambiguation + + + + + This string contains plurals + + + + + + diff -r ef0373b55136 -r 758a864f9613 tests/auto/macnativeevents/tst_macnativeevents.cpp --- a/tests/auto/macnativeevents/tst_macnativeevents.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/macnativeevents/tst_macnativeevents.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -67,6 +67,11 @@ void testDragWindow(); void testMouseEnter(); void testChildDialogInFrontOfModalParent(); +#ifdef QT_MAC_USE_COCOA + void testChildWindowInFrontOfParentWindow(); +// void testChildToolWindowInFrontOfChildNormalWindow(); + void testChildWindowInFrontOfStaysOnTopParentWindow(); +#endif void testKeyPressOnToplevel(); }; @@ -308,6 +313,82 @@ QVERIFY(!child.isVisible()); } +#ifdef QT_MAC_USE_COCOA +void tst_MacNativeEvents::testChildWindowInFrontOfParentWindow() +{ + // Test that a child window always stacks in front of its parent window. + // Do this by first click on the parent, then on the child window button. + QWidget parent; + QPushButton child("a button", &parent); + child.setWindowFlags(Qt::Window); + connect(&child, SIGNAL(clicked()), &child, SLOT(close())); + parent.show(); + child.show(); + + QPoint parent_p = parent.geometry().bottomLeft() + QPoint(20, -20); + QPoint child_p = child.geometry().center(); + + NativeEventList native; + native.append(new QNativeMouseButtonEvent(parent_p, Qt::LeftButton, 1, Qt::NoModifier)); + native.append(new QNativeMouseButtonEvent(parent_p, Qt::LeftButton, 0, Qt::NoModifier)); + native.append(new QNativeMouseButtonEvent(child_p, Qt::LeftButton, 1, Qt::NoModifier)); + native.append(new QNativeMouseButtonEvent(child_p, Qt::LeftButton, 0, Qt::NoModifier)); + + native.play(); + QTest::qWait(100); + QVERIFY(!child.isVisible()); +} + +/* This test can be enabled once setStackingOrder has been fixed in qwidget_mac.mm +void tst_MacNativeEvents::testChildToolWindowInFrontOfChildNormalWindow() +{ + // Test that a child tool window always stacks in front of normal sibling windows. + // Do this by first click on the sibling, then on the tool window button. + QWidget parent; + QWidget normalChild(&parent, Qt::Window); + QPushButton toolChild("a button", &parent); + toolChild.setWindowFlags(Qt::Tool); + connect(&toolChild, SIGNAL(clicked()), &toolChild, SLOT(close())); + parent.show(); + normalChild.show(); + toolChild.show(); + + QPoint normalChild_p = normalChild.geometry().bottomLeft() + QPoint(20, -20); + QPoint toolChild_p = toolChild.geometry().center(); + + NativeEventList native; + native.append(new QNativeMouseButtonEvent(normalChild_p, Qt::LeftButton, 1, Qt::NoModifier)); + native.append(new QNativeMouseButtonEvent(normalChild_p, Qt::LeftButton, 0, Qt::NoModifier)); + native.append(new QNativeMouseButtonEvent(toolChild_p, Qt::LeftButton, 1, Qt::NoModifier)); + native.append(new QNativeMouseButtonEvent(toolChild_p, Qt::LeftButton, 0, Qt::NoModifier)); + + native.play(); + QTest::qWait(100); + QVERIFY(!toolChild.isVisible()); +} +*/ +void tst_MacNativeEvents::testChildWindowInFrontOfStaysOnTopParentWindow() +{ + // Test that a child window stacks on top of a stays-on-top parent. + QWidget parent(0, Qt::WindowStaysOnTopHint); + QPushButton button("close", &parent); + button.setWindowFlags(Qt::Window); + connect(&button, SIGNAL(clicked()), &button, SLOT(close())); + parent.show(); + button.show(); + QPoint inside = button.geometry().center(); + + // Post a click on the button to close the child dialog: + NativeEventList native; + native.append(new QNativeMouseButtonEvent(inside, Qt::LeftButton, 1, Qt::NoModifier)); + native.append(new QNativeMouseButtonEvent(inside, Qt::LeftButton, 0, Qt::NoModifier)); + + native.play(); + QTest::qWait(100); + QVERIFY(!button.isVisible()); +} +#endif + void tst_MacNativeEvents::testKeyPressOnToplevel() { // Check that we receive keyevents for diff -r ef0373b55136 -r 758a864f9613 tests/auto/mediaobject/tst_mediaobject.cpp --- a/tests/auto/mediaobject/tst_mediaobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/mediaobject/tst_mediaobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -201,9 +201,6 @@ void tst_MediaObject::testPlayFromResource() { -#ifdef Q_OS_SYMBIAN - QSKIP("Not implemented yet.", SkipAll); -#else MediaObject media; media.setCurrentSource(QString(MEDIA_FILEPATH)); QVERIFY(media.state() != Phonon::ErrorState); @@ -214,7 +211,6 @@ if (media.state() != Phonon::PlayingState) QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); QCOMPARE(media.state(), Phonon::PlayingState); -#endif } void tst_MediaObject::testPlayIllegalFile() diff -r ef0373b55136 -r 758a864f9613 tests/auto/moc/error-on-wrong-notify.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/moc/error-on-wrong-notify.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include + +class ClassWithWrongNOTIFY : public QObject +{ + Q_OBJECT + Q_PROPERTY(int foo READ foo WRITE setFoo NOTIFY fooChanged) + + int m_foo; +public: + void setFoo(int i) { m_foo = i; } + int foo() { return m_foo; } +}; + diff -r ef0373b55136 -r 758a864f9613 tests/auto/moc/tst_moc.cpp --- a/tests/auto/moc/tst_moc.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/moc/tst_moc.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -492,6 +492,7 @@ void warnOnVirtualSignal(); void QTBUG5590_dummyProperty(); void QTBUG12260_defaultTemplate(); + void notifyError(); signals: void sigWithUnsignedArg(unsigned foo); void sigWithSignedArg(signed foo); @@ -1362,6 +1363,27 @@ QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("doAnotherThing(bool,bool)") != -1); } +void tst_Moc::notifyError() +{ +#ifdef MOC_CROSS_COMPILED + QSKIP("Not tested when cross-compiled", SkipAll); +#endif +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) + QProcess proc; + proc.start("moc", QStringList(srcify("error-on-wrong-notify.h"))); + QVERIFY(proc.waitForFinished()); + QCOMPARE(proc.exitCode(), 1); + QCOMPARE(proc.exitStatus(), QProcess::NormalExit); + QByteArray mocOut = proc.readAllStandardOutput(); + QVERIFY(mocOut.isEmpty()); + QString mocError = QString::fromLocal8Bit(proc.readAllStandardError()); + QCOMPARE(mocError, QString(SRCDIR) + + QString("/error-on-wrong-notify.h:52: Error: NOTIFY signal 'fooChanged' of property 'foo' does not exist in class ClassWithWrongNOTIFY.\n")); +#else + QSKIP("Only tested on linux/gcc", SkipAll); +#endif +} + QTEST_APPLESS_MAIN(tst_Moc) #include "tst_moc.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qapplication/modal/base.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qapplication/modal/base.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "base.h" + +base::base(QWidget *parent) : + QWidget(parent) +{ + m_timer = new QTimer(this); + m_modalStarted = false; + m_timer->setSingleShot(false); + connect(m_timer, SIGNAL(timeout()), this, SLOT(periodicTimer())); + m_timer->start(5000); +} + +void base::periodicTimer() +{ + if(m_modalStarted) + exit(0); + m_modalDialog = new QDialog(this); + m_modalDialog->setModal(true); + m_modalDialog->show(); + m_modalStarted = true; +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/qapplication/modal/base.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qapplication/modal/base.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef BASE_H +#define BASE_H + +#include +#include +#include + +class base : public QWidget +{ +Q_OBJECT + QTimer *m_timer; + bool m_modalStarted; + QDialog *m_modalDialog; +public: + explicit base(QWidget *parent = 0); + +signals: + +public slots: + void periodicTimer(); +}; + +#endif // BASE_H diff -r ef0373b55136 -r 758a864f9613 tests/auto/qapplication/modal/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qapplication/modal/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include +#include "base.h" + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + base *b = new base(); + return app.exec(); +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/qapplication/modal/modal.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qapplication/modal/modal.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,8 @@ +TEMPLATE = app +TARGET = +DEPENDPATH += . +INCLUDEPATH += . +SOURCES += main.cpp \ + base.cpp +DESTDIR = ./ +HEADERS += base.h diff -r ef0373b55136 -r 758a864f9613 tests/auto/qapplication/qapplication.pro --- a/tests/auto/qapplication/qapplication.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qapplication/qapplication.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS = test \ desktopsettingsaware \ + modal \ wincmdline diff -r ef0373b55136 -r 758a864f9613 tests/auto/qapplication/tst_qapplication.cpp --- a/tests/auto/qapplication/tst_qapplication.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qapplication/tst_qapplication.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -146,6 +146,7 @@ void symbianNeedForTraps(); void symbianLeaveThroughMain(); + void qtbug_12673(); }; class EventSpy : public QObject @@ -2239,6 +2240,23 @@ #endif } +void tst_QApplication::qtbug_12673() +{ +#ifdef Q_OS_SYMBIAN + QSKIP("This might not make sense in Symbian, but since I do not know how to test it I'll just skip it for now.", SkipAll); +#else + QProcess testProcess; + QStringList arguments; +#ifdef Q_OS_MAC + testProcess.start("modal/modal.app", arguments); +#else + testProcess.start("modal/modal", arguments); +#endif + QVERIFY(testProcess.waitForFinished(20000)); + QCOMPARE(testProcess.exitStatus(), QProcess::NormalExit); +#endif // Q_OS_SYMBIAN +} + //QTEST_APPLESS_MAIN(tst_QApplication) int main(int argc, char *argv[]) { diff -r ef0373b55136 -r 758a864f9613 tests/auto/qdatastream/tst_qdatastream.cpp --- a/tests/auto/qdatastream/tst_qdatastream.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qdatastream/tst_qdatastream.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1820,7 +1820,7 @@ #ifdef Q_OS_WINCE QSKIP("Test depends on more memory than available on Qt/CE", SkipAll); #endif - STREAM_IMPL(QIcon); + STREAM_IMPL(QPixmap); } void tst_QDataStream::stream_QIcon_data() diff -r ef0373b55136 -r 758a864f9613 tests/auto/qdatetime/tst_qdatetime.cpp --- a/tests/auto/qdatetime/tst_qdatetime.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qdatetime/tst_qdatetime.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -959,16 +959,30 @@ #endif QDateTime upperBound; upperBound.setTime_t(buf2); - upperBound = upperBound.addSecs(1); - - QVERIFY(lowerBound < upperBound); + // Note we must add 2 seconds here because time() may return up to + // 1 second difference from the more accurate method used by QDateTime::currentDateTime() + upperBound = upperBound.addSecs(2); - QVERIFY(lowerBound <= dt1); - QVERIFY(dt1 < upperBound); - QVERIFY(lowerBound <= dt2); - QVERIFY(dt2 < upperBound); - QVERIFY(lowerBound <= dt3); - QVERIFY(dt3 < upperBound); + QString details = QString("\n" + "lowerBound: %1\n" + "dt1: %2\n" + "dt2: %3\n" + "dt3: %4\n" + "upperBound: %5\n") + .arg(lowerBound.toTime_t()) + .arg(dt1.toTime_t()) + .arg(dt2.toTime_t()) + .arg(dt3.toTime_t()) + .arg(upperBound.toTime_t()); + + QVERIFY2(lowerBound < upperBound, qPrintable(details)); + + QVERIFY2(lowerBound <= dt1, qPrintable(details)); + QVERIFY2(dt1 < upperBound, qPrintable(details)); + QVERIFY2(lowerBound <= dt2, qPrintable(details)); + QVERIFY2(dt2 < upperBound, qPrintable(details)); + QVERIFY2(lowerBound <= dt3, qPrintable(details)); + QVERIFY2(dt3 < upperBound, qPrintable(details)); QVERIFY(dt1.timeSpec() == Qt::LocalTime); QVERIFY(dt2.timeSpec() == Qt::LocalTime); @@ -998,16 +1012,30 @@ #endif QDateTime upperBound; upperBound.setTime_t(buf2); - upperBound = upperBound.addSecs(1); - - QVERIFY(lowerBound < upperBound); + // Note we must add 2 seconds here because time() may return up to + // 1 second difference from the more accurate method used by QDateTime::currentDateTime() + upperBound = upperBound.addSecs(2); - QVERIFY(lowerBound <= dt1); - QVERIFY(dt1 < upperBound); - QVERIFY(lowerBound <= dt2); - QVERIFY(dt2 < upperBound); - QVERIFY(lowerBound <= dt3); - QVERIFY(dt3 < upperBound); + QString details = QString("\n" + "lowerBound: %1\n" + "dt1: %2\n" + "dt2: %3\n" + "dt3: %4\n" + "upperBound: %5\n") + .arg(lowerBound.toTime_t()) + .arg(dt1.toTime_t()) + .arg(dt2.toTime_t()) + .arg(dt3.toTime_t()) + .arg(upperBound.toTime_t()); + + QVERIFY2(lowerBound < upperBound, qPrintable(details)); + + QVERIFY2(lowerBound <= dt1, qPrintable(details)); + QVERIFY2(dt1 < upperBound, qPrintable(details)); + QVERIFY2(lowerBound <= dt2, qPrintable(details)); + QVERIFY2(dt2 < upperBound, qPrintable(details)); + QVERIFY2(lowerBound <= dt3, qPrintable(details)); + QVERIFY2(dt3 < upperBound, qPrintable(details)); QVERIFY(dt1.timeSpec() == Qt::UTC); QVERIFY(dt2.timeSpec() == Qt::LocalTime); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qdbusinterface/tst_qdbusinterface.cpp --- a/tests/auto/qdbusinterface/tst_qdbusinterface.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qdbusinterface/tst_qdbusinterface.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -70,18 +70,34 @@ " \n" " \n" " \n" +" \n" +" \n" +" \n" +" \n" " \n" " \n" " \n" " \n" " \n" " \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" " \n" " \n" " \n" " \n" " \n" " \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" " \n" "") Q_PROPERTY(int prop1 READ prop1 WRITE setProp1) @@ -120,6 +136,20 @@ m_complexProp = value; } + Q_INVOKABLE void ping_invokable(QDBusMessage msg) + { + QDBusConnection sender = QDBusConnection::sender(); + if (!sender.isConnected()) + exit(1); + + ++callCount; + callArgs = msg.arguments(); + + msg.setDelayedReply(true); + if (!sender.send(msg.createReply(callArgs))) + exit(1); + } + public slots: void ping(QDBusMessage msg) @@ -220,6 +250,7 @@ con.registerObject("/", &obj, QDBusConnection::ExportAllProperties | QDBusConnection::ExportAllSlots + | QDBusConnection::ExportAllInvokables | QDBusConnection::ExportChildObjects); } @@ -283,7 +314,7 @@ const QMetaObject *mo = iface.metaObject(); - QCOMPARE(mo->methodCount() - mo->methodOffset(), 4); + QCOMPARE(mo->methodCount() - mo->methodOffset(), 7); QVERIFY(mo->indexOfSignal(TEST_SIGNAL_NAME "(QString)") != -1); QCOMPARE(mo->propertyCount() - mo->propertyOffset(), 2); @@ -298,6 +329,8 @@ TEST_INTERFACE_NAME); MyObject::callCount = 0; + + // call a SLOT method QDBusMessage reply = iface.call("ping", qVariantFromValue(QDBusVariant("foo"))); QCOMPARE(MyObject::callCount, 1); QCOMPARE(reply.type(), QDBusMessage::ReplyMessage); @@ -315,6 +348,25 @@ dv = qdbus_cast(v); QCOMPARE(dv.variant().type(), QVariant::String); QCOMPARE(dv.variant().toString(), QString("foo")); + + // call an INVOKABLE method + reply = iface.call("ping_invokable", qVariantFromValue(QDBusVariant("bar"))); + QCOMPARE(MyObject::callCount, 2); + QCOMPARE(reply.type(), QDBusMessage::ReplyMessage); + + // verify what the callee received + QCOMPARE(MyObject::callArgs.count(), 1); + v = MyObject::callArgs.at(0); + dv = qdbus_cast(v); + QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().toString(), QString("bar")); + + // verify reply + QCOMPARE(reply.arguments().count(), 1); + v = reply.arguments().at(0); + dv = qdbus_cast(v); + QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().toString(), QString("bar")); } void tst_QDBusInterface::invokeMethod() @@ -323,8 +375,9 @@ QDBusInterface iface(QDBusConnection::sessionBus().baseService(), QLatin1String("/"), TEST_INTERFACE_NAME); - // make the call without a return type MyObject::callCount = 0; + + // make the SLOT call without a return type QDBusVariant arg("foo"); QVERIFY(QMetaObject::invokeMethod(&iface, "ping", Q_ARG(QDBusVariant, arg))); QCOMPARE(MyObject::callCount, 1); @@ -335,6 +388,18 @@ QDBusVariant dv = qdbus_cast(v); QCOMPARE(dv.variant().type(), QVariant::String); QCOMPARE(dv.variant().toString(), QString("foo")); + + // make the INVOKABLE call without a return type + QDBusVariant arg2("bar"); + QVERIFY(QMetaObject::invokeMethod(&iface, "ping_invokable", Q_ARG(QDBusVariant, arg2))); + QCOMPARE(MyObject::callCount, 2); + + // verify what the callee received + QCOMPARE(MyObject::callArgs.count(), 1); + v = MyObject::callArgs.at(0); + dv = qdbus_cast(v); + QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().toString(), QString("bar")); } void tst_QDBusInterface::invokeMethodWithReturn() @@ -343,10 +408,11 @@ QDBusInterface iface(QDBusConnection::sessionBus().baseService(), QLatin1String("/"), TEST_INTERFACE_NAME); - // make the call without a return type MyObject::callCount = 0; + QDBusVariant retArg; + + // make the SLOT call without a return type QDBusVariant arg("foo"); - QDBusVariant retArg; QVERIFY(QMetaObject::invokeMethod(&iface, "ping", Q_RETURN_ARG(QDBusVariant, retArg), Q_ARG(QDBusVariant, arg))); QCOMPARE(MyObject::callCount, 1); @@ -359,6 +425,21 @@ // verify that we got the reply as expected QCOMPARE(retArg.variant(), arg.variant()); + + // make the INVOKABLE call without a return type + QDBusVariant arg2("bar"); + QVERIFY(QMetaObject::invokeMethod(&iface, "ping_invokable", Q_RETURN_ARG(QDBusVariant, retArg), Q_ARG(QDBusVariant, arg2))); + QCOMPARE(MyObject::callCount, 2); + + // verify what the callee received + QCOMPARE(MyObject::callArgs.count(), 1); + v = MyObject::callArgs.at(0); + dv = qdbus_cast(v); + QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().toString(), arg2.variant().toString()); + + // verify that we got the reply as expected + QCOMPARE(retArg.variant(), arg2.variant()); } void tst_QDBusInterface::invokeMethodWithMultiReturn() @@ -367,10 +448,11 @@ QDBusInterface iface(QDBusConnection::sessionBus().baseService(), QLatin1String("/"), TEST_INTERFACE_NAME); - // make the call without a return type MyObject::callCount = 0; + QDBusVariant retArg, retArg2; + + // make the SLOT call without a return type QDBusVariant arg("foo"), arg2("bar"); - QDBusVariant retArg, retArg2; QVERIFY(QMetaObject::invokeMethod(&iface, "ping", Q_RETURN_ARG(QDBusVariant, retArg), Q_ARG(QDBusVariant, arg), @@ -393,6 +475,31 @@ // verify that we got the replies as expected QCOMPARE(retArg.variant(), arg.variant()); QCOMPARE(retArg2.variant(), arg2.variant()); + + // make the INVOKABLE call without a return type + QDBusVariant arg3("hello"), arg4("world"); + QVERIFY(QMetaObject::invokeMethod(&iface, "ping_invokable", + Q_RETURN_ARG(QDBusVariant, retArg), + Q_ARG(QDBusVariant, arg3), + Q_ARG(QDBusVariant, arg4), + Q_ARG(QDBusVariant&, retArg2))); + QCOMPARE(MyObject::callCount, 2); + + // verify what the callee received + QCOMPARE(MyObject::callArgs.count(), 2); + v = MyObject::callArgs.at(0); + dv = qdbus_cast(v); + QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().toString(), arg3.variant().toString()); + + v = MyObject::callArgs.at(1); + dv = qdbus_cast(v); + QCOMPARE(dv.variant().type(), QVariant::String); + QCOMPARE(dv.variant().toString(), arg4.variant().toString()); + + // verify that we got the replies as expected + QCOMPARE(retArg.variant(), arg3.variant()); + QCOMPARE(retArg2.variant(), arg4.variant()); } void tst_QDBusInterface::invokeMethodWithComplexReturn() @@ -401,10 +508,11 @@ QDBusInterface iface(QDBusConnection::sessionBus().baseService(), QLatin1String("/"), TEST_INTERFACE_NAME); - // make the call without a return type MyObject::callCount = 0; + QList retArg; + + // make the SLOT call without a return type QList arg = QList() << 42 << -47; - QList retArg; QVERIFY(QMetaObject::invokeMethod(&iface, "ping", Q_RETURN_ARG(QList, retArg), Q_ARG(QList, arg))); QCOMPARE(MyObject::callCount, 1); @@ -416,6 +524,20 @@ // verify that we got the reply as expected QCOMPARE(retArg, arg); + + // make the INVOKABLE call without a return type + QList arg2 = QList() << 24 << -74; + QVERIFY(QMetaObject::invokeMethod(&iface, "ping", Q_RETURN_ARG(QList, retArg), Q_ARG(QList, arg2))); + QCOMPARE(MyObject::callCount, 2); + + // verify what the callee received + QCOMPARE(MyObject::callArgs.count(), 1); + v = MyObject::callArgs.at(0); + QCOMPARE(v.userType(), qMetaTypeId()); + QCOMPARE(qdbus_cast >(v), arg2); + + // verify that we got the reply as expected + QCOMPARE(retArg, arg2); } void tst_QDBusInterface::signal() diff -r ef0373b55136 -r 758a864f9613 tests/auto/qdbusthreading/tst_qdbusthreading.cpp --- a/tests/auto/qdbusthreading/tst_qdbusthreading.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qdbusthreading/tst_qdbusthreading.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -70,7 +70,12 @@ QSemaphore sem1, sem2; volatile bool success; QEventLoop *loop; - const char *functionSpy; + enum FunctionSpy { + NoMethod = 0, + Adaptor_method, + Object_method + } functionSpy; + QThread *threadSpy; int signalSpy; @@ -127,7 +132,7 @@ public Q_SLOTS: void method() { - tst_QDBusThreading::self()->functionSpy = Q_FUNC_INFO; + tst_QDBusThreading::self()->functionSpy = tst_QDBusThreading::Adaptor_method; tst_QDBusThreading::self()->threadSpy = QThread::currentThread(); emit signal(); } @@ -155,7 +160,7 @@ public Q_SLOTS: void method() { - tst_QDBusThreading::self()->functionSpy = Q_FUNC_INFO; + tst_QDBusThreading::self()->functionSpy = tst_QDBusThreading::Object_method; tst_QDBusThreading::self()->threadSpy = QThread::currentThread(); emit signal(); deleteLater(); @@ -198,7 +203,7 @@ static const char myConnectionName[] = "connection"; tst_QDBusThreading::tst_QDBusThreading() - : loop(0), functionSpy(0), threadSpy(0) + : loop(0), functionSpy(NoMethod), threadSpy(0) { _self = this; QCoreApplication::instance()->thread()->setObjectName("Main thread"); @@ -420,22 +425,22 @@ QTest::qWait(100); QCOMPARE(signalSpy, 0); - functionSpy = 0; + functionSpy = NoMethod; threadSpy = 0; QDBusReply reply = iface.call("method"); QVERIFY(reply.isValid()); - QCOMPARE(functionSpy, "void Object::method()"); + QCOMPARE(functionSpy, Object_method); QCOMPARE(threadSpy, th); QTest::qWait(100); QCOMPARE(signalSpy, 1); sem2.acquire(); // the object is gone - functionSpy = 0; + functionSpy = NoMethod; threadSpy = 0; reply = iface.call("method"); QVERIFY(!reply.isValid()); - QCOMPARE(functionSpy, (const char*)0); + QCOMPARE(functionSpy, NoMethod); QCOMPARE(threadSpy, (QThread*)0); } @@ -468,36 +473,36 @@ connect(&adaptor, SIGNAL(signal()), SLOT(signalSpySlot())); QCOMPARE(signalSpy, 0); - functionSpy = 0; + functionSpy = NoMethod; threadSpy = 0; QDBusReply reply = adaptor.call("method"); QVERIFY(reply.isValid()); - QCOMPARE(functionSpy, "void Adaptor::method()"); + QCOMPARE(functionSpy, Adaptor_method); QCOMPARE(threadSpy, th); QTest::qWait(100); QCOMPARE(signalSpy, 1); - functionSpy = 0; + functionSpy = NoMethod; threadSpy = 0; reply = object.call("method"); QVERIFY(reply.isValid()); - QCOMPARE(functionSpy, "void Object::method()"); + QCOMPARE(functionSpy, Object_method); QCOMPARE(threadSpy, th); QTest::qWait(100); QCOMPARE(signalSpy, 1); sem2.acquire(); // the object is gone - functionSpy = 0; + functionSpy = NoMethod; threadSpy = 0; reply = adaptor.call("method"); QVERIFY(!reply.isValid()); - QCOMPARE(functionSpy, (const char*)0); + QCOMPARE(functionSpy, NoMethod); QCOMPARE(threadSpy, (QThread*)0); reply = object.call("method"); QVERIFY(!reply.isValid()); - QCOMPARE(functionSpy, (const char*)0); + QCOMPARE(functionSpy, NoMethod); QCOMPARE(threadSpy, (QThread*)0); } diff -r ef0373b55136 -r 758a864f9613 tests/auto/qdom/qdom.pro --- a/tests/auto/qdom/qdom.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qdom/qdom.pro Mon Oct 04 01:19:32 2010 +0300 @@ -9,7 +9,9 @@ addFiles.path = . DEPLOYMENT += addFiles - DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + wince*|qt_not_deployed { + DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + } !symbian:DEFINES += SRCDIR=\\\"\\\" } else { diff -r ef0373b55136 -r 758a864f9613 tests/auto/qdom/tst_qdom.cpp --- a/tests/auto/qdom/tst_qdom.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qdom/tst_qdom.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1776,6 +1776,7 @@ QDomImplementation::setInvalidDataPolicy(QDomImplementation::ReturnNullNode); QDomDocument docImport; + QCOMPARE(docImport.setContent(QLatin1String("text"), true), false); QVERIFY(docImport.setContent(QLatin1String(""))); } diff -r ef0373b55136 -r 758a864f9613 tests/auto/qfile/qfile.pro --- a/tests/auto/qfile/qfile.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qfile/qfile.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,5 +1,5 @@ TEMPLATE = subdirs -wince*:{ +wince*|symbian:{ SUBDIRS = test } else { SUBDIRS = test stdinprocess diff -r ef0373b55136 -r 758a864f9613 tests/auto/qfileinfo/qfileinfo.pro --- a/tests/auto/qfileinfo/qfileinfo.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qfileinfo/qfileinfo.pro Mon Oct 04 01:19:32 2010 +0300 @@ -16,6 +16,7 @@ symbian { TARGET.CAPABILITY=AllFiles LIBS *= -lefsrv + INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE # Needed for e32svr.h in S^3 envs } # support for running test from shadow build directory diff -r ef0373b55136 -r 758a864f9613 tests/auto/qgl/tst_qgl.cpp --- a/tests/auto/qgl/tst_qgl.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qgl/tst_qgl.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -847,6 +847,7 @@ scene.addWidget(widget)->setPos(0, 0); QGraphicsView view(&scene); + view.setBackgroundBrush(Qt::white); #ifdef Q_WS_QWS view.setWindowFlags(Qt::FramelessWindowHint); #endif @@ -1835,7 +1836,7 @@ // Sample pixels in a grid pattern which avoids false failures due to // off-by-one pixel errors on some buggy GL implementations for (int x = 2; x < reference.width(); x += 5) { - for (int y = 2; y < reference.width(); y += 5) { + for (int y = 2; y < reference.height(); y += 5) { QFUZZY_COMPARE_PIXELS(widgetFB.pixel(x, y), reference.pixel(x, y)); } } @@ -2252,5 +2253,30 @@ #endif } -QTEST_MAIN(tst_QGL) +class tst_QGLDummy : public QObject +{ +Q_OBJECT + +public: + tst_QGLDummy() {} + +private slots: + void qglSkipTests() { + QSKIP("QGL not supported on this system.", SkipAll); + } +}; + +int main(int argc, char **argv) +{ + QApplication app(argc, argv); + QTEST_DISABLE_KEYPAD_NAVIGATION \ + QGLWidget glWidget; + if (!glWidget.isValid()) { + tst_QGLDummy tc; + return QTest::qExec(&tc, argc, argv); + } + tst_QGL tc; + return QTest::qExec(&tc, argc, argv); +} + #include "tst_qgl.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp --- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -183,20 +183,20 @@ QGraphicsItem *item = new QGraphicsRectItem(0, 0, 10, 10); item->setGraphicsEffect(effect); QVERIFY(effect->source()); - QCOMPARE(effect->source()->graphicsItem(), item); + QCOMPARE(effect->source()->graphicsItem(), (const QGraphicsItem*)item); QVERIFY(effect->m_sourceChangedFlags & QGraphicsEffect::SourceAttached); effect->reset(); // Make sure disabling/enabling the effect doesn't change the source. effect->setEnabled(false); QVERIFY(effect->source()); - QCOMPARE(effect->source()->graphicsItem(), item); + QCOMPARE(effect->source()->graphicsItem(), (const QGraphicsItem*)item); QVERIFY(!effect->m_sourceChangedFlags); effect->reset(); effect->setEnabled(true); QVERIFY(effect->source()); - QCOMPARE(effect->source()->graphicsItem(), item); + QCOMPARE(effect->source()->graphicsItem(), (const QGraphicsItem*)item); QVERIFY(!effect->m_sourceChangedFlags); effect->reset(); @@ -210,7 +210,7 @@ item->setGraphicsEffect(effect); QPointer source = effect->source(); QVERIFY(source); - QCOMPARE(source->graphicsItem(), item); + QCOMPARE(source->graphicsItem(), (const QGraphicsItem*)item); delete item; QVERIFY(!effect); QVERIFY(!source); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp --- a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -209,7 +209,7 @@ void tst_QGraphicsEffectSource::graphicsItem() { QVERIFY(effect->source()); - QCOMPARE(effect->source()->graphicsItem(), item); + QCOMPARE(effect->source()->graphicsItem(), (const QGraphicsItem*)item); } void tst_QGraphicsEffectSource::styleOption() @@ -237,7 +237,7 @@ CustomEffect *anotherEffect = new CustomEffect; pixmapItem->setGraphicsEffect(anotherEffect); QVERIFY(anotherEffect->source()); - QCOMPARE(anotherEffect->source()->graphicsItem(), static_cast(pixmapItem)); + QCOMPARE(anotherEffect->source()->graphicsItem(), static_cast(pixmapItem)); QVERIFY(anotherEffect->source()->isPixmap()); delete pixmapItem; } diff -r ef0373b55136 -r 758a864f9613 tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp --- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -107,12 +107,13 @@ void avoidRecursionInInsertItem(); void styleInfoLeak(); void task236367_maxSizeHint(); + void heightForWidth(); }; class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){} + RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent), m_fnConstraint(0) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { @@ -125,9 +126,12 @@ QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const { - if (m_sizeHints[which].isValid()) { + if (constraint.width() < 0 && constraint.height() < 0 && m_sizeHints[which].isValid()) { return m_sizeHints[which]; } + if (m_fnConstraint) { + return m_fnConstraint(which, constraint); + } return QGraphicsWidget::sizeHint(which, constraint); } @@ -136,7 +140,13 @@ updateGeometry(); } + void setConstraintFunction(QSizeF (*fnConstraint)(Qt::SizeHint, const QSizeF &)) { + m_fnConstraint = fnConstraint; + } + QSizeF m_sizeHints[Qt::NSizeHints]; + QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &); + }; struct ItemDesc @@ -146,7 +156,8 @@ m_rowSpan(1), m_colSpan(1), m_sizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)), - m_align(0) + m_align(0), + m_fnConstraint(0) { } @@ -213,8 +224,20 @@ return (*this); } + ItemDesc &heightForWidth(QSizeF (*fnConstraint)(Qt::SizeHint, const QSizeF &)) { + m_fnConstraint = fnConstraint; + m_constraintOrientation = Qt::Vertical; + return (*this); + } + void apply(QGraphicsGridLayout *layout, QGraphicsWidget *item) { - item->setSizePolicy(m_sizePolicy); + QSizePolicy sp = m_sizePolicy; + if (m_fnConstraint) { + sp.setHeightForWidth(m_constraintOrientation == Qt::Vertical); + //sp.setWidthForHeight(m_constraintOrientation == Qt::Horizontal); + } + + item->setSizePolicy(sp); for (int i = 0; i < Qt::NSizeHints; ++i) { if (!m_sizes[i].isValid()) continue; @@ -233,6 +256,7 @@ break; } } + layout->addItem(item, m_pos.first, m_pos.second, m_rowSpan, m_colSpan); layout->setAlignment(item, m_align); } @@ -240,6 +264,7 @@ void apply(QGraphicsGridLayout *layout, RectWidget *item) { for (int i = 0; i < Qt::NSizeHints; ++i) item->setSizeHint((Qt::SizeHint)i, m_sizeHints[i]); + item->setConstraintFunction(m_fnConstraint); apply(layout, static_cast(item)); } @@ -251,6 +276,9 @@ QSizeF m_sizeHints[Qt::NSizeHints]; QSizeF m_sizes[Qt::NSizeHints]; Qt::Alignment m_align; + + Qt::Orientation m_constraintOrientation; + QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &); }; typedef QList ItemList; @@ -485,12 +513,12 @@ widget->resize(widget->effectiveSizeHint(Qt::MaximumSize)); QApplication::processEvents(); - QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(0, 25, 50, 25)); - QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(125, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(125, 25, 50, 25)); - QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(250, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(250, 25, 50, 25)); + QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(0, 50, 50, 50)); + QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(125, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(125, 50, 50, 50)); + QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(250, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(250, 50, 50, 50)); delete widget; } @@ -544,12 +572,12 @@ | HCenter | Right | Left | +---------------------------------+ */ - QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(25, 26, 50, 25)); // item is king - QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(126, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(151, 26, 50, 25)); // item is king - QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(252, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(202, 26, 50, 25)); // item is king + QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(25, 51, 50, 50)); // item is king + QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(126, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(151, 51, 50, 50)); // item is king + QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(252, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(202, 51, 50, 50)); // item is king delete widget; } @@ -2116,6 +2144,17 @@ delete widget; } +static QSizeF hfw1(Qt::SizeHint, const QSizeF &constraint) +{ + QSizeF result(constraint); + if (constraint.width() < 0 && constraint.height() < 0) { + return QSizeF(50, 400); + } else if (constraint.width() >= 0) { + result.setHeight(20000./constraint.width()); + } + return result; +} + void tst_QGraphicsGridLayout::geometries_data() { @@ -2145,6 +2184,186 @@ << QRectF(0, 0, 60,10) << QRectF(0, 10, 60,10) ); + // change layout height and verify + QTest::newRow("hfw-h401") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 401) + << (RectList() + << QRectF(0, 0, 50, 1) << QRectF(50, 0, 50, 1) + << QRectF(0, 1, 50,100) << QRectF(50, 1, 50,400) + ); + + + QTest::newRow("hfw-h408") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 408) + << (RectList() + << QRectF(0, 0, 50, 8) << QRectF(50, 0, 50, 8) + << QRectF(0, 8, 50,100) << QRectF(50, 8, 50,400) + ); + + QTest::newRow("hfw-h410") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 410) + << (RectList() + << QRectF(0, 0, 50,10) << QRectF(50, 0, 50,10) + << QRectF(0, 10, 50,100) << QRectF(50, 10, 50,400) + ); + + QTest::newRow("hfw-h470") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 470) + << (RectList() + << QRectF(0, 0, 50,70) << QRectF(50, 0, 50,70) + << QRectF(0, 70, 50,100) << QRectF(50, 70, 50,400) + ); + + + // change layout width and verify + QTest::newRow("hfw-w100") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(5000, 5000)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 401) + << (RectList() + << QRectF( 0, 0, 50, 1) << QRectF( 50, 0, 50, 1) + << QRectF( 0, 1, 50, 100) << QRectF( 50, 1, 50, 400) + ); + + QTest::newRow("hfw-w160") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(5000, 5000)) + .heightForWidth(hfw1) + ) + << QSizeF(160, 401) + << (RectList() + << QRectF( 0, 0, 80, 100) << QRectF( 80, 0, 80, 100) + << QRectF( 0, 100, 80, 100) << QRectF( 80, 100, 80, 250) + ); + + + QTest::newRow("hfw-w500") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(5000, 5000)) + .heightForWidth(hfw1) + ) + << QSizeF(500, 401) + << (RectList() + << QRectF( 0, 0, 100, 100) << QRectF(100, 0, 100, 100) + << QRectF( 0, 100, 100, 100) << QRectF(100, 100, 400, 50) + ); + } void tst_QGraphicsGridLayout::geometries() @@ -2215,6 +2434,143 @@ QCOMPARE(widget->size(), QSizeF(w, h)); } +/* +static qreal hfw(qreal w) +{ + if (w == 0) + return 20000; + return 20000/w; +} +*/ +static QSizeF hfw(Qt::SizeHint /*which*/, const QSizeF &constraint) +{ + QSizeF result(constraint); + const qreal cw = constraint.width(); + const qreal ch = constraint.height(); + if (cw < 0 && ch < 0) { + return QSizeF(200, 100); + } else if (cw >= 0) { + result.setHeight(20000./cw); + } else if (cw == 0) { + result.setHeight(20000); + } else if (ch >= 0) { + result.setWidth(20000./ch); + } else if (ch == 0) { + result.setWidth(20000); + } + + return result; +} + +static qreal growthFactorBelowPreferredSize(qreal desired, qreal sumAvailable, qreal sumDesired) +{ + Q_ASSERT(sumDesired != 0.0); + return desired * qPow(sumAvailable / sumDesired, desired / sumDesired); +} + +static void expectedWidth(qreal minSize1, qreal prefSize1, + qreal minSize2, qreal prefSize2, + qreal targetSize, qreal *width1, qreal *width2) +{ + qreal sumAvail,factor1,factor2; + // stretch behaviour is different below and above preferred size... + if (targetSize < prefSize1 + prefSize2) { + sumAvail = targetSize - minSize1 - minSize2; + const qreal desired1 = prefSize1 - minSize1; + const qreal desired2 = prefSize2 - minSize2; + const qreal sumDesired = desired1 + desired2; + factor1 = growthFactorBelowPreferredSize(desired1, sumAvail, sumDesired); + factor2 = growthFactorBelowPreferredSize(desired2, sumAvail, sumDesired); + const qreal sumFactors = factor1 + factor2; + *width1 = sumAvail*factor1/sumFactors + minSize1; + *width2 = sumAvail*factor2/sumFactors + minSize2; + } else { + sumAvail = targetSize - prefSize1 - prefSize2; + factor1 = prefSize1; + factor2 = prefSize2; + const qreal sumFactors = factor1 + factor2; + *width1 = sumAvail*factor1/sumFactors + prefSize1; + *width2 = sumAvail*factor2/sumFactors + prefSize2; + } +} + + +bool qFuzzyCompare(const QSizeF &a, const QSizeF &b) +{ + return qFuzzyCompare(a.width(), b.width()) && qFuzzyCompare(a.height(), b.height()); +} + +void tst_QGraphicsGridLayout::heightForWidth() +{ + QGraphicsWidget *widget = new QGraphicsWidget; + QGraphicsGridLayout *layout = new QGraphicsGridLayout; + widget->setLayout(layout); + layout->setContentsMargins(0, 0, 0, 0); + layout->setSpacing(0); + RectWidget *w00 = new RectWidget; + w00->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w00->setSizeHint(Qt::PreferredSize, QSizeF(10,10)); + w00->setSizeHint(Qt::MaximumSize, QSizeF(100,100)); + layout->addItem(w00, 0, 0); + + RectWidget *w01 = new RectWidget; + w01->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w01->setSizeHint(Qt::PreferredSize, QSizeF(10,10)); + w01->setSizeHint(Qt::MaximumSize, QSizeF(100,100)); + layout->addItem(w01, 0, 1); + + RectWidget *w10 = new RectWidget; + w10->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w10->setSizeHint(Qt::PreferredSize, QSizeF(10,10)); + w10->setSizeHint(Qt::MaximumSize, QSizeF(100,100)); + layout->addItem(w10, 1, 0); + + RectWidget *w11 = new RectWidget; + w11->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w11->setSizeHint(Qt::MaximumSize, QSizeF(30000,30000)); + w11->setConstraintFunction(hfw); + QSizePolicy sp(QSizePolicy::Preferred, QSizePolicy::Preferred); + sp.setHeightForWidth(true); + w11->setSizePolicy(sp); + layout->addItem(w11, 1, 1); + + QSizeF prefSize = layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(-1, -1)); + QCOMPARE(prefSize, QSizeF(10+200, 10+100)); + + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(2, -1)), QSizeF(2, 20001)); + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(2, -1)), QSizeF(2, 20010)); + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(2, -1)), QSizeF(2, 20100)); + qreal width1; + qreal width2; + expectedWidth(1, 10, 1, 200, 20, &width1, &width2); + QSizeF expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1); + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(20, -1)), expectedSize); + expectedSize.rheight()+=9; + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(20, -1)), expectedSize); + expectedSize.rheight()+=90; + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(20, -1)), expectedSize); + + expectedWidth(1, 10, 1, 200, 300, &width1, &width2); + expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1); + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(300, -1)), expectedSize); + expectedSize.rheight()+=9; + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(300, -1)), expectedSize); + // the height of the hfw widget is shorter than the one to the left, which is 100, so + // the total height of the last row is 100 (which leaves the layout height to be 200) + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(300, -1)), QSizeF(300, 200)); + + // the hfw item is shorter than the item to the left + expectedWidth(1, 10, 1, 200, 500, &width1, &width2); + expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1); + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(500, -1)), expectedSize); + expectedSize.rheight()+=9; + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(500, -1)), expectedSize); + // the height of the hfw widget is shorter than the one to the left, which is 100, so + // the total height of the last row is 100 (which leaves the layout height to be 200) + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(500, -1)), QSizeF(500, 200)); + +} + QTEST_MAIN(tst_QGraphicsGridLayout) #include "tst_qgraphicsgridlayout.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -4578,7 +4578,7 @@ QCOMPARE(tester.changes.at(tester.changes.size() - 1), QGraphicsItem::ItemFlagsHaveChanged); QVariant expectedFlags = qVariantFromValue(QGraphicsItem::GraphicsItemFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges)); QCOMPARE(tester.values.at(tester.values.size() - 2), expectedFlags); - QCOMPARE(tester.values.at(tester.values.size() - 1), qVariantFromValue(QGraphicsItem::ItemIsSelectable)); + QCOMPARE(tester.values.at(tester.values.size() - 1), qVariantFromValue((quint32)QGraphicsItem::ItemIsSelectable)); } { // ItemSelectedChange diff -r ef0373b55136 -r 758a864f9613 tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp --- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -788,7 +788,7 @@ view.show(); QApplication::setActiveWindow(&view); QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); if (hasScene) { scene.addItem(proxy); proxy->show(); @@ -837,7 +837,7 @@ view.setFocus(); QTest::qWaitForWindowShown(&view); QTRY_VERIFY(view.isVisible()); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); QWidget *widget = new QWidget; widget->setFocusPolicy(Qt::WheelFocus); @@ -1093,7 +1093,7 @@ view.viewport()->setFocus(); QApplication::setActiveWindow(&view); QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); SubQGraphicsProxyWidget *proxy = new SubQGraphicsProxyWidget; proxy->setFlag(QGraphicsItem::ItemIsFocusable, true); // ### remove me!!! @@ -1134,7 +1134,7 @@ view.show(); QApplication::setActiveWindow(&view); QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); SubQGraphicsProxyWidget *proxy = new SubQGraphicsProxyWidget; @@ -1178,7 +1178,7 @@ QApplication::setActiveWindow(&view); QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); SubQGraphicsProxyWidget *proxy = new SubQGraphicsProxyWidget; proxy->setFlag(QGraphicsItem::ItemIsFocusable, true); // ### remove me!!! @@ -3472,7 +3472,7 @@ qt_x11_wait_for_window_manager(&view); #endif QApplication::setActiveWindow(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); QVERIFY(!proxy->hasFocus()); QVERIFY(!proxy->widget()->hasFocus()); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp --- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -276,6 +276,7 @@ void isActive(); void siblingIndexAlwaysValid(); void removeFullyTransparentItem(); + void zeroScale(); // task specific tests below me void task139710_bspTreeCrash(); @@ -1491,7 +1492,7 @@ scene.setItemIndexMethod(QGraphicsScene::NoIndex); scene.addItem(firstItem); scene.addItem(secondItem); - QCOMPARE(scene.items().at(0), firstItem); + QCOMPARE(scene.items().at(0), (QGraphicsItem*)firstItem); QCOMPARE(scene.items().at(1), secondItem); ClearTestItem *thirdItem = new ClearTestItem(firstItem); @@ -4564,5 +4565,30 @@ } } +void tst_QGraphicsScene::zeroScale() +{ + //should not crash + QGraphicsScene scene; + scene.setSceneRect(-100, -100, 100, 100); + QGraphicsView view(&scene); + + ChangedListener cl; + connect(&scene, SIGNAL(changed(const QList &)), &cl, SLOT(changed(const QList &))); + + QGraphicsRectItem *rect1 = new QGraphicsRectItem(0, 0, 0.0000001, 0.00000001); + scene.addItem(rect1); + rect1->setRotation(82); + rect1->setScale(0.00000001); + + QApplication::processEvents(); + QTRY_COMPARE(cl.changes.count(), 1); + QGraphicsRectItem *rect2 = new QGraphicsRectItem(-0.0000001, -0.0000001, 0.0000001, 0.0000001); + rect2->setScale(0.00000001); + scene.addItem(rect2); + rect1->setPos(20,20); + QApplication::processEvents(); + QTRY_COMPARE(cl.changes.count(), 2); +} + QTEST_MAIN(tst_QGraphicsScene) #include "tst_qgraphicsscene.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qgraphicsview/tst_qgraphicsview.cpp --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -244,6 +244,9 @@ void QTBUG_4151_clipAndIgnore(); void QTBUG_5859_exposedRect(); void QTBUG_7438_cursor(); + +public slots: + void dummySlot() {} }; void tst_QGraphicsView::initTestCase() @@ -3202,14 +3205,18 @@ void tst_QGraphicsView::moveItemWhileScrolling_data() { QTest::addColumn("adjustForAntialiasing"); - - QTest::newRow("no adjust") << false; - QTest::newRow("adjust") << true; + QTest::addColumn("changedConnected"); + + QTest::newRow("no adjust") << false << false; + QTest::newRow("adjust") << true << false; + QTest::newRow("no adjust changedConnected") << false << true; + QTest::newRow("adjust changedConnected") << true << true; } void tst_QGraphicsView::moveItemWhileScrolling() { QFETCH(bool, adjustForAntialiasing); + QFETCH(bool, changedConnected); class MoveItemScrollView : public QGraphicsView { @@ -3253,6 +3260,8 @@ view.resize(200, 200); view.painted = false; view.show(); + if (changedConnected) + QObject::connect(view.scene(), SIGNAL(changed(QList)), this, SLOT(dummySlot())); QTest::qWaitForWindowShown(&view); QApplication::processEvents(); QTRY_VERIFY(view.painted); @@ -3691,24 +3700,32 @@ { QTest::addColumn("penWidth"); QTest::addColumn("antialiasing"); + QTest::addColumn("changedConnected"); // Anti-aliased. - QTest::newRow("pen width: 0.0, antialiasing: true") << 0.0 << true; - QTest::newRow("pen width: 1.5, antialiasing: true") << 1.5 << true; - QTest::newRow("pen width: 2.0, antialiasing: true") << 2.0 << true; - QTest::newRow("pen width: 3.0, antialiasing: true") << 3.0 << true; + QTest::newRow("pen width: 0.0, antialiasing: true") << 0.0 << true << false; + QTest::newRow("pen width: 1.5, antialiasing: true") << 1.5 << true << false; + QTest::newRow("pen width: 2.0, antialiasing: true") << 2.0 << true << false; + QTest::newRow("pen width: 3.0, antialiasing: true") << 3.0 << true << false; // Aliased. - QTest::newRow("pen width: 0.0, antialiasing: false") << 0.0 << false; - QTest::newRow("pen width: 1.5, antialiasing: false") << 1.5 << false; - QTest::newRow("pen width: 2.0, antialiasing: false") << 2.0 << false; - QTest::newRow("pen width: 3.0, antialiasing: false") << 3.0 << false; + QTest::newRow("pen width: 0.0, antialiasing: false") << 0.0 << false << false; + QTest::newRow("pen width: 1.5, antialiasing: false") << 1.5 << false << false; + QTest::newRow("pen width: 2.0, antialiasing: false") << 2.0 << false << false; + QTest::newRow("pen width: 3.0, antialiasing: false") << 3.0 << false << false; + + // changed() connected + QTest::newRow("pen width: 0.0, antialiasing: false, changed") << 0.0 << false << true; + QTest::newRow("pen width: 1.5, antialiasing: true, changed") << 1.5 << true << true; + QTest::newRow("pen width: 2.0, antialiasing: false, changed") << 2.0 << false << true; + QTest::newRow("pen width: 3.0, antialiasing: true, changed") << 3.0 << true << true; } void tst_QGraphicsView::update2() { QFETCH(qreal, penWidth); QFETCH(bool, antialiasing); + QFETCH(bool, changedConnected); // Create a rect item. const QRectF rawItemRect(-50.4, -50.3, 100.2, 100.1); @@ -3719,6 +3736,9 @@ // Add item to a scene. QGraphicsScene scene(-100, -100, 200, 200); + if (changedConnected) + QObject::connect(&scene, SIGNAL(changed(QList)), this, SLOT(dummySlot())); + scene.addItem(rect); // Create a view on the scene. diff -r ef0373b55136 -r 758a864f9613 tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp --- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -111,6 +111,7 @@ void fontPropagationSceneChange(); void geometry_data(); void geometry(); + void geometryChanged(); void width(); void height(); void getContentsMargins_data(); @@ -171,6 +172,12 @@ void itemChangeEvents(); void itemSendGeometryPosChangesDeactivated(); + void fontPropagatesResolveToChildren(); + void fontPropagatesResolveToGrandChildren(); + void fontPropagatesResolveInParentChange(); + void fontPropagatesResolveViaNonWidget(); + void fontPropagatesResolveFromScene(); + // Task fixes void task236127_bspTreeIndexFails(); void task243004_setStyleCrash(); @@ -621,6 +628,192 @@ QCOMPARE(widget.font().family(), font.family()); } +void tst_QGraphicsWidget::fontPropagatesResolveToChildren() +{ + QGraphicsWidget *root = new QGraphicsWidget(); + QGraphicsWidget *child1 = new QGraphicsWidget(root); + + QGraphicsScene scene; + scene.addItem(root); + + QFont font; + font.setItalic(true); + root->setFont(font); + + QGraphicsWidget *child2 = new QGraphicsWidget(root); + QGraphicsWidget *child3 = new QGraphicsWidget(); + child3->setParentItem(root); + + QGraphicsView view; + view.setScene(&scene); + view.show(); + QTest::qWaitForWindowShown(&view); + + QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); + QCOMPARE(root->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(child1->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(child2->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(child3->font().resolve(), uint(QFont::StyleResolved)); +} + +void tst_QGraphicsWidget::fontPropagatesResolveToGrandChildren() +{ + QGraphicsWidget *root = new QGraphicsWidget(); + QGraphicsWidget *child1 = new QGraphicsWidget(root); + QGraphicsWidget *grandChild1 = new QGraphicsWidget(child1); + + QGraphicsScene scene; + scene.addItem(root); + + QFont font; + font.setItalic(true); + root->setFont(font); + + QGraphicsWidget *child2 = new QGraphicsWidget(root); + QGraphicsWidget *grandChild2 = new QGraphicsWidget(child2); + QGraphicsWidget *grandChild3 = new QGraphicsWidget(child2); + + QGraphicsWidget *child3 = new QGraphicsWidget(); + QGraphicsWidget *grandChild4 = new QGraphicsWidget(child3); + QGraphicsWidget *grandChild5 = new QGraphicsWidget(child3); + child3->setParentItem(root); + grandChild5->setParentItem(child3); + + QGraphicsView view; + view.setScene(&scene); + view.show(); + QTest::qWaitForWindowShown(&view); + + QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild3->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild4->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild5->font().resolve(), uint(QFont::StyleResolved)); +} + +void tst_QGraphicsWidget::fontPropagatesResolveViaNonWidget() +{ + QGraphicsWidget *root = new QGraphicsWidget(); + QGraphicsPixmapItem *child1 = new QGraphicsPixmapItem(root); + QGraphicsWidget *grandChild1 = new QGraphicsWidget(child1); + + QGraphicsScene scene; + scene.addItem(root); + + QFont font; + font.setItalic(true); + root->setFont(font); + + QGraphicsPixmapItem *child2 = new QGraphicsPixmapItem(root); + QGraphicsWidget *grandChild2 = new QGraphicsWidget(child2); + QGraphicsWidget *grandChild3 = new QGraphicsWidget(child2); + + QGraphicsPixmapItem *child3 = new QGraphicsPixmapItem(); + QGraphicsWidget *grandChild4 = new QGraphicsWidget(child3); + QGraphicsWidget *grandChild5 = new QGraphicsWidget(child3); + child3->setParentItem(root); + grandChild5->setParentItem(child3); + + QGraphicsView view; + view.setScene(&scene); + view.show(); + QTest::qWaitForWindowShown(&view); + + QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild3->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild4->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild5->font().resolve(), uint(QFont::StyleResolved)); +} + +void tst_QGraphicsWidget::fontPropagatesResolveFromScene() +{ + QGraphicsWidget *root = new QGraphicsWidget(); + QGraphicsWidget *child1 = new QGraphicsWidget(root); + QGraphicsWidget *grandChild1 = new QGraphicsWidget(child1); + + QGraphicsScene scene; + scene.addItem(root); + + QFont font; + font.setItalic(true); + scene.setFont(font); + + QGraphicsWidget *child2 = new QGraphicsWidget(root); + QGraphicsWidget *grandChild2 = new QGraphicsWidget(child2); + QGraphicsWidget *grandChild3 = new QGraphicsWidget(child2); + + QGraphicsWidget *child3 = new QGraphicsWidget(); + QGraphicsWidget *grandChild4 = new QGraphicsWidget(child3); + QGraphicsWidget *grandChild5 = new QGraphicsWidget(child3); + child3->setParentItem(root); + grandChild5->setParentItem(child3); + + QGraphicsView view; + view.setScene(&scene); + view.show(); + QTest::qWaitForWindowShown(&view); + + QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); + QCOMPARE(root->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(child1->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(child2->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(child3->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild3->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild4->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild5->font().resolve(), uint(QFont::StyleResolved)); +} + +void tst_QGraphicsWidget::fontPropagatesResolveInParentChange() +{ + QGraphicsWidget *root = new QGraphicsWidget(); + + QGraphicsWidget *child1 = new QGraphicsWidget(root); + QGraphicsWidget *grandChild1 = new QGraphicsWidget(child1); + + QGraphicsWidget *child2 = new QGraphicsWidget(root); + QGraphicsWidget *grandChild2 = new QGraphicsWidget(child2); + + QGraphicsScene scene; + scene.addItem(root); + + QFont italicFont; + italicFont.setItalic(true); + child1->setFont(italicFont); + + QFont boldFont; + boldFont.setBold(true); + child2->setFont(boldFont); + + QVERIFY(grandChild1->font().italic()); + QVERIFY(!grandChild1->font().bold()); + QVERIFY(!grandChild2->font().italic()); + QVERIFY(grandChild2->font().bold()); + + QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild2->font().resolve(), uint(QFont::WeightResolved)); + + grandChild2->setParentItem(child1); + + QGraphicsView view; + view.setScene(&scene); + view.show(); + QTest::qWaitForWindowShown(&view); + + QVERIFY(grandChild1->font().italic()); + QVERIFY(!grandChild1->font().bold()); + QVERIFY(grandChild2->font().italic()); + QVERIFY(!grandChild2->font().bold()); + + QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); + QCOMPARE(grandChild2->font().resolve(), uint(QFont::StyleResolved)); + +} + void tst_QGraphicsWidget::fontPropagation() { QGraphicsWidget *root = new QGraphicsWidget; @@ -727,11 +920,12 @@ widget->setFont(font); QCOMPARE(widget2->font().pointSize(), 43); - QCOMPARE(widget2->font().resolve(), QFont().resolve()); + QCOMPARE(widget2->font().resolve(), uint(QFont::SizeResolved)); widget->setFont(QFont()); QCOMPARE(widget2->font().pointSize(), qApp->font().pointSize()); + QCOMPARE(widget2->font().resolve(), QFont().resolve()); } void tst_QGraphicsWidget::fontPropagationSceneChange() @@ -776,11 +970,28 @@ QFETCH(QSizeF, size); widget.setPos(pos); widget.resize(size); - if (!size.isNull()) + if (!size.isNull() && !pos.isNull()) + QCOMPARE(spy.count(), 2); + if (!size.isNull() && pos.isNull()) QCOMPARE(spy.count(), 1); QCOMPARE(widget.geometry(), QRectF(pos, size)); } +void tst_QGraphicsWidget::geometryChanged() +{ + QGraphicsWidget w; + w.setGeometry(0, 0, 200, 200); + QCOMPARE(w.geometry(), QRectF(0, 0, 200, 200)); + QSignalSpy spy(&w, SIGNAL(geometryChanged())); + w.setGeometry(0, 0, 100, 100); + QCOMPARE(spy.count(), 1); + QCOMPARE(w.geometry(), QRectF(0, 0, 100, 100)); + w.setPos(10, 10); + QCOMPARE(spy.count(), 2); + QCOMPARE(w.geometry(), QRectF(10, 10, 100, 100)); + +} + void tst_QGraphicsWidget::width() { QGraphicsWidget w; @@ -872,7 +1083,7 @@ qt_x11_wait_for_window_manager(&view); #endif QApplication::setActiveWindow(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); view.setAlignment(Qt::AlignTop | Qt::AlignLeft); SubQGraphicsWidget *widget = new SubQGraphicsWidget; @@ -1204,7 +1415,7 @@ qt_x11_wait_for_window_manager(&view); #endif QApplication::setActiveWindow(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); QGraphicsWidget *lastItem = 0; QTest::ignoreMessage(QtWarningMsg, "QGraphicsWidget::setTabOrder(0, 0) is undefined"); @@ -1267,7 +1478,7 @@ view.show(); QApplication::setActiveWindow(&view); QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); int i; QGraphicsWidget *w1, *w2, *w3, *w4; @@ -1407,7 +1618,7 @@ view.show(); QApplication::setActiveWindow(&view); QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); { // parent/child focus @@ -1534,7 +1745,7 @@ qt_x11_wait_for_window_manager(&view); #endif QApplication::setActiveWindow(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); // delete item in focus chain with no focus and verify chain SubQGraphicsWidget *parent = new SubQGraphicsWidget(0, Qt::Window); @@ -2485,7 +2696,7 @@ view.setScene(&scene); view.show(); QApplication::setActiveWindow(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); // *** Event: *** diff -r ef0373b55136 -r 758a864f9613 tests/auto/qimage/tst_qimage.cpp --- a/tests/auto/qimage/tst_qimage.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qimage/tst_qimage.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -83,6 +83,8 @@ void convertToFormat_data(); void convertToFormat(); + void convertToFormatRgb888ToRGB32(); + void createAlphaMask_data(); void createAlphaMask(); #ifndef QT_NO_IMAGE_HEURISTIC_MASK @@ -137,6 +139,9 @@ void premultipliedAlphaConsistency(); void compareIndexed(); + + void rgbSwapped_data(); + void rgbSwapped(); }; tst_QImage::tst_QImage() @@ -799,6 +804,26 @@ QFile::remove(QLatin1String("expected2.xpm")); } +void tst_QImage::convertToFormatRgb888ToRGB32() +{ + // 545 so width % 4 != 0. This ensure there is padding at the end of the scanlines + const int height = 545; + const int width = 545; + QImage source(width, height, QImage::Format_RGB888); + for (int y = 0; y < height; ++y) { + uchar *srcPixels = source.scanLine(y); + for (int x = 0; x < width * 3; ++x) + srcPixels[x] = x; + } + + QImage rgb32Image = source.convertToFormat(QImage::Format_RGB888); + QCOMPARE(rgb32Image.format(), QImage::Format_RGB888); + for (int x = 0; x < width; ++x) { + for (int y = 0; y < height; ++y) + QCOMPARE(rgb32Image.pixel(x, y), source.pixel(x, y)); + } +} + void tst_QImage::createAlphaMask_data() { QTest::addColumn("x"); @@ -1426,11 +1451,6 @@ return int(256. * (qrand() / (RAND_MAX + 1.0))); } -static inline bool compare(int a, int b, int tolerance) -{ - return qAbs(a - b) <= tolerance; -} - // compares img.scale against the bilinear filtering used by QPainter void tst_QImage::smoothScale3() { @@ -1458,6 +1478,7 @@ p.scale(scales[i], scales[i]); p.drawImage(0, 0, img); p.end(); + int err = 0; for (int y = 0; y < a.height(); ++y) { for (int x = 0; x < a.width(); ++x) { @@ -1465,11 +1486,15 @@ QRgb cb = b.pixel(x, y); // tolerate a little bit of rounding errors - QVERIFY(compare(qRed(ca), qRed(cb), 3)); - QVERIFY(compare(qGreen(ca), qGreen(cb), 3)); - QVERIFY(compare(qBlue(ca), qBlue(cb), 3)); + bool r = true; + r &= qAbs(qRed(ca) - qRed(cb)) <= 18; + r &= qAbs(qGreen(ca) - qGreen(cb)) <= 18; + r &= qAbs(qBlue(ca) - qBlue(cb)) <= 18; + if (!r) + err++; } } + QCOMPARE(err, 0); } } @@ -1798,5 +1823,68 @@ QCOMPARE(img, imgInverted); } +void tst_QImage::rgbSwapped_data() +{ + QTest::addColumn("format"); + + QTest::newRow("Format_Indexed8") << QImage::Format_Indexed8; + QTest::newRow("Format_RGB32") << QImage::Format_RGB32; + QTest::newRow("Format_ARGB32") << QImage::Format_ARGB32; + QTest::newRow("Format_ARGB32_Premultiplied") << QImage::Format_ARGB32_Premultiplied; + QTest::newRow("Format_RGB16") << QImage::Format_RGB16; + QTest::newRow("Format_ARGB8565_Premultiplied") << QImage::Format_ARGB8565_Premultiplied; + QTest::newRow("Format_ARGB6666_Premultiplied") << QImage::Format_ARGB6666_Premultiplied; + QTest::newRow("Format_ARGB4444_Premultiplied") << QImage::Format_ARGB4444_Premultiplied; + QTest::newRow("Format_RGB666") << QImage::Format_RGB666; + QTest::newRow("Format_RGB555") << QImage::Format_RGB555; + QTest::newRow("Format_ARGB8555_Premultiplied") << QImage::Format_ARGB8555_Premultiplied; + QTest::newRow("Format_RGB888") << QImage::Format_RGB888; + QTest::newRow("Format_RGB444") << QImage::Format_RGB444; +} + +void tst_QImage::rgbSwapped() +{ + QFETCH(QImage::Format, format); + + QImage image(100, 1, format); + image.fill(0); + + QVector testColor(image.width()); + + for (int i = 0; i < image.width(); ++i) + testColor[i] = QColor(i, 10 + i, 20 + i * 2, 30 + i); + + if (format != QImage::Format_Indexed8) { + QPainter p(&image); + p.setCompositionMode(QPainter::CompositionMode_Source); + for (int i = 0; i < image.width(); ++i) + p.fillRect(QRect(i, 0, 1, 1), testColor[i].rgb()); + } else { + image.setColorCount(image.width()); + for (int i = 0; i < image.width(); ++i) { + image.setColor(0, testColor[i].rgba()); + image.setPixel(i, 0, i); + } + } + + QImage imageSwapped = image.rgbSwapped(); + + for (int i = 0; i < image.width(); ++i) { + QColor referenceColor = QColor(image.pixel(i, 0)); + QColor swappedColor = QColor(imageSwapped.pixel(i, 0)); + + QCOMPARE(swappedColor.alpha(), referenceColor.alpha()); + QCOMPARE(swappedColor.red(), referenceColor.blue()); + QCOMPARE(swappedColor.green(), referenceColor.green()); + QCOMPARE(swappedColor.blue(), referenceColor.red()); + } + + QImage imageSwappedTwice = imageSwapped.rgbSwapped(); + + QCOMPARE(image, imageSwappedTwice); + + QCOMPARE(memcmp(image.constBits(), imageSwappedTwice.constBits(), image.numBytes()), 0); +} + QTEST_MAIN(tst_QImage) #include "tst_qimage.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qinputcontext/qinputcontext.pro --- a/tests/auto/qinputcontext/qinputcontext.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qinputcontext/qinputcontext.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,2 +1,6 @@ load(qttest_p4) SOURCES += tst_qinputcontext.cpp + +symbian { + LIBS += -lws32 -lcone +} diff -r ef0373b55136 -r 758a864f9613 tests/auto/qinputcontext/tst_qinputcontext.cpp --- a/tests/auto/qinputcontext/tst_qinputcontext.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qinputcontext/tst_qinputcontext.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -48,17 +48,27 @@ #include #include #include +#include +#include + +#ifdef Q_OS_SYMBIAN +#include +#include + +#include +#include +#endif class tst_QInputContext : public QObject { Q_OBJECT public: - tst_QInputContext() {} + tst_QInputContext() : m_phoneIsQwerty(false) {} virtual ~tst_QInputContext() {} public slots: - void initTestCase() {} + void initTestCase(); void cleanupTestCase() {} void init() {} void cleanup() {} @@ -69,8 +79,178 @@ void closeSoftwareInputPanel(); void selections(); void focusProxy(); + void symbianTestCoeFepInputContext_data(); + void symbianTestCoeFepInputContext(); + void symbianTestCoeFepAutoCommit_data(); + void symbianTestCoeFepAutoCommit(); + +private: + bool m_phoneIsQwerty; }; +#ifdef Q_OS_SYMBIAN +class KeyEvent : public TWsEvent +{ +public: + KeyEvent(QWidget *w, TInt type, TInt scanCode, TUint code, TUint modifiers, TInt repeats) { + iHandle = w->effectiveWinId()->DrawableWindow()->WindowGroupId(); + iType = type; + SetTimeNow(); + TKeyEvent *keyEvent = reinterpret_cast(iEventData); + keyEvent->iScanCode = scanCode; + keyEvent->iCode = code; + keyEvent->iModifiers = modifiers; + keyEvent->iRepeats = repeats; + } +}; + +class FepReplayEvent +{ +public: + enum Type { + Pause, + Key, + CompleteKey + }; + + FepReplayEvent(int msecsToPause) + : m_type(Pause) + , m_msecsToPause(msecsToPause) + { + } + + FepReplayEvent(TInt keyType, TInt scanCode, TUint code, TUint modifiers, TInt repeats) + : m_type(Key) + , m_keyType(keyType) + , m_scanCode(scanCode) + , m_code(code) + , m_modifiers(modifiers) + , m_repeats(repeats) + { + } + + FepReplayEvent(TInt scanCode, TUint code, TUint modifiers, TInt repeats) + : m_type(CompleteKey) + , m_scanCode(scanCode) + , m_code(code) + , m_modifiers(modifiers) + , m_repeats(repeats) + { + } + + void sendEvent(QWidget *w, TInt type, TInt scanCode, TUint code, TUint modifiers, TInt repeats) + { + KeyEvent event(w, type, scanCode, code, modifiers, repeats); + S60->wsSession().SendEventToWindowGroup(w->effectiveWinId()->DrawableWindow()->WindowGroupId(), event); + } + + void pause(int msecs) + { + // Don't use qWait here. The polling nature of that function screws up the test. + QTimer timer; + QEventLoop loop; + QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit())); + timer.setSingleShot(true); + timer.start(msecs); + loop.exec(); + } + + // For some reason, the test fails if using processEvents instead of an event loop + // with a zero timer to quit it, so use the timer. +#define KEY_WAIT 0 + + void replay(QWidget *w) + { + if (m_type == Pause) { + pause(m_msecsToPause); + } else if (m_type == Key) { + sendEvent(w, m_keyType, m_scanCode, m_code, m_modifiers, m_repeats); + if (m_keyType != EEventKeyDown) + // EEventKeyDown events should have no pause before the EEventKey event. + pause(KEY_WAIT); + } else if (m_type == CompleteKey) { + sendEvent(w, EEventKeyDown, m_scanCode, 0, m_modifiers, m_repeats); + // EEventKeyDown events should have no pause before the EEventKey event. + sendEvent(w, EEventKey, m_scanCode, m_code, m_modifiers, m_repeats); + pause(KEY_WAIT); + sendEvent(w, EEventKeyUp, m_scanCode, 0, m_modifiers, m_repeats); + pause(KEY_WAIT); + } + } + +private: + Type m_type; + int m_msecsToPause; + TInt m_keyType; + TInt m_scanCode; + TUint m_code; + TUint m_modifiers; + TInt m_repeats; +}; + +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(Qt::InputMethodHints) +Q_DECLARE_METATYPE(QLineEdit::EchoMode); + +#endif // Q_OS_SYMBIAN + +void tst_QInputContext::initTestCase() +{ +#ifdef Q_OS_SYMBIAN + // Sanity test. Checks FEP for: + // - T9 mode is default (it will attempt to fix this) + // - Language is English (it cannot fix this; bail out if not correct) + QWidget w; + QLayout *layout = new QVBoxLayout; + w.setLayout(layout); + QLineEdit *lineedit = new QLineEdit; + layout->addWidget(lineedit); + lineedit->setFocus(); +#ifdef QT_KEYPAD_NAVIGATION + lineedit->setEditFocus(true); +#endif + w.show(); + + QDesktopWidget desktop; + QRect screenSize = desktop.screenGeometry(&w); + if (screenSize.width() > screenSize.height()) { + // Crude way of finding out we are running on a qwerty phone. + m_phoneIsQwerty = true; + return; + } + + for (int iterations = 0; iterations < 16; iterations++) { + QTest::qWait(500); + + QList keyEvents; + + keyEvents << FepReplayEvent('9', '9', 0, 0); + keyEvents << FepReplayEvent('6', '6', 0, 0); + keyEvents << FepReplayEvent('8', '8', 0, 0); + keyEvents << FepReplayEvent(EStdKeyRightArrow, EKeyRightArrow, 0, 0); + + foreach(FepReplayEvent event, keyEvents) { + event.replay(lineedit); + } + + QApplication::processEvents(); + + if (lineedit->text().endsWith("you", Qt::CaseInsensitive)) { + // Success! + return; + } + + // Try changing modes. + // After 8 iterations, try to press the mode switch twice before typing. + for (int c = 0; c <= iterations / 8; c++) { + FepReplayEvent(EStdKeyHash, '#', 0, 0).replay(lineedit); + } + } + + QFAIL("FEP sanity test failed. Either the phone is not set to English, or the test was unable to enable T9"); +#endif +} + void tst_QInputContext::maximumTextLength() { QLineEdit le; @@ -271,7 +451,6 @@ QInputContext *gic = qApp->inputContext(); QVERIFY(gic); - qDebug() << gic->focusWidget() << &proxy; QCOMPARE(gic->focusWidget(), &proxy); // then change the focus proxy and check that input context is valid @@ -285,5 +464,601 @@ QCOMPARE(gic->focusWidget(), &proxy); } +void tst_QInputContext::symbianTestCoeFepInputContext_data() +{ +#ifdef Q_OS_SYMBIAN + QTest::addColumn ("inputMethodEnabled"); + QTest::addColumn ("inputMethodHints"); + QTest::addColumn ("maxLength"); // Zero for no limit + QTest::addColumn ("echoMode"); + QTest::addColumn > ("keyEvents"); + QTest::addColumn ("finalString"); + QTest::addColumn ("preeditString"); + QList events; + + events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0); + events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0); + events << FepReplayEvent('5', '5', 0, 0); + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent('6', '6', 0, 0); + events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0); + events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0); + events << FepReplayEvent('1', '1', 0, 0); + events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0); + events << FepReplayEvent('2', '2', 0, 0); + events << FepReplayEvent('1', '1', 0, 0); + QTest::newRow("Numbers (no FEP)") + << false + << Qt::InputMethodHints(Qt::ImhNone) + << 0 + << QLineEdit::Normal + << events + << QString("521") + << QString(""); + QTest::newRow("Numbers and password mode (no FEP)") + << false + << Qt::InputMethodHints(Qt::ImhNone) + << 0 + << QLineEdit::Password + << events + << QString("521") + << QString(""); + QTest::newRow("Numbers") + << true + << Qt::InputMethodHints(Qt::ImhDigitsOnly) + << 0 + << QLineEdit::Normal + << events + << QString("521") + << QString(""); + QTest::newRow("Numbers max length (no FEP)") + << false + << Qt::InputMethodHints(Qt::ImhNone) + << 2 + << QLineEdit::Normal + << events + << QString("21") + << QString(""); + QTest::newRow("Numbers max length") + << true + << Qt::InputMethodHints(Qt::ImhDigitsOnly) + << 2 + << QLineEdit::Normal + << events + << QString("21") + << QString(""); + events.clear(); + + events << FepReplayEvent(EEventKeyDown, '5', 0, 0, 0); + events << FepReplayEvent(EEventKey, '5', '5', 0, 0); + events << FepReplayEvent(EEventKey, '5', '5', 0, 1); + events << FepReplayEvent(EEventKey, '5', '5', 0, 1); + events << FepReplayEvent(EEventKeyUp, '5', 0, 0, 0); + QTest::newRow("Numbers and autorepeat (no FEP)") + << false + << Qt::InputMethodHints(Qt::ImhNone) + << 0 + << QLineEdit::Normal + << events + << QString("555") + << QString(""); + events.clear(); + + events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0); + events << FepReplayEvent('2', '2', 0, 0); + events << FepReplayEvent('3', '3', 0, 0); + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent('5', '5', 0, 0); + events << FepReplayEvent('5', '5', 0, 0); + events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0); + QTest::newRow("Multitap") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText) + << 0 + << QLineEdit::Normal + << events + << QString("Adh") + << QString(""); + QTest::newRow("Multitap with no auto uppercase") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhNoAutoUppercase) + << 0 + << QLineEdit::Normal + << events + << QString("adh") + << QString(""); + QTest::newRow("Multitap with uppercase") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferUppercase) + << 0 + << QLineEdit::Normal + << events + << QString("ADH") + << QString(""); + QTest::newRow("Multitap with lowercase") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase) + << 0 + << QLineEdit::Normal + << events + << QString("adh") + << QString(""); + QTest::newRow("Multitap with forced uppercase") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhUppercaseOnly) + << 0 + << QLineEdit::Normal + << events + << QString("ADH") + << QString(""); + QTest::newRow("Multitap with forced lowercase") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhLowercaseOnly) + << 0 + << QLineEdit::Normal + << events + << QString("adh") + << QString(""); + events.clear(); + + events << FepReplayEvent(EStdKeyHash, '#', 0, 0); + events << FepReplayEvent('2', '2', 0, 0); + events << FepReplayEvent('2', '2', 0, 0); + events << FepReplayEvent('3', '3', 0, 0); + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent('5', '5', 0, 0); + events << FepReplayEvent('5', '5', 0, 0); + events << FepReplayEvent(EStdKeyBackspace, EKeyBackspace, 0, 0); + QTest::newRow("Multitap with mode switch") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText) + << 0 + << QLineEdit::Normal + << events + << QString("bdh") + << QString(""); + events.clear(); + + events << FepReplayEvent('7', '7', 0, 0); + events << FepReplayEvent('7', '7', 0, 0); + events << FepReplayEvent('8', '8', 0, 0); + events << FepReplayEvent('9', '9', 0, 0); + events << FepReplayEvent('9', '9', 0, 0); + QTest::newRow("Multitap with unfinished text") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText) + << 0 + << QLineEdit::Normal + << events + << QString("Qt") + << QString("x"); + events << FepReplayEvent(2000); + QTest::newRow("Multitap with committed text") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText) + << 0 + << QLineEdit::Normal + << events + << QString("Qtx") + << QString(""); + events.clear(); + + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent('4', '4', 0, 0); + // Simulate holding down hash key. + events << FepReplayEvent(EEventKeyDown, EStdKeyHash, 0, 0, 0); + events << FepReplayEvent(EEventKey, EStdKeyHash, '#', 0, 0); + events << FepReplayEvent(500); + events << FepReplayEvent(EEventKey, EStdKeyHash, '#', 0, 1); + events << FepReplayEvent(EEventKey, EStdKeyHash, '#', 0, 1); + events << FepReplayEvent(EEventKey, EStdKeyHash, '#', 0, 1); + events << FepReplayEvent(EEventKeyUp, EStdKeyHash, 0, 0, 0); + events << FepReplayEvent('7', '7', 0, 0); + events << FepReplayEvent('7', '7', 0, 0); + events << FepReplayEvent('8', '8', 0, 0); + // QTBUG-9867: Switch back as well to make sure we don't get extra symbols + events << FepReplayEvent(EEventKeyDown, EStdKeyHash, 0, 0, 0); + events << FepReplayEvent(EEventKey, EStdKeyHash, '#', 0, 0); + events << FepReplayEvent(500); + events << FepReplayEvent(EEventKey, EStdKeyHash, '#', 0, 1); + events << FepReplayEvent(EEventKey, EStdKeyHash, '#', 0, 1); + events << FepReplayEvent(EEventKey, EStdKeyHash, '#', 0, 1); + events << FepReplayEvent(EEventKeyUp, EStdKeyHash, 0, 0, 0); + events << FepReplayEvent('9', '9', 0, 0); + events << FepReplayEvent('6', '6', 0, 0); + events << FepReplayEvent('8', '8', 0, 0); + events << FepReplayEvent(2000); + events << FepReplayEvent(EStdKeyDevice3, EKeyDevice3, 0, 0); // Select key + QTest::newRow("Multitap and numbers") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText) + << 0 + << QLineEdit::Normal + << events + << QString("H778wmt") + << QString(""); + QTest::newRow("T9 and numbers") + << true + << Qt::InputMethodHints(Qt::ImhPreferLowercase) + << 0 + << QLineEdit::Normal + << events + << QString("hi778you") + << QString(""); + events.clear(); + + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent(EStdKeyDevice3, EKeyDevice3, 0, 0); // Select key + QTest::newRow("T9") + << true + << Qt::InputMethodHints(Qt::ImhPreferLowercase) + << 0 + << QLineEdit::Normal + << events + << QString("hi") + << QString(""); + QTest::newRow("T9 with uppercase") + << true + << Qt::InputMethodHints(Qt::ImhPreferUppercase) + << 0 + << QLineEdit::Normal + << events + << QString("HI") + << QString(""); + QTest::newRow("T9 with forced lowercase") + << true + << Qt::InputMethodHints(Qt::ImhLowercaseOnly) + << 0 + << QLineEdit::Normal + << events + << QString("hi") + << QString(""); + QTest::newRow("T9 with forced uppercase") + << true + << Qt::InputMethodHints(Qt::ImhUppercaseOnly) + << 0 + << QLineEdit::Normal + << events + << QString("HI") + << QString(""); + QTest::newRow("T9 with maxlength") + << true + << Qt::InputMethodHints(Qt::ImhLowercaseOnly) + << 1 + << QLineEdit::Normal + << events + << QString("i") + << QString(""); + events.clear(); + + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent(EStdKeyLeftArrow, EKeyLeftArrow, 0, 0); + events << FepReplayEvent(EStdKeyLeftArrow, EKeyLeftArrow, 0, 0); + events << FepReplayEvent('9', '9', 0, 0); + events << FepReplayEvent('6', '6', 0, 0); + events << FepReplayEvent('8', '8', 0, 0); + events << FepReplayEvent('0', '0', 0, 0); + events << FepReplayEvent(EStdKeyRightArrow, EKeyRightArrow, 0, 0); + events << FepReplayEvent(EStdKeyRightArrow, EKeyRightArrow, 0, 0); + events << FepReplayEvent('8', '8', 0, 0); + events << FepReplayEvent('8', '8', 0, 0); + QTest::newRow("T9 with movement and unfinished text") + << true + << Qt::InputMethodHints(Qt::ImhPreferLowercase) + << 0 + << QLineEdit::Normal + << events + << QString("you hi") + << QString("tv"); + QTest::newRow("T9 with movement, password and unfinished text") + << true + << Qt::InputMethodHints(Qt::ImhPreferLowercase) + << 0 + << QLineEdit::Password + << events + << QString("wmt h") + << QString("u"); + QTest::newRow("T9 with movement, maxlength, password and unfinished text") + << true + << Qt::InputMethodHints(Qt::ImhPreferLowercase) + << 2 + << QLineEdit::Password + << events + << QString("wh") + << QString(""); + QTest::newRow("T9 with movement, maxlength and unfinished text") + << true + << Qt::InputMethodHints(Qt::ImhPreferLowercase) + << 2 + << QLineEdit::Normal + << events + << QString("hi") + << QString(""); + QTest::newRow("Multitap with movement and unfinished text") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase) + << 0 + << QLineEdit::Normal + << events + << QString("wmt h") + << QString("u"); + QTest::newRow("Multitap with movement, maxlength and unfinished text") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase) + << 2 + << QLineEdit::Normal + << events + << QString("wh") + << QString(""); + QTest::newRow("Numbers with movement") + << true + << Qt::InputMethodHints(Qt::ImhDigitsOnly) + << 0 + << QLineEdit::Normal + << events + << QString("96804488") + << QString(""); + QTest::newRow("Numbers with movement and maxlength") + << true + << Qt::InputMethodHints(Qt::ImhDigitsOnly) + << 2 + << QLineEdit::Normal + << events + << QString("44") + << QString(""); + QTest::newRow("Numbers with movement, password and unfinished text") + << true + << Qt::InputMethodHints(Qt::ImhDigitsOnly) + << 0 + << QLineEdit::Password + << events + << QString("9680448") + << QString("8"); + QTest::newRow("Numbers with movement, maxlength, password and unfinished text") + << true + << Qt::InputMethodHints(Qt::ImhDigitsOnly) + << 2 + << QLineEdit::Password + << events + << QString("44") + << QString(""); + events << FepReplayEvent(EStdKeyRightArrow, EKeyRightArrow, 0, 0); + QTest::newRow("T9 with movement") + << true + << Qt::InputMethodHints(Qt::ImhPreferLowercase) + << 0 + << QLineEdit::Normal + << events + << QString("you htvi") + << QString(""); + QTest::newRow("T9 with movement and password") + << true + << Qt::InputMethodHints(Qt::ImhPreferLowercase) + << 0 + << QLineEdit::Password + << events + << QString("wmt hu") + << QString(""); + QTest::newRow("T9 with movement, maxlength and password") + << true + << Qt::InputMethodHints(Qt::ImhPreferLowercase) + << 2 + << QLineEdit::Password + << events + << QString("wh") + << QString(""); + QTest::newRow("Multitap with movement") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase) + << 0 + << QLineEdit::Normal + << events + << QString("wmt hu") + << QString(""); + QTest::newRow("Multitap with movement and maxlength") + << true + << Qt::InputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase) + << 2 + << QLineEdit::Normal + << events + << QString("wh") + << QString(""); + QTest::newRow("Numbers with movement and password") + << true + << Qt::InputMethodHints(Qt::ImhDigitsOnly) + << 0 + << QLineEdit::Password + << events + << QString("96804488") + << QString(""); + QTest::newRow("Numbers with movement, maxlength and password") + << true + << Qt::InputMethodHints(Qt::ImhDigitsOnly) + << 2 + << QLineEdit::Password + << events + << QString("44") + << QString(""); + events.clear(); +#endif +} + +void tst_QInputContext::symbianTestCoeFepInputContext() +{ +#ifndef Q_OS_SYMBIAN + QSKIP("This is a Symbian-only test", SkipAll); +#else + QCoeFepInputContext *ic = qobject_cast(qApp->inputContext()); + if (!ic) { + QSKIP("coefep is not the active input context; skipping test", SkipAll); + } + + QFETCH(bool, inputMethodEnabled); + QFETCH(Qt::InputMethodHints, inputMethodHints); + QFETCH(int, maxLength); + QFETCH(QLineEdit::EchoMode, echoMode); + QFETCH(QList, keyEvents); + QFETCH(QString, finalString); + QFETCH(QString, preeditString); + + if (inputMethodEnabled && m_phoneIsQwerty) { + QSKIP("Skipping advanced input method tests on QWERTY phones", SkipSingle); + } + + QWidget w; + QLayout *layout = new QVBoxLayout; + w.setLayout(layout); + QLineEdit *lineedit = new QLineEdit; + layout->addWidget(lineedit); + lineedit->setFocus(); +#ifdef QT_KEYPAD_NAVIGATION + lineedit->setEditFocus(true); +#endif + w.show(); + + lineedit->setAttribute(Qt::WA_InputMethodEnabled, inputMethodEnabled); + lineedit->setInputMethodHints(inputMethodHints); + if (maxLength > 0) + lineedit->setMaxLength(maxLength); + lineedit->setEchoMode(echoMode); + + QTest::qWait(200); + + foreach(FepReplayEvent event, keyEvents) { + event.replay(lineedit); + } + + QApplication::processEvents(); + + QCOMPARE(lineedit->text(), finalString); + QCOMPARE(ic->m_preeditString, preeditString); +#endif +} + +void tst_QInputContext::symbianTestCoeFepAutoCommit_data() +{ +#ifdef Q_OS_SYMBIAN + QTest::addColumn ("inputMethodHints"); + QTest::addColumn ("echoMode"); + QTest::addColumn > ("keyEvents"); + QTest::addColumn ("finalString"); + + QList events; + + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent('4', '4', 0, 0); + events << FepReplayEvent('0', '0', 0, 0); + events << FepReplayEvent('9', '9', 0, 0); + events << FepReplayEvent('6', '6', 0, 0); + events << FepReplayEvent('8', '8', 0, 0); + QTest::newRow("Numbers") + << Qt::InputMethodHints(Qt::ImhDigitsOnly) + << QLineEdit::Normal + << events + << QString("440968"); + QTest::newRow("Numbers and password") + << Qt::InputMethodHints(Qt::ImhDigitsOnly) + << QLineEdit::Password + << events + << QString("440968"); + QTest::newRow("Multitap") + << Qt::InputMethodHints(Qt::ImhPreferLowercase | Qt::ImhNoPredictiveText) + << QLineEdit::Normal + << events + << QString("h wmt"); + QTest::newRow("T9") + << Qt::InputMethodHints(Qt::ImhPreferLowercase) + << QLineEdit::Normal + << events + << QString("hi you"); + QTest::newRow("Multitap with password") + << Qt::InputMethodHints(Qt::ImhPreferLowercase | Qt::ImhNoPredictiveText) + << QLineEdit::Password + << events + << QString("h wmt"); + QTest::newRow("T9 with password") + << Qt::InputMethodHints(Qt::ImhPreferLowercase) + << QLineEdit::Password + << events + << QString("h wmt"); +#endif +} + +void tst_QInputContext::symbianTestCoeFepAutoCommit() +{ +#ifndef Q_OS_SYMBIAN + QSKIP("This is a Symbian-only test", SkipAll); +#else + QCoeFepInputContext *ic = qobject_cast(qApp->inputContext()); + if (!ic) { + QSKIP("coefep is not the active input context; skipping test", SkipAll); + } + + QFETCH(Qt::InputMethodHints, inputMethodHints); + QFETCH(QLineEdit::EchoMode, echoMode); + QFETCH(QList, keyEvents); + QFETCH(QString, finalString); + + if (m_phoneIsQwerty) { + QSKIP("Skipping advanced input method tests on QWERTY phones", SkipSingle); + } + + QWidget w; + QLayout *layout = new QVBoxLayout; + w.setLayout(layout); + QLineEdit *lineedit = new QLineEdit; + layout->addWidget(lineedit); + lineedit->setFocus(); +#ifdef QT_KEYPAD_NAVIGATION + lineedit->setEditFocus(true); +#endif + QPushButton *pushButton = new QPushButton("Done"); + layout->addWidget(pushButton); + QAction softkey("Done", &w); + softkey.setSoftKeyRole(QAction::PositiveSoftKey); + w.addAction(&softkey); + w.show(); + + lineedit->setInputMethodHints(inputMethodHints); + lineedit->setEchoMode(echoMode); + + QTest::qWait(200); + foreach(FepReplayEvent event, keyEvents) { + event.replay(lineedit); + } + QApplication::processEvents(); + + QTest::mouseClick(pushButton, Qt::LeftButton); + + QCOMPARE(lineedit->text(), finalString); + QVERIFY(ic->m_preeditString.isEmpty()); + +#ifdef Q_WS_S60 + lineedit->inputContext()->reset(); + lineedit->clear(); + lineedit->setFocus(); +#ifdef QT_KEYPAD_NAVIGATION + lineedit->setEditFocus(true); +#endif + + QTest::qWait(200); + foreach(FepReplayEvent event, keyEvents) { + event.replay(lineedit); + } + QApplication::processEvents(); + + FepReplayEvent(EStdKeyDevice0, EKeyDevice0, 0, 0).replay(lineedit); // Left softkey + + QCOMPARE(lineedit->text(), finalString); + QVERIFY(ic->m_preeditString.isEmpty()); + +#endif // Q_WS_S60 +#endif // Q_OS_SYMBIAN +} + QTEST_MAIN(tst_QInputContext) #include "tst_qinputcontext.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qkeysequence/tst_qkeysequence.cpp --- a/tests/auto/qkeysequence/tst_qkeysequence.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qkeysequence/tst_qkeysequence.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -532,20 +532,20 @@ QTest::addColumn("transKey"); QTest::addColumn("compKey"); - QTest::newRow("Shift++") << QString(tr("Shift++")) << QString("Umschalt++"); - QTest::newRow("Ctrl++") << QString(tr("Ctrl++")) << QString("Strg++"); - QTest::newRow("Alt++") << QString(tr("Alt++")) << QString("Alt++"); - QTest::newRow("Meta++") << QString(tr("Meta++")) << QString("Meta++"); + QTest::newRow("Shift++") << tr("Shift++") << QString("Umschalt++"); + QTest::newRow("Ctrl++") << tr("Ctrl++") << QString("Strg++"); + QTest::newRow("Alt++") << tr("Alt++") << QString("Alt++"); + QTest::newRow("Meta++") << tr("Meta++") << QString("Meta++"); - QTest::newRow("Shift+,, Shift++") << QString(tr("Shift+,, Shift++")) << QString("Umschalt+,, Umschalt++"); - QTest::newRow("Shift+,, Ctrl++") << QString(tr("Shift+,, Ctrl++")) << QString("Umschalt+,, Strg++"); - QTest::newRow("Shift+,, Alt++") << QString(tr("Shift+,, Alt++")) << QString("Umschalt+,, Alt++"); - QTest::newRow("Shift+,, Meta++") << QString(tr("Shift+,, Meta++")) << QString("Umschalt+,, Meta++"); + QTest::newRow("Shift+,, Shift++") << tr("Shift+,, Shift++") << QString("Umschalt+,, Umschalt++"); + QTest::newRow("Shift+,, Ctrl++") << tr("Shift+,, Ctrl++") << QString("Umschalt+,, Strg++"); + QTest::newRow("Shift+,, Alt++") << tr("Shift+,, Alt++") << QString("Umschalt+,, Alt++"); + QTest::newRow("Shift+,, Meta++") << tr("Shift+,, Meta++") << QString("Umschalt+,, Meta++"); - QTest::newRow("Ctrl+,, Shift++") << QString(tr("Ctrl+,, Shift++")) << QString("Strg+,, Umschalt++"); - QTest::newRow("Ctrl+,, Ctrl++") << QString(tr("Ctrl+,, Ctrl++")) << QString("Strg+,, Strg++"); - QTest::newRow("Ctrl+,, Alt++") << QString(tr("Ctrl+,, Alt++")) << QString("Strg+,, Alt++"); - QTest::newRow("Ctrl+,, Meta++") << QString(tr("Ctrl+,, Meta++")) << QString("Strg+,, Meta++"); + QTest::newRow("Ctrl+,, Shift++") << tr("Ctrl+,, Shift++") << QString("Strg+,, Umschalt++"); + QTest::newRow("Ctrl+,, Ctrl++") << tr("Ctrl+,, Ctrl++") << QString("Strg+,, Strg++"); + QTest::newRow("Ctrl+,, Alt++") << tr("Ctrl+,, Alt++") << QString("Strg+,, Alt++"); + QTest::newRow("Ctrl+,, Meta++") << tr("Ctrl+,, Meta++") << QString("Strg+,, Meta++"); qApp->removeTranslator(ourTranslator); qApp->removeTranslator(qtTranslator); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qlineedit/tst_qlineedit.cpp --- a/tests/auto/qlineedit/tst_qlineedit.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qlineedit/tst_qlineedit.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -66,7 +66,6 @@ #include #include - //TESTED_CLASS= //TESTED_FILES= @@ -275,6 +274,7 @@ void taskQTBUG_7902_contextMenuCrash(); #endif void taskQTBUG_7395_readOnlyShortcut(); + void QTBUG697_paletteCurrentColorGroup(); #ifdef QT3_SUPPORT void validateAndSet_data(); @@ -3714,5 +3714,32 @@ QCOMPARE(spy.count(), 1); } +void tst_QLineEdit::QTBUG697_paletteCurrentColorGroup() +{ +#ifndef Q_WS_X11 + QSKIP("Only tested on X11", SkipAll); +#endif + QLineEdit le; + le.setText(" "); + QPalette p = le.palette(); + p.setBrush(QPalette::Active, QPalette::Highlight, Qt::green); + p.setBrush(QPalette::Inactive, QPalette::Highlight, Qt::red); + le.setPalette(p); + + le.show(); + QApplication::setActiveWindow(&le); + QTest::qWaitForWindowShown(&le); + le.setFocus(); + QTRY_VERIFY(le.hasFocus()); + le.selectAll(); + + QImage img(le.size(),QImage::Format_ARGB32 ); + le.render(&img); + QCOMPARE(img.pixel(10, le.height()/2), QColor(Qt::green).rgb()); + QApplication::setActiveWindow(0); + le.render(&img); + QCOMPARE(img.pixel(10, le.height()/2), QColor(Qt::red).rgb()); +} + QTEST_MAIN(tst_QLineEdit) #include "tst_qlineedit.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qlistview/tst_qlistview.cpp --- a/tests/auto/qlistview/tst_qlistview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qlistview/tst_qlistview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -125,6 +126,8 @@ void taskQTBUG_5877_skippingItemInPageDownUp(); void taskQTBUG_9455_wrongScrollbarRanges(); void styleOptionViewItem(); + void taskQTBUG_12308_artihmeticException(); + void taskQTBUG_12308_wrongFlowLayout(); }; // Testing get/set functions @@ -1653,8 +1656,8 @@ //we'll make sure the item is repainted delegate.numPaints = 0; QApplication::processEvents(); + QTRY_COMPARE(delegate.numPaints, 1); QCOMPARE(list.visualRect(index).topLeft(), topLeft); - QCOMPARE(delegate.numPaints, 1); } @@ -2002,5 +2005,53 @@ QApplication::processEvents(); } +void tst_QListView::taskQTBUG_12308_artihmeticException() +{ + QListWidget lw; + lw.setLayoutMode(QListView::Batched); + lw.setViewMode(QListView::IconMode); + for (int i = 0; i < lw.batchSize() + 1; i++) { + QListWidgetItem *item = new QListWidgetItem(); + item->setText(QString("Item %L1").arg(i)); + lw.addItem(item); + item->setHidden(true); + } + lw.show(); + QTest::qWaitForWindowShown(&lw); + // No crash, it's all right. +} + +class Delegate12308 : public QStyledItemDelegate +{ + Q_OBJECT +public: + Delegate12308(QObject *parent = 0) : QStyledItemDelegate(parent) + { } + + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const + { + QVERIFY(option.rect.topLeft() != QPoint(-1, -1)); + QStyledItemDelegate::paint(painter, option, index); + } +}; + +void tst_QListView::taskQTBUG_12308_wrongFlowLayout() +{ + QListWidget lw; + Delegate12308 delegate; + lw.setLayoutMode(QListView::Batched); + lw.setViewMode(QListView::IconMode); + lw.setItemDelegate(&delegate); + for (int i = 0; i < lw.batchSize() + 1; i++) { + QListWidgetItem *item = new QListWidgetItem(); + item->setText(QString("Item %L1").arg(i)); + lw.addItem(item); + if (!item->text().contains(QString::fromAscii("1"))) + item->setHidden(true); + } + lw.show(); + QTest::qWaitForWindowShown(&lw); +} + QTEST_MAIN(tst_QListView) #include "tst_qlistview.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qlocale/test/test.pro --- a/tests/auto/qlocale/test/test.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qlocale/test/test.pro Mon Oct 04 01:19:32 2010 +0300 @@ -37,3 +37,5 @@ "$${LITERAL_HASH}endif" MMP_RULES += custom_paged_rule } + +symbian: INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE # Needed for e32svr.h in S^3 envs diff -r ef0373b55136 -r 758a864f9613 tests/auto/qmake/qmake.pro --- a/tests/auto/qmake/qmake.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qmake/qmake.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,6 +1,7 @@ load(qttest_p4) HEADERS += testcompiler.h SOURCES += tst_qmake.cpp testcompiler.cpp +QT -= gui cross_compile: DEFINES += QMAKE_CROSS_COMPILED diff -r ef0373b55136 -r 758a864f9613 tests/auto/qmake/testdata/substitutes/sub/test2.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qmake/testdata/substitutes/sub/test2.in Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +heya diff -r ef0373b55136 -r 758a864f9613 tests/auto/qmake/testdata/substitutes/test.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qmake/testdata/substitutes/test.in Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,2 @@ +test +tst diff -r ef0373b55136 -r 758a864f9613 tests/auto/qmake/testdata/substitutes/test.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qmake/testdata/substitutes/test.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,5 @@ +QMAKE_SUBSTITUTES += test.in sub/test2.in indirect + +indirect.input = $$PWD/test3.txt +indirect.output = $$OUT_PWD/sub/indirect_test.txt + diff -r ef0373b55136 -r 758a864f9613 tests/auto/qmake/testdata/substitutes/test3.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qmake/testdata/substitutes/test3.txt Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +hello diff -r ef0373b55136 -r 758a864f9613 tests/auto/qmake/testdata/substitutes_build/README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qmake/testdata/substitutes_build/README Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +Placeholder file to ensure this directory exists diff -r ef0373b55136 -r 758a864f9613 tests/auto/qmake/tst_qmake.cpp --- a/tests/auto/qmake/tst_qmake.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qmake/tst_qmake.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -90,6 +90,7 @@ void bundle_spaces(); #endif void includefunction(); + void substitutes(); private: TestCompiler test_compiler; @@ -98,7 +99,8 @@ tst_qmake::tst_qmake() { - QString cmd = QString("qmake \"QT_VERSION=%1\"").arg(QT_VERSION); + QString binpath = QLibraryInfo::location(QLibraryInfo::BinariesPath); + QString cmd = QString("%2/qmake \"QT_VERSION=%1\"").arg(QT_VERSION).arg(binpath); #ifdef Q_CC_MSVC test_compiler.setBaseCommands( "nmake", cmd ); #elif defined(Q_CC_MINGW) @@ -477,6 +479,23 @@ QVERIFY(test_compiler.commandOutput().contains(warningMsg)); } +void tst_qmake::substitutes() +{ + QString workDir = base_path + "/testdata/substitutes"; + QVERIFY( test_compiler.qmake( workDir, "test" )); + QVERIFY( test_compiler.exists( workDir, "test", Plain, "" )); + QVERIFY( test_compiler.exists( workDir, "sub/test2", Plain, "" )); + QVERIFY( test_compiler.exists( workDir, "sub/indirect_test.txt", Plain, "" )); + QVERIFY( test_compiler.makeDistClean( workDir )); + + QString buildDir = base_path + "/testdata/substitutes_build"; + QVERIFY( test_compiler.qmake( workDir, "test", buildDir )); + QVERIFY( test_compiler.exists( buildDir, "test", Plain, "" )); + QVERIFY( test_compiler.exists( buildDir, "sub/test2", Plain, "" )); + QVERIFY( test_compiler.exists( buildDir, "sub/indirect_test.txt", Plain, "" )); + QVERIFY( test_compiler.makeDistClean( buildDir )); +} + QTEST_MAIN(tst_qmake) #include "tst_qmake.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qmetaobject/tst_qmetaobject.cpp --- a/tests/auto/qmetaobject/tst_qmetaobject.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -107,7 +107,7 @@ Q_PROPERTY(QVariantList value5 WRITE setVal5 READ val5) Q_PROPERTY(int value6 READ value6 NOTIFY value6Changed) Q_PROPERTY(MyStruct value7 READ value7 WRITE setVal7 NOTIFY value7Changed) - Q_PROPERTY(int value8 READ value8 NOTIFY value8Changed) + Q_PROPERTY(int value8 READ value8) Q_PROPERTY(int value9 READ value9 CONSTANT) Q_PROPERTY(int value10 READ value10 FINAL) @@ -714,6 +714,8 @@ QTest::newRow("const12") << "void foo(Fooconst*const *const)" << "void foo(Foo*const*const)"; QTest::newRow("const13") << "void foo(const Foo&)" << "void foo(Foo)"; QTest::newRow("const14") << "void foo(Fooconst&)" << "void foo(Foo)"; + + QTest::newRow("invalid1") << "a( b" << "a(b"; } void tst_QMetaObject::normalizedSignature() @@ -721,7 +723,7 @@ QFETCH(QString, signature); QFETCH(QString, result); - QCOMPARE(QString::fromLatin1(QMetaObject::normalizedSignature(signature.toLatin1())), result); + QCOMPARE(QMetaObject::normalizedSignature(signature.toLatin1()), result.toLatin1()); } void tst_QMetaObject::normalizedType_data() @@ -759,7 +761,7 @@ QFETCH(QString, type); QFETCH(QString, result); - QCOMPARE(QString::fromLatin1(QMetaObject::normalizedType(type.toLatin1())), result); + QCOMPARE(QMetaObject::normalizedType(type.toLatin1()), result.toLatin1()); } void tst_QMetaObject::customPropertyType() diff -r ef0373b55136 -r 758a864f9613 tests/auto/qnetworkreply/test/test.pro --- a/tests/auto/qnetworkreply/test/test.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qnetworkreply/test/test.pro Mon Oct 04 01:19:32 2010 +0300 @@ -31,7 +31,7 @@ DEPLOYMENT += certFiles # Symbian toolchain does not support correct include semantics - INCPATH+=..\\..\\..\\..\\include\\QtNetwork\\private + INCLUDEPATH+=..\\..\\..\\..\\include\\QtNetwork\\private # bigfile test case requires more heap TARGET.EPOCHEAPSIZE="0x100 0x1000000" TARGET.CAPABILITY="ALL -TCB" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qnetworkreply/tst_qnetworkreply.cpp --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -289,6 +289,8 @@ void symbianOpenCDataUrlCrash(); + void qtbug12908compressedHttpReply(); + // NOTE: This test must be last! void parentingRepliesToTheApp(); }; @@ -4274,6 +4276,30 @@ QCOMPARE(reply->header(QNetworkRequest::ContentLengthHeader).toLongLong(), qint64(598)); } +// TODO: +// Prepare a gzip that has one chunk that expands to the size mentioned in the bugreport. +// Then have a custom HTTP server that waits after this chunk so the returning gets +// triggered. +void tst_QNetworkReply::qtbug12908compressedHttpReply() +{ + QString header("HTTP/1.0 200 OK\r\nContent-Encoding: gzip\r\nContent-Length: 63\r\n\r\n"); + + // dd if=/dev/zero of=qtbug-12908 bs=16384 count=1 && gzip qtbug-12908 && base64 -w 0 qtbug-12908.gz + QString encodedFile("H4sICDdDaUwAA3F0YnVnLTEyOTA4AO3BMQEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAIC3AYbSVKsAQAAA"); + QByteArray decodedFile = QByteArray::fromBase64(encodedFile.toAscii()); + + MiniHttpServer server(header.toAscii() + decodedFile); + server.doClose = true; + + QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort()))); + QNetworkReplyPtr reply = manager.get(request); + + connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); + QTestEventLoop::instance().enterLoop(10); + QVERIFY(!QTestEventLoop::instance().timeout()); + + QCOMPARE(reply->error(), QNetworkReply::NoError); +} // NOTE: This test must be last testcase in tst_qnetworkreply! diff -r ef0373b55136 -r 758a864f9613 tests/auto/qnetworksession/test/tst_qnetworksession.cpp --- a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -88,7 +88,7 @@ void sessionStop(); void roamingErrorCodes(); - + void sessionProperties_data(); void sessionProperties(); @@ -918,6 +918,10 @@ session.waitForOpened(); #endif + // Wait until the configuration is uptodate as well, it may be signaled 'connected' + // bit later than the session + QTRY_VERIFY(configuration.state() == QNetworkConfiguration::Active); + if (session.isOpen()) QVERIFY(!sessionOpenedSpy.isEmpty() || !errorSpy.isEmpty()); if (!errorSpy.isEmpty()) { @@ -1131,8 +1135,9 @@ roamedSuccessfully = true; } else if (state == QNetworkSession::Closing) { QTRY_VERIFY(session2.state() == QNetworkSession::Disconnected); - QTRY_VERIFY(session.state() == QNetworkSession::Connected); - roamedSuccessfully = true; + QTRY_VERIFY(session.state() == QNetworkSession::Connected || + session.state() == QNetworkSession::Disconnected); + roamedSuccessfully = false; } else if (state == QNetworkSession::Disconnected) { QTRY_VERIFY(!errorSpy.isEmpty()); QTRY_VERIFY(session2.state() == QNetworkSession::Disconnected); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qpainter/tst_qpainter.cpp --- a/tests/auto/qpainter/tst_qpainter.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qpainter/tst_qpainter.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -4176,14 +4176,18 @@ p.setWorldTransform(QTransform().scale(0.5, 0.5), true); } -bool testCompositionMode(int src, int dst, int expected, QPainter::CompositionMode op) +bool testCompositionMode(int src, int dst, int expected, QPainter::CompositionMode op, qreal opacity = 1.0) { - QImage actual(1, 1, QImage::Format_ARGB32_Premultiplied); + // The test image needs to be large enough to test SIMD code + const QSize imageSize(100, 100); + + QImage actual(imageSize, QImage::Format_ARGB32_Premultiplied); actual.fill(QColor(dst, dst, dst).rgb()); QPainter p(&actual); p.setCompositionMode(op); - p.fillRect(0, 0, 1, 1, QColor(src, src, src)); + p.setOpacity(opacity); + p.fillRect(QRect(QPoint(), imageSize), QColor(src, src, src)); p.end(); if (qRed(actual.pixel(0, 0)) != expected) { @@ -4191,7 +4195,9 @@ src, dst, qRed(actual.pixel(0, 0)), expected); return false; } else { - return true; + QImage refImage(imageSize, QImage::Format_ARGB32_Premultiplied); + refImage.fill(QColor(expected, expected, expected).rgb()); + return actual == refImage; } } @@ -4206,6 +4212,16 @@ QVERIFY(testCompositionMode( 0, 255, 255, QPainter::CompositionMode_Plus)); QVERIFY(testCompositionMode(128, 128, 255, QPainter::CompositionMode_Plus)); + QVERIFY(testCompositionMode(255, 255, 255, QPainter::CompositionMode_Plus, 0.3)); + QVERIFY(testCompositionMode( 0, 0, 0, QPainter::CompositionMode_Plus, 0.3)); + QVERIFY(testCompositionMode(127, 128, 165, QPainter::CompositionMode_Plus, 0.3)); + QVERIFY(testCompositionMode(127, 0, 37, QPainter::CompositionMode_Plus, 0.3)); + QVERIFY(testCompositionMode( 0, 127, 127, QPainter::CompositionMode_Plus, 0.3)); + QVERIFY(testCompositionMode(255, 0, 75, QPainter::CompositionMode_Plus, 0.3)); + QVERIFY(testCompositionMode( 0, 255, 255, QPainter::CompositionMode_Plus, 0.3)); + QVERIFY(testCompositionMode(128, 128, 166, QPainter::CompositionMode_Plus, 0.3)); + QVERIFY(testCompositionMode(186, 200, 255, QPainter::CompositionMode_Plus, 0.3)); + QVERIFY(testCompositionMode(255, 255, 255, QPainter::CompositionMode_Multiply)); QVERIFY(testCompositionMode( 0, 0, 0, QPainter::CompositionMode_Multiply)); QVERIFY(testCompositionMode(127, 255, 127, QPainter::CompositionMode_Multiply)); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qpauseanimation/tst_qpauseanimation.cpp --- a/tests/auto/qpauseanimation/tst_qpauseanimation.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qpauseanimation/tst_qpauseanimation.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -280,7 +280,7 @@ QVERIFY(group.state() == QAbstractAnimation::Running); QVERIFY(animation1.state() == QAbstractAnimation::Stopped); - QCOMPARE(&animation2, group.currentAnimation()); + QCOMPARE((QAbstractAnimation*)&animation2, group.currentAnimation()); QVERIFY(animation2.state() == QAbstractAnimation::Running); QVERIFY(animation3.state() == QAbstractAnimation::Stopped); @@ -292,7 +292,7 @@ QVERIFY(group.state() == QAbstractAnimation::Running); QVERIFY(animation1.state() == QAbstractAnimation::Stopped); QVERIFY(animation2.state() == QAbstractAnimation::Stopped); - QCOMPARE(&animation3, group.currentAnimation()); + QCOMPARE((QAbstractAnimation*)&animation3, group.currentAnimation()); QVERIFY(animation3.state() == QAbstractAnimation::Running); group.setCurrentTime(750); @@ -329,7 +329,7 @@ QVERIFY(group.state() == QAbstractAnimation::Running); QVERIFY(animation.state() == QAbstractAnimation::Stopped); - QCOMPARE(&pause, group.currentAnimation()); + QCOMPARE((QAbstractAnimation*)&pause, group.currentAnimation()); QVERIFY(pause.state() == QAbstractAnimation::Running); group.setCurrentTime(600); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qpen/tst_qpen.cpp --- a/tests/auto/qpen/tst_qpen.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qpen/tst_qpen.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -213,6 +213,5 @@ QCOMPARE(pen, cmp); } - QTEST_APPLESS_MAIN(tst_QPen) #include "tst_qpen.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qpixmap/tst_qpixmap.cpp --- a/tests/auto/qpixmap/tst_qpixmap.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qpixmap/tst_qpixmap.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1558,6 +1558,8 @@ const QString prefix = QLatin1String(SRCDIR) + "/loadFromData"; #endif QTest::newRow("designer_argb32.png") << prefix + "/designer_argb32.png"; + // When no extension is provided we try all extensions that has been registered by image providers + QTest::newRow("designer_argb32") << prefix + "/designer_argb32.png"; QTest::newRow("designer_indexed8_no_alpha.png") << prefix + "/designer_indexed8_no_alpha.png"; QTest::newRow("designer_indexed8_with_alpha.png") << prefix + "/designer_indexed8_with_alpha.png"; QTest::newRow("designer_rgb32.png") << prefix + "/designer_rgb32.png"; @@ -1673,31 +1675,39 @@ void tst_QPixmap::loadAsBitmapOrPixmap() { QImage tmp(10, 10, QImage::Format_RGB32); - tmp.save("tmp.png"); + tmp.save("temp_image.png"); bool ok; // Check that we can load the pixmap as a pixmap and that it then turns into a pixmap - QPixmap pixmap("tmp.png"); + QPixmap pixmap("temp_image.png"); QVERIFY(!pixmap.isNull()); QVERIFY(pixmap.depth() > 1); QVERIFY(!pixmap.isQBitmap()); pixmap = QPixmap(); - ok = pixmap.load("tmp.png"); + ok = pixmap.load("temp_image.png"); + QVERIFY(ok); + QVERIFY(!pixmap.isNull()); + QVERIFY(pixmap.depth() > 1); + QVERIFY(!pixmap.isQBitmap()); + + //now we can try to load it without an extension + pixmap = QPixmap(); + ok = pixmap.load("temp_image"); QVERIFY(ok); QVERIFY(!pixmap.isNull()); QVERIFY(pixmap.depth() > 1); QVERIFY(!pixmap.isQBitmap()); // The do the same check for bitmaps.. - QBitmap bitmap("tmp.png"); + QBitmap bitmap("temp_image.png"); QVERIFY(!bitmap.isNull()); QVERIFY(bitmap.depth() == 1); QVERIFY(bitmap.isQBitmap()); bitmap = QBitmap(); - ok = bitmap.load("tmp.png"); + ok = bitmap.load("temp_image.png"); QVERIFY(ok); QVERIFY(!bitmap.isNull()); QVERIFY(bitmap.depth() == 1); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qpixmapcache/tst_qpixmapcache.cpp --- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -497,26 +497,22 @@ QVERIFY(!getPrivate(key8)); } -//QTP: remove temporarily to get the code compiled. -// The following function is implemented in qpixmapcache.cpp in GUI but export for -// auto test only with marco Q_AUTOTEST_EXPORT - -//QT_BEGIN_NAMESPACE -//extern int q_QPixmapCache_keyHashSize(); -//QT_END_NAMESPACE +QT_BEGIN_NAMESPACE +extern int q_QPixmapCache_keyHashSize(); +QT_END_NAMESPACE void tst_QPixmapCache::noLeak() { QPixmapCache::Key key; - int oldSize = 0;//q_QPixmapCache_keyHashSize(); + int oldSize = q_QPixmapCache_keyHashSize(); for (int i = 0; i < 100; ++i) { QPixmap pm(128, 128); pm.fill(Qt::transparent); key = QPixmapCache::insert(pm); QPixmapCache::remove(key); } - int newSize = 0;//q_QPixmapCache_keyHashSize(); + int newSize = q_QPixmapCache_keyHashSize(); QCOMPARE(oldSize, newSize); } diff -r ef0373b55136 -r 758a864f9613 tests/auto/qpluginloader/lib/lib.pro --- a/tests/auto/qpluginloader/lib/lib.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qpluginloader/lib/lib.pro Mon Oct 04 01:19:32 2010 +0300 @@ -2,7 +2,7 @@ CONFIG += dll CONFIG -= staticlib SOURCES = mylib.c -TARGET = mylib +TARGET = tst_qpluginloaderlib DESTDIR = ../bin QT = core diff -r ef0373b55136 -r 758a864f9613 tests/auto/qpluginloader/tst/tst.pro --- a/tests/auto/qpluginloader/tst/tst.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qpluginloader/tst/tst.pro Mon Oct 04 01:19:32 2010 +0300 @@ -20,7 +20,7 @@ } symbian: { - libDep.sources = mylib.dll + libDep.sources = tst_qpluginloaderlib.dll libDep.path = /sys/bin pluginDep.sources = theplugin.dll pluginDep.path = bin diff -r ef0373b55136 -r 758a864f9613 tests/auto/qpluginloader/tst_qpluginloader.cpp --- a/tests/auto/qpluginloader/tst_qpluginloader.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -169,7 +169,7 @@ QCOMPARE(loader.errorString(), unknown); } { - QPluginLoader loader( sys_qualifiedLibraryName("mylib")); //not a plugin + QPluginLoader loader( sys_qualifiedLibraryName("tst_qpluginloaderlib")); //not a plugin bool loaded = loader.load(); #ifdef SHOW_ERRORS qDebug() << loader.errorString(); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qregexp/tst_qregexp.cpp --- a/tests/auto/qregexp/tst_qregexp.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qregexp/tst_qregexp.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -105,6 +105,7 @@ void QTBUG_7049_data(); void QTBUG_7049(); + void interval(); }; // Testing get/set functions @@ -1426,5 +1427,22 @@ QCOMPARE( re.cap(2), cap2 ); } +void tst_QRegExp::interval() +{ + { + QRegExp exp("a{0,1}"); + QVERIFY(exp.isValid()); + } + { + QRegExp exp("a{1,1}"); + QVERIFY(exp.isValid()); + } + { + QRegExp exp("a{1,0}"); + QVERIFY(!exp.isValid()); + } +} + + QTEST_APPLESS_MAIN(tst_QRegExp) #include "tst_qregexp.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qscriptengine/idtranslatable.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qscriptengine/idtranslatable.js Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,5 @@ +qsTrId("qtn_foo_bar"); + +var more_greeting_strings = [ QT_TRID_NOOP("qtn_needle"), QT_TRID_NOOP("qtn_haystack") ]; + +qsTrId("qtn_bar_baz", 10); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qscriptengine/qscriptengine.qrc --- a/tests/auto/qscriptengine/qscriptengine.qrc Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qscriptengine/qscriptengine.qrc Mon Oct 04 01:19:32 2010 +0300 @@ -1,5 +1,6 @@ translations/translatable_la.qm + translations/idtranslatable_la.qm diff -r ef0373b55136 -r 758a864f9613 tests/auto/qscriptengine/translations/idtranslatable_la.qm Binary file tests/auto/qscriptengine/translations/idtranslatable_la.qm has changed diff -r ef0373b55136 -r 758a864f9613 tests/auto/qscriptengine/translations/idtranslatable_la.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qscriptengine/translations/idtranslatable_la.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,30 @@ + + + + + + + + + First string + + + + + Second string + + + + + Third string + + + + + + Fourth string + %n fooish bar(s) found + + + + diff -r ef0373b55136 -r 758a864f9613 tests/auto/qscriptengine/tst_qscriptengine.cpp --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -162,6 +162,7 @@ void translateWithInvalidArgs(); void translationContext_data(); void translationContext(); + void translateScriptIdBased(); void functionScopes(); void nativeFunctionScopes(); void evaluateProgram(); @@ -4386,6 +4387,8 @@ QVERIFY(!global.property("QT_TRANSLATE_NOOP").isValid()); QVERIFY(!global.property("qsTr").isValid()); QVERIFY(!global.property("QT_TR_NOOP").isValid()); + QVERIFY(!global.property("qsTrId").isValid()); + QVERIFY(!global.property("QT_TRID_NOOP").isValid()); QVERIFY(!globalOrig.property("String").property("prototype").property("arg").isValid()); eng.installTranslatorFunctions(); @@ -4393,6 +4396,8 @@ QVERIFY(global.property("QT_TRANSLATE_NOOP").isFunction()); QVERIFY(global.property("qsTr").isFunction()); QVERIFY(global.property("QT_TR_NOOP").isFunction()); + QVERIFY(global.property("qsTrId").isFunction()); + QVERIFY(global.property("QT_TRID_NOOP").isFunction()); QVERIFY(globalOrig.property("String").property("prototype").property("arg").isFunction()); if (useCustomGlobalObject) { @@ -4400,6 +4405,8 @@ QVERIFY(!globalOrig.property("QT_TRANSLATE_NOOP").isValid()); QVERIFY(!globalOrig.property("qsTr").isValid()); QVERIFY(!globalOrig.property("QT_TR_NOOP").isValid()); + QVERIFY(!globalOrig.property("qsTrId").isValid()); + QVERIFY(!globalOrig.property("QT_TRID_NOOP").isValid()); } { @@ -4427,6 +4434,17 @@ QVERIFY(ret.isString()); QCOMPARE(ret.toString(), QString::fromLatin1("foobar")); } + + { + QScriptValue ret = eng.evaluate("qsTrId('foo')"); + QVERIFY(ret.isString()); + QCOMPARE(ret.toString(), QString::fromLatin1("foo")); + } + { + QScriptValue ret = eng.evaluate("QT_TRID_NOOP('foo')"); + QVERIFY(ret.isString()); + QCOMPARE(ret.toString(), QString::fromLatin1("foo")); + } } static QScriptValue callQsTr(QScriptContext *ctx, QScriptEngine *eng) @@ -4537,6 +4555,10 @@ QTest::newRow("qsTranslate('foo', 'bar', 'baz', 123)") << "qsTranslate('foo', 'bar', 'baz', 123)" << "Error: qsTranslate(): fourth argument (encoding) must be a string"; QTest::newRow("qsTranslate('foo', 'bar', 'baz', 'zab', 'rab')") << "qsTranslate('foo', 'bar', 'baz', 'zab', 'rab')" << "Error: qsTranslate(): fifth argument (n) must be a number"; QTest::newRow("qsTranslate('foo', 'bar', 'baz', 'zab', 123)") << "qsTranslate('foo', 'bar', 'baz', 'zab', 123)" << "Error: qsTranslate(): invalid encoding 'zab'"; + + QTest::newRow("qsTrId()") << "qsTrId()" << "Error: qsTrId() requires at least one argument"; + QTest::newRow("qsTrId(123)") << "qsTrId(123)" << "TypeError: qsTrId(): first argument (id) must be a string"; + QTest::newRow("qsTrId('foo', 'bar')") << "qsTrId('foo', 'bar')" << "TypeError: qsTrId(): second argument (n) must be a number"; } void tst_QScriptEngine::translateWithInvalidArgs() @@ -4598,6 +4620,53 @@ QCoreApplication::instance()->removeTranslator(&translator); } +void tst_QScriptEngine::translateScriptIdBased() +{ + QScriptEngine engine; + + QTranslator translator; + translator.load(":/translations/idtranslatable_la"); + QCoreApplication::instance()->installTranslator(&translator); + engine.installTranslatorFunctions(); + + QString fileName = QString::fromLatin1("idtranslatable.js"); + + QHash expectedTranslations; + expectedTranslations["qtn_foo_bar"] = "First string"; + expectedTranslations["qtn_needle"] = "Second string"; + expectedTranslations["qtn_haystack"] = "Third string"; + expectedTranslations["qtn_bar_baz"] = "Fourth string"; + + QHash::const_iterator it; + for (it = expectedTranslations.constBegin(); it != expectedTranslations.constEnd(); ++it) { + for (int x = 0; x < 2; ++x) { + QString fn; + if (x) + fn = fileName; + // Top-level + QCOMPARE(engine.evaluate(QString::fromLatin1("qsTrId('%0')") + .arg(it.key()), fn).toString(), + it.value()); + QCOMPARE(engine.evaluate(QString::fromLatin1("QT_TRID_NOOP('%0')") + .arg(it.key()), fn).toString(), + it.key()); + // From function + QCOMPARE(engine.evaluate(QString::fromLatin1("(function() { return qsTrId('%0'); })()") + .arg(it.key()), fn).toString(), + it.value()); + QCOMPARE(engine.evaluate(QString::fromLatin1("(function() { return QT_TRID_NOOP('%0'); })()") + .arg(it.key()), fn).toString(), + it.key()); + } + } + + // Plural form + QCOMPARE(engine.evaluate("qsTrId('qtn_bar_baz', 10)").toString(), + QString::fromLatin1("10 fooish bar(s) found")); + QCOMPARE(engine.evaluate("qsTrId('qtn_foo_bar', 10)").toString(), + QString::fromLatin1("qtn_foo_bar")); // Doesn't have plural +} + void tst_QScriptEngine::functionScopes() { QScriptEngine eng; diff -r ef0373b55136 -r 758a864f9613 tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp --- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -97,6 +97,7 @@ void functionEntryAndExit_objectCall(); void positionChange_1(); void positionChange_2(); + void positionChange_3(); void exceptionThrowAndCatch(); void eventOrder_assigment(); void eventOrder_functionDefinition(); @@ -116,6 +117,8 @@ void evaluateProgram_SyntaxError(); void evaluateNullProgram(); void QTBUG6108(); + void backtraces_data(); + void backtraces(); private: double m_testProperty; @@ -1623,6 +1626,56 @@ delete spy; } +void tst_QScriptEngineAgent::positionChange_3() +{ + QScriptEngine eng; + eng.evaluate("function some_function1(a) {\n a++; \n return a + 12; } \n some_function1(42);", "function1.qs", 12); + QScriptValue some_function2 = eng.evaluate("(function (b) {\n b--; \n return b + 11; })", "function2.qs", 21); + some_function2.call(QScriptValue(), QScriptValueList() << 2 ); + + // Test that the agent work, even if installed after the function has been evaluated. + ScriptEngineSpy *spy = new ScriptEngineSpy(&eng, ~(ScriptEngineSpy::IgnorePositionChange)); + { + spy->clear(); + QScriptValue v = eng.evaluate("some_function1(15)"); + QCOMPARE(v.toInt32(), (15+1+12)); + QCOMPARE(spy->count(), 3); + + // some_function1() + QCOMPARE(spy->at(0).type, ScriptEngineEvent::PositionChange); + QVERIFY(spy->at(0).scriptId != -1); + QCOMPARE(spy->at(0).lineNumber, 1); + + // a++ + QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange); + QVERIFY(spy->at(1).scriptId != spy->at(0).scriptId); + QCOMPARE(spy->at(1).lineNumber, 13); + // return a + 12 + QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange); + QVERIFY(spy->at(2).scriptId == spy->at(1).scriptId); + QCOMPARE(spy->at(2).lineNumber, 14); + } + + { + spy->clear(); + QScriptValue v = some_function2.call(QScriptValue(), QScriptValueList() << 89 ); + QCOMPARE(v.toInt32(), (89-1+11)); + QCOMPARE(spy->count(), 2); + + // b-- + QCOMPARE(spy->at(0).type, ScriptEngineEvent::PositionChange); + QVERIFY(spy->at(0).scriptId != -1); + QCOMPARE(spy->at(0).lineNumber, 22); + // return b + 11 + QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange); + QVERIFY(spy->at(1).scriptId == spy->at(0).scriptId); + QCOMPARE(spy->at(1).lineNumber, 23); + } + + QVERIFY(!eng.hasUncaughtException()); +} + + void tst_QScriptEngineAgent::exceptionThrowAndCatch() { QScriptEngine eng; @@ -2379,5 +2432,86 @@ QCOMPARE(spy->at(4).scriptId, spy->at(0).scriptId); } +class BacktraceSpy : public QScriptEngineAgent +{ +public: + BacktraceSpy(QScriptEngine *engine, const QStringList &expectedbacktrace, int breakpoint) + : QScriptEngineAgent(engine), expectedbacktrace(expectedbacktrace), breakpoint(breakpoint), ok(false) {} + + QStringList expectedbacktrace; + int breakpoint; + bool ok; + +protected: + + void exceptionThrow(qint64 , const QScriptValue &, bool) + { check(); } + + void positionChange(qint64 , int lineNumber, int ) + { + if (lineNumber == breakpoint) + check(); + } + +private: + void check() + { + QCOMPARE(engine()->currentContext()->backtrace(), expectedbacktrace); + ok = true; + } +}; + + +void tst_QScriptEngineAgent::backtraces_data() +{ + QTest::addColumn("code"); + QTest::addColumn("breakpoint"); + QTest::addColumn("expectedbacktrace"); + + { + QString source( + "function foo() {\n" + " var a = 5\n" + "}\n" + "foo('hello', { })\n" + "var r = 0;"); + + QStringList expected; + expected + << "foo('hello', [object Object]) at filename.js:2" + << "() at filename.js:4"; + QTest::newRow("simple breakpoint") << source << 2 << expected; + } + + { + QString source( + "function foo() {\n" + " error = err\n" //this must throw + "}\n" + "foo('hello', { })\n" + "var r = 0;"); + + QStringList expected; + expected + << "foo('hello', [object Object]) at filename.js:2" + << "() at filename.js:4"; + QTest::newRow("throw because of error") << source << -100 << expected; + } +} + +void tst_QScriptEngineAgent::backtraces() +{ + QFETCH(QString, code); + QFETCH(int, breakpoint); + QFETCH(QStringList, expectedbacktrace); + + QScriptEngine eng; + BacktraceSpy *spy = new BacktraceSpy(&eng, expectedbacktrace, breakpoint); + eng.setAgent(spy); + QLatin1String filename("filename.js"); + eng.evaluate(code, filename); + QVERIFY(spy->ok); +} + QTEST_MAIN(tst_QScriptEngineAgent) #include "tst_qscriptengineagent.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qsocks5socketengine/qsocks5socketengine.pro --- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro Mon Oct 04 01:19:32 2010 +0300 @@ -10,7 +10,7 @@ QT = core network # Symbian toolchain does not support correct include semantics -symbian:INCPATH+=..\\..\\..\\include\\QtNetwork\\private +symbian:INCLUDEPATH+=..\\..\\..\\include\\QtNetwork\\private symbian: TARGET.CAPABILITY = NetworkServices diff -r ef0373b55136 -r 758a864f9613 tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICWjCCAcOgAwIBAgIJAM7bMShFxAVAMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX +aWRnaXRzIFB0eSBMdGQwIBcNMTAwODA0MDk1MzQxWhgPMjA1MTA4MjkwOTUzNDFa +MEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJ +bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ +AoGBAM2q22/WNMmn8cC+5EEYGeICySLmp9W6Ay6eKHr0Xxp3X3epETuPfvAuxp7r +OtkS18EMUegkUj8jw0IMEcbyHKFC/rTCaYOt93CxGBXMIChiMPAsFeYzGa/D6xzA +kfcRaJRQ+Ek3CDLXPnXfo7xpABXezYcPXAJrgsgBfWrwHdxzAgMBAAGjUDBOMB0G +A1UdDgQWBBSKbhnnl5uP2X+zuwFP6GovUpUN2TAfBgNVHSMEGDAWgBSKbhnnl5uP +2X+zuwFP6GovUpUN2TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKF0 +jl02liwFfupmzC5oxz2T3IyjEa21fm7QBMQJvQr5OTuX1/C7DAl7g/6/h7BH6JS3 +qpx5rXGet8SZmG8dODL4o3U4xOXnNzch7HtQixWwlx4XnFAXPMHflFX7YC5QQNHq +I8Y8IW+XjAYWpYJywWMUZIbr1/9y9gn1beYEE3pq +-----END CERTIFICATE----- diff -r ef0373b55136 -r 758a864f9613 tests/auto/qsslcertificate/tst_qsslcertificate.cpp --- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -110,6 +110,7 @@ void nulInCN(); void nulInSan(); void largeSerialNumber(); + void largeExpirationDate(); // ### add tests for certificate bundles (multiple certificates concatenated into a single // structure); both PEM and DER formatted #endif @@ -802,6 +803,20 @@ QCOMPARE(cert.serialNumber(), QByteArray("01:02:03:04:05:06:07:08:09:10:aa:bb:cc:dd:ee:ff:17:18:19:20")); } +void tst_QSslCertificate::largeExpirationDate() // QTBUG-12489 +{ + QList certList = + QSslCertificate::fromPath(SRCDIR "more-certificates/cert-large-expiration-date.pem"); + + QCOMPARE(certList.size(), 1); + + const QSslCertificate &cert = certList.at(0); + QVERIFY(!cert.isNull()); + QCOMPARE(cert.effectiveDate().toUTC(), QDateTime(QDate(2010, 8, 4), QTime(9, 53, 41), Qt::UTC)); + // if the date is larger than 2049, then the generalized time format is used + QCOMPARE(cert.expiryDate().toUTC(), QDateTime(QDate(2051, 8, 29), QTime(9, 53, 41), Qt::UTC)); +} + #endif // QT_NO_OPENSSL QTEST_MAIN(tst_QSslCertificate) diff -r ef0373b55136 -r 758a864f9613 tests/auto/qsslsocket/qsslsocket.pro --- a/tests/auto/qsslsocket/qsslsocket.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qsslsocket/qsslsocket.pro Mon Oct 04 01:19:32 2010 +0300 @@ -29,6 +29,7 @@ certFiles.sources = certs ssl.tar.gz certFiles.path = . DEPLOYMENT += certFiles + INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE # Needed for e32svr.h in S^3 envs } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff -r ef0373b55136 -r 758a864f9613 tests/auto/qsslsocket/tst_qsslsocket.cpp --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -183,6 +183,7 @@ void ignoreSslErrorsListWithSlot(); void readFromClosedSocket(); void writeBigChunk(); + void setEmptyDefaultConfiguration(); static void exitLoop() { @@ -1072,6 +1073,7 @@ QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example.com"), QString("www.example.com")), true ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx*.example.com"), QString("xxxwww.example.com")), true ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("f*.example.com"), QString("foo.example.com")), true ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("192.168.0.0"), QString("192.168.0.0")), true ); // Failing CN matches QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx.example.com"), QString("www.example.com")), false ); @@ -1085,6 +1087,7 @@ QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example."), QString("www.example")), false ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString(""), QString("www")), false ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*"), QString("www")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.168.0.0"), QString("192.168.0.0")), false ); } void tst_QSslSocket::wildcard() @@ -1833,6 +1836,21 @@ socket->close(); } +void tst_QSslSocket::setEmptyDefaultConfiguration() +{ + // used to produce a crash in QSslConfigurationPrivate::deepCopyDefaultConfiguration, QTBUG-13265 + + if (!QSslSocket::supportsSsl()) + return; + + QSslConfiguration emptyConf; + QSslConfiguration::setDefaultConfiguration(emptyConf); + + QSslSocketPtr socket = newSocket(); + socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 443); + +} + #endif // QT_NO_OPENSSL QTEST_MAIN(tst_QSslSocket) diff -r ef0373b55136 -r 758a864f9613 tests/auto/qstatictext/tst_qstatictext.cpp --- a/tests/auto/qstatictext/tst_qstatictext.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qstatictext/tst_qstatictext.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -73,6 +73,8 @@ void prepareToCorrectData(); void prepareToWrongData(); + void copyConstructor(); + void translatedPainter(); void rotatedPainter(); void scaledPainter(); @@ -85,6 +87,10 @@ void setPenPlainText(); void setPenRichText(); void richTextOverridesPen(); + + void drawStruckOutText(); + void drawOverlinedText(); + void drawUnderlinedText(); }; void tst_QStaticText::init() @@ -100,6 +106,31 @@ QStaticText text("My text"); } +void tst_QStaticText::copyConstructor() +{ + QStaticText text(QLatin1String("My text")); + + QTextOption textOption(Qt::AlignRight); + text.setTextOption(textOption); + + text.setPerformanceHint(QStaticText::AggressiveCaching); + text.setTextWidth(123.456); + text.setTextFormat(Qt::PlainText); + + QStaticText copiedText(text); + copiedText.setText(QLatin1String("Other text")); + + QCOMPARE(copiedText.textOption().alignment(), Qt::AlignRight); + QCOMPARE(copiedText.performanceHint(), QStaticText::AggressiveCaching); + QCOMPARE(copiedText.textWidth(), 123.456); + QCOMPARE(copiedText.textFormat(), Qt::PlainText); + + QStaticText otherCopiedText(copiedText); + otherCopiedText.setTextWidth(789); + + QCOMPARE(otherCopiedText.text(), QString::fromLatin1("Other text")); +} + Q_DECLARE_METATYPE(QStaticText::PerformanceHint) void tst_QStaticText::drawToPoint_data() { @@ -620,5 +651,107 @@ } } +void tst_QStaticText::drawStruckOutText() +{ + QPixmap imageDrawText(1000, 1000); + QPixmap imageDrawStaticText(1000, 1000); + + imageDrawText.fill(Qt::white); + imageDrawStaticText.fill(Qt::white); + + QString s = QString::fromLatin1("Foobar"); + + QFont font; + font.setStrikeOut(true); + + { + QPainter p(&imageDrawText); + p.setFont(font); + p.drawText(QPointF(50, 50), s); + } + + { + QPainter p(&imageDrawStaticText); + QStaticText text = QStaticText(s); + p.setFont(font); + p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text); + } + +#if defined(DEBUG_SAVE_IMAGE) + imageDrawText.save("drawStruckOutText_imageDrawText.png"); + imageDrawStaticText.save("drawStruckOutText_imageDrawStaticText.png"); +#endif + + QCOMPARE(imageDrawText, imageDrawStaticText); +} + +void tst_QStaticText::drawOverlinedText() +{ + QPixmap imageDrawText(1000, 1000); + QPixmap imageDrawStaticText(1000, 1000); + + imageDrawText.fill(Qt::white); + imageDrawStaticText.fill(Qt::white); + + QString s = QString::fromLatin1("Foobar"); + + QFont font; + font.setOverline(true); + + { + QPainter p(&imageDrawText); + p.setFont(font); + p.drawText(QPointF(50, 50), s); + } + + { + QPainter p(&imageDrawStaticText); + QStaticText text = QStaticText(s); + p.setFont(font); + p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text); + } + +#if defined(DEBUG_SAVE_IMAGE) + imageDrawText.save("drawOverlinedText_imageDrawText.png"); + imageDrawStaticText.save("drawOverlinedText_imageDrawStaticText.png"); +#endif + + QCOMPARE(imageDrawText, imageDrawStaticText); +} + +void tst_QStaticText::drawUnderlinedText() +{ + QPixmap imageDrawText(1000, 1000); + QPixmap imageDrawStaticText(1000, 1000); + + imageDrawText.fill(Qt::white); + imageDrawStaticText.fill(Qt::white); + + QString s = QString::fromLatin1("Foobar"); + + QFont font; + font.setUnderline(true); + + { + QPainter p(&imageDrawText); + p.setFont(font); + p.drawText(QPointF(50, 50), s); + } + + { + QPainter p(&imageDrawStaticText); + QStaticText text = QStaticText(s); + p.setFont(font); + p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text); + } + +#if defined(DEBUG_SAVE_IMAGE) + imageDrawText.save("drawUnderlinedText_imageDrawText.png"); + imageDrawStaticText.save("drawUnderlinedText_imageDrawStaticText.png"); +#endif + + QCOMPARE(imageDrawText, imageDrawStaticText); +} + QTEST_MAIN(tst_QStaticText) #include "tst_qstatictext.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qstring/tst_qstring.cpp --- a/tests/auto/qstring/tst_qstring.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qstring/tst_qstring.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -208,6 +208,7 @@ void repeated_data() const; void task262677remove(); void QTBUG10404_compareRef(); + void QTBUG9281_arg_locale(); }; typedef QList IntList; @@ -4860,6 +4861,17 @@ QVERIFY(QStringRef(&a2, 1, 2).compare(QStringRef(&a, 1, 3), Qt::CaseInsensitive) < 0); } +void tst_QString::QTBUG9281_arg_locale() +{ + QLocale l(QLocale::English, QLocale::UnitedKingdom); + l.setNumberOptions(QLocale::OmitGroupSeparator); + QLocale::setDefault(l); + QString str("*%L1*%L2*"); + str = str.arg(123456).arg(1234.56); + QCOMPARE(str, QString::fromLatin1("*123456*1234.56*")); + QLocale::setDefault(QLocale::C); +} + QTEST_APPLESS_MAIN(tst_QString) diff -r ef0373b55136 -r 758a864f9613 tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp --- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -698,20 +698,25 @@ QCOMPARE(FONTSIZE(edit2), 26); } -static bool testForColors(const QImage& image, const QColor& color) +// Ensure primary will only return true if the color covers more than 50% of pixels +static bool testForColors(const QImage& image, const QColor& color, bool ensurePrimary=false) { int count = 0; QRgb rgb = color.rgba(); + int totalCount = image.height()*image.width(); for (int y = 0; y < image.height(); ++y) { for (int x = 0; x < image.width(); ++x) { // Because of antialiasing we allow a certain range of errors here. QRgb pixel = image.pixel(x, y); + if (qAbs((int)(pixel & 0xff) - (int)(rgb & 0xff)) + qAbs((int)((pixel & 0xff00) >> 8) - (int)((rgb & 0xff00) >> 8)) + qAbs((int)((pixel & 0xff0000) >> 16) - (int)((rgb & 0xff0000) >> 16)) <= 50) { - if (++count >= 10) { + count++; + if (!ensurePrimary && count >=10 ) return true; - } + else if (count > totalCount/2) + return true; } } } @@ -1528,6 +1533,15 @@ tree.render(&image); QVERIFY(testForColors(image, tree.palette().base().color())); QVERIFY(!testForColors(image, QColor(0xab, 0x12, 0x51))); + + QTableWidget table(12, 12); + table.setItem(0, 0, new QTableWidgetItem()); + table.setStyleSheet( "QTableView {background-color: #ff0000}" ); + table.show(); + QTest::qWait(20); + image = QImage(table.width(), table.height(), QImage::Format_ARGB32); + table.render(&image); + QVERIFY(testForColors(image, Qt::red, true)); } void tst_QStyleSheetStyle::task232085_spinBoxLineEditBg() diff -r ef0373b55136 -r 758a864f9613 tests/auto/qsvgrenderer/qsvgrenderer.pro --- a/tests/auto/qsvgrenderer/qsvgrenderer.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qsvgrenderer/qsvgrenderer.pro Mon Oct 04 01:19:32 2010 +0300 @@ -13,6 +13,8 @@ addFiles.path = . DEPLOYMENT += addFiles - DEPLOYMENT_PLUGIN += qsvg + wince*|qt_not_deployed { + DEPLOYMENT_PLUGIN += qsvg + } } diff -r ef0373b55136 -r 758a864f9613 tests/auto/qtextcodec/qtextcodec.pro --- a/tests/auto/qtextcodec/qtextcodec.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qtextcodec/qtextcodec.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS = test -!wince*:SUBDIRS += echo +!wince*:!symbian:SUBDIRS += echo diff -r ef0373b55136 -r 758a864f9613 tests/auto/qtextcodec/test/test.pro --- a/tests/auto/qtextcodec/test/test.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qtextcodec/test/test.pro Mon Oct 04 01:19:32 2010 +0300 @@ -20,7 +20,9 @@ addFiles.sources = ../*.txt addFiles.path = . DEPLOYMENT += addFiles - DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + wince*|qt_not_deployed { + DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + } } wince*: { diff -r ef0373b55136 -r 758a864f9613 tests/auto/qtextcodec/tst_qtextcodec.cpp --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1946,6 +1946,8 @@ { #ifdef QT_NO_PROCESS QSKIP("This test requires QProcess", SkipAll); +#elif defined(Q_OS_SYMBIAN) + QSKIP("This test requires streams support in QProcess", SkipAll); #else QProcess process; process.start("echo/echo"); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qtextlayout/tst_qtextlayout.cpp --- a/tests/auto/qtextlayout/tst_qtextlayout.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -122,6 +122,7 @@ void smallTextLengthWrapAtWordBoundaryOrAnywhere(); void testLineBreakingAllSpaces(); void lineWidthFromBOM(); + void textWidthVsWIdth(); private: @@ -1359,5 +1360,34 @@ } } +void tst_QTextLayout::textWidthVsWIdth() +{ + QTextLayout layout; + QTextOption opt; + opt.setWrapMode(QTextOption::WrapAnywhere); + layout.setTextOption(opt); + layout.setText(QString::fromLatin1( + "g++ -c -m64 -pipe -g -fvisibility=hidden -fvisibility-inlines-hidden -Wall -W -D_REENTRANT -fPIC -DCORE_LIBRARY -DIDE_LIBRARY_BASENAME=\"lib\" -DWITH_TESTS " + "-DQT_NO_CAST_TO_ASCII -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -DQT_PLUGIN -DQT_TESTLIB_LIB -DQT_SCRIPT_LIB -DQT_SVG_LIB -DQT_SQL_LIB -DQT_XM" + "L_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -I../../../../qt-qml/mkspecs/linux-g++-64 -I. -I../../../../qt-qml/include/QtCore -I../../../." + "./qt-qml/include/QtNetwork -I../../../../qt-qml/include/QtGui -I../../../../qt-qml/include/QtXml -I../../../../qt-qml/include/QtSql -I../../../../qt-qml/inc" + "lude/QtSvg -I../../../../qt-qml/include/QtScript -I../../../../qt-qml/include/QtTest -I../../../../qt-qml/include -I../../../../qt-qml/include/QtHelp -I../." + "./libs -I/home/ettrich/dev/creator/tools -I../../plugins -I../../shared/scriptwrapper -I../../libs/3rdparty/botan/build -Idialogs -Iactionmanager -Ieditorma" + "nager -Iprogressmanager -Iscriptmanager -I.moc/debug-shared -I.uic -o .obj/debug-shared/sidebar.o sidebar.cpp")); + + // textWidth includes right bearing, but it should never be LARGER than width if there is space for at least one character + for (int width = 100; width < 1000; ++width) { + layout.beginLayout(); + QTextLine line = layout.createLine(); + line.setLineWidth(width); + layout.endLayout(); + + qreal textWidthIsLargerBy = qMax(qreal(0), line.naturalTextWidth() - line.width()); + qreal thisMustBeZero = 0; + QCOMPARE(textWidthIsLargerBy, thisMustBeZero); + } +} + + QTEST_MAIN(tst_QTextLayout) #include "tst_qtextlayout.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qtextstream/qtextstream.pro --- a/tests/auto/qtextstream/qtextstream.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qtextstream/qtextstream.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,5 +1,6 @@ TEMPLATE = subdirs -SUBDIRS = test stdinProcess readAllStdinProcess readLineStdinProcess +SUBDIRS = test +!symbian: SUBDIRS += stdinProcess readAllStdinProcess readLineStdinProcess diff -r ef0373b55136 -r 758a864f9613 tests/auto/qtimer/tst_qtimer.cpp --- a/tests/auto/qtimer/tst_qtimer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qtimer/tst_qtimer.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -86,6 +86,7 @@ void timerIdPersistsAfterThreadExit(); void cancelLongTimer(); void singleShotStaticFunctionZeroTimeout(); + void recurseOnTimeoutAndStopTimer(); }; class TimerHelper : public QObject @@ -160,8 +161,9 @@ QCOMPARE(helper.count, 1); } -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) -// Increase wait as emulator startup can cause unexpected delays +#if defined(Q_OS_SYMBIAN) +// Increase wait as emulator startup can cause unexpected delays, and +// on hardware there are sometimes spikes right after process startup. #define TIMEOUT_TIMEOUT 2000 #else #define TIMEOUT_TIMEOUT 200 @@ -623,5 +625,48 @@ QCOMPARE(helper.count, 1); } +class RecursOnTimeoutAndStopTimerTimer : public QObject +{ + Q_OBJECT + +public: + QTimer *one; + QTimer *two; + +public slots: + void onetrigger() + { + QCoreApplication::processEvents(); + } + + void twotrigger() + { + one->stop(); + } +}; + +void tst_QTimer::recurseOnTimeoutAndStopTimer() +{ + QEventLoop eventLoop; + QTimer::singleShot(1000, &eventLoop, SLOT(quit())); + + RecursOnTimeoutAndStopTimerTimer t; + t.one = new QTimer(&t); + t.two = new QTimer(&t); + + QObject::connect(t.one, SIGNAL(timeout()), &t, SLOT(onetrigger())); + QObject::connect(t.two, SIGNAL(timeout()), &t, SLOT(twotrigger())); + + t.two->setSingleShot(true); + + t.one->start(); + t.two->start(); + + (void) eventLoop.exec(); + + QVERIFY(!t.one->isActive()); + QVERIFY(!t.two->isActive()); +} + QTEST_MAIN(tst_QTimer) #include "tst_qtimer.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qtouchevent/tst_qtouchevent.cpp --- a/tests/auto/qtouchevent/tst_qtouchevent.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qtouchevent/tst_qtouchevent.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -109,6 +109,7 @@ public: QList touchBeginPoints, touchUpdatePoints, touchEndPoints; bool seenTouchBegin, seenTouchUpdate, seenTouchEnd; + int touchBeginCounter, touchUpdateCounter, touchEndCounter; bool acceptTouchBegin, acceptTouchUpdate, acceptTouchEnd; bool deleteInTouchBegin, deleteInTouchUpdate, deleteInTouchEnd; tst_QTouchEventGraphicsItem **weakpointer; @@ -131,6 +132,7 @@ touchUpdatePoints.clear(); touchEndPoints.clear(); seenTouchBegin = seenTouchUpdate = seenTouchEnd = false; + touchBeginCounter = touchUpdateCounter = touchEndCounter = 0; acceptTouchBegin = acceptTouchUpdate = acceptTouchEnd = true; deleteInTouchBegin = deleteInTouchUpdate = deleteInTouchEnd = false; } @@ -146,6 +148,7 @@ if (seenTouchUpdate) qWarning("TouchBegin: TouchUpdate cannot happen before TouchBegin"); if (seenTouchEnd) qWarning("TouchBegin: TouchEnd cannot happen before TouchBegin"); seenTouchBegin = !seenTouchBegin && !seenTouchUpdate && !seenTouchEnd; + ++touchBeginCounter; touchBeginPoints = static_cast(event)->touchPoints(); event->setAccepted(acceptTouchBegin); if (deleteInTouchBegin) @@ -155,6 +158,7 @@ if (!seenTouchBegin) qWarning("TouchUpdate: have not seen TouchBegin"); if (seenTouchEnd) qWarning("TouchUpdate: TouchEnd cannot happen before TouchUpdate"); seenTouchUpdate = seenTouchBegin && !seenTouchEnd; + ++touchUpdateCounter; touchUpdatePoints = static_cast(event)->touchPoints(); event->setAccepted(acceptTouchUpdate); if (deleteInTouchUpdate) @@ -164,6 +168,7 @@ if (!seenTouchBegin) qWarning("TouchEnd: have not seen TouchBegin"); if (seenTouchEnd) qWarning("TouchEnd: already seen a TouchEnd"); seenTouchEnd = seenTouchBegin && !seenTouchEnd; + ++touchEndCounter; touchEndPoints = static_cast(event)->touchPoints(); event->setAccepted(acceptTouchEnd); if (deleteInTouchEnd) @@ -194,6 +199,7 @@ void deleteInEventHandler(); void deleteInRawEventTranslation(); void crashInQGraphicsSceneAfterNotHandlingTouchBegin(); + void touchBeginWithGraphicsWidget(); }; void tst_QTouchEvent::touchDisabledByDefault() @@ -1334,6 +1340,59 @@ QTest::touchEvent(view.viewport()).release(0, view.mapFromScene(QPoint(10, 10))); } +void tst_QTouchEvent::touchBeginWithGraphicsWidget() +{ + QGraphicsScene scene; + QGraphicsView view(&scene); + tst_QTouchEventGraphicsItem *root; + root = new tst_QTouchEventGraphicsItem; + root->setAcceptTouchEvents(true); + scene.addItem(root); + + QGraphicsWidget *glassWidget = new QGraphicsWidget; + glassWidget->setMinimumSize(100, 100); + scene.addItem(glassWidget); + + view.resize(200, 200); + view.show(); + QTest::qWaitForWindowShown(&view); + view.fitInView(scene.sceneRect()); + + QTest::touchEvent() + .press(0, view.mapFromScene(root->mapToScene(3,3)), view.viewport()); + QTest::touchEvent() + .stationary(0) + .press(1, view.mapFromScene(root->mapToScene(6,6)), view.viewport()); + QTest::touchEvent() + .release(0, view.mapFromScene(root->mapToScene(3,3)), view.viewport()) + .release(1, view.mapFromScene(root->mapToScene(6,6)), view.viewport()); + + QCOMPARE(root->touchBeginCounter, 1); + QCOMPARE(root->touchUpdateCounter, 1); + QCOMPARE(root->touchEndCounter, 1); + QCOMPARE(root->touchUpdatePoints.size(), 2); + + root->reset(); + glassWidget->setWindowFlags(Qt::Window); // make the glassWidget a panel + + QTest::touchEvent() + .press(0, view.mapFromScene(root->mapToScene(3,3)), view.viewport()); + QTest::touchEvent() + .stationary(0) + .press(1, view.mapFromScene(root->mapToScene(6,6)), view.viewport()); + QTest::touchEvent() + .release(0, view.mapFromScene(root->mapToScene(3,3)), view.viewport()) + .release(1, view.mapFromScene(root->mapToScene(6,6)), view.viewport()); + + QCOMPARE(root->touchBeginCounter, 0); + QCOMPARE(root->touchUpdateCounter, 0); + QCOMPARE(root->touchEndCounter, 0); + + + delete root; + delete glassWidget; +} + QTEST_MAIN(tst_QTouchEvent) #include "tst_qtouchevent.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qtreeview/tst_qtreeview.cpp --- a/tests/auto/qtreeview/tst_qtreeview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qtreeview/tst_qtreeview.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -239,6 +239,7 @@ void doubleClickedWithSpans(); void taskQTBUG_6450_selectAllWith1stColumnHidden(); void taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint(); + void taskQTBUG_11466_keyboardNavigationRegression(); }; class QtTestModel: public QAbstractItemModel @@ -3785,5 +3786,129 @@ QCOMPARE(view.currentIndex(), model.index(6, 0)); } +class Model_11466 : public QAbstractItemModel +{ + Q_OBJECT +public: + Model_11466(QObject *parent) : + m_block(false) + { + // set up the model to have two top level items and a few others + m_selectionModel = new QItemSelectionModel(this, this); // owned by this + + connect(m_selectionModel, SIGNAL(currentChanged(const QModelIndex &,const QModelIndex &)), + this, SLOT(slotCurrentChanged(const QModelIndex &,const QModelIndex &))); + }; + + int rowCount(const QModelIndex &parent) const + { + if (parent.isValid()) + return (parent.internalId() == 0) ? 4 : 0; + return 2; // two top level items + } + + int columnCount(const QModelIndex &parent) const + { + return 2; + } + + QVariant data(const QModelIndex &index, int role) const + { + if (role == Qt::DisplayRole && index.isValid()) { + qint64 parentRowPlusOne = index.internalId(); + QString str; + QTextStream stream(&str); + if (parentRowPlusOne > 0) + stream << parentRowPlusOne << " -> " << index.row() << " : " << index.column(); + else + stream << index.row() << " : " << index.column(); + return QVariant(str); + } + return QVariant(); + } + + QModelIndex parent(const QModelIndex &index) const + { + if (index.isValid()) { + qint64 parentRowPlusOne = index.internalId(); + if (parentRowPlusOne > 0) { + int row = static_cast(parentRowPlusOne - 1); + return createIndex(row, 0, (quint32)0); + } + } + return QModelIndex(); + } + + void bindView(QTreeView *view) + { + // sets the view to this model with a shared selection model + QItemSelectionModel *oldModel = view->selectionModel(); + if (oldModel != m_selectionModel) + delete oldModel; + view->setModel(this); // this creates a new selection model for the view, but we dont want it either ... + oldModel = view->selectionModel(); + view->setSelectionModel(m_selectionModel); + delete oldModel; + } + + QModelIndex index(int row, int column, const QModelIndex &parent) const + { + return createIndex(row, column, parent.isValid() ? (quint32)(parent.row() + 1) : (quint32)0); + } + +public slots: + void slotCurrentChanged(const QModelIndex ¤t,const QModelIndex &) + { + if (m_block) + return; + + if (current.isValid()) { + int selectedRow = current.row(); + quint32 parentRowPlusOne = static_cast(current.internalId()); + + for (int i = 0; i < 2; ++i) { + // announce the removal of all non top level items + beginRemoveRows(createIndex(i, 0, 0), 0, 3); + // nothing to actually do for the removal + endRemoveRows(); + + // put them back in again + beginInsertRows(createIndex(i, 0, 0), 0, 3); + // nothing to actually do for the insertion + endInsertRows(); + } + // reselect the current item ... + QModelIndex selectedIndex = createIndex(selectedRow, 0, parentRowPlusOne); + + m_block = true; // recursion block + m_selectionModel->select(selectedIndex, QItemSelectionModel::ClearAndSelect|QItemSelectionModel::Current|QItemSelectionModel::Rows); + m_selectionModel->setCurrentIndex(selectedIndex, QItemSelectionModel::NoUpdate); + m_block = false; + } else { + m_selectionModel->clear(); + } + } + +private: + bool m_block; + QItemSelectionModel *m_selectionModel; +}; + +void tst_QTreeView::taskQTBUG_11466_keyboardNavigationRegression() +{ + QTreeView treeView; + treeView.setSelectionBehavior(QAbstractItemView::SelectRows); + treeView.setSelectionMode(QAbstractItemView::SingleSelection); + Model_11466 model(&treeView); + model.bindView(&treeView); + treeView.expandAll(); + treeView.show(); + QTest::qWaitForWindowShown(&treeView); + + QTest::keyPress(treeView.viewport(), Qt::Key_Down); + QTest::qWait(10); + QTRY_COMPARE(treeView.currentIndex(), treeView.selectionModel()->selection().indexes().first()); +} + QTEST_MAIN(tst_QTreeView) #include "tst_qtreeview.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qurl/tst_qurl.cpp --- a/tests/auto/qurl/tst_qurl.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qurl/tst_qurl.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -194,6 +194,7 @@ void task_199967(); void task_240612(); void taskQTBUG_6962(); + void taskQTBUG_8701(); #ifdef QT3_SUPPORT void dirPath(); @@ -3912,5 +3913,17 @@ QCOMPARE(url.authority(), QString()); } +void tst_QUrl::taskQTBUG_8701() +{ + //bug 8701: foo:///bar mangled to foo:/bar + QString foo_triple_bar("foo:///bar"), foo_uni_bar("foo:/bar"); + + QCOMPARE(foo_triple_bar, QUrl(foo_triple_bar).toString()); + QCOMPARE(foo_uni_bar, QUrl(foo_uni_bar).toString()); + + QCOMPARE(foo_triple_bar, QUrl(foo_triple_bar, QUrl::StrictMode).toString()); // fails + QCOMPARE(foo_uni_bar, QUrl(foo_uni_bar, QUrl::StrictMode).toString()); +} + QTEST_MAIN(tst_QUrl) #include "tst_qurl.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp --- a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -127,16 +127,37 @@ QTest::addColumn("frameSize"); QTest::addColumn("pixelFormat"); QTest::addColumn("handleType"); + QTest::addColumn("valid"); QTest::newRow("32x32 rgb32 no handle") << QSize(32, 32) << QVideoFrame::Format_RGB32 - << QAbstractVideoBuffer::NoHandle; + << QAbstractVideoBuffer::NoHandle + << true; QTest::newRow("1024x768 YUV444 GL texture") << QSize(32, 32) << QVideoFrame::Format_YUV444 - << QAbstractVideoBuffer::GLTextureHandle; + << QAbstractVideoBuffer::GLTextureHandle + << true; + + QTest::newRow("32x32 invalid no handle") + << QSize(32, 32) + << QVideoFrame::Format_Invalid + << QAbstractVideoBuffer::NoHandle + << false; + + QTest::newRow("invalid size, rgb32 no handle") + << QSize() + << QVideoFrame::Format_RGB32 + << QAbstractVideoBuffer::NoHandle + << false; + + QTest::newRow("0x0 rgb32 no handle") + << QSize(0,0) + << QVideoFrame::Format_RGB32 + << QAbstractVideoBuffer::NoHandle + << true; } void tst_QVideoSurfaceFormat::construct() @@ -144,6 +165,7 @@ QFETCH(QSize, frameSize); QFETCH(QVideoFrame::PixelFormat, pixelFormat); QFETCH(QAbstractVideoBuffer::HandleType, handleType); + QFETCH(bool, valid); QRect viewport(QPoint(0, 0), frameSize); @@ -154,6 +176,7 @@ QCOMPARE(format.frameSize(), frameSize); QCOMPARE(format.frameWidth(), frameSize.width()); QCOMPARE(format.frameHeight(), frameSize.height()); + QCOMPARE(format.isValid(), valid); QCOMPARE(format.viewport(), viewport); QCOMPARE(format.scanLineDirection(), QVideoSurfaceFormat::TopToBottom); QCOMPARE(format.frameRate(), 0.0); diff -r ef0373b55136 -r 758a864f9613 tests/auto/qwidget/tst_qwidget.cpp --- a/tests/auto/qwidget/tst_qwidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/qwidget/tst_qwidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -402,6 +402,8 @@ #endif // QT_MAC_USE_COCOA #endif + void nativeChildFocus(); + private: bool ensureScreenSize(int width, int height); QWidget *testWidget; @@ -9694,7 +9696,6 @@ // Native child widget should once again share parent's backing store QVERIFY(0 != backingStore(parent)); - QEXPECT_FAIL("", "QTBUG-10643", Continue); QVERIFY(0 == backingStore(child)); } @@ -9743,7 +9744,6 @@ QVERIFY(0 != backingStore(child)); // Parent is obscured, therefore its backing store should be destroyed - QEXPECT_FAIL("", "QTBUG-10643", Continue); QVERIFY(0 == backingStore(parent)); // Disable full screen @@ -9757,9 +9757,82 @@ // Native child widget should once again share parent's backing store QVERIFY(0 != backingStore(parent)); - QEXPECT_FAIL("", "QTBUG-10643", Continue); QVERIFY(0 == backingStore(child)); } + + // 6. Partial reveal followed by full reveal + { + QWidget upper; + upper.setAutoFillBackground(true); + upper.setPalette(Qt::red); + upper.setGeometry(50, 50, 100, 100); + + QWidget lower; + lower.setAutoFillBackground(true); + lower.setPalette(Qt::green); + lower.setGeometry(50, 50, 100, 100); + + lower.show(); + QTest::qWaitForWindowShown(&lower); + upper.show(); + QTest::qWaitForWindowShown(&upper); + upper.raise(); + + QVERIFY(0 != backingStore(upper)); + QVERIFY(0 == backingStore(lower)); + + // Check that upper obscures lower + QVERIFY(lower.visibleRegion().subtracted(upper.visibleRegion()).isEmpty()); + + // Partially reveal lower + upper.move(100, 100); + + // Completely reveal lower + upper.hide(); + + // Hide lower widget - this should cause its backing store to be deleted + lower.hide(); + + // Check that backing store was deleted + WAIT_AND_VERIFY(0 == backingStore(lower)); + } + + // 7. Reparenting of visible native child widget + { + QWidget parent1; + parent1.setAutoFillBackground(true); + parent1.setPalette(Qt::green); + parent1.setGeometry(50, 50, 100, 100); + + QWidget *child = new QWidget(&parent1); + child->winId(); + child->setAutoFillBackground(true); + child->setPalette(Qt::red); + child->setGeometry(10, 10, 30, 30); + + QWidget parent2; + parent2.setAutoFillBackground(true); + parent2.setPalette(Qt::blue); + parent2.setGeometry(150, 150, 100, 100); + + parent1.show(); + QTest::qWaitForWindowShown(&parent1); + QVERIFY(0 != backingStore(parent1)); + + parent2.show(); + QTest::qWaitForWindowShown(&parent2); + QVERIFY(0 != backingStore(parent2)); + + child->setParent(&parent2); + child->setGeometry(10, 10, 30, 30); + child->show(); + + parent1.hide(); + WAIT_AND_VERIFY(0 == backingStore(parent1)); + + parent2.hide(); + WAIT_AND_VERIFY(0 == backingStore(parent2)); + } } #undef WAIT_AND_VERIFY @@ -10460,5 +10533,28 @@ #endif // QT_MAC_USE_COCOA #endif +void tst_QWidget::nativeChildFocus() +{ + QWidget w; + QLayout *layout = new QVBoxLayout; + w.setLayout(layout); + QLineEdit *p1 = new QLineEdit; + QLineEdit *p2 = new QLineEdit; + layout->addWidget(p1); + layout->addWidget(p2); + p1->setObjectName("p1"); + p2->setObjectName("p2"); + w.show(); + w.activateWindow(); + p1->setFocus(); + p1->setAttribute(Qt::WA_NativeWindow); + p2->setAttribute(Qt::WA_NativeWindow); + QApplication::processEvents(); + QTest::qWaitForWindowShown(&w); + + QCOMPARE(QApplication::activeWindow(), &w); + QCOMPARE(QApplication::focusWidget(), p1); +} + QTEST_MAIN(tst_QWidget) #include "tst_qwidget.moc" diff -r ef0373b55136 -r 758a864f9613 tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1 @@ +2009-12-16T23:14:10.823218Z diff -r ef0373b55136 -r 758a864f9613 tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xsd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/auto/xmlpatternsvalidator/files/dateTime-with-microseconds.xsd Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -r ef0373b55136 -r 758a864f9613 tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp --- a/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/auto/xmlpatternsvalidator/tst_xmlpatternsvalidator.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -216,6 +216,12 @@ << 0 << (QStringList() << QLatin1String("files/complex-type-including-anonymous-type.xsd")) << QString(); + + QTest::newRow("QTBUG-11559 A schema and instance with a dateTime containing microseconds") + << 0 + << (QStringList() << QLatin1String("files/dateTime-with-microseconds.xml") + << QLatin1String("files/dateTime-with-microseconds.xsd")) + << QString(); } QTEST_MAIN(tst_XmlPatternsValidator) diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/benchmarks/README Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,81 @@ +The most reliable way of running benchmarks is to do it in an otherwise idle +system. On a busy system, the results will vary according to the other tasks +demanding attention in the system. + +We have managed to obtain quite reliable results by doing the following on +Linux (and you need root): + + - switching the scheduler to a Real-Time mode + - setting the processor affinity to one single processor + - disabling the other thread of the same core + +This should work rather well for CPU-intensive tasks. A task that is in Real- +Time mode will simply not be preempted by the OS. But if you make OS syscalls, +especially I/O ones, your task will be de-scheduled. Note that this includes +page faults, so if you can, make sure your benchmark's warmup code paths touch +most of the data. + +To do this you need a tool called schedtool (package schedtool), from +http://freequaos.host.sk/schedtool/ + +From this point on, we are using CPU0 for all tasks: + +If you have a Hyperthreaded multi-core processor (Core-i5 and Core-i7), you +have to disable the other thread of the same core as CPU0. To discover which +one it is: + +$ cat /sys/devices/system/cpu/cpu0/topology/thread_siblings_list + +This will print something like 0,4, meaning that CPUs 0 and 4 are sibling +threads on the same core. So we'll turn CPU 4 off: + +(as root) +# echo 0 > /sys/devices/system/cpu/cpu4/online + +To turn it back on, echo 1 into the same file. + +To run a task on CPU 0 exclusively, using FIFO RT priority 10, you run the +following: + +(as root) +# schedtool -F -p 10 -a 1 -e ./taskname + +For example: +# schedtool -F -p 10 -a 1 -e ./tst_bench_qstring -tickcounter + +Warning: if your task livelocks or takes far too long to complete, your system +may be unusable for a long time, especially if you don't have other cores to +run stuff on. To prevent that, run it before schedtool and time it. + +You can also limit the CPU time that the task is allowed to take. Run in the +same shell as you'll run schedtool: + +$ ulimit -s 300 +To limit to 300 seconds (5 minutes) + +If your task runs away, it will get a SIGXCPU after consuming 5 minutes of CPU +time (5 minutes running at 100%). + +If your app is multithreaded, you may want to give it more CPUs, like CPU0 and +CPU1 with -a 3 (it's a bitmask). + +For best results, you should disable ALL other cores and threads of the same +processor. The new Core-i7 have one processor with 4 cores, +each core can run 2 threads; the older Mac Pros have two processors with 4 +cores each. So on those Mac Pros, you'd disable cores 1, 2 and 3, while on the +Core-i7, you'll need to disable all other CPUs. + +However, disabling just the sibling thread seems to produce very reliable +results for me already, with variance often below 0.5% (even though there are +some measurable spikes). + +Other things to try: + +Running the benchmark with highest priority, i.e. "sudo nice -19" +usually produces stable results on some machines. If the benchmark also +involves displaying something on the screen (on X11), running it with +"-sync" is a must. Though, in that case the "real" cost is not correct, +but it is useful to discover regressions. + +Also; not many people know about ionice (1) + ionice - get/set program io scheduling class and priority diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/benchmarks.pro --- a/tests/benchmarks/benchmarks.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/benchmarks/benchmarks.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,6 +1,5 @@ TEMPLATE = subdirs SUBDIRS = \ - uimodels\GraphicsViewBenchmark \ corelib \ gui \ network \ diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/corelib/io/io.pro --- a/tests/benchmarks/corelib/io/io.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/benchmarks/corelib/io/io.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,9 +1,9 @@ TEMPLATE = subdirs SUBDIRS = \ -# qdir \ + qdir \ qdiriterator \ -# qfile \ -# qfileinfo \ + qfile \ + qfileinfo \ qiodevice \ qtemporaryfile diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/corelib/tools/qregexp/main.cpp --- a/tests/benchmarks/corelib/tools/qregexp/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/benchmarks/corelib/tools/qregexp/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -38,16 +38,27 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #include #include #include +#include #include +#ifdef HAVE_BOOST +#include +#endif +#include +#include "pcre/pcre.h" + +#define ZLIB_VERSION "1.2.3.4" class tst_qregexp : public QObject { Q_OBJECT +public: + tst_qregexp(); private slots: void escape_old(); void escape_old_data() { escape_data(); } @@ -59,10 +70,56 @@ void escape_new3_data() { escape_data(); } void escape_new4(); void escape_new4_data() { escape_data(); } +/* + JSC outperforms everything. + Boost is less impressive then expected. + */ + void simpleFind1(); + void rangeReplace1(); + void matchReplace1(); + + void simpleFind2(); + void rangeReplace2(); + void matchReplace2(); + + void simpleFindJSC(); + void rangeReplaceJSC(); + void matchReplaceJSC(); + +#ifdef HAVE_BOOST + void simpleFindBoost(); + void rangeReplaceBoost(); + void matchReplaceBoost(); +#endif + +/* those apply an (incorrect) regexp on entire source + (this main.cpp). JSC appears to handle this + (ab)use case best. QRegExp performs extremly bad. + */ + void horribleWrongReplace1(); + void horribleReplace1(); + void horribleReplace2(); + void horribleWrongReplace2(); + void horribleWrongReplaceJSC(); + void horribleReplaceJSC(); +#ifdef HAVE_BOOST + void horribleWrongReplaceBoost(); + void horribleReplaceBoost(); +#endif private: + QString str1; + QString str2; void escape_data(); }; +tst_qregexp::tst_qregexp() + :QObject() + ,str1("We are all happy monkeys") +{ + QFile f(":/main.cpp"); + f.open(QFile::ReadOnly); + str2=f.readAll(); +} static void verify(const QString "ed, const QString &expected) { @@ -285,6 +342,253 @@ // "return quoted" } } + + +void tst_qregexp::simpleFind1() +{ + int roff; + QRegExp rx("happy"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + roff = rx.indexIn(str1); + } + QCOMPARE(roff, 11); +} + +void tst_qregexp::rangeReplace1() +{ + QString r; + QRegExp rx("[a-f]"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str1).replace(rx, "-"); + } + QCOMPARE(r, QString("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplace1() +{ + QString r; + QRegExp rx("[^a-f]*([a-f]+)[^a-f]*"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str1).replace(rx, "\\1"); + } + QCOMPARE(r, QString("eaeaae")); +} + +void tst_qregexp::horribleWrongReplace1() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, str2); +} + +void tst_qregexp::horribleReplace1() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, QString("1.2.3")); +} + + +void tst_qregexp::simpleFind2() +{ + int roff; + QRegExp rx("happy"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + roff = rx.indexIn(str1); + } + QCOMPARE(roff, 11); +} + +void tst_qregexp::rangeReplace2() +{ + QString r; + QRegExp rx("[a-f]"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str1).replace(rx, "-"); + } + QCOMPARE(r, QString("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplace2() +{ + QString r; + QRegExp rx("[^a-f]*([a-f]+)[^a-f]*"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str1).replace(rx, "\\1"); + } + QCOMPARE(r, QString("eaeaae")); +} + +void tst_qregexp::horribleWrongReplace2() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, str2); +} + +void tst_qregexp::horribleReplace2() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, QString("1.2.3")); +} + + +void tst_qregexp::simpleFindJSC() +{ + int numr; + const char * errmsg=" "; + QString rxs("happy"); + JSRegExp *rx = jsRegExpCompile(rxs.utf16(), rxs.length(), JSRegExpDoNotIgnoreCase, JSRegExpSingleLine, 0, &errmsg); + QVERIFY(rx != 0); + QString s(str1); + int offsetVector[3]; + QBENCHMARK{ + numr = jsRegExpExecute(rx, s.utf16(), s.length(), 0, offsetVector, 3); + } + jsRegExpFree(rx); + QCOMPARE(numr, 1); + QCOMPARE(offsetVector[0], 11); +} + +void tst_qregexp::rangeReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + engine.globalObject().setProperty("s", str1); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/[a-f]/g, '-') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), QString("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + engine.globalObject().setProperty("s", str1); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/[^a-f]*([a-f]+)[^a-f]*/g, '$1') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), QString("eaeaae")); +} + +void tst_qregexp::horribleWrongReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + engine.globalObject().setProperty("s", str2); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/.*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*/gm, '$1.$2.$3') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), str2); +} + +void tst_qregexp::horribleReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + // the m flag doesnt actually work here; dunno + engine.globalObject().setProperty("s", str2.replace('\n', ' ')); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/.*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*/gm, '$1.$2.$3') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), QString("1.2.3")); +} + + +#ifdef HAVE_BOOST +void tst_qregexp::simpleFindBoost(){ + int roff; + boost::regex rx ("happy", boost::regex_constants::perl); + std::string s = str1.toStdString(); + std::string::const_iterator start, end; + start = s.begin(); + end = s.end(); + boost::match_flag_type flags = boost::match_default; + QBENCHMARK{ + boost::match_results what; + regex_search(start, end, what, rx, flags); + roff = (what[0].first)-start; + } + QCOMPARE(roff, 11); +} + +void tst_qregexp::rangeReplaceBoost() +{ + boost::regex pattern ("[a-f]", boost::regex_constants::perl); + std::string s = str1.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "-"); + } + QCOMPARE(r, std::string("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplaceBoost() +{ + boost::regex pattern ("[^a-f]*([a-f]+)[^a-f]*",boost::regex_constants::perl); + std::string s = str1.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "$1"); + } + QCOMPARE(r, std::string("eaeaae")); +} + +void tst_qregexp::horribleWrongReplaceBoost() +{ + boost::regex pattern (".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*", boost::regex_constants::perl); + std::string s = str2.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "$1.$2.$3"); + } + QCOMPARE(r, s); +} + +void tst_qregexp::horribleReplaceBoost() +{ + boost::regex pattern (".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*", boost::regex_constants::perl); + std::string s = str2.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "$1.$2.$3"); + } + QCOMPARE(r, std::string("1.2.3")); +} +#endif //HAVE_BOOST + QTEST_MAIN(tst_qregexp) #include "main.moc" diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/corelib/tools/qregexp/qregexp.pro --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro Mon Oct 04 01:19:32 2010 +0300 @@ -3,10 +3,19 @@ TARGET = tst_bench_qregexp DEPENDPATH += . INCLUDEPATH += . - +RESOURCES+=qregexp.qrc QT -= gui +QT += script CONFIG += release # Input SOURCES += main.cpp + +include( $${QT_SOURCE_TREE}/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri ) + +exists( /usr/include/boost/regex.hpp ){ +DEFINES+=HAVE_BOOST +LIBS+=-lboost_regex +} + diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/corelib/tools/qregexp/qregexp.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.qrc Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,6 @@ + + + main.cpp + + + diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/corelib/tools/qstring/data.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/benchmarks/corelib/tools/qstring/data.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1284 @@ +// This is a generated file - DO NOT EDIT +static const ushort stringCollectionData[] __attribute__((aligned(16))) = { + // #0 + 65535, + 99, 111, 109, 112, 105, 108, 101, 114, 32, 118, 101, 114, 115, 105, 111, 110, 115, 47, + 65535,65534,65533,65532,65531, // 24 + 65535,65534,65533,65532,65531, + 99, 111, 109, 112, 105, 108, 101, 114, 32, 118, 101, 114, 115, 105, 111, 110, 115, 47, + 65535, // 48 + + // #1 + 65535,65534,65533,65532,65531, + 99, 111, 109, 112, 105, 108, 101, 114, 32, 118, 101, 114, 115, 105, 111, 110, 115, 47, + 65535, // 72 + 65535,65534,65533,65532,65531, + 67, 111, 109, 112, 105, 108, 101, 114, 32, 86, 101, 114, 115, 105, 111, 110, 115, 47, + 65535, // 96 + + // #2 + 65535, + 99, 111, 109, 112, 105, 108, 101, 114, 32, 116, 105, 109, 101, 115, 116, 97, 109, 112, 115, 47, + 65535,65534,65533, // 120 + 65535,65534,65533,65532,65531, + 99, 111, 109, 112, 105, 108, 101, 114, 32, 116, 105, 109, 101, 115, 116, 97, 109, 112, 115, 47, + 65535,65534,65533,65532,65531,65530,65529, // 152 + + // #3 + 65535,65534,65533,65532,65531, + 99, 111, 109, 112, 105, 108, 101, 114, 32, 116, 105, 109, 101, 115, 116, 97, 109, 112, 115, 47, + 65535,65534,65533,65532,65531,65530,65529, // 184 + 65535, + 67, 111, 109, 112, 105, 108, 101, 114, 32, 84, 105, 109, 101, 115, 116, 97, 109, 112, 115, 47, + 65535,65534,65533, // 208 + + // #4 + 65535,65534,65533,65532,65531,65530,65529,65528,65527,65526,65525,65524,65523,65522,65521,65520,65519, + 47, 118, 97, 114, 47, 116, 109, 112, 47, 116, 101, 97, 109, 98, 117, 105, 108, 100, 101, 114, 45, 116, 109, 97, 99, 105, 101, 105, 114, 47, 99, 108, 105, 101, 110, 116, 47, 99, 111, 109, 112, 105, 108, 101, 114, 115, 46, 99, 111, 110, 102, + 65535,65534,65533,65532, // 280+ + + + // #5 + 65535,65534,65533,65532,65531,65530,65529,65528,65527,65526,65525,65524,65523, + 47, 118, 97, 114, 47, 116, 109, 112, 47, 116, 101, 97, 109, 98, 117, 105, 108, 100, 101, 114, 45, 116, 109, 97, 99, 105, 101, 105, 114, 47, 99, 108, 105, 101, 110, 116, 47, 99, 111, 109, 112, 105, 108, 101, 114, 115, 46, 99, 111, 110, 102, + 65535,65534,65533,65532,65531,65530,65529,65528, // 352+ + 65535, + 47, 118, 97, 114, 47, 116, 109, 112, 47, 116, 101, 97, 109, 98, 117, 105, 108, 100, 101, 114, 45, 116, 109, 97, 99, 105, 101, 105, 114, 47, 99, 108, 105, 101, 110, 116, 47, 99, 111, 109, 112, 105, 108, 101, 114, 115, 46, 99, 111, 110, 102, + 65535,65534,65533,65532, // 408+ + + // #6 + 65535,65534,65533,65532,65531,65530,65529,65528,65527, + 47, 118, 97, 114, 47, 116, 109, 112, 47, 116, 101, 97, 109, 98, 117, 105, 108, 100, 101, 114, 45, 116, 109, 97, 99, 105, 101, 105, 114, 47, 99, 108, 105, 101, 110, 116, 47, 99, 111, 109, 112, 105, 108, 101, 114, 115, 46, 99, 111, 110, 102, + 65535,65534,65533,65532, // 472+ + + + // #7 + 65535, + 97, 114, 99, 104, 105, 118, 101, 100, 32, 99, 111, 109, 112, 105, 108, 101, 114, 115, 47, + 65535,65534,65533,65532, // 496 + 65535,65534,65533,65532,65531, + 97, 114, 99, 104, 105, 118, 101, 100, 32, 99, 111, 109, 112, 105, 108, 101, 114, 115, 47, + 65535,65534,65533,65532,65531,65530,65529,65528, // 528 + + // #8 + 65535,65534,65533,65532,65531, + 97, 114, 99, 104, 105, 118, 101, 100, 32, 99, 111, 109, 112, 105, 108, 101, 114, 115, 47, + 65535,65534,65533,65532,65531,65530,65529,65528, // 560 + 65535,65534,65533,65532,65531, + 65, 114, 99, 104, 105, 118, 101, 100, 32, 67, 111, 109, 112, 105, 108, 101, 114, 115, 47, + 65535,65534,65533,65532,65531,65530,65529,65528, // 592 + + // #9 + 65535,65534,65533,65532,65531,65530,65529,65528,65527,65526,65525,65524,65523,65522,65521,65520,65519, + 47, 118, 97, 114, 47, 116, 109, 112, 47, 116, 101, 97, 109, 98, 117, 105, 108, 100, 101, 114, 45, 116, 109, 97, 99, 105, 101, 105, 114, 47, 99, 108, 105, 101, 110, 116, 47, 99, 111, 109, 112, 105, 108, 101, 114, 115, 46, 99, 111, 110, 102, + 65535,65534,65533,65532, // 664+ + 65535,65534,65533,65532,65531,65530,65529,65528,65527,65526,65525,65524,65523, + 47, 118, 97, 114, 47, 116, 109, 112, 47, 116, 101, 97, 109, 98, 117, 105, 108, 100, 101, 114, 45, 116, 109, 97, 99, 105, 101, 105, 114, 47, 99, 108, 105, 101, 110, 116, 47, 99, 111, 109, 112, 105, 108, 101, 114, 115, 46, 99, 111, 110, 102, + 65535,65534,65533,65532,65531,65530,65529,65528, // 736+ + + // #10 + 65535,65534,65533,65532,65531, + 76, 105, 110, 117, 120, + 65535,65534,65533,65532,65531,65530, // 752 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 760 + + // #11 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 776 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 792 + + // #12 + 65535, + 105, 99, 99, + 65535,65534,65533,65532, // 800 + 65535,65534,65533,65532,65531, + 103, 43, 43, + 65535,65534,65533,65532,65531,65530,65529,65528, // 816 + + // #13 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 824 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 832 + + // #14 + 65535, + 105, 51, 56, 54, + 65535,65534,65533, // 840 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 856 + + // #15 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 864 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 872 + + // #16 + 65535, + 105, 51, 56, 54, + 65535,65534,65533, // 880 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 896 + + // #17 + 65535, + 103, 99, 99, + 65535,65534,65533,65532, // 904 + 65535,65534,65533,65532,65531, + 103, 43, 43, + 65535,65534,65533,65532,65531,65530,65529,65528, // 920 + + // #18 + 65535,65534,65533,65532,65531, + 76, 105, 110, 117, 120, + 65535,65534,65533,65532,65531,65530, // 936 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 944 + + // #19 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 960 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 976 + + // #20 + 65535, + 103, 43, 43, + 65535,65534,65533,65532, // 984 + 65535,65534,65533,65532,65531, + 103, 43, 43, + 65535,65534,65533,65532,65531,65530,65529,65528, // 1000 + + // #21 + 65535,65534,65533,65532,65531, + 52, 46, 52, 46, 51, + 65535,65534,65533,65532,65531,65530, // 1016 + 65535,65534,65533,65532,65531, + 52, 46, 52, 46, 51, + 65535,65534,65533,65532,65531,65530, // 1032 + + // #22 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 1040 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 1048 + + // #23 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 1064 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 1080 + + // #24 + 65535, + 47, 117, 115, 114, 47, 98, 105, 110, 47, 103, 43, 43, + 65535,65534,65533, // 1096 + 65535, + 47, 117, 115, 114, 47, 98, 105, 110, 47, 103, 43, 43, + 65535,65534,65533, // 1112 + + // #25 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 1120 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 1128 + + // #26 + 65535, + 105, 51, 56, 54, + 65535,65534,65533, // 1136 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 1152 + + // #27 + 65535, + 105, 99, 99, + 65535,65534,65533,65532, // 1160 + 65535,65534,65533,65532,65531, + 103, 43, 43, + 65535,65534,65533,65532,65531,65530,65529,65528, // 1176 + + // #28 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 1184 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 1192 + + // #29 + 65535, + 105, 51, 56, 54, + 65535,65534,65533, // 1200 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 1216 + + // #30 + 65535,65534,65533,65532,65531, + 76, 105, 110, 117, 120, + 65535,65534,65533,65532,65531,65530, // 1232 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 1240 + + // #31 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 1256 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 1272 + + // #32 + 65535,65534,65533,65532,65531, + 76, 105, 110, 117, 120, + 65535,65534,65533,65532,65531,65530, // 1288 + 65535, + 76, 105, 110, 117, 120, + 65535,65534, // 1296 + + // #33 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 1312 + 65535,65534,65533,65532,65531, + 105, 51, 56, 54, + 65535,65534,65533,65532,65531,65530,65529, // 1328 + + // #34 + 65535, + 45, 109, 97, 114, 99, 104, 61, 99, 111, 114, 101, 50, + 65535,65534,65533, // 1344 + 65535, + 116, 98, 51, 54, 57, 54, 56, 95, 50, 46, 105, 105, + 65535,65534,65533, // 1360 + + // #35 + 65535,65534,65533,65532,65531, + 45, 102, 108, 111, 111, 112, 45, 98, 108, 111, 99, 107, + 65535,65534,65533,65532,65531,65530,65529, // 1384 + 65535, + 116, 98, 51, 54, 57, 54, 56, 95, 50, 46, 105, 105, + 65535,65534,65533, // 1400 + + // #36 + 65535,65534,65533,65532,65531, + 116, 98, 51, 54, 57, 54, 56, 95, 50, 46, 105, 105, + 65535,65534,65533,65532,65531,65530,65529, // 1424 + 65535, + 116, 98, 51, 54, 57, 54, 56, 95, 50, 46, 105, 105, + 65535,65534,65533, // 1440 + + // #37 + 65535,65534,65533,65532,65531, + 45, 109, 115, 115, 101, 52, + 65535,65534,65533,65532,65531, // 1456 + 65535,65534,65533,65532,65531, + 108, 101, 110, 103, 116, 104, + 65535,65534,65533,65532,65531, // 1472 + + // #38 + 65535,65534,65533,65532,65531, + 116, 98, 51, 54, 57, 54, 56, 95, 49, 46, 111, + 65535,65534,65533,65532,65531,65530,65529,65528, // 1496 + 65535,65534,65533,65532,65531, + 116, 98, 51, 54, 57, 54, 56, 95, 49, 46, 111, + 65535,65534,65533,65532,65531,65530,65529,65528, // 1520 + + // #39 + 65535,65534,65533,65532,65531, + 68, 69, 83, 75, 84, 79, 80, 95, 83, 69, 83, 83, + 65535,65534,65533,65532,65531,65530,65529, // 1544 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1560 + + // #40 + 65535,65534,65533,65532,65531, + 76, 67, 95, 83, 79, 85, 82, 67, 69, 68, 61, 49, + 65535,65534,65533,65532,65531,65530,65529, // 1584 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1600 + + // #41 + 65535,65534,65533,65532,65531, + 81, 84, 68, 73, 82, 61, 47, 104, 111, 109, 101, 47, + 65535,65534,65533,65532,65531,65530,65529, // 1624 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1640 + + // #42 + 65535, + 76, 67, 95, 67, 84, 89, 80, 69, 61, 112, 116, 95, + 65535,65534,65533, // 1656 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1672 + + // #43 + 65535, + 71, 84, 75, 95, 82, 67, 95, 70, 73, 76, 69, 83, + 65535,65534,65533, // 1688 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1704 + + // #44 + 65535, + 88, 77, 79, 68, 73, 70, 73, 69, 82, 83, 61, 64, + 65535,65534,65533, // 1720 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1736 + + // #45 + 65535, + 83, 72, 69, 76, 76, 61, 47, 98, 105, 110, 47, 122, + 65535,65534,65533, // 1752 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1768 + + // #46 + 65535,65534,65533,65532,65531, + 85, 61, 64, 123, 117, 112, 115, 116, 114, 101, 97, 109, + 65535,65534,65533,65532,65531,65530,65529, // 1792 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1808 + + // #47 + 65535, + 95, 61, 47, 117, 115, 114, 47, 98, 105, 110, 47, 105, + 65535,65534,65533, // 1824 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1840 + + // #48 + 65535, + 88, 68, 71, 95, 67, 79, 78, 70, 73, 71, 95, 68, + 65535,65534,65533, // 1856 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1872 + + // #49 + 65535,65534,65533,65532,65531, + 83, 65, 86, 69, 72, 73, 83, 84, 61, 49, 48, 48, + 65535,65534,65533,65532,65531,65530,65529, // 1896 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1912 + + // #50 + 65535, + 75, 68, 69, 95, 77, 85, 76, 84, 73, 72, 69, 65, + 65535,65534,65533, // 1928 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1944 + + // #51 + 65535,65534,65533,65532,65531, + 77, 65, 76, 76, 79, 67, 95, 67, 72, 69, 67, 75, + 65535,65534,65533,65532,65531,65530,65529, // 1968 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 1984 + + // #52 + 65535,65534,65533,65532,65531, + 72, 73, 83, 84, 67, 79, 78, 84, 82, 79, 76, 61, + 65535,65534,65533,65532,65531,65530,65529, // 2008 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2024 + + // #53 + 65535,65534,65533,65532,65531, + 88, 68, 71, 95, 68, 65, 84, 65, 95, 68, 73, 82, + 65535,65534,65533,65532,65531,65530,65529, // 2048 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2064 + + // #54 + 65535,65534,65533,65532,65531, + 88, 68, 77, 95, 77, 65, 78, 65, 71, 69, 68, 61, + 65535,65534,65533,65532,65531,65530,65529, // 2088 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2104 + + // #55 + 65535, + 76, 67, 95, 67, 79, 76, 76, 65, 84, 69, 61, 112, + 65535,65534,65533, // 2120 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2136 + + // #56 + 65535, + 81, 84, 95, 80, 76, 85, 71, 73, 78, 95, 80, 65, + 65535,65534,65533, // 2152 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2168 + + // #57 + 65535, + 83, 67, 82, 69, 69, 78, 68, 73, 82, 61, 47, 104, + 65535,65534,65533, // 2184 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2200 + + // #58 + 65535,65534,65533,65532,65531, + 76, 69, 83, 83, 79, 80, 69, 78, 61, 124, 47, 117, + 65535,65534,65533,65532,65531,65530,65529, // 2224 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2240 + + // #59 + 65535, + 76, 67, 95, 78, 65, 77, 69, 61, 110, 98, 95, 78, + 65535,65534,65533, // 2256 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2272 + + // #60 + 65535,65534,65533,65532,65531, + 80, 52, 67, 76, 73, 69, 78, 84, 61, 116, 109, 97, + 65535,65534,65533,65532,65531,65530,65529, // 2296 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2312 + + // #61 + 65535, + 80, 65, 84, 72, 61, 47, 104, 111, 109, 101, 47, 116, + 65535,65534,65533, // 2328 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2344 + + // #62 + 65535,65534,65533,65532,65531, + 71, 80, 71, 95, 65, 71, 69, 78, 84, 95, 73, 78, + 65535,65534,65533,65532,65531,65530,65529, // 2368 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2384 + + // #63 + 65535,65534,65533,65532,65531, + 88, 67, 85, 82, 83, 79, 82, 95, 84, 72, 69, 77, + 65535,65534,65533,65532,65531,65530,65529, // 2408 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2424 + + // #64 + 65535,65534,65533,65532,65531, + 83, 69, 83, 83, 73, 79, 78, 95, 77, 65, 78, 65, + 65535,65534,65533,65532,65531,65530,65529, // 2448 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2464 + + // #65 + 65535, + 81, 84, 83, 82, 67, 68, 73, 82, 61, 47, 104, 111, + 65535,65534,65533, // 2480 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2496 + + // #66 + 65535,65534,65533,65532,65531, + 87, 73, 78, 68, 79, 87, 73, 68, 61, 52, 54, 49, + 65535,65534,65533,65532,65531,65530,65529, // 2520 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2536 + + // #67 + 65535,65534,65533,65532,65531, + 76, 67, 95, 77, 69, 83, 83, 65, 71, 69, 83, 61, + 65535,65534,65533,65532,65531,65530,65529, // 2560 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2576 + + // #68 + 65535, + 76, 67, 95, 78, 85, 77, 69, 82, 73, 67, 61, 110, + 65535,65534,65533, // 2592 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2608 + + // #69 + 65535, + 71, 84, 75, 50, 95, 82, 67, 95, 70, 73, 76, 69, + 65535,65534,65533, // 2624 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2640 + + // #70 + 65535, + 80, 82, 79, 70, 73, 76, 69, 72, 79, 77, 69, 61, + 65535,65534,65533, // 2656 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2672 + + // #71 + 65535,65534,65533,65532,65531, + 68, 77, 95, 67, 79, 78, 84, 82, 79, 76, 61, 47, + 65535,65534,65533,65532,65531,65530,65529, // 2696 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2712 + + // #72 + 65535, + 76, 83, 95, 67, 79, 76, 79, 82, 83, 61, 114, 115, + 65535,65534,65533, // 2728 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2744 + + // #73 + 65535,65534,65533,65532,65531, + 83, 83, 72, 95, 65, 85, 84, 72, 95, 83, 79, 67, + 65535,65534,65533,65532,65531,65530,65529, // 2768 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2784 + + // #74 + 65535,65534,65533,65532,65531, + 75, 68, 69, 68, 73, 82, 83, 61, 47, 104, 111, 109, + 65535,65534,65533,65532,65531,65530,65529, // 2808 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2824 + + // #75 + 65535,65534,65533,65532,65531, + 76, 68, 95, 80, 82, 69, 76, 79, 65, 68, 61, 47, + 65535,65534,65533,65532,65531,65530,65529, // 2848 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2864 + + // #76 + 65535,65534,65533,65532,65531, + 88, 67, 85, 82, 83, 79, 82, 95, 80, 65, 84, 72, + 65535,65534,65533,65532,65531,65530,65529, // 2888 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2904 + + // #77 + 65535, + 115, 114, 99, 100, 105, 114, 61, 47, 104, 111, 109, 101, + 65535,65534,65533, // 2920 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2936 + + // #78 + 65535,65534,65533,65532,65531, + 72, 79, 77, 69, 61, 47, 104, 111, 109, 101, 47, 116, + 65535,65534,65533,65532,65531,65530,65529, // 2960 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 2976 + + // #79 + 65535, + 81, 84, 52, 68, 79, 67, 68, 73, 82, 61, 47, 117, + 65535,65534,65533, // 2992 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3008 + + // #80 + 65535,65534,65533,65532,65531, + 80, 87, 68, 61, 47, 104, 111, 109, 101, 47, 116, 109, + 65535,65534,65533,65532,65531,65530,65529, // 3032 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3048 + + // #81 + 65535,65534,65533,65532,65531, + 75, 68, 69, 95, 83, 69, 83, 83, 73, 79, 78, 95, + 65535,65534,65533,65532,65531,65530,65529, // 3072 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3088 + + // #82 + 65535, + 73, 78, 83, 73, 68, 69, 95, 83, 80, 69, 67, 73, + 65535,65534,65533, // 3104 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3120 + + // #83 + 65535, + 83, 83, 72, 95, 65, 71, 69, 78, 84, 95, 80, 73, + 65535,65534,65533, // 3136 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3152 + + // #84 + 65535, + 80, 75, 71, 95, 67, 79, 78, 70, 73, 71, 95, 80, + 65535,65534,65533, // 3168 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3184 + + // #85 + 65535,65534,65533,65532,65531, + 68, 66, 85, 83, 95, 83, 69, 83, 83, 73, 79, 78, + 65535,65534,65533,65532,65531,65530,65529, // 3208 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3224 + + // #86 + 65535, + 76, 68, 95, 76, 73, 66, 82, 65, 82, 89, 95, 80, + 65535,65534,65533, // 3240 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3256 + + // #87 + 65535,65534,65533,65532,65531, + 80, 52, 85, 83, 69, 82, 61, 116, 106, 109, 97, 99, + 65535,65534,65533,65532,65531,65530,65529, // 3280 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3296 + + // #88 + 65535,65534,65533,65532,65531, + 81, 84, 69, 83, 84, 95, 67, 79, 76, 79, 82, 69, + 65535,65534,65533,65532,65531,65530,65529, // 3320 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3336 + + // #89 + 65535,65534,65533,65532,65531, + 88, 68, 71, 95, 83, 69, 83, 83, 73, 79, 78, 95, + 65535,65534,65533,65532,65531,65530,65529, // 3360 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3376 + + // #90 + 65535,65534,65533,65532,65531, + 76, 69, 83, 83, 75, 69, 89, 61, 47, 101, 116, 99, + 65535,65534,65533,65532,65531,65530,65529, // 3400 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3416 + + // #91 + 65535, + 76, 79, 71, 78, 65, 77, 69, 61, 116, 109, 97, 99, + 65535,65534,65533, // 3432 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3448 + + // #92 + 65535, + 71, 95, 70, 73, 76, 69, 78, 65, 77, 69, 95, 69, + 65535,65534,65533, // 3464 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3480 + + // #93 + 65535, + 75, 68, 69, 95, 70, 85, 76, 76, 95, 83, 69, 83, + 65535,65534,65533, // 3496 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3512 + + // #94 + 65535,65534,65533,65532,65531, + 72, 79, 83, 84, 78, 65, 77, 69, 61, 108, 111, 116, + 65535,65534,65533,65532,65531,65530,65529, // 3536 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3552 + + // #95 + 65535,65534,65533,65532,65531, + 76, 67, 95, 84, 73, 77, 69, 61, 112, 116, 95, 66, + 65535,65534,65533,65532,65531,65530,65529, // 3576 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3592 + + // #96 + 65535, + 83, 83, 72, 95, 65, 83, 75, 80, 65, 83, 83, 61, + 65535,65534,65533, // 3608 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3624 + + // #97 + 65535,65534,65533,65532,65531, + 72, 73, 83, 84, 70, 73, 76, 69, 61, 47, 104, 111, + 65535,65534,65533,65532,65531,65530,65529, // 3648 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3664 + + // #98 + 65535, + 75, 79, 78, 83, 79, 76, 69, 95, 68, 66, 85, 83, + 65535,65534,65533, // 3680 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3696 + + // #99 + 65535, + 77, 65, 75, 69, 61, 47, 117, 115, 114, 47, 98, 105, + 65535,65534,65533, // 3712 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3728 + + // #100 + 65535, + 67, 65, 78, 66, 69, 82, 82, 65, 95, 68, 82, 73, + 65535,65534,65533, // 3744 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3760 + + // #101 + 65535, + 71, 67, 79, 78, 70, 95, 84, 77, 80, 68, 73, 82, + 65535,65534,65533, // 3776 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3792 + + // #102 + 65535,65534,65533,65532,65531, + 85, 83, 69, 82, 61, 116, 109, 97, 99, 105, 101, 105, + 65535,65534,65533,65532,65531,65530,65529, // 3816 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3832 + + // #103 + 65535, + 111, 98, 106, 100, 105, 114, 61, 47, 104, 111, 109, 101, + 65535,65534,65533, // 3848 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3864 + + // #104 + 65535,65534,65533,65532,65531, + 76, 67, 95, 77, 79, 78, 69, 84, 65, 82, 89, 61, + 65535,65534,65533,65532,65531,65530,65529, // 3888 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3904 + + // #105 + 65535,65534,65533,65532,65531, + 81, 84, 76, 73, 66, 61, 47, 117, 115, 114, 47, 108, + 65535,65534,65533,65532,65531,65530,65529, // 3928 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3944 + + // #106 + 65535,65534,65533,65532,65531, + 76, 67, 95, 84, 69, 76, 69, 80, 72, 79, 78, 69, + 65535,65534,65533,65532,65531,65530,65529, // 3968 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 3984 + + // #107 + 65535, + 80, 89, 84, 72, 79, 78, 68, 79, 78, 84, 87, 82, + 65535,65534,65533, // 4000 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4016 + + // #108 + 65535,65534,65533,65532,65531, + 84, 77, 80, 68, 73, 82, 61, 47, 116, 109, 112, 47, + 65535,65534,65533,65532,65531,65530,65529, // 4040 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4056 + + // #109 + 65535,65534,65533,65532,65531, + 65, 82, 77, 76, 77, 68, 95, 76, 73, 67, 69, 78, + 65535,65534,65533,65532,65531,65530,65529, // 4080 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4096 + + // #110 + 65535, + 80, 89, 84, 72, 79, 78, 80, 65, 84, 72, 61, 47, + 65535,65534,65533, // 4112 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4128 + + // #111 + 65535,65534,65533,65532,65531, + 77, 65, 75, 69, 70, 76, 65, 71, 83, 61, 119, 32, + 65535,65534,65533,65532,65531,65530,65529, // 4152 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4168 + + // #112 + 65535, + 77, 70, 76, 65, 71, 83, 61, 45, 119, 32, 45, 45, + 65535,65534,65533, // 4184 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4200 + + // #113 + 65535, + 77, 65, 73, 76, 61, 47, 118, 97, 114, 47, 115, 112, + 65535,65534,65533, // 4216 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4232 + + // #114 + 65535,65534,65533,65532,65531, + 83, 72, 69, 76, 76, 95, 83, 69, 83, 83, 73, 79, + 65535,65534,65533,65532,65531,65530,65529, // 4256 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4272 + + // #115 + 65535, + 75, 68, 69, 68, 73, 82, 61, 47, 104, 111, 109, 101, + 65535,65534,65533, // 4288 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4304 + + // #116 + 65535,65534,65533,65532,65531, + 76, 69, 83, 83, 67, 72, 65, 82, 83, 69, 84, 61, + 65535,65534,65533,65532,65531,65530,65529, // 4328 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4344 + + // #117 + 65535,65534,65533,65532,65531, + 76, 67, 95, 80, 65, 80, 69, 82, 61, 110, 98, 95, + 65535,65534,65533,65532,65531,65530,65529, // 4368 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4384 + + // #118 + 65535, + 66, 82, 79, 87, 83, 69, 82, 61, 47, 117, 115, 114, + 65535,65534,65533, // 4400 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4416 + + // #119 + 65535, + 77, 69, 84, 65, 95, 67, 76, 65, 83, 83, 61, 100, + 65535,65534,65533, // 4432 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4448 + + // #120 + 65535,65534,65533,65532,65531, + 77, 68, 86, 95, 77, 69, 78, 85, 95, 83, 84, 89, + 65535,65534,65533,65532,65531,65530,65529, // 4472 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4488 + + // #121 + 65535,65534,65533,65532,65531, + 67, 79, 76, 79, 82, 70, 71, 66, 71, 61, 49, 53, + 65535,65534,65533,65532,65531,65530,65529, // 4512 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4528 + + // #122 + 65535,65534,65533,65532,65531, + 80, 89, 84, 72, 79, 78, 83, 84, 65, 82, 84, 85, + 65535,65534,65533,65532,65531,65530,65529, // 4552 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4568 + + // #123 + 65535, + 76, 67, 95, 77, 69, 65, 83, 85, 82, 69, 77, 69, + 65535,65534,65533, // 4584 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4600 + + // #124 + 65535,65534,65533,65532,65531, + 69, 68, 73, 84, 79, 82, 61, 47, 117, 115, 114, 47, + 65535,65534,65533,65532,65531,65530,65529, // 4624 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4640 + + // #125 + 65535,65534,65533,65532,65531, + 69, 78, 95, 84, 66, 61, 109, 111, 99, 58, 117, 105, + 65535,65534,65533,65532,65531,65530,65529, // 4664 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4680 + + // #126 + 65535, + 72, 73, 83, 84, 83, 73, 90, 69, 61, 49, 48, 48, + 65535,65534,65533, // 4696 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4712 + + // #127 + 65535,65534,65533,65532,65531, + 71, 83, 95, 76, 73, 66, 61, 47, 104, 111, 109, 101, + 65535,65534,65533,65532,65531,65530,65529, // 4736 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4752 + + // #128 + 65535,65534,65533,65532,65531, + 78, 76, 83, 80, 65, 84, 72, 61, 47, 117, 115, 114, + 65535,65534,65533,65532,65531,65530,65529, // 4776 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4792 + + // #129 + 65535,65534,65533,65532,65531, + 87, 73, 78, 68, 79, 87, 80, 65, 84, 72, 61, 55, + 65535,65534,65533,65532,65531,65530,65529, // 4816 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4832 + + // #130 + 65535,65534,65533,65532,65531, + 75, 79, 78, 83, 79, 76, 69, 95, 68, 66, 85, 83, + 65535,65534,65533,65532,65531,65530,65529, // 4856 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4872 + + // #131 + 65535, + 76, 67, 95, 73, 68, 69, 78, 84, 73, 70, 73, 67, + 65535,65534,65533, // 4888 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4904 + + // #132 + 65535, + 73, 78, 80, 85, 84, 82, 67, 61, 47, 101, 116, 99, + 65535,65534,65533, // 4920 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4936 + + // #133 + 65535,65534,65533,65532,65531, + 81, 84, 73, 78, 67, 61, 47, 117, 115, 114, 47, 108, + 65535,65534,65533,65532,65531,65530,65529, // 4960 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 4976 + + // #134 + 65535, + 76, 67, 95, 65, 68, 68, 82, 69, 83, 83, 61, 110, + 65535,65534,65533, // 4992 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 5008 + + // #135 + 65535,65534,65533,65532,65531, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 95, + 65535,65534,65533,65532,65531,65530,65529, // 5032 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 5048 + + // #136 + 65535, + 76, 65, 78, 71, 61, 112, 116, 95, 66, 82, 46, 85, + 65535,65534,65533, // 5064 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 5080 + + // #137 + 65535, + 80, 52, 80, 79, 82, 84, 61, 112, 52, 46, 116, 114, + 65535,65534,65533, // 5096 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 5112 + + // #138 + 65535,65534,65533,65532,65531, + 80, 73, 76, 79, 84, 80, 79, 82, 84, 61, 117, 115, + 65535,65534,65533,65532,65531,65530,65529, // 5136 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 5152 + + // #139 + 65535, + 75, 68, 69, 95, 83, 69, 83, 83, 73, 79, 78, 95, + 65535,65534,65533, // 5168 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 5184 + + // #140 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 5200 + 65535, + 84, 69, 65, 77, 66, 85, 73, 76, 68, 69, 82, 61, + 65535,65534,65533, // 5216 + + +}; +static struct StringCollection +{ + int len; + int offset1, offset2; + ushort align1, align2; +} stringCollection[] = { + {18, 1, 29, 3666, 106}, // #0 + {18, 53, 77, 106, 1978}, // #1 + {20, 97, 125, 2850, 3210}, // #2 + {20, 157, 185, 3210, 3138}, // #3 + {51, 225, 225, 3362, 3362}, // #4 + {51, 293, 353, 1434, 3362}, // #5 + {51, 417, 417, 3362, 3362}, // #6 + {19, 473, 501, 2850, 10}, // #7 + {19, 533, 565, 10, 442}, // #8 + {51, 609, 677, 3362, 1434}, // #9 + {5, 741, 753, 2666, 2066}, // #10 + {4, 765, 781, 2362, 3930}, // #11 + {3, 793, 805, 3330, 2138}, // #12 + {5, 817, 825, 738, 2066}, // #13 + {4, 833, 845, 434, 3930}, // #14 + {5, 857, 865, 3842, 2066}, // #15 + {4, 873, 885, 3538, 3930}, // #16 + {3, 897, 909, 3330, 2138}, // #17 + {5, 925, 937, 1898, 2066}, // #18 + {4, 949, 965, 1594, 3930}, // #19 + {3, 977, 989, 3330, 2138}, // #20 + {5, 1005, 1021, 2218, 762}, // #21 + {5, 1033, 1041, 3346, 2066}, // #22 + {4, 1053, 1069, 3082, 3930}, // #23 + {12, 1081, 1097, 2082, 962}, // #24 + {5, 1113, 1121, 3362, 2066}, // #25 + {4, 1129, 1141, 322, 3930}, // #26 + {3, 1153, 1165, 2050, 2138}, // #27 + {5, 1177, 1185, 1538, 2066}, // #28 + {4, 1193, 1205, 1234, 3930}, // #29 + {5, 1221, 1233, 554, 2066}, // #30 + {4, 1245, 1261, 250, 3930}, // #31 + {5, 1277, 1289, 2858, 2066}, // #32 + {4, 1301, 1317, 2554, 3930}, // #33 + {12, 1329, 1345, 2194, 1762}, // #34 + {12, 1365, 1385, 2170, 1762}, // #35 + {12, 1405, 1425, 2314, 1762}, // #36 + {6, 1445, 1461, 3626, 666}, // #37 + {11, 1477, 1501, 3882, 842}, // #38 + {12, 1525, 1545, 1722, 2930}, // #39 + {12, 1565, 1585, 1914, 2930}, // #40 + {12, 1605, 1625, 442, 2930}, // #41 + {12, 1641, 1657, 626, 2930}, // #42 + {12, 1673, 1689, 946, 2930}, // #43 + {12, 1705, 1721, 738, 2930}, // #44 + {12, 1737, 1753, 2066, 2930}, // #45 + {12, 1773, 1793, 1210, 2930}, // #46 + {12, 1809, 1825, 1426, 2930}, // #47 + {12, 1841, 1857, 1650, 2930}, // #48 + {12, 1877, 1897, 1530, 2930}, // #49 + {12, 1913, 1929, 1858, 2930}, // #50 + {12, 1949, 1969, 2106, 2930}, // #51 + {12, 1989, 2009, 2202, 2930}, // #52 + {12, 2029, 2049, 2490, 2930}, // #53 + {12, 2069, 2089, 2794, 2930}, // #54 + {12, 2105, 2121, 2322, 2930}, // #55 + {12, 2137, 2153, 2834, 2930}, // #56 + {12, 2169, 2185, 1266, 2930}, // #57 + {12, 2205, 2225, 2538, 2930}, // #58 + {12, 2241, 2257, 2706, 2930}, // #59 + {12, 2277, 2297, 3402, 2930}, // #60 + {12, 2313, 2329, 146, 2930}, // #61 + {12, 2349, 2369, 3690, 2930}, // #62 + {12, 2389, 2409, 810, 2930}, // #63 + {12, 2429, 2449, 1178, 2930}, // #64 + {12, 2465, 2481, 1442, 2930}, // #65 + {12, 2501, 2521, 3546, 2930}, // #66 + {12, 2541, 2561, 1930, 2930}, // #67 + {12, 2577, 2593, 1634, 2930}, // #68 + {12, 2609, 2625, 1986, 2930}, // #69 + {12, 2641, 2657, 1970, 2930}, // #70 + {12, 2677, 2697, 1834, 2930}, // #71 + {12, 2713, 2729, 1474, 2930}, // #72 + {12, 2749, 2769, 2250, 2930}, // #73 + {12, 2789, 2809, 2458, 2930}, // #74 + {12, 2829, 2849, 2618, 2930}, // #75 + {12, 2869, 2889, 3066, 2930}, // #76 + {12, 2905, 2921, 3330, 2930}, // #77 + {12, 2941, 2961, 1706, 2930}, // #78 + {12, 2977, 2993, 2802, 2930}, // #79 + {12, 3013, 3033, 3770, 2930}, // #80 + {12, 3053, 3073, 3594, 2930}, // #81 + {12, 3089, 3105, 2, 2930}, // #82 + {12, 3121, 3137, 2962, 2930}, // #83 + {12, 3153, 3169, 290, 2930}, // #84 + {12, 3189, 3209, 794, 2930}, // #85 + {12, 3225, 3241, 1058, 2930}, // #86 + {12, 3261, 3281, 2394, 2930}, // #87 + {12, 3301, 3321, 138, 2930}, // #88 + {12, 3341, 3361, 1482, 2930}, // #89 + {12, 3381, 3401, 570, 2930}, // #90 + {12, 3417, 3433, 674, 2930}, // #91 + {12, 3449, 3465, 1282, 2930}, // #92 + {12, 3481, 3497, 1746, 2930}, // #93 + {12, 3517, 3537, 1866, 2930}, // #94 + {12, 3557, 3577, 1978, 2930}, // #95 + {12, 3593, 3609, 3954, 2930}, // #96 + {12, 3629, 3649, 2570, 2930}, // #97 + {12, 3665, 3681, 2754, 2930}, // #98 + {12, 3697, 3713, 3666, 2930}, // #99 + {12, 3729, 3745, 34, 2930}, // #100 + {12, 3761, 3777, 2914, 2930}, // #101 + {12, 3797, 3817, 1194, 2930}, // #102 + {12, 3833, 3849, 3202, 2930}, // #103 + {12, 3869, 3889, 3018, 2930}, // #104 + {12, 3909, 3929, 202, 2930}, // #105 + {12, 3949, 3969, 3546, 2930}, // #106 + {12, 3985, 4001, 3682, 2930}, // #107 + {12, 4021, 4041, 3466, 2930}, // #108 + {12, 4061, 4081, 4074, 2930}, // #109 + {12, 4097, 4113, 306, 2930}, // #110 + {12, 4133, 4153, 634, 2930}, // #111 + {12, 4169, 4185, 802, 2930}, // #112 + {12, 4201, 4217, 962, 2930}, // #113 + {12, 4237, 4257, 1114, 2930}, // #114 + {12, 4273, 4289, 1250, 2930}, // #115 + {12, 4309, 4329, 3898, 2930}, // #116 + {12, 4349, 4369, 1386, 2930}, // #117 + {12, 4385, 4401, 1586, 2930}, // #118 + {12, 4417, 4433, 1730, 2930}, // #119 + {12, 4453, 4473, 1914, 2930}, // #120 + {12, 4493, 4513, 1498, 2930}, // #121 + {12, 4533, 4553, 2138, 2930}, // #122 + {12, 4569, 4585, 2290, 2930}, // #123 + {12, 4605, 4625, 2426, 2930}, // #124 + {12, 4645, 4665, 2666, 2930}, // #125 + {12, 4681, 4697, 2050, 2930}, // #126 + {12, 4717, 4737, 2874, 2930}, // #127 + {12, 4757, 4777, 3018, 2930}, // #128 + {12, 4797, 4817, 1834, 2930}, // #129 + {12, 4837, 4857, 3178, 2930}, // #130 + {12, 4873, 4889, 3314, 2930}, // #131 + {12, 4905, 4921, 2546, 2930}, // #132 + {12, 4941, 4961, 3546, 2930}, // #133 + {12, 4977, 4993, 3682, 2930}, // #134 + {12, 5013, 5033, 3802, 2930}, // #135 + {12, 5049, 5065, 3922, 2930}, // #136 + {12, 5081, 5097, 4018, 2930}, // #137 + {12, 5117, 5137, 42, 2930}, // #138 + {12, 5153, 5169, 130, 2930}, // #139 + {12, 5185, 5201, 242, 2930}, // #140 +}; +static const int stringCollectionCount = 141; +static const int stringCollectionMaxLen = 51; +// average comparison length: 12.0922 +// cache-line crosses: 6 (2.1%) +// alignment histogram: +// 0xXXX2 = 188 (66.7%) strings, 57 (30.3%) of which same-aligned +// 0xXXXa = 94 (33.3%) strings, 10 (10.6%) of which same-aligned +// total = 282 (100%) strings, 67 (23.8%) of which same-aligned diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/corelib/tools/qstring/data.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/benchmarks/corelib/tools/qstring/data.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +struct StringCollection +{ + int len; + int offset1, offset2; + ushort align1, align2; +}; + +extern const ushort stringCollectionData[]; +extern StringCollection stringCollection[]; +extern const int stringCollectionCount; diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/corelib/tools/qstring/generatelist.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/benchmarks/corelib/tools/qstring/generatelist.pl Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,198 @@ +#!/usr/bin/perl +## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +## All rights reserved. +## Contact: Nokia Corporation (qt-info@nokia.com) +## +## This file is part of the QtCore module of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## No Commercial Usage +## This file contains pre-release code and may not be distributed. +## You may use this file in accordance with the terms and conditions +## contained in the Technology Preview License Agreement accompanying +## this package. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 2.1 requirements +## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## In addition, as a special exception, Nokia gives you certain additional +## rights. These rights are described in the Nokia Qt LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## If you have questions regarding the use of this file, please contact +## Nokia at qt-info@nokia.com. +## +## +## +## +## +## +## +## +## $QT_END_LICENSE$ +# +# Parses a file (passed as argument) that contains a dump of pairs of +# strings and generates C source code including said data. +# +# The format of the file is: +# LEN = \n\n +# where: +# LEN the literal string "LEN" +# the length of the data, in 16-bit words +# the literal string "SAME" or "DIFF" +# the alignment or pointer value of the first data +# the alignment or pointer value of the second data +# the first data +# the second data +# \n newline +# +# The code to write this data would be: +# fprintf(out, "LEN = %d %s %d %d\n", len, +# (p1 == p2) ? "SAME" : "DIFF", +# uint(quintptr(p1)) & 0xfff, uint(quintptr(p2)) & 0xfff); +# fwrite(p1, 2, len, out); +# fwrite(p2, 2, len, out); +# fwrite("\n", 1, 1, out); + +sub printUshortArray($$$) { + $str = $_[0]; + $align = $_[1] & 0x1f; + $offset = $_[2]; + + die if ($align & 1) != 0; + $align /= 2; + + $len = (length $str) / 2; + $headpadding = $align & 0x7; + $tailpadding = 8 - (($len + $headpadding) & 0x7); + $multiplecachelines = ($align + $len) > 0x20; + + if ($multiplecachelines) { + # if this string crosses into a new cacheline, then + # replicate the result + $headpadding |= ($offset & ~0x1f); + $headpadding += 0x20 + if ($headpadding < $offset); + $headpadding -= $offset; + ++$cachelinecrosses; + } + for $i (1..$headpadding) { + print 65536-$i,","; + } + print "\n " if ($headpadding > 0); + print " " if ($headpadding == 0); + + for ($i = 0; $i < $len * 2; $i += 2) { + print " ", ord(substr($str, $i, 1)) + + ord(substr($str, $i + 1, 1)) * 256, + ","; + } + print "\n " if ($tailpadding > 0); + + for $i (1..$tailpadding) { + print 65536-$i, ","; + } + print " // ", $offset + $headpadding + $len + $tailpadding; + print "+" if $multiplecachelines; + + return ($offset + $headpadding, $offset + $headpadding + $len + $tailpadding); +} + +print "#include \"data.h\"\n\n"; + +print "// This is a generated file - DO NOT EDIT\n"; +print "const ushort stringCollectionData[] __attribute__((aligned(64))) = {\n"; +$count = 0; +$offset = 0; +$totalsize = 0; +$maxlen = 0; +$cachelinecrosses = 0; + +open IN, "<" . $ARGV[0]; +while (1) { + $line = readline(*IN); + last unless defined($line); + $line =~ /LEN = (\d+) (\w+) (\d+) (\d+)/; + $len = $1; + $data[$count]->{len} = $len; + $sameptr = $2; + $data[$count]->{align1} = $3 - 0; + $data[$count]->{align2} = $4 - 0; + + # statistics + $alignhistogram{$3 & 0xf}++; + $alignhistogram{$4 & 0xf}++; + $samealignments{$3 & 0xf}++ if ($3 & 0xf) == ($4 & 0xf); + + read IN, $a, $len * 2; + read IN, $b, $len * 2; + + ; # Eat the newline + + if ($len == 0) { + $data[$count]->{offset1} = $offset; + $data[$count]->{offset2} = $data[$count]->{offset1}; + ++$data[$count]->{offset2} if ($sameptr eq "DIFF"); + } else { + print " // #$count\n"; + print " "; + ($data[$count]->{offset1}, $offset) = + printUshortArray($a, $data[$count]->{align1}, $offset); + print "\n "; + die if ($offset & 0x7) != 0; + + if ($sameptr eq "DIFF") { + ($data[$count]->{offset2}, $offset) = + printUshortArray($b, $data[$count]->{align2}, $offset); + print "\n\n"; + } else { + $data[$count]->{offset2} = $data[$count]->{offset1}; + print "\n\n"; + } + } + ++$count; + + $totalsize += $len; + $maxlen = $len if $len > $maxlen; +} +print "\n};\n"; +close IN; + +print "struct StringCollection stringCollection[] = {\n"; + +for $i (0..$count-1) { + print " {", + $data[$i]->{len}, ", ", + $data[$i]->{offset1}, ", ", + $data[$i]->{offset2}, ", ", + $data[$i]->{align1}, ", ", + $data[$i]->{align2}, + "}, // #$i\n"; + next if $data[$i]->{len} == 0; + die if (($data[$i]->{offset1} & 0x7) != ($data[$i]->{align1} & 0xf)/2); + die if (($data[$i]->{offset2} & 0x7) != ($data[$i]->{align2} & 0xf)/2); +} +print "};\n"; + +print "const int stringCollectionCount = $count;\n"; +print "const int stringCollectionMaxLen = $maxlen;\n"; +printf "// average comparison length: %.4f\n", ($totalsize * 1.0 / $count); +printf "// cache-line crosses: %d (%.1f%%)\n", + $cachelinecrosses, ($cachelinecrosses * 100.0 / $count / 2); + +print "// alignment histogram:\n"; +for $key (sort { $a <=> $b } keys(%alignhistogram)) { + $value = $alignhistogram{$key}; + $samealigned = $samealignments{$key}; + printf "// 0xXXX%x = %d (%.1f%%) strings, %d (%.1f%%) of which same-aligned\n", + $key, $value, $value * 100.0 / ($count*2), + $samealigned, $samealigned * 100.0 / $value; + $samealignedtotal += $samealigned; +} +printf "// total = %d (100%) strings, %d (%.1f%%) of which same-aligned\n", + $count * 2, $samealignedtotal, $samealignedtotal * 100 / $count / 2; diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/corelib/tools/qstring/main.cpp --- a/tests/benchmarks/corelib/tools/qstring/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -40,7 +40,7 @@ ****************************************************************************/ #include #include -#include +#include #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir @@ -48,12 +48,27 @@ #define SRCDIR "" #endif +#ifdef Q_OS_UNIX +#include +#include +#endif + +#include + +#include "data.h" + class tst_QString: public QObject { Q_OBJECT +public: + tst_QString(); private slots: void equals() const; void equals_data() const; + void equals2_data() const; + void equals2() const; + void ucstrncmp_data() const; + void ucstrncmp() const; void fromUtf8() const; }; @@ -67,6 +82,10 @@ } } +tst_QString::tst_QString() +{ +} + void tst_QString::equals_data() const { static const struct { @@ -126,6 +145,1247 @@ << QString::fromRawData(ptr + 1, 58) << QString::fromRawData(ptr + 3, 58); } +static bool equals2_memcmp_call(const ushort *p1, const ushort *p2, int len) +{ + return memcmp(p1, p2, len * 2) == 0; +} + +static bool equals2_bytewise(const ushort *p1, const ushort *p2, int len) +{ + if (p1 == p2 || !len) + return true; + uchar *b1 = (uchar *)p1; + uchar *b2 = (uchar *)p2; + len *= 2; + while (len--) + if (*b1++ != *b2++) + return false; + return true; +} + +static bool equals2_shortwise(const ushort *p1, const ushort *p2, int len) +{ + if (p1 == p2 || !len) + return true; +// for (register int counter; counter < len; ++counter) +// if (p1[counter] != p2[counter]) +// return false; + while (len--) { + if (p1[len] != p2[len]) + return false; + } + return true; +} + +static bool equals2_intwise(const ushort *p1, const ushort *p2, int length) +{ + if (p1 == p2 || !length) + return true; + register union { + const quint16 *w; + const quint32 *d; + quintptr value; + } sa, sb; + sa.w = p1; + sb.w = p2; + + // check alignment + if ((sa.value & 2) == (sb.value & 2)) { + // both addresses have the same alignment + if (sa.value & 2) { + // both addresses are not aligned to 4-bytes boundaries + // compare the first character + if (*sa.w != *sb.w) + return false; + --length; + ++sa.w; + ++sb.w; + + // now both addresses are 4-bytes aligned + } + + // both addresses are 4-bytes aligned + // do a fast 32-bit comparison + register const quint32 *e = sa.d + (length >> 1); + for ( ; sa.d != e; ++sa.d, ++sb.d) { + if (*sa.d != *sb.d) + return false; + } + + // do we have a tail? + return (length & 1) ? *sa.w == *sb.w : true; + } else { + // one of the addresses isn't 4-byte aligned but the other is + register const quint16 *e = sa.w + length; + for ( ; sa.w != e; ++sa.w, ++sb.w) { + if (*sa.w != *sb.w) + return false; + } + } + return true; +} + +static inline bool equals2_short_tail(const ushort *p1, const ushort *p2, int len) +{ + if (len) { + if (*p1 != *p2) + return false; + if (--len) { + if (p1[1] != p2[1]) + return false; + if (--len) { + if (p1[2] != p2[2]) + return false; + if (--len) { + if (p1[3] != p2[3]) + return false; + if (--len) { + if (p1[4] != p2[4]) + return false; + if (--len) { + if (p1[5] != p2[5]) + return false; + if (--len) { + if (p1[6] != p2[6]) + return false; + return p1[7] == p2[7]; + } + } + } + } + } + } + } + return true; +} + +//#pragma GCC optimize("no-unroll-loops") +#ifdef __SSE2__ +static bool equals2_sse2_aligned(const ushort *p1, const ushort *p2, int len) +{ + if (len >= 8) { + qptrdiff counter = 0; + while (len > 8) { + __m128i q1 = _mm_load_si128((__m128i *)(p1 + counter)); + __m128i q2 = _mm_load_si128((__m128i *)(p2 + counter)); + __m128i cmp = _mm_cmpeq_epi16(q1, q2); + if (ushort(_mm_movemask_epi8(cmp)) != ushort(0xffff)) + return false; + + len -= 8; + counter += 8; + } + p1 += counter; + p2 += counter; + } + + return equals2_short_tail(p1, p2, len); +} + +static bool __attribute__((optimize("no-unroll-loops"))) equals2_sse2(const ushort *p1, const ushort *p2, int len) +{ + if (p1 == p2 || !len) + return true; + + if (len >= 8) { + qptrdiff counter = 0; + while (len >= 8) { + __m128i q1 = _mm_loadu_si128((__m128i *)(p1 + counter)); + __m128i q2 = _mm_loadu_si128((__m128i *)(p2 + counter)); + __m128i cmp = _mm_cmpeq_epi16(q1, q2); + if (ushort(_mm_movemask_epi8(cmp)) != 0xffff) + return false; + + len -= 8; + counter += 8; + } + p1 += counter; + p2 += counter; + } + + return equals2_short_tail(p1, p2, len); +} + +//static bool equals2_sse2(const ushort *p1, const ushort *p2, int len) +//{ +// register int val1 = quintptr(p1) & 0xf; +// register int val2 = quintptr(p2) & 0xf; +// if (false && val1 + val2 == 0) +// return equals2_sse2_aligned(p1, p2, len); +// else +// return equals2_sse2_unaligned(p1, p2, len); +//} + +static bool equals2_sse2_aligning(const ushort *p1, const ushort *p2, int len) +{ + if (len < 8) + return equals2_short_tail(p1, p2, len); + + qptrdiff counter = 0; + + // which one is easier to align, p1 or p2 ? + register int val1 = quintptr(p1) & 0xf; + register int val2 = quintptr(p2) & 0xf; + if (val1 && val2) { +#if 0 + // we'll align the one which requires the least number of steps + if (val1 > val2) { + qSwap(p1, p2); + val1 = val2; + } + + // val1 contains the number of bytes past the 16-aligned mark + // we must read 16-val1 bytes to align + val1 = 16 - val1; + if (val1 & 0x2) { + if (*p1 != *p2) + return false; + --len; + ++counter; + } + while (val1 & 12) { + if (*(uint*)p1 != *(uint*)p2) + return false; + --len; + counter += 2; + val1 -= 4; + } +#else + // we'll align the one closest to the 16-byte mark + if (val1 > val2) { + qSwap(p1, p2); + val1 = val2; + } + + // we're reading val1 bytes too many + __m128i q2 = _mm_loadu_si128((__m128i *)(p2 - val1/2)); + __m128i cmp = _mm_cmpeq_epi16(*(__m128i *)(p1 - val1/2), q2); + if (short(_mm_movemask_epi8(cmp)) >> val1 != short(-1)) + return false; + + counter = 8 - val1/2; + len -= 8 - val1/2; +#endif + } else if (!val2) { + // p2 is already aligned + qSwap(p1, p2); + } + + // p1 is aligned + + while (len >= 8) { + __m128i q1 = _mm_load_si128((__m128i *)(p1 + counter)); + __m128i q2 = _mm_loadu_si128((__m128i *)(p2 + counter)); + __m128i cmp = _mm_cmpeq_epi16(q1, q2); + if (ushort(_mm_movemask_epi8(cmp)) != ushort(0xffff)) + return false; + + len -= 8; + counter += 8; + } + + // tail + return equals2_short_tail(p1 + counter, p2 + counter, len); +} + +#ifdef __SSE3__ +static bool __attribute__((optimize("no-unroll-loops"))) equals2_sse3(const ushort *p1, const ushort *p2, int len) +{ + if (p1 == p2 || !len) + return true; + + if (len >= 8) { + qptrdiff counter = 0; + while (len >= 8) { + __m128i q1 = _mm_lddqu_si128((__m128i *)(p1 + counter)); + __m128i q2 = _mm_lddqu_si128((__m128i *)(p2 + counter)); + __m128i cmp = _mm_cmpeq_epi16(q1, q2); + if (ushort(_mm_movemask_epi8(cmp)) != 0xffff) + return false; + + len -= 8; + counter += 8; + } + p1 += counter; + p2 += counter; + } + + return equals2_short_tail(p1, p2, len); +} + +#ifdef __SSSE3__ +template static __attribute__((optimize("unroll-loops"))) inline bool equals2_ssse3_alignr(__m128i *m1, __m128i *m2, int len) +{ + __m128i lower = _mm_load_si128(m1); + while (len >= 8) { + __m128i upper = _mm_load_si128(m1 + 1); + __m128i correct; + correct = _mm_alignr_epi8(upper, lower, N); + + __m128i q2 = _mm_lddqu_si128(m2); + __m128i cmp = _mm_cmpeq_epi16(correct, q2); + if (ushort(_mm_movemask_epi8(cmp)) != 0xffff) + return false; + + len -= 8; + ++m2; + ++m1; + lower = upper; + } + + // tail + return len == 0 || equals2_short_tail((const ushort *)m1 + N / 2, (const ushort*)m2, len); +} + +static inline __attribute__((optimize("unroll-loops"))) bool equals2_ssse3_aligned(__m128i *m1, __m128i *m2, int len) +{ + while (len >= 8) { + __m128i q2 = _mm_lddqu_si128(m2); + __m128i cmp = _mm_cmpeq_epi16(*m1, q2); + if (ushort(_mm_movemask_epi8(cmp)) != 0xffff) + return false; + + len -= 8; + ++m1; + ++m2; + } + return len == 0 || equals2_short_tail((const ushort *)m1, (const ushort *)m2, len); +} + +static bool equals2_ssse3(const ushort *p1, const ushort *p2, int len) +{ + // p1 & 0xf can be: + // 0, 2, 4, 6, 8, 10, 12, 14 + // If it's 0, we're aligned + // If it's not, then we're interested in the 16 - (p1 & 0xf) bytes only + + if (len >= 8) { + // find the last aligned position below the p1 memory + __m128i *m1 = (__m128i *)(quintptr(p1) & ~0xf); + __m128i *m2 = (__m128i *)p2; + qptrdiff diff = quintptr(p1) - quintptr(m1); + + // diff contains the number of extra bytes + if (diff == 10) + return equals2_ssse3_alignr<10>(m1, m2, len); + else if (diff == 2) + return equals2_ssse3_alignr<2>(m1, m2, len); + if (diff < 8) { + if (diff < 4) { + return equals2_ssse3_aligned(m1, m2, len); + } else { + if (diff == 4) + return equals2_ssse3_alignr<4>(m1, m2, len); + else // diff == 6 + return equals2_ssse3_alignr<6>(m1, m2, len); + } + } else { + if (diff < 12) { + return equals2_ssse3_alignr<8>(m1, m2, len); + } else { + if (diff == 12) + return equals2_ssse3_alignr<12>(m1, m2, len); + else // diff == 14 + return equals2_ssse3_alignr<14>(m1, m2, len); + } + } + } + + // tail + return equals2_short_tail(p1, p2, len); +} + +template static inline bool equals2_ssse3_aligning_alignr(__m128i *m1, __m128i *m2, int len) +{ + __m128i lower = _mm_load_si128(m1); + while (len >= 8) { + __m128i upper = _mm_load_si128(m1 + 1); + __m128i correct; + correct = _mm_alignr_epi8(upper, lower, N); + + __m128i cmp = _mm_cmpeq_epi16(correct, *m2); + if (ushort(_mm_movemask_epi8(cmp)) != 0xffff) + return false; + + len -= 8; + ++m2; + ++m1; + lower = upper; + } + + // tail + return len == 0 || equals2_short_tail((const ushort *)m1 + N / 2, (const ushort*)m2, len); +} + +static bool equals2_ssse3_aligning(const ushort *p1, const ushort *p2, int len) +{ + if (len < 8) + return equals2_short_tail(p1, p2, len); + qptrdiff counter = 0; + + // which one is easier to align, p1 or p2 ? + { + register int val1 = quintptr(p1) & 0xf; + register int val2 = quintptr(p2) & 0xf; + if (val1 && val2) { + // we'll align the one closest to the 16-byte mark + if (val1 < val2) { + qSwap(p1, p2); + val2 = val1; + } + + // we're reading val1 bytes too many + __m128i q1 = _mm_lddqu_si128((__m128i *)(p1 - val2/2)); + __m128i cmp = _mm_cmpeq_epi16(q1, *(__m128i *)(p2 - val2/2)); + if (short(_mm_movemask_epi8(cmp)) >> val1 != short(-1)) + return false; + + counter = 8 - val2/2; + len -= 8 - val2/2; + } else if (!val1) { + // p1 is already aligned + qSwap(p1, p2); + } + } + + // p2 is aligned now + // we want to use palignr in the mis-alignment of p1 + __m128i *m1 = (__m128i *)(quintptr(p1 + counter) & ~0xf); + __m128i *m2 = (__m128i *)(p2 + counter); + register int val1 = quintptr(p1 + counter) - quintptr(m1); + + // val1 contains the number of extra bytes + if (val1 == 8) + return equals2_ssse3_aligning_alignr<8>(m1, m2, len); + if (val1 == 0) + return equals2_sse2_aligned(p1 + counter, p2 + counter, len); + if (val1 < 8) { + if (val1 < 4) { + return equals2_ssse3_aligning_alignr<2>(m1, m2, len); + } else { + if (val1 == 4) + return equals2_ssse3_aligning_alignr<4>(m1, m2, len); + else // diff == 6 + return equals2_ssse3_aligning_alignr<6>(m1, m2, len); + } + } else { + if (val1 < 12) { + return equals2_ssse3_aligning_alignr<10>(m1, m2, len); + } else { + if (val1 == 12) + return equals2_ssse3_aligning_alignr<12>(m1, m2, len); + else // diff == 14 + return equals2_ssse3_aligning_alignr<14>(m1, m2, len); + } + } +} + +#ifdef __SSE4_1__ +static bool equals2_sse4(const ushort *p1, const ushort *p2, int len) +{ + // We use the pcmpestrm instruction searching for differences (negative polarity) + // it will reset CF if it's all equal + // it will reset OF if the first char is equal + // it will set ZF & SF if the length is less than 8 (which means we've done the last operation) + // the three possible conditions are: + // difference found: CF = 1 + // all equal, not finished: CF = ZF = SF = 0 + // all equal, finished: CF = 0, ZF = SF = 1 + // We use the JA instruction that jumps if ZF = 0 and CF = 0 + if (p1 == p2 || !len) + return true; + + // This function may read some bytes past the end of p1 or p2 + // It is safe to do that, as long as those extra bytes (beyond p1+len and p2+len) + // are on the same page as the last valid byte. + // If len is a multiple of 8, we'll never load invalid bytes. + if (len & 7) { + // The last load would load (len & ~7) valid bytes and (8 - (len & ~7)) invalid bytes. + // So we can't do the last load if any of those bytes is in a different + // page. That is, if: + // pX + len is on a different page from pX + (len & ~7) + 8 + // + // that is, if second-to-last load ended up less than 16 bytes from the page end: + // pX + (len & ~7) is the last ushort read in the second-to-last load + if (len < 8) + return equals2_short_tail(p1, p2, len); + if ((quintptr(p1 + (len & ~7)) & 0xfff) > 0xff0 || + (quintptr(p2 + (len & ~7)) & 0xfff) > 0xff0) { + + // yes, so we mustn't do the final 128-bit load + bool result; + asm ( + "sub %[p1], %[p2]\n\t" + "sub $16, %[p1]\n\t" + "add $8, %[len]\n\t" + + // main loop: + "0:\n\t" + "add $16, %[p1]\n\t" + "sub $8, %[len]\n\t" + "jz 1f\n\t" + "lddqu (%[p1]), %%xmm0\n\t" + "mov %[len], %%edx\n\t" + "pcmpestri %[mode], (%[p2],%[p1]), %%xmm0\n\t" + + "jna 1f\n\t" + "add $16, %[p1]\n\t" + "sub $8, %[len]\n\t" + "jz 1f\n\t" + "lddqu (%[p1]), %%xmm0\n\t" + "mov %[len], %%edx\n\t" + "pcmpestri %[mode], (%[p2],%[p1]), %%xmm0\n\t" + + "ja 0b\n\t" + "1:\n\t" + "setnc %[result]\n\t" + : [result] "=a" (result), + [p1] "+r" (p1), + [p2] "+r" (p2) + : [len] "0" (len & ~7), + [mode] "i" (_SIDD_UWORD_OPS | _SIDD_CMP_EQUAL_EACH | _SIDD_NEGATIVE_POLARITY) + : "%edx", "%ecx", "%xmm0" + ); + return result && equals2_short_tail(p1, (const ushort *)(quintptr(p1) + quintptr(p2)), len & 7); + } + } + +// const qptrdiff disp = p2 - p1; +// p1 -= 8; +// len += 8; +// while (true) { +// enum { Mode = _SIDD_UWORD_OPS | _SIDD_CMP_EQUAL_EACH | _SIDD_NEGATIVE_POLARITY }; + +// p1 += 8; +// len -= 8; +// if (!len) +// return true; + +// __m128i q1 = _mm_lddqu_si128((__m128i *)(p1 + disp)); +// __m128i *m2 = (__m128i *)p1; + +// bool cmp_a = _mm_cmpestra(q1, len, *m2, len, Mode); +// if (cmp_a) +// continue; +// return !_mm_cmpestrc(q1, len, *m2, len, Mode); +// } +// return true; + bool result; + asm ( + "sub %[p1], %[p2]\n\t" + "sub $16, %[p1]\n\t" + "add $8, %[len]\n\t" + + "0:\n\t" + "add $16, %[p1]\n\t" + "sub $8, %[len]\n\t" + "jz 1f\n\t" + "lddqu (%[p2],%[p1]), %%xmm0\n\t" + "mov %[len], %%edx\n\t" + "pcmpestri %[mode], (%[p1]), %%xmm0\n\t" + + "jna 1f\n\t" + "add $16, %[p1]\n\t" + "sub $8, %[len]\n\t" + "jz 1f\n\t" + "lddqu (%[p2],%[p1]), %%xmm0\n\t" + "mov %[len], %%edx\n\t" + "pcmpestri %[mode], (%[p1]), %%xmm0\n\t" + + "ja 0b\n\t" + + "1:\n\t" + "setnc %[result]\n\t" + : [result] "=a" (result) + : [len] "0" (len), + [p1] "r" (p1), + [p2] "r" (p2), + [mode] "i" (_SIDD_UWORD_OPS | _SIDD_CMP_EQUAL_EACH | _SIDD_NEGATIVE_POLARITY) + : "%edx", "%ecx", "%xmm0" + ); + return result; +} + +#endif +#endif +#endif +#endif + +typedef bool (* FuncPtr)(const ushort *, const ushort *, int); +static const FuncPtr func[] = { + equals2_memcmp_call, // 0 + equals2_bytewise, // 1 + equals2_shortwise, // 1 + equals2_intwise, // 3 +#ifdef __SSE2__ + equals2_sse2, // 4 + equals2_sse2_aligning, // 5 +#ifdef __SSE3__ + equals2_sse3, // 6 +#ifdef __SSSE3__ + equals2_ssse3, // 7 + equals2_ssse3, // 8 +#ifdef __SSE4_1__ + equals2_sse4, // 9 +#endif +#endif +#endif +#endif + 0 +}; +static const int functionCount = sizeof(func)/sizeof(func[0]) - 1; + +void tst_QString::equals2_data() const +{ + QTest::addColumn("algorithm"); + QTest::newRow("selftest") << -1; + QTest::newRow("memcmp_call") << 0; + QTest::newRow("bytewise") << 1; + QTest::newRow("shortwise") << 2; + QTest::newRow("intwise") << 3; +#ifdef __SSE2__ + QTest::newRow("sse2") << 4; + QTest::newRow("sse2_aligning") << 5; +#ifdef __SSE3__ + QTest::newRow("sse3") << 6; +#ifdef __SSSE3__ + QTest::newRow("ssse3") << 7; + QTest::newRow("ssse3_aligning") << 8; +#ifdef __SSE4_1__ + QTest::newRow("sse4.2") << 9; +#endif +#endif +#endif +#endif +} + +static void __attribute__((noinline)) equals2_selftest() +{ +#ifdef Q_OS_UNIX + const long pagesize = sysconf(_SC_PAGESIZE); + void *page1, *page3; + ushort *page2; + page1 = mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + page2 = (ushort *)mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0); + page3 = mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + + Q_ASSERT(quintptr(page2) == quintptr(page1) + pagesize || quintptr(page2) == quintptr(page1) - pagesize); + Q_ASSERT(quintptr(page3) == quintptr(page2) + pagesize || quintptr(page3) == quintptr(page2) - pagesize); + munmap(page1, pagesize); + munmap(page3, pagesize); + + // populate our page + for (uint i = 0; i < pagesize / sizeof(long long); ++i) + ((long long *)page2)[i] = Q_INT64_C(0x0041004100410041); + + // the following should crash: + //page2[-1] = 0xdead; + //page2[pagesize / sizeof(ushort) + 1] = 0xbeef; + + static const ushort needle[] = { + 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, + 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, + 0x41 + }; + + for (int algo = 0; algo < functionCount; ++algo) { + // boundary condition test: + for (int i = 0; i < 8; ++i) { + (func[algo])(page2 + i, needle, sizeof needle / 2); + (func[algo])(page2 - i - 1 - sizeof(needle)/2 + pagesize/2, needle, sizeof needle/2); + } + } + + munmap(page2, pagesize); +#endif + + for (int algo = 0; algo < functionCount; ++algo) { + for (int i = 0; i < stringCollectionCount; ++i) { + const ushort *p1 = stringCollectionData + stringCollection[i].offset1; + const ushort *p2 = stringCollectionData + stringCollection[i].offset2; + bool expected = memcmp(p1, p2, stringCollection[i].len * 2) == 0; + + bool result = (func[algo])(p1, p2, stringCollection[i].len); + if (expected != result) + qWarning().nospace() + << "algo=" << algo + << " i=" << i + << " failed (" << result << "!=" << expected + << "); strings were " + << QByteArray((char*)p1, stringCollection[i].len).toHex() + << " and " + << QByteArray((char*)p2, stringCollection[i].len).toHex(); + } + } +} + +void tst_QString::equals2() const +{ + QFETCH(int, algorithm); + if (algorithm == -1) { + equals2_selftest(); + return; + } + + QBENCHMARK { + for (int i = 0; i < stringCollectionCount; ++i) { + const ushort *p1 = stringCollectionData + stringCollection[i].offset1; + const ushort *p2 = stringCollectionData + stringCollection[i].offset2; + bool result = (func[algorithm])(p1, p2, stringCollection[i].len); + Q_UNUSED(result); + } + } +} + +static int ucstrncmp_shortwise(const ushort *a, const ushort *b, int l) +{ + while (l-- && *a == *b) + a++,b++; + if (l==-1) + return 0; + return *a - *b; +} + +static int ucstrncmp_intwise(const ushort *a, const ushort *b, int len) +{ + // do both strings have the same alignment? + if ((quintptr(a) & 2) == (quintptr(b) & 2)) { + // are we aligned to 4 bytes? + if (quintptr(a) & 2) { + if (*a != *b) + return *a - *b; + ++a; + ++b; + --len; + } + + const uint *p1 = (const uint *)a; + const uint *p2 = (const uint *)b; + quintptr counter = 0; + for ( ; len > 1 ; len -= 2, ++counter) { + if (p1[counter] != p2[counter]) { + // which ushort isn't equal? + int diff = a[2*counter] - b[2*counter]; + return diff ? diff : a[2*counter + 1] - b[2*counter + 1]; + } + } + + return len ? a[2*counter] - b[2*counter] : 0; + } else { + while (len-- && *a == *b) + a++,b++; + if (len==-1) + return 0; + return *a - *b; + } +} + +#ifdef __SSE2__ +static inline int ucstrncmp_short_tail(const ushort *p1, const ushort *p2, int len) +{ + if (len) { + if (*p1 != *p2) + return *p1 - *p2; + if (--len) { + if (p1[1] != p2[1]) + return p1[1] - p2[1]; + if (--len) { + if (p1[2] != p2[2]) + return p1[2] - p2[2]; + if (--len) { + if (p1[3] != p2[3]) + return p1[3] - p2[3]; + if (--len) { + if (p1[4] != p2[4]) + return p1[4] - p2[4]; + if (--len) { + if (p1[5] != p2[5]) + return p1[5] - p2[5]; + if (--len) { + if (p1[6] != p2[6]) + return p1[6] - p2[6]; + return p1[7] - p2[7]; + } + } + } + } + } + } + } + return 0; +} + +static inline int bsf_nonzero(register long val) +{ + int result; +# ifdef Q_CC_GNU + // returns the first non-zero bit on a non-zero reg + asm ("bsf %1, %0" : "=r" (result) : "r" (val)); + return result; +# elif defined(Q_CC_MSVC) + _BitScanForward(&result, val); + return result; +# endif +} + +static __attribute__((optimize("no-unroll-loops"))) int ucstrncmp_sse2(const ushort *a, const ushort *b, int len) +{ + qptrdiff counter = 0; + while (len >= 8) { + __m128i m1 = _mm_loadu_si128((__m128i *)(a + counter)); + __m128i m2 = _mm_loadu_si128((__m128i *)(b + counter)); + __m128i cmp = _mm_cmpeq_epi16(m1, m2); + ushort mask = ~uint(_mm_movemask_epi8(cmp)); + if (mask) { + // which ushort isn't equal? + counter += bsf_nonzero(mask)/2; + return a[counter] - b[counter]; + } + + counter += 8; + len -= 8; + } + return ucstrncmp_short_tail(a + counter, b + counter, len); +} + +static __attribute__((optimize("no-unroll-loops"))) int ucstrncmp_sse2_aligning(const ushort *a, const ushort *b, int len) +{ + if (len >= 8) { + __m128i m1 = _mm_loadu_si128((__m128i *)a); + __m128i m2 = _mm_loadu_si128((__m128i *)b); + __m128i cmp = _mm_cmpeq_epi16(m1, m2); + ushort mask = ~uint(_mm_movemask_epi8(cmp)); + if (mask) { + // which ushort isn't equal? + int counter = bsf_nonzero(mask)/2; + return a[counter] - b[counter]; + } + + + // now align to do 16-byte loads + int diff = 8 - (quintptr(a) & 0xf)/2; + len -= diff; + a += diff; + b += diff; + } + + qptrdiff counter = 0; + while (len >= 8) { + __m128i m1 = _mm_load_si128((__m128i *)(a + counter)); + __m128i m2 = _mm_loadu_si128((__m128i *)(b + counter)); + __m128i cmp = _mm_cmpeq_epi16(m1, m2); + ushort mask = ~uint(_mm_movemask_epi8(cmp)); + if (mask) { + // which ushort isn't equal? + counter += bsf_nonzero(mask)/2; + return a[counter] - b[counter]; + } + + counter += 8; + len -= 8; + } + return ucstrncmp_short_tail(a + counter, b + counter, len); +} + +static inline __attribute__((optimize("no-unroll-loops"))) int ucstrncmp_sse2_aligned(const ushort *a, const ushort *b, int len) +{ + quintptr counter = 0; + while (len >= 8) { + __m128i m1 = _mm_load_si128((__m128i *)(a + counter)); + __m128i m2 = _mm_load_si128((__m128i *)(b + counter)); + __m128i cmp = _mm_cmpeq_epi16(m1, m2); + ushort mask = ~uint(_mm_movemask_epi8(cmp)); + if (mask) { + // which ushort isn't equal? + counter += bsf_nonzero(mask)/2; + return a[counter] - b[counter]; + } + + counter += 8; + len -= 8; + } + return ucstrncmp_short_tail(a + counter, b + counter, len); +} + +static inline __attribute__((optimize("no-unroll-loops"))) int ucstrncmp_ssse3_alignr_aligned(const ushort *a, const ushort *b, int len) +{ + quintptr counter = 0; + while (len >= 8) { + __m128i m1 = _mm_load_si128((__m128i *)(a + counter)); + __m128i m2 = _mm_lddqu_si128((__m128i *)(b + counter)); + __m128i cmp = _mm_cmpeq_epi16(m1, m2); + ushort mask = ~uint(_mm_movemask_epi8(cmp)); + if (mask) { + // which ushort isn't equal? + counter += bsf_nonzero(mask)/2; + return a[counter] - b[counter]; + } + + counter += 8; + len -= 8; + } + return ucstrncmp_short_tail(a + counter, b + counter, len); +} + + +typedef __m128i (* MMLoadFunction)(const __m128i *); +template +static inline __attribute__((optimize("no-unroll-loops"))) int ucstrncmp_ssse3_alignr(const ushort *a, const ushort *b, int len) +{ + qptrdiff counter = 0; + __m128i lower, upper; + upper = _mm_load_si128((__m128i *)a); + + do { + lower = upper; + upper = _mm_load_si128((__m128i *)(a + counter) + 1); + __m128i merged = _mm_alignr_epi8(upper, lower, N); + + __m128i m2 = LoadFunction((__m128i *)(b + counter)); + __m128i cmp = _mm_cmpeq_epi16(merged, m2); + ushort mask = ~uint(_mm_movemask_epi8(cmp)); + if (mask) { + // which ushort isn't equal? + counter += bsf_nonzero(mask)/2; + return a[counter + N/2] - b[counter]; + } + + counter += 8; + len -= 8; + } while (len >= 8); + + return ucstrncmp_short_tail(a + counter + N/2, b + counter, len); +} + +static int ucstrncmp_ssse3(const ushort *a, const ushort *b, int len) +{ + if (len >= 8) { + int val = quintptr(a) & 0xf; + a -= val/2; + + if (val == 10) + return ucstrncmp_ssse3_alignr<10, _mm_lddqu_si128>(a, b, len); + else if (val == 2) + return ucstrncmp_ssse3_alignr<2, _mm_lddqu_si128>(a, b, len); + if (val < 8) { + if (val < 4) + return ucstrncmp_ssse3_alignr_aligned(a, b, len); + else if (val == 4) + return ucstrncmp_ssse3_alignr<4, _mm_lddqu_si128>(a, b, len); + else + return ucstrncmp_ssse3_alignr<6, _mm_lddqu_si128>(a, b, len); + } else { + if (val < 12) + return ucstrncmp_ssse3_alignr<8, _mm_lddqu_si128>(a, b, len); + else if (val == 12) + return ucstrncmp_ssse3_alignr<12, _mm_lddqu_si128>(a, b, len); + else + return ucstrncmp_ssse3_alignr<14, _mm_lddqu_si128>(a, b, len); + } + } + return ucstrncmp_short_tail(a, b, len); +} + +static int ucstrncmp_ssse3_aligning(const ushort *a, const ushort *b, int len) +{ + if (len >= 8) { + __m128i m1 = _mm_loadu_si128((__m128i *)a); + __m128i m2 = _mm_loadu_si128((__m128i *)b); + __m128i cmp = _mm_cmpeq_epi16(m1, m2); + ushort mask = ~uint(_mm_movemask_epi8(cmp)); + if (mask) { + // which ushort isn't equal? + int counter = bsf_nonzero(mask)/2; + return a[counter] - b[counter]; + } + + + // now 'b' align to do 16-byte loads + int diff = 8 - (quintptr(b) & 0xf)/2; + len -= diff; + a += diff; + b += diff; + } + + if (len < 8) + return ucstrncmp_short_tail(a, b, len); + + // 'b' is aligned + int val = quintptr(a) & 0xf; + a -= val/2; + + if (val == 8) + return ucstrncmp_ssse3_alignr<8, _mm_load_si128>(a, b, len); + else if (val == 0) + return ucstrncmp_sse2_aligned(a, b, len); + if (val < 8) { + if (val < 4) + return ucstrncmp_ssse3_alignr<2, _mm_load_si128>(a, b, len); + else if (val == 4) + return ucstrncmp_ssse3_alignr<4, _mm_load_si128>(a, b, len); + else + return ucstrncmp_ssse3_alignr<6, _mm_load_si128>(a, b, len); + } else { + if (val < 12) + return ucstrncmp_ssse3_alignr<10, _mm_load_si128>(a, b, len); + else if (val == 12) + return ucstrncmp_ssse3_alignr<12, _mm_load_si128>(a, b, len); + else + return ucstrncmp_ssse3_alignr<14, _mm_load_si128>(a, b, len); + } +} + +static inline __attribute__((optimize("no-unroll-loops"))) +int ucstrncmp_ssse3_aligning2_aligned(const ushort *a, const ushort *b, int len, int garbage) +{ + // len >= 8 + __m128i m1 = _mm_load_si128((const __m128i *)a); + __m128i m2 = _mm_load_si128((const __m128i *)b); + __m128i cmp = _mm_cmpeq_epi16(m1, m2); + int mask = short(_mm_movemask_epi8(cmp)); // force sign extension + mask >>= garbage; + if (~mask) { + // which ushort isn't equal? + uint counter = (garbage + bsf_nonzero(~mask)); + return a[counter/2] - b[counter/2]; + } + + // the first 16-garbage bytes (8-garbage/2 ushorts) were equal + len -= 8 - garbage/2; + return ucstrncmp_sse2_aligned(a + 8, b + 8, len); +} + +template static inline __attribute__((optimize("no-unroll-loops"),always_inline)) +int ucstrncmp_ssse3_aligning2_alignr(const ushort *a, const ushort *b, int len, int garbage) +{ + // len >= 8 + __m128i lower, upper, merged; + lower = _mm_load_si128((const __m128i*)a); + upper = _mm_load_si128((const __m128i*)(a + 8)); + merged = _mm_alignr_epi8(upper, lower, N); + + __m128i m2 = _mm_load_si128((const __m128i*)b); + __m128i cmp = _mm_cmpeq_epi16(merged, m2); + int mask = short(_mm_movemask_epi8(cmp)); // force sign extension + mask >>= garbage; + if (~mask) { + // which ushort isn't equal? + uint counter = (garbage + bsf_nonzero(~mask)); + return a[counter/2 + N/2] - b[counter/2]; + } + + // the first 16-garbage bytes (8-garbage/2 ushorts) were equal + quintptr counter = 8; + len -= 8 - garbage/2; + while (len >= 8) { + lower = upper; + upper = _mm_load_si128((__m128i *)(a + counter) + 1); + merged = _mm_alignr_epi8(upper, lower, N); + + m2 = _mm_load_si128((__m128i *)(b + counter)); + cmp = _mm_cmpeq_epi16(merged, m2); + ushort mask = ~uint(_mm_movemask_epi8(cmp)); + if (mask) { + // which ushort isn't equal? + counter += bsf_nonzero(mask)/2; + return a[counter + N/2] - b[counter]; + } + + counter += 8; + len -= 8; + } + + return ucstrncmp_short_tail(a + counter + N/2, b + counter, len); +} + +static inline int conditional_invert(int result, bool invert) +{ + if (invert) + return -result; + return result; +} + +static int ucstrncmp_ssse3_aligning2(const ushort *a, const ushort *b, int len) +{ + // Different strategy from above: instead of doing two unaligned loads + // when trying to align, we'll only do aligned loads and round down the + // addresses of a and b. This means the first load will contain garbage + // in the beginning of the string, which we'll shift out of the way + // (after _mm_movemask_epi8) + + if (len < 8) + return ucstrncmp_intwise(a, b, len); + + // both a and b are misaligned + // we'll call the alignr function with the alignment *difference* between the two + int offset = (quintptr(a) & 0xf) - (quintptr(b) & 0xf); + if (offset >= 0) { + // from this point on, b has the shortest alignment + // and align(a) = align(b) + offset + // round down the alignment so align(b) == align(a) == 0 + int garbage = (quintptr(b) & 0xf); + a = (const ushort*)(quintptr(a) & ~0xf); + b = (const ushort*)(quintptr(b) & ~0xf); + + // now the first load of b will load 'garbage' extra bytes + // and the first load of a will load 'garbage + offset' extra bytes + if (offset == 8) + return ucstrncmp_ssse3_aligning2_alignr<8>(a, b, len, garbage); + if (offset == 0) + return ucstrncmp_ssse3_aligning2_aligned(a, b, len, garbage); + if (offset < 8) { + if (offset < 4) + return ucstrncmp_ssse3_aligning2_alignr<2>(a, b, len, garbage); + else if (offset == 4) + return ucstrncmp_ssse3_aligning2_alignr<4>(a, b, len, garbage); + else + return ucstrncmp_ssse3_aligning2_alignr<6>(a, b, len, garbage); + } else { + if (offset < 12) + return ucstrncmp_ssse3_aligning2_alignr<10>(a, b, len, garbage); + else if (offset == 12) + return ucstrncmp_ssse3_aligning2_alignr<12>(a, b, len, garbage); + else + return ucstrncmp_ssse3_aligning2_alignr<14>(a, b, len, garbage); + } + } else { + // same as above but inverted + int garbage = (quintptr(a) & 0xf); + a = (const ushort*)(quintptr(a) & ~0xf); + b = (const ushort*)(quintptr(b) & ~0xf); + + offset = -offset; + if (offset == 8) + return -ucstrncmp_ssse3_aligning2_alignr<8>(b, a, len, garbage); + if (offset < 8) { + if (offset < 4) + return -ucstrncmp_ssse3_aligning2_alignr<2>(b, a, len, garbage); + else if (offset == 4) + return -ucstrncmp_ssse3_aligning2_alignr<4>(b, a, len, garbage); + else + return -ucstrncmp_ssse3_aligning2_alignr<6>(b, a, len, garbage); + } else { + if (offset < 12) + return -ucstrncmp_ssse3_aligning2_alignr<10>(b, a, len, garbage); + else if (offset == 12) + return -ucstrncmp_ssse3_aligning2_alignr<12>(b, a, len, garbage); + else + return -ucstrncmp_ssse3_aligning2_alignr<14>(b, a, len, garbage); + } + } +} + +#endif + +typedef int (* UcstrncmpFunction)(const ushort *, const ushort *, int); +Q_DECLARE_METATYPE(UcstrncmpFunction) + +void tst_QString::ucstrncmp_data() const +{ + QTest::addColumn("function"); + QTest::newRow("selftest") << UcstrncmpFunction(0); + QTest::newRow("shortwise") << &ucstrncmp_shortwise; + QTest::newRow("intwise") << &ucstrncmp_intwise; +#ifdef __SSE2__ + QTest::newRow("sse2") << &ucstrncmp_sse2; + QTest::newRow("sse2_aligning") << &ucstrncmp_sse2_aligning; +#ifdef __SSSE3__ + QTest::newRow("ssse3") << &ucstrncmp_ssse3; + QTest::newRow("ssse3_aligning") << &ucstrncmp_ssse3_aligning; + QTest::newRow("ssse3_aligning2") << &ucstrncmp_ssse3_aligning2; +#endif +#endif +} + +void tst_QString::ucstrncmp() const +{ + QFETCH(UcstrncmpFunction, function); + if (!function) { + static const UcstrncmpFunction func[] = { + &ucstrncmp_shortwise, + &ucstrncmp_intwise, +#ifdef __SSE2__ + &ucstrncmp_sse2, + &ucstrncmp_sse2_aligning, +#ifdef __SSSE3__ + &ucstrncmp_ssse3, + &ucstrncmp_ssse3_aligning, + &ucstrncmp_ssse3_aligning2 +#endif +#endif + }; + static const int functionCount = sizeof func / sizeof func[0]; + +#ifdef Q_OS_UNIX + const long pagesize = sysconf(_SC_PAGESIZE); + void *page1, *page3; + ushort *page2; + page1 = mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + page2 = (ushort *)mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0); + page3 = mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + + Q_ASSERT(quintptr(page2) == quintptr(page1) + pagesize || quintptr(page2) == quintptr(page1) - pagesize); + Q_ASSERT(quintptr(page3) == quintptr(page2) + pagesize || quintptr(page3) == quintptr(page2) - pagesize); + munmap(page1, pagesize); + munmap(page3, pagesize); + + // populate our page + for (uint i = 0; i < pagesize / sizeof(long long); ++i) + ((long long *)page2)[i] = Q_INT64_C(0x0041004100410041); + + // the following should crash: + //page2[-1] = 0xdead; + //page2[pagesize / sizeof(ushort) + 1] = 0xbeef; + + static const ushort needle[] = { + 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, + 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, + 0x41 + }; + + for (int algo = 0; algo < functionCount; ++algo) { + // boundary condition test: + for (int i = 0; i < 8; ++i) { + (func[algo])(page2 + i, needle, sizeof needle / 2); + (func[algo])(page2 - i - 1 - sizeof(needle)/2 + pagesize/2, needle, sizeof needle/2); + } + } + + munmap(page2, pagesize); +#endif + + for (int algo = 0; algo < functionCount; ++algo) { + for (int i = 0; i < stringCollectionCount; ++i) { + const ushort *p1 = stringCollectionData + stringCollection[i].offset1; + const ushort *p2 = stringCollectionData + stringCollection[i].offset2; + int expected = ucstrncmp_shortwise(p1, p2, stringCollection[i].len); + expected = qBound(-1, expected, 1); + + int result = (func[algo])(p1, p2, stringCollection[i].len); + result = qBound(-1, result, 1); + if (expected != result) + qWarning().nospace() + << "algo=" << algo + << " i=" << i + << " failed (" << result << "!=" << expected + << "); strings were " + << QByteArray((char*)p1, stringCollection[i].len).toHex() + << " and " + << QByteArray((char*)p2, stringCollection[i].len).toHex(); + } + } + return; + } + + QBENCHMARK { + for (int i = 0; i < stringCollectionCount; ++i) { + const ushort *p1 = stringCollectionData + stringCollection[i].offset1; + const ushort *p2 = stringCollectionData + stringCollection[i].offset2; + (function)(p1, p2, stringCollection[i].len); + } + } +} + void tst_QString::fromUtf8() const { QFile file(SRCDIR "utf-8.txt"); diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/corelib/tools/qstring/qstring.pro --- a/tests/benchmarks/corelib/tools/qstring/qstring.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/benchmarks/corelib/tools/qstring/qstring.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,7 +1,7 @@ load(qttest_p4) TARGET = tst_bench_qstring QT -= gui -SOURCES += main.cpp +SOURCES += main.cpp data.cpp wince*:{ DEFINES += SRCDIR=\\\"\\\" @@ -14,3 +14,6 @@ DEFINES += SRCDIR=\\\"$$PWD/\\\" } +sse4:QMAKE_CXXFLAGS += -msse4 +else:ssse3:QMAKE_FLAGS += -mssse3 +else:sse2:QMAKE_CXXFLAGS += -msse2 diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/gui/image/blendbench/main.cpp --- a/tests/benchmarks/gui/image/blendbench/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/benchmarks/gui/image/blendbench/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -103,6 +103,12 @@ private slots: void blendBench_data(); void blendBench(); + + void blendBenchAlpha_data(); + void blendBenchAlpha(); + + void unalignedBlendArgb32_data(); + void unalignedBlendArgb32(); }; void BlendBench::blendBench_data() @@ -147,6 +153,75 @@ } } +void BlendBench::blendBenchAlpha_data() +{ + blendBench_data(); +} + +void BlendBench::blendBenchAlpha() +{ + QFETCH(int, brushType); + QFETCH(int, compositionMode); + + QImage img(512, 512, QImage::Format_ARGB32_Premultiplied); + QImage src(512, 512, QImage::Format_ARGB32_Premultiplied); + paint(&src); + QPainter p(&img); + p.setPen(Qt::NoPen); + + p.setCompositionMode(QPainter::CompositionMode(compositionMode)); + if (brushType == ImageBrush) { + p.setBrush(QBrush(src)); + } else if (brushType == SolidBrush) { + p.setBrush(QColor(127, 127, 127, 127)); + } + p.setOpacity(0.7f); + + QBENCHMARK { + p.drawRect(0, 0, 512, 512); + } +} + +void BlendBench::unalignedBlendArgb32_data() +{ + // The performance of blending can depend of the alignment of the data + // on 16 bytes. Some SIMD instruction set have significantly better + // memory access when the memory is aligned on 16 bytes boundary. + + // offset in 32 bits words + QTest::addColumn("offset"); + QTest::newRow("aligned on 16 bytes") << 0; + QTest::newRow("unaligned by 4 bytes") << 1; + QTest::newRow("unaligned by 8 bytes") << 2; + QTest::newRow("unaligned by 12 bytes") << 3; +} + +void BlendBench::unalignedBlendArgb32() +{ + const int dimension = 1024; + + // We use dst aligned by design. We don't want to test all the combination of alignemnt for src and dst. + // Moreover, it make sense for us to align dst in the implementation because it is accessed more often. + uchar *dstMemory = static_cast(qMallocAligned((dimension * dimension * sizeof(quint32)), 16)); + QImage destination(dstMemory, dimension, dimension, QImage::Format_ARGB32_Premultiplied); + destination.fill(0x12345678); // avoid special cases of alpha + + uchar *srcMemory = static_cast(qMallocAligned((dimension * dimension * sizeof(quint32)) + 16, 16)); + QFETCH(int, offset); + srcMemory += (offset * sizeof(quint32)); + + QImage src(srcMemory, dimension, dimension, QImage::Format_ARGB32_Premultiplied); + src.fill(0x87654321); + + QPainter painter(&destination); + QBENCHMARK { + painter.drawImage(QPoint(), src); + } + + qFreeAligned(srcMemory); + qFreeAligned(dstMemory); +} + QTEST_MAIN(BlendBench) #include "main.moc" diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/gui/image/image.pro --- a/tests/benchmarks/gui/image/image.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/benchmarks/gui/image/image.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS = \ blendbench \ + qimageconversion \ qimagereader \ qpixmap \ qpixmapcache diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,10 @@ +load(qttest_p4) +TEMPLATE = app +TARGET = tst_bench_imageConversion + +SOURCES += tst_qimageconversion.cpp + +!contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF +!contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG +!contains(QT_CONFIG, no-mng):DEFINES += QTEST_HAVE_MNG +!contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +Q_DECLARE_METATYPE(QImage) + +class tst_QImageConversion : public QObject +{ + Q_OBJECT +private slots: + void convertRgb888ToRGB32_data(); + void convertRgb888ToRGB32(); + +private: + QImage generateImageRgb888(int width, int height); +}; + +void tst_QImageConversion::convertRgb888ToRGB32_data() +{ + QTest::addColumn("inputImage"); + // height = 5000 to get interesting timing. + + // 3 pixels wide -> smaller than regular vector of 128bits + QTest::newRow("width: 3px; height: 5000px;") << generateImageRgb888(3, 5000); + + // 8 pixels wide -> potential for 2 vectors + QTest::newRow("width: 8px; height: 5000px;") << generateImageRgb888(3, 5000); + + // 16 pixels, minimum for the SSSE3 implementation + QTest::newRow("width: 16px; height: 5000px;") << generateImageRgb888(16, 5000); + + // 50 pixels, more realistic use case + QTest::newRow("width: 50px; height: 5000px;") << generateImageRgb888(50, 5000); + + // 2000 pixels -> typical values for pictures + QTest::newRow("width: 2000px; height: 5000px;") << generateImageRgb888(2000, 5000); +} + +void tst_QImageConversion::convertRgb888ToRGB32() +{ + QFETCH(QImage, inputImage); + + QBENCHMARK { + volatile QImage output = inputImage.convertToFormat(QImage::Format_RGB32); + // we need the volatile and the following to make sure the compiler does not do + // anything stupid :) + (void)output; + } +} + +/* + Fill a RGB888 image with "random" pixel values. + */ +QImage tst_QImageConversion::generateImageRgb888(int width, int height) +{ + QImage image(width, height, QImage::Format_RGB888); + const int byteWidth = width * 3; + + for (int y = 0; y < image.height(); ++y) { + uchar *scanline = image.scanLine(y); + for (int x = 0; x < byteWidth; ++x) + scanline[x] = x ^ y; + } + return image; +} + +QTEST_MAIN(tst_QImageConversion) +#include "tst_qimageconversion.moc" diff -r ef0373b55136 -r 758a864f9613 tests/benchmarks/network/network.pro --- a/tests/benchmarks/network/network.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/benchmarks/network/network.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS = \ +SUBDIRS = \ access \ -# kernel \ + kernel \ socket diff -r ef0373b55136 -r 758a864f9613 tests/manual/bearerex/bearerex.cpp --- a/tests/manual/bearerex/bearerex.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/manual/bearerex/bearerex.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -433,6 +433,7 @@ iapLineEdit->setText(config.name()+" ("+config.identifier()+")"); } } + newState(m_NetworkSession->state()); // Update the "(open)" if (m_NetworkSession->configuration().type() == QNetworkConfiguration::UserChoice) { QVariant identifier = m_NetworkSession->sessionProperty("UserChoiceConfiguration"); @@ -523,7 +524,7 @@ QString active; if (m_NetworkSession->isOpen()) { - active = " (O)"; + active = " (open)"; } stateLineEdit->setText(stateString(state)+active); } diff -r ef0373b55136 -r 758a864f9613 tests/manual/bearerex/bearerex.pro --- a/tests/manual/bearerex/bearerex.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/manual/bearerex/bearerex.pro Mon Oct 04 01:19:32 2010 +0300 @@ -25,4 +25,4 @@ xqlistwidget.cpp \ datatransferer.cpp -symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData +symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData WriteDeviceData ReadDeviceData diff -r ef0373b55136 -r 758a864f9613 tests/manual/inputmethodhints/inputmethodhints.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/manual/inputmethodhints/inputmethodhints.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "inputmethodhints.h" + +inputmethodhints::inputmethodhints(QWidget *parent) + : QMainWindow(parent) +{ + ui.setupUi(this); + connect(ui.cbDialableOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbDigitsOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbEmailOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbFormattedNumbersOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbHiddenText, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbLowercaseOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbNoAutoUppercase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbNoPredictiveText, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbPreferLowercase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbPreferNumbers, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbPreferUpperCase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbUppercaseOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbUrlOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); +} + +inputmethodhints::~inputmethodhints() +{ + +} + +void inputmethodhints::checkboxChanged(int) +{ + int flags = 0; + if (ui.cbDialableOnly->isChecked()) + flags |= Qt::ImhDialableCharactersOnly; + if (ui.cbDigitsOnly->isChecked()) + flags |= Qt::ImhDigitsOnly; + if (ui.cbEmailOnly->isChecked()) + flags |= Qt::ImhEmailCharactersOnly; + if (ui.cbFormattedNumbersOnly->isChecked()) + flags |= Qt::ImhFormattedNumbersOnly; + if (ui.cbHiddenText->isChecked()) + flags |= Qt::ImhHiddenText; + if (ui.cbLowercaseOnly->isChecked()) + flags |= Qt::ImhLowercaseOnly; + if (ui.cbNoAutoUppercase->isChecked()) + flags |= Qt::ImhNoAutoUppercase; + if (ui.cbNoPredictiveText->isChecked()) + flags |= Qt::ImhNoPredictiveText; + if (ui.cbPreferLowercase->isChecked()) + flags |= Qt::ImhPreferLowercase; + if (ui.cbPreferNumbers->isChecked()) + flags |= Qt::ImhPreferNumbers; + if (ui.cbPreferUpperCase->isChecked()) + flags |= Qt::ImhPreferUppercase; + if (ui.cbUppercaseOnly->isChecked()) + flags |= Qt::ImhUppercaseOnly; + if (ui.cbUrlOnly->isChecked()) + flags |= Qt::ImhUrlCharactersOnly; + ui.lineEdit->clear(); + ui.lineEdit->setInputMethodHints(Qt::InputMethodHints(flags)); +} diff -r ef0373b55136 -r 758a864f9613 tests/manual/inputmethodhints/inputmethodhints.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/manual/inputmethodhints/inputmethodhints.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef INPUTMETHODHINTS_H +#define INPUTMETHODHINTS_H + +#include +#include "ui_tst_inputmethodhints.h" + +class inputmethodhints : public QMainWindow +{ + Q_OBJECT + +public: + inputmethodhints(QWidget *parent = 0); + ~inputmethodhints(); + +public slots: + void checkboxChanged(int); + +private: + Ui::MainWindow ui; +}; + +#endif // INPUTMETHODHINTS_H diff -r ef0373b55136 -r 758a864f9613 tests/manual/inputmethodhints/inputmethodhints.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/manual/inputmethodhints/inputmethodhints.pro Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,13 @@ +TEMPLATE = app +TARGET = tst_inputmethodhints + +QT += core \ + gui + +HEADERS += inputmethodhints.h +SOURCES += main.cpp \ + inputmethodhints.cpp +FORMS += inputmethodhints.ui +RESOURCES += + +symbian:TARGET.UID3 = 0xE4938ABC diff -r ef0373b55136 -r 758a864f9613 tests/manual/inputmethodhints/inputmethodhints.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/manual/inputmethodhints/inputmethodhints.ui Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,138 @@ + + + MainWindow + + + + 0 + 0 + 360 + 640 + + + + MainWindow + + + + + + + 1 + + + + behaviour + + + + + + ImhHiddenText + + + + + + + ImhNoAutoUppercase + + + + + + + ImhPreferNumbers + + + + + + + ImhPreferUppercase + + + + + + + ImhPreferLowercase + + + + + + + ImhNoPredictiveText + + + + + + + + restrictions + + + + + + ImhDigitsOnly + + + + + + + ImhFormattedNumbersOnly + + + + + + + ImhUppercaseOnly + + + + + + + ImhLowercaseOnly + + + + + + + ImhDialableCharactersOnly + + + + + + + ImhEmailCharactersOnly + + + + + + + ImhUrlCharactersOnly + + + + + + + + + + + + + + + + diff -r ef0373b55136 -r 758a864f9613 tests/manual/inputmethodhints/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/manual/inputmethodhints/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "inputmethodhints.h" + +#include +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + inputmethodhints w; + w.showMaximized(); + return a.exec(); +} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp.pro --- a/tests/qtp/qtp.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - qtp_addressbook \ - qtp_analogclock \ - qtp_animatedtiles \ - qtp_collidingmice \ - qtp_masterdetail \ - qtp_qftp \ - qtp_raycasting \ - qtp_svgviewer \ - qtp_wiggly - -#contains(QT_CONFIG, webkit): SUBDIRS += qtp_anomaly -contains(QT_CONFIG, openvg): SUBDIRS += qtp_star - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/adddialog.cpp --- a/tests/qtp/qtp_addressbook/adddialog.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "adddialog.h" - -//! [0] -AddDialog::AddDialog(QWidget *parent) - : QDialog(parent) -{ - nameLabel = new QLabel("Name"); - addressLabel = new QLabel("Address"); - okButton = new QPushButton("OK"); - cancelButton = new QPushButton("Cancel"); - - nameText = new QLineEdit; - addressText = new QTextEdit; - - QGridLayout *gLayout = new QGridLayout; - gLayout->setColumnStretch(1, 2); - gLayout->addWidget(nameLabel, 0, 0); - gLayout->addWidget(nameText, 0, 1); - - gLayout->addWidget(addressLabel, 1, 0, Qt::AlignLeft|Qt::AlignTop); - gLayout->addWidget(addressText, 1, 1, Qt::AlignLeft); - - QHBoxLayout *buttonLayout = new QHBoxLayout; - buttonLayout->addWidget(okButton); - buttonLayout->addWidget(cancelButton); - - gLayout->addLayout(buttonLayout, 2, 1, Qt::AlignRight); - - QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addLayout(gLayout); - setLayout(mainLayout); - - connect(okButton, SIGNAL(clicked()), - this, SLOT(accept())); - - connect(cancelButton, SIGNAL(clicked()), - this, SLOT(reject())); - - setWindowTitle(tr("Add a Contact")); -} -//! [0] diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/adddialog.h --- a/tests/qtp/qtp_addressbook/adddialog.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef ADDDIALOG_H -#define ADDDIALOG_H - -#include - -QT_BEGIN_NAMESPACE -class QLabel; -class QPushButton; -class QTextEdit; -class QLineEdit; -QT_END_NAMESPACE - -//! [0] -class AddDialog : public QDialog -{ - Q_OBJECT - -public: - AddDialog(QWidget *parent=0); - QLineEdit *nameText; - QTextEdit *addressText; - -private: - QLabel *nameLabel; - QLabel *addressLabel; - QPushButton *okButton; - QPushButton *cancelButton; -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/addresswidget.cpp --- a/tests/qtp/qtp_addressbook/addresswidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,238 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "addresswidget.h" -#include "adddialog.h" - -//! [0] -AddressWidget::AddressWidget(QWidget *parent) - : QTabWidget(parent) -{ - table = new TableModel(this); - newAddressTab = new NewAddressTab(this); - connect(newAddressTab, SIGNAL(sendDetails(QString, QString)), - this, SLOT(addEntry(QString, QString))); - - addTab(newAddressTab, "Address Book"); - - setupTabs(); -} -//! [0] - -//! [2] -void AddressWidget::addEntry() -{ - AddDialog aDialog; - - if (aDialog.exec()) { - QString name = aDialog.nameText->text(); - QString address = aDialog.addressText->toPlainText(); - - addEntry(name, address); - } -} -//! [2] - -//! [3] -void AddressWidget::addEntry(QString name, QString address) -{ - QList< QPair >list = table->getList(); - QPair pair(name, address); - - if (!list.contains(pair)) { - table->insertRows(0, 1, QModelIndex()); - - QModelIndex index = table->index(0, 0, QModelIndex()); - table->setData(index, name, Qt::EditRole); - index = table->index(0, 1, QModelIndex()); - table->setData(index, address, Qt::EditRole); - removeTab(indexOf(newAddressTab)); - } else { - QMessageBox::information(this, tr("Duplicate Name"), - tr("The name \"%1\" already exists.").arg(name)); - } -} -//! [3] - -//! [4a] -void AddressWidget::editEntry() -{ - QTableView *temp = static_cast(currentWidget()); - QSortFilterProxyModel *proxy = static_cast(temp->model()); - QItemSelectionModel *selectionModel = temp->selectionModel(); - - QModelIndexList indexes = selectionModel->selectedRows(); - QModelIndex index, i; - QString name; - QString address; - int row = -1; - - foreach (index, indexes) { - row = proxy->mapToSource(index).row(); - i = table->index(row, 0, QModelIndex()); - QVariant varName = table->data(i, Qt::DisplayRole); - name = varName.toString(); - - i = table->index(row, 1, QModelIndex()); - QVariant varAddr = table->data(i, Qt::DisplayRole); - address = varAddr.toString(); - } -//! [4a] - -//! [4b] - AddDialog aDialog; - aDialog.setWindowTitle(tr("Edit a Contact")); - - aDialog.nameText->setReadOnly(true); - aDialog.nameText->setText(name); - aDialog.addressText->setText(address); - - if (aDialog.exec()) { - QString newAddress = aDialog.addressText->toPlainText(); - if (newAddress != address) { - i = table->index(row, 1, QModelIndex()); - table->setData(i, newAddress, Qt::EditRole); - } - } -} -//! [4b] - -//! [5] -void AddressWidget::removeEntry() -{ - QTableView *temp = static_cast(currentWidget()); - QSortFilterProxyModel *proxy = static_cast(temp->model()); - QItemSelectionModel *selectionModel = temp->selectionModel(); - - QModelIndexList indexes = selectionModel->selectedRows(); - QModelIndex index; - - foreach (index, indexes) { - int row = proxy->mapToSource(index).row(); - table->removeRows(row, 1, QModelIndex()); - } - - if (table->rowCount(QModelIndex()) == 0) { - insertTab(0, newAddressTab, "Address Book"); - } -} -//! [5] - -//! [1] -void AddressWidget::setupTabs() -{ - QStringList groups; - groups << "ABC" << "DEF" << "GHI" << "JKL" << "MNO" << "PQR" << "STU" << "VW" << "XYZ"; - - for (int i = 0; i < groups.size(); ++i) { - QString str = groups.at(i); - - proxyModel = new QSortFilterProxyModel(this); - proxyModel->setSourceModel(table); - proxyModel->setDynamicSortFilter(true); - - QTableView *tableView = new QTableView; - tableView->setModel(proxyModel); - tableView->setSortingEnabled(true); - tableView->setSelectionBehavior(QAbstractItemView::SelectRows); - tableView->horizontalHeader()->setStretchLastSection(true); - tableView->verticalHeader()->hide(); - tableView->setEditTriggers(QAbstractItemView::NoEditTriggers); - tableView->setSelectionMode(QAbstractItemView::SingleSelection); - - QString newStr = QString("^[%1].*").arg(str); - - proxyModel->setFilterRegExp(QRegExp(newStr, Qt::CaseInsensitive)); - proxyModel->setFilterKeyColumn(0); - proxyModel->sort(0, Qt::AscendingOrder); - - connect(tableView->selectionModel(), - SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)), - this, SIGNAL(selectionChanged(const QItemSelection &))); - - addTab(tableView, str); - } -} -//! [1] - -//! [7] -void AddressWidget::readFromFile(QString fileName) -{ - QFile file(fileName); - - if (!file.open(QIODevice::ReadOnly)) { - QMessageBox::information(this, tr("Unable to open file"), - file.errorString()); - return; - } - - QList< QPair > pairs = table->getList(); - QDataStream in(&file); - in >> pairs; - - if (pairs.isEmpty()) { - QMessageBox::information(this, tr("No contacts in file"), - tr("The file you are attempting to open contains no contacts.")); - } else { - for (int i=0; i p = pairs.at(i); - addEntry(p.first, p.second); - } - } -} -//! [7] - -//! [6] -void AddressWidget::writeToFile(QString fileName) -{ - QFile file(fileName); - - if (!file.open(QIODevice::WriteOnly)) { - QMessageBox::information(this, tr("Unable to open file"), file.errorString()); - return; - } - - QList< QPair > pairs = table->getList(); - QDataStream out(&file); - out << pairs; -} -//! [6] diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/addresswidget.h --- a/tests/qtp/qtp_addressbook/addresswidget.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef ADDRESSWIDGET_H -#define ADDRESSWIDGET_H - -#include -#include -#include "tablemodel.h" -#include "newaddresstab.h" - -QT_BEGIN_NAMESPACE -class QSortFilterProxyModel; -class QItemSelectionModel; -QT_END_NAMESPACE - -//! [0] -class AddressWidget : public QTabWidget -{ - Q_OBJECT - -public: - AddressWidget(QWidget *parent=0); - void readFromFile(QString fileName); - void writeToFile(QString fileName); - -public slots: - void addEntry(); - void addEntry(QString name, QString address); - void editEntry(); - void removeEntry(); - -signals: - void selectionChanged (const QItemSelection &selected); - -private: - void setupTabs(); - - TableModel *table; - NewAddressTab *newAddressTab; - QSortFilterProxyModel *proxyModel; -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/autotest.cpp --- a/tests/qtp/qtp_addressbook/autotest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,241 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "mainwindow.h" -#include "addresswidget.h" -#include "adddialog.h" -#include "newaddresstab.h" -#include "tablemodel.h" -#include "autotest.h" - -void autoTest::initTestCase() -{ -} - -void autoTest::testDefaults() -{ - MainWindow mw; - mw.show(); - - // Test default values for widget properties - QCOMPARE( mw.acceptDrops(), false ); - QCOMPARE( mw.hasEditFocus(), false ); - QCOMPARE( mw.hasFocus(), false ); - QCOMPARE( mw.hasMouseTracking(), false ); - QCOMPARE( mw.isActiveWindow(), true ); - QCOMPARE( mw.isEnabled(), true ); - QCOMPARE( mw.isFullScreen(), false ); - QCOMPARE( mw.isHidden(), false ); - QCOMPARE( mw.isMaximized(), false ); - QCOMPARE( mw.isMinimized(), false ); - QCOMPARE( mw.isModal(), false ); - QCOMPARE( mw.isVisible(), true ); - QCOMPARE( mw.isWindow(), true ); - QCOMPARE( mw.isWindowModified(), false ); - QCOMPARE( mw.underMouse(), false ); - QCOMPARE( mw.updatesEnabled(), true ); - - mw.hide(); -} - -void autoTest::testMainWindow() -{ - MainWindow mw; - mw.show(); - - QTest::qWait(1000); - - QAction *openAction = NULL; - QAction *saveAction = NULL; - QList allActions = mw.findChildren(); - QVERIFY( allActions.count() > 0 ); - - for ( int i = 0; i < allActions.count(); i++ ) - { - if ( allActions.at(i)->text() == QString("&Open...")) - { - openAction = allActions.at(i); - } - else if ( allActions.at(i)->text() == QString("&Save As...")) - { - saveAction = allActions.at(i); - } - else - { - // not currently tested by this autotest - } - } - - // verifies that these items exist, but no further testing is currently possible - // due to limitations of event sending in kernel space between different threads. - QVERIFY( openAction ); - QVERIFY( saveAction ); - - QTest::qWait(1000); -} - -void autoTest::testAddressWidget() -{ - QString name; - QString address; - - MainWindow mw; - mw.show(); - - QTest::qWait(500); - - QList allAddrWidgets = mw.findChildren(); - QVERIFY( allAddrWidgets.count() == 1 ); - AddressWidget *wg = allAddrWidgets.at(0); - - // Some sanity checks for AddressWidget - QVERIFY( wg != 0 ); - - QVERIFY( wg->width() > 0 ); - QVERIFY( wg->height() > 0 ); - QVERIFY( wg->width() <= mw.width() ); - QVERIFY( wg->height() <= mw.height() ); - - // Testing adding items to data fields - QList allTables = wg->findChildren(); - QVERIFY( allTables.count() == 1 ); - TableModel *tm = allTables.at(0); - QVERIFY( tm != 0 ); - - QCOMPARE( tm->rowCount( QModelIndex()), 0 ); - QCOMPARE( tm->columnCount( QModelIndex()), 2 ); - - name = "asdf"; - address = "0xD34DB33F"; - wg->addEntry( name, address ); - - name = "qwerty"; - address = "usb1:0"; - wg->addEntry( name, address ); - - name = "john"; - address = "doestreet"; - wg->addEntry( name, address ); - - QCOMPARE( tm->rowCount( QModelIndex()), 3 ); - QCOMPARE( tm->columnCount( QModelIndex()), 2 ); - - QTest::qWait(1000); - - // Testing removing items to data fields - QTableView *tmp = static_cast(wg->currentWidget()); - QVERIFY( tmp ); - tmp->selectRow(0); - QTest::qWait(1000); - - wg->removeEntry(); - QTest::qWait(200); - QCOMPARE( tm->rowCount( QModelIndex()), 2 ); - QCOMPARE( tm->columnCount( QModelIndex()), 2 ); - - QTest::qWait(1000); - - mw.hide(); -} - -void autoTest::testAddDialog() -{ - MainWindow mw; - mw.show(); - - QTest::qWait(500); - - mw.hide(); -} - -void autoTest::testNewAddressTab() -{ - MainWindow mw; - mw.show(); - - QTest::qWait(500); - - QList allAddrWidgets = mw.findChildren(); - QVERIFY( allAddrWidgets.count() == 1 ); - AddressWidget *wg = allAddrWidgets.at(0); - QVERIFY( wg != 0 ); - - QList allNewWidgets = wg->findChildren(); - QVERIFY( allNewWidgets.count() == 1 ); - NewAddressTab *nat = allNewWidgets.at(0); - QVERIFY( nat != 0 ); - - QTableView *tmp = static_cast(wg->currentWidget()); - QVERIFY( tmp ); - - for (int i = 0; i < wg->count(); i++) - { - wg->setCurrentIndex(i); - QTest::qWait(500); - } - wg->setCurrentIndex(0); - - QTest::keyClick ( wg, Qt::Key_Tab, Qt::NoModifier, 500 ); - QTest::keyClick ( wg, Qt::Key_Tab, Qt::NoModifier, 500 ); - - mw.hide(); -} - -void autoTest::testTableModel() -{ - MainWindow mw; - mw.show(); - - QTest::qWait(500); - - QList allAddrWidgets = mw.findChildren(); - QVERIFY( allAddrWidgets.count() == 1 ); - AddressWidget *wg = allAddrWidgets.at(0); - QVERIFY( wg != 0 ); - - QList allTables = wg->findChildren(); - QVERIFY( allTables.count() == 1 ); - TableModel *tm = allTables.at(0); - QVERIFY( tm != 0 ); - - mw.hide(); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/autotest.h --- a/tests/qtp/qtp_addressbook/autotest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef AUTOTEST_H -#define AUTOTEST_H - -#include -#include -#include - - -class autoTest: public QObject -{ - Q_OBJECT - - void initTestCase(); - - private slots: - void testDefaults(); - void testMainWindow(); - void testAddressWidget(); - void testAddDialog(); - void testNewAddressTab(); - void testTableModel(); -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/main.cpp --- a/tests/qtp/qtp_addressbook/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include "mainwindow.h" -#include "autotest.h" - -QTEST_MAIN(autoTest) diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/mainwindow.cpp --- a/tests/qtp/qtp_addressbook/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,138 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "mainwindow.h" - -//! [0] -MainWindow::MainWindow() -{ - addressWidget = new AddressWidget; - setCentralWidget(addressWidget); - createMenus(); - setWindowTitle(tr("Address Book")); -} -//! [0] - -//! [1a] -void MainWindow::createMenus() -{ - fileMenu = menuBar()->addMenu(tr("&File")); - - openAct = new QAction(tr("&Open..."), this); - fileMenu->addAction(openAct); - connect(openAct, SIGNAL(triggered()), - this, SLOT(openFile())); -//! [1a] - - saveAct = new QAction(tr("&Save As..."), this); - fileMenu->addAction(saveAct); - connect(saveAct, SIGNAL(triggered()), - this, SLOT(saveFile())); - - fileMenu->addSeparator(); - - exitAct = new QAction(tr("E&xit"), this); - fileMenu->addAction(exitAct); - connect(exitAct, SIGNAL(triggered()), - this, SLOT(close())); - - toolMenu = menuBar()->addMenu(tr("&Tools")); - - addAct = new QAction(tr("&Add Entry..."), this); - toolMenu->addAction(addAct); - connect(addAct, SIGNAL(triggered()), - addressWidget, SLOT(addEntry())); - -//! [1b] - editAct = new QAction(tr("&Edit Entry..."), this); - editAct->setEnabled(false); - toolMenu->addAction(editAct); - connect(editAct, SIGNAL(triggered()), - addressWidget, SLOT(editEntry())); - - toolMenu->addSeparator(); - - removeAct = new QAction(tr("&Remove Entry"), this); - removeAct->setEnabled(false); - toolMenu->addAction(removeAct); - connect(removeAct, SIGNAL(triggered()), - addressWidget, SLOT(removeEntry())); - - connect(addressWidget, SIGNAL(selectionChanged(const QItemSelection &)), - this, SLOT(updateActions(const QItemSelection &))); -} -//! [1b] - -//! [2] -void MainWindow::openFile() -{ - QString fileName = QFileDialog::getOpenFileName(this); - if (!fileName.isEmpty()) { - addressWidget->readFromFile(fileName); - } -} -//! [2] - -//! [3] -void MainWindow::saveFile() -{ - QString fileName = QFileDialog::getSaveFileName(this); - if (!fileName.isEmpty()) { - addressWidget->writeToFile(fileName); - } -} -//! [3] - -//! [4] -void MainWindow::updateActions(const QItemSelection &selection) -{ - QModelIndexList indexes = selection.indexes(); - - if (!indexes.isEmpty()) { - removeAct->setEnabled(true); - editAct->setEnabled(true); - } else { - removeAct->setEnabled(false); - editAct->setEnabled(false); - } -} -//! [4] diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/mainwindow.h --- a/tests/qtp/qtp_addressbook/mainwindow.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include "addresswidget.h" - -//! [0] -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - MainWindow(); - -private slots: - void updateActions(const QItemSelection &selection); - void openFile(); - void saveFile(); - -private: - void createMenus(); - - AddressWidget *addressWidget; - QMenu *fileMenu; - QMenu *toolMenu; - QAction *openAct; - QAction *saveAct; - QAction *exitAct; - QAction *addAct; - QAction *editAct; - QAction *removeAct; -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/newaddresstab.cpp --- a/tests/qtp/qtp_addressbook/newaddresstab.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "newaddresstab.h" -#include "adddialog.h" - -//! [0] -NewAddressTab::NewAddressTab(QWidget *parent) -{ - Q_UNUSED(parent); - - descriptionLabel = new QLabel(tr("There are currently no contacts in your address book. " - "\nClick Add to add new contacts.")); - - addButton = new QPushButton(tr("Add")); - - connect(addButton, SIGNAL(clicked()), this, SLOT(addEntry())); - - mainLayout = new QVBoxLayout; - mainLayout->addWidget(descriptionLabel); - mainLayout->addWidget(addButton, 0, Qt::AlignCenter); - - setLayout(mainLayout); -} -//! [0] - -//! [1] -void NewAddressTab::addEntry() -{ - AddDialog aDialog; - - if (aDialog.exec()) { - QString name = aDialog.nameText->text(); - QString address = aDialog.addressText->toPlainText(); - - emit sendDetails(name, address); - } -} -//! [1] diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/newaddresstab.h --- a/tests/qtp/qtp_addressbook/newaddresstab.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef NEWADDRESSTAB_H -#define NEWADDRESSTAB_H - -#include - -QT_BEGIN_NAMESPACE -class QLabel; -class QPushButton; -class QVBoxLayout; -QT_END_NAMESPACE - -//! [0] -class NewAddressTab : public QWidget -{ - Q_OBJECT - -public: - NewAddressTab(QWidget *parent=0); - -public slots: - void addEntry(); - -signals: - void sendDetails(QString name, QString address); - -private: - QLabel *descriptionLabel; - QPushButton *addButton; - QVBoxLayout *mainLayout; - -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/qtp_addressbook.pro --- a/tests/qtp/qtp_addressbook/qtp_addressbook.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ - -SOURCES = adddialog.cpp \ - addresswidget.cpp \ - main.cpp \ - autotest.cpp \ - mainwindow.cpp \ - newaddresstab.cpp \ - tablemodel.cpp -HEADERS = adddialog.h \ - addresswidget.h \ - autotest.h \ - mainwindow.h \ - newaddresstab.h \ - tablemodel.h - -CONFIG += qt warn_on console depend_includepath - -qtAddLibrary(QtTest) - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/addressbook -sources.files = $$SOURCES $$HEADERS $$RESOURCES addressbook.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/addressbook -INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xED83EC01 - TARGET.CAPABILITY="ALL -TCB" - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - RSS_RULES ="group_name=\"QtTests\";" -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/tablemodel.cpp --- a/tests/qtp/qtp_addressbook/tablemodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,185 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "tablemodel.h" - -//! [0] -TableModel::TableModel(QObject *parent) - : QAbstractTableModel(parent) -{ -} - -TableModel::TableModel(QList< QPair > pairs, QObject *parent) - : QAbstractTableModel(parent) -{ - listOfPairs=pairs; -} -//! [0] - -//! [1] -int TableModel::rowCount(const QModelIndex &parent) const -{ - Q_UNUSED(parent); - return listOfPairs.size(); -} - -int TableModel::columnCount(const QModelIndex &parent) const -{ - Q_UNUSED(parent); - return 2; -} -//! [1] - -//! [2] -QVariant TableModel::data(const QModelIndex &index, int role) const -{ - if (!index.isValid()) - return QVariant(); - - if (index.row() >= listOfPairs.size() || index.row() < 0) - return QVariant(); - - if (role == Qt::DisplayRole) { - QPair pair = listOfPairs.at(index.row()); - - if (index.column() == 0) - return pair.first; - else if (index.column() == 1) - return pair.second; - } - return QVariant(); -} -//! [2] - -//! [3] -QVariant TableModel::headerData(int section, Qt::Orientation orientation, int role) const -{ - if (role != Qt::DisplayRole) - return QVariant(); - - if (orientation == Qt::Horizontal) { - switch (section) { - case 0: - return tr("Name"); - - case 1: - return tr("Address"); - - default: - return QVariant(); - } - } - return QVariant(); -} -//! [3] - -//! [4] -bool TableModel::insertRows(int position, int rows, const QModelIndex &index) -{ - Q_UNUSED(index); - beginInsertRows(QModelIndex(), position, position+rows-1); - - for (int row=0; row < rows; row++) { - QPair pair(" ", " "); - listOfPairs.insert(position, pair); - } - - endInsertRows(); - return true; -} -//! [4] - -//! [5] -bool TableModel::removeRows(int position, int rows, const QModelIndex &index) -{ - Q_UNUSED(index); - beginRemoveRows(QModelIndex(), position, position+rows-1); - - for (int row=0; row < rows; ++row) { - listOfPairs.removeAt(position); - } - - endRemoveRows(); - return true; -} -//! [5] - -//! [6] -bool TableModel::setData(const QModelIndex &index, const QVariant &value, int role) -{ - if (index.isValid() && role == Qt::EditRole) { - int row = index.row(); - - QPair p = listOfPairs.value(row); - - if (index.column() == 0) - p.first = value.toString(); - else if (index.column() == 1) - p.second = value.toString(); - else - return false; - - listOfPairs.replace(row, p); - emit(dataChanged(index, index)); - - return true; - } - - return false; -} -//! [6] - -//! [7] -Qt::ItemFlags TableModel::flags(const QModelIndex &index) const -{ - if (!index.isValid()) - return Qt::ItemIsEnabled; - - return QAbstractTableModel::flags(index) | Qt::ItemIsEditable; -} -//! [7] - -//! [8] -QList< QPair > TableModel::getList() -{ - return listOfPairs; -} -//! [8] diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_addressbook/tablemodel.h --- a/tests/qtp/qtp_addressbook/tablemodel.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef TABLEMODEL_H -#define TABLEMODEL_H - -#include -#include -#include - -//! [0] -class TableModel : public QAbstractTableModel -{ - Q_OBJECT - -public: - TableModel(QObject *parent=0); - TableModel(QList< QPair > listofPairs, QObject *parent=0); - - int rowCount(const QModelIndex &parent) const; - int columnCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &index, int role) const; - QVariant headerData(int section, Qt::Orientation orientation, int role) const; - Qt::ItemFlags flags(const QModelIndex &index) const; - bool setData(const QModelIndex &index, const QVariant &value, int role=Qt::EditRole); - bool insertRows(int position, int rows, const QModelIndex &index=QModelIndex()); - bool removeRows(int position, int rows, const QModelIndex &index=QModelIndex()); - QList< QPair > getList(); - -private: - QList< QPair > listOfPairs; -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_analogclock/analogclock.cpp --- a/tests/qtp/qtp_analogclock/analogclock.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include "analogclock.h" - -//! [0] //! [1] -AnalogClock::AnalogClock(QWidget *parent) -//! [0] //! [2] - : QWidget(parent) -//! [2] //! [3] -{ -//! [3] //! [4] - QTimer *timer = new QTimer(this); -//! [4] //! [5] - connect(timer, SIGNAL(timeout()), this, SLOT(update())); -//! [5] //! [6] - timer->start(1000); -//! [6] - - setWindowTitle(tr("Analog Clock")); - resize(200, 200); - - // simple counter for testing purposes - counter = 0; -//! [7] -} -//! [1] //! [7] - -//! [8] //! [9] -void AnalogClock::paintEvent(QPaintEvent *) -//! [8] //! [10] -{ - static const QPoint hourHand[3] = { - QPoint(7, 8), - QPoint(-7, 8), - QPoint(0, -40) - }; - static const QPoint minuteHand[3] = { - QPoint(7, 8), - QPoint(-7, 8), - QPoint(0, -70) - }; - - QColor hourColor(127, 0, 127); - QColor minuteColor(0, 127, 127, 191); - - int side = qMin(width(), height()); - QTime time = QTime::currentTime(); -//! [10] - -//! [11] - QPainter painter(this); -//! [11] //! [12] - painter.setRenderHint(QPainter::Antialiasing); -//! [12] //! [13] - painter.translate(width() / 2, height() / 2); -//! [13] //! [14] - painter.scale(side / 200.0, side / 200.0); -//! [9] //! [14] - -//! [15] - painter.setPen(Qt::NoPen); -//! [15] //! [16] - painter.setBrush(hourColor); -//! [16] - -//! [17] //! [18] - painter.save(); -//! [17] //! [19] - painter.rotate(30.0 * ((time.hour() + time.minute() / 60.0))); - painter.drawConvexPolygon(hourHand, 3); - painter.restore(); -//! [18] //! [19] - -//! [20] - painter.setPen(hourColor); -//! [20] //! [21] - - for (int i = 0; i < 12; ++i) { - painter.drawLine(88, 0, 96, 0); - painter.rotate(30.0); - } -//! [21] - -//! [22] - painter.setPen(Qt::NoPen); -//! [22] //! [23] - painter.setBrush(minuteColor); - -//! [24] - painter.save(); - painter.rotate(6.0 * (time.minute() + time.second() / 60.0)); - painter.drawConvexPolygon(minuteHand, 3); - painter.restore(); -//! [23] //! [24] - -//! [25] - painter.setPen(minuteColor); -//! [25] //! [26] - -//! [27] - for (int j = 0; j < 60; ++j) { - if ((j % 5) != 0) - painter.drawLine(92, 0, 96, 0); - painter.rotate(6.0); - } - counter++; -//! [27] -} -//! [26] diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_analogclock/analogclock.h --- a/tests/qtp/qtp_analogclock/analogclock.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef ANALOGCLOCK_H -#define ANALOGCLOCK_H - -#include - -//! [0] -class AnalogClock : public QWidget -{ - Q_OBJECT - -public: - AnalogClock(QWidget *parent = 0); - -protected: - void paintEvent(QPaintEvent *event); - -public: - int counter; -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_analogclock/autotest.cpp --- a/tests/qtp/qtp_analogclock/autotest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "analogclock.h" -#include "autotest.h" - - -void autoTest::initTestCase() -{ -} - -void autoTest::testDefaults() -{ - AnalogClock clock; - clock.show(); - - // Test default values for widget properties - QCOMPARE( clock.acceptDrops(), false ); - QCOMPARE( clock.hasEditFocus(), false ); - QCOMPARE( clock.hasFocus(), false ); - QCOMPARE( clock.hasMouseTracking(), false ); - QCOMPARE( clock.isActiveWindow(), true ); - QCOMPARE( clock.isEnabled(), true ); - QCOMPARE( clock.isFullScreen(), false ); - QCOMPARE( clock.isHidden(), false ); - QCOMPARE( clock.isMaximized(), false ); - QCOMPARE( clock.isMinimized(), false ); - QCOMPARE( clock.isModal(), false ); - QCOMPARE( clock.isVisible(), true ); - QCOMPARE( clock.isWindow(), true ); - QCOMPARE( clock.isWindowModified(), false ); - QCOMPARE( clock.underMouse(), false ); - QCOMPARE( clock.updatesEnabled(), true ); - - clock.hide(); -} - -void autoTest::testClockWidget() -{ - AnalogClock clock; - clock.show(); - - int cvalue = clock.counter; - QTest::qWait(2000); - - QVERIFY( clock.counter > cvalue ); - cvalue = clock.counter; - - QCOMPARE( clock.size().width(), 200 ); - QCOMPARE( clock.size().height(), 200 ); - - QTest::qWait(2000); - QVERIFY( clock.counter > cvalue ); - - clock.hide(); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_analogclock/autotest.h --- a/tests/qtp/qtp_analogclock/autotest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef AUTOTEST_H -#define AUTOTEST_H - -#include -#include -#include - - -class autoTest: public QObject -{ - Q_OBJECT - - void initTestCase(); - - private slots: - void testDefaults(); - void testClockWidget(); -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_analogclock/main.cpp --- a/tests/qtp/qtp_analogclock/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include "autotest.h" - -#include "analogclock.h" - -QTEST_MAIN(autoTest) diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_analogclock/qtp_analogclock.pro --- a/tests/qtp/qtp_analogclock/qtp_analogclock.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ - -HEADERS = analogclock.h autotest.h -SOURCES = analogclock.cpp \ - autotest.cpp \ - main.cpp - -CONFIG += qt warn_on console depend_includepath - -qtAddLibrary(QtTest) - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/analogclock -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS analogclock.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/analogclock -INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xED83EC02 - TARGET.CAPABILITY="ALL -TCB" - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - RSS_RULES ="group_name=\"QtTests\";" - } diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/autotest.cpp --- a/tests/qtp/qtp_animatedtiles/autotest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#include "mainwindow.h" -#include "autotest.h" - - -void autoTest::initTestCase() -{ -} - -void autoTest::testDefaults() -{ - MainWindow mw; - mw.show(); - - // Test default values for widget properties - QCOMPARE( mw.acceptDrops(), false ); - QCOMPARE( mw.hasEditFocus(), false ); - QCOMPARE( mw.hasFocus(), false ); - QCOMPARE( mw.hasMouseTracking(), false ); - QCOMPARE( mw.isActiveWindow(), true ); - QCOMPARE( mw.isEnabled(), true ); - QCOMPARE( mw.isFullScreen(), false ); - QCOMPARE( mw.isHidden(), false ); - QCOMPARE( mw.isMaximized(), false ); - QCOMPARE( mw.isMinimized(), false ); - QCOMPARE( mw.isModal(), false ); - QCOMPARE( mw.isVisible(), true ); - QCOMPARE( mw.isWindow(), true ); - QCOMPARE( mw.isWindowModified(), false ); - QCOMPARE( mw.underMouse(), false ); - QCOMPARE( mw.updatesEnabled(), true ); - - mw.hide(); -} - -void autoTest::getValues() -{ - -} - -void autoTest::testMainWindow() -{ - MainWindow mw; - - mw.show(); - - // QGraphicsWidget doesn't seem to accept QTest::mouseClick (unhandled exception occurs) - QTest::qWait(3000); - - mw.hide(); - mw.close(); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/autotest.h --- a/tests/qtp/qtp_animatedtiles/autotest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef AUTOTEST_H -#define AUTOTEST_H - -//#include -#include -#include - - -class autoTest: public QObject -{ - Q_OBJECT - - void initTestCase(); - -public slots: - void getValues(); - - private slots: - void testDefaults(); - void testMainWindow(); -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/images/Time-For-Lunch-2.jpg Binary file tests/qtp/qtp_animatedtiles/images/Time-For-Lunch-2.jpg has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/images/centered.png Binary file tests/qtp/qtp_animatedtiles/images/centered.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/images/ellipse.png Binary file tests/qtp/qtp_animatedtiles/images/ellipse.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/images/figure8.png Binary file tests/qtp/qtp_animatedtiles/images/figure8.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/images/kinetic.png Binary file tests/qtp/qtp_animatedtiles/images/kinetic.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/images/random.png Binary file tests/qtp/qtp_animatedtiles/images/random.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/images/tile.png Binary file tests/qtp/qtp_animatedtiles/images/tile.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/main.cpp --- a/tests/qtp/qtp_animatedtiles/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#include "autotest.h" - - -QTEST_MAIN(autoTest) - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/mainwindow.cpp --- a/tests/qtp/qtp_animatedtiles/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,177 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include - -#include "mainwindow.h" - -MainWindow::MainWindow(QWidget *parent) - : QWidget(parent) -{ - QPixmap kineticPix(":/images/kinetic.png"); - QPixmap bgPix(":/images/Time-For-Lunch-2.jpg"); - - QGraphicsScene scene(-350, -350, 700, 700); - - for (int i = 0; i < 64; ++i) { - Pixmap *item = new Pixmap(kineticPix); - item->setOffset(-kineticPix.width()/2, -kineticPix.height()/2); - item->setZValue(i); - items << item; - scene.addItem(item); - } - - // Buttons - QGraphicsItem *buttonParent = new QGraphicsRectItem; - ellipseButton = new Button(QPixmap(":/images/ellipse.png"), buttonParent); - figure8Button = new Button(QPixmap(":/images/figure8.png"), buttonParent); - randomButton = new Button(QPixmap(":/images/random.png"), buttonParent); - tiledButton = new Button(QPixmap(":/images/tile.png"), buttonParent); - centeredButton = new Button(QPixmap(":/images/centered.png"), buttonParent); - - ellipseButton->setPos(-100, -100); - figure8Button->setPos(100, -100); - randomButton->setPos(0, 0); - tiledButton->setPos(-100, 100); - centeredButton->setPos(100, 100); - - scene.addItem(buttonParent); - buttonParent->scale(0.75, 0.75); - buttonParent->setPos(200, 200); - buttonParent->setZValue(65); - - qDebug() << "qtp_animatedtiles: states next"; - // States - QState *rootState = new QState; - QState *ellipseState = new QState(rootState); - QState *figure8State = new QState(rootState); - QState *randomState = new QState(rootState); - QState *tiledState = new QState(rootState); - QState *centeredState = new QState(rootState); - - qDebug() << "qtp_animatedtiles: values next"; - // Values - for (int i = 0; i < items.count(); ++i) { - Pixmap *item = items.at(i); - // Ellipse - ellipseState->assignProperty(item, "pos", - QPointF(cos((i / 63.0) * 6.28) * 250, - sin((i / 63.0) * 6.28) * 250)); - - // Figure 8 - figure8State->assignProperty(item, "pos", - QPointF(sin((i / 63.0) * 6.28) * 250, - sin(((i * 2)/63.0) * 6.28) * 250)); - - // Random - randomState->assignProperty(item, "pos", - QPointF(-250 + qrand() % 500, - -250 + qrand() % 500)); - - // Tiled - tiledState->assignProperty(item, "pos", - QPointF(((i % 8) - 4) * kineticPix.width() + kineticPix.width() / 2, - ((i / 8) - 4) * kineticPix.height() + kineticPix.height() / 2)); - - // Centered - centeredState->assignProperty(item, "pos", QPointF()); - } - - qDebug() << "qtp_animatedtiles: ui next"; - // Ui - View *view = new View(&scene); - view->setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Animated Tiles")); - view->setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate); - view->setBackgroundBrush(bgPix); - view->setCacheMode(QGraphicsView::CacheBackground); - view->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform); - // view->show(); - - QStateMachine states; - states.addState(rootState); - states.setInitialState(rootState); - rootState->setInitialState(centeredState); - - qDebug() << "qtp_animatedtiles: animgroup next"; - QParallelAnimationGroup *group = new QParallelAnimationGroup; - for (int i = 0; i < items.count(); ++i) { - QPropertyAnimation *anim = new QPropertyAnimation(items[i], "pos"); - anim->setDuration(750 + i * 25); - anim->setEasingCurve(QEasingCurve::InOutBack); - group->addAnimation(anim); - } - - qDebug() << "qtp_animatedtiles: button signaling next"; - QAbstractTransition *trans = rootState->addTransition(ellipseButton, SIGNAL(pressed()), ellipseState); - trans->addAnimation(group); - - trans = rootState->addTransition(figure8Button, SIGNAL(pressed()), figure8State); - trans->addAnimation(group); - - trans = rootState->addTransition(randomButton, SIGNAL(pressed()), randomState); - trans->addAnimation(group); - - trans = rootState->addTransition(tiledButton, SIGNAL(pressed()), tiledState); - trans->addAnimation(group); - - trans = rootState->addTransition(centeredButton, SIGNAL(pressed()), centeredState); - trans->addAnimation(group); - - qDebug() << "qtp_animatedtiles: timer next"; - QTimer timer; - timer.start(125); - timer.setSingleShot(true); - trans = rootState->addTransition(&timer, SIGNAL(timeout()), ellipseState); - trans->addAnimation(group); - - qDebug() << "qtp_animatedtiles: starting states"; - states.start(); -} - -void MainWindow::showPosition() - { - Pixmap *item = items.at(0); - - qDebug() << "qtp_animatedtiles: position of item[0] x: " << item->x() << " y: " << item->y(); - } - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/mainwindow.h --- a/tests/qtp/qtp_animatedtiles/mainwindow.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,179 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include -#include -#include -#include -#include -#include - - -class Pixmap : public QObject, public QGraphicsPixmapItem -{ - Q_OBJECT - Q_PROPERTY(QPointF pos READ pos WRITE setPos) -public: - Pixmap(const QPixmap &pix) - : QObject(), QGraphicsPixmapItem(pix) - { - setCacheMode(DeviceCoordinateCache); - } -}; - -class Button : public QGraphicsWidget -{ - Q_OBJECT -public: - Button(const QPixmap &pixmap, QGraphicsItem *parent = 0) - : QGraphicsWidget(parent), _pix(pixmap) - { - setAcceptHoverEvents(true); - setCacheMode(DeviceCoordinateCache); - } - - QRectF boundingRect() const - { - return QRectF(-65, -65, 130, 130); - } - - QPainterPath shape() const - { - QPainterPath path; - path.addEllipse(boundingRect()); - return path; - } - void click() - { - mousePressEvent( (QGraphicsSceneMouseEvent *)NULL ); - mouseReleaseEvent( (QGraphicsSceneMouseEvent *)NULL ); - } - - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) - { - bool down = option->state & QStyle::State_Sunken; - QRectF r = boundingRect(); - QLinearGradient grad(r.topLeft(), r.bottomRight()); - grad.setColorAt(down ? 1 : 0, option->state & QStyle::State_MouseOver ? Qt::white : Qt::lightGray); - grad.setColorAt(down ? 0 : 1, Qt::darkGray); - painter->setPen(Qt::darkGray); - painter->setBrush(grad); - painter->drawEllipse(r); - QLinearGradient grad2(r.topLeft(), r.bottomRight()); - grad.setColorAt(down ? 1 : 0, Qt::darkGray); - grad.setColorAt(down ? 0 : 1, Qt::lightGray); - painter->setPen(Qt::NoPen); - painter->setBrush(grad); - if (down) - painter->translate(2, 2); - painter->drawEllipse(r.adjusted(5, 5, -5, -5)); - painter->drawPixmap(-_pix.width()/2, -_pix.height()/2, _pix); - } - -signals: - void pressed(); - -protected: - void mousePressEvent(QGraphicsSceneMouseEvent *) - { - emit pressed(); - //update(); - } - - void mouseReleaseEvent(QGraphicsSceneMouseEvent *) - { - //update(); - } - -private: - QPixmap _pix; -}; - -class View : public QGraphicsView -{ -public: - View(QGraphicsScene *scene) : QGraphicsView(scene) { } - -protected: - void resizeEvent(QResizeEvent *event) - { - QGraphicsView::resizeEvent(event); - fitInView(sceneRect(), Qt::KeepAspectRatio); - } -}; - - -//! [0] -class MainWindow : public QWidget -{ - Q_OBJECT - -public: - MainWindow(QWidget *parent = 0); - - void showPosition(); - - Button * getEllipseButton() { return ellipseButton; }; - Button *getFigure8Button() { return figure8Button; }; - Button *getRandomButton() { return randomButton; }; - Button *getTiledButton() { return tiledButton; }; - Button *getCenteredButton() { return centeredButton; }; -/* -protected: - void paintEvent(QPaintEvent *event); -*/ -private: - Button *ellipseButton; - Button *figure8Button; - Button *randomButton; - Button *tiledButton; - Button *centeredButton; - - QList items; - -}; -//! [0] - -#endif // mainwindow_h diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/qtp_animatedtiles.pro --- a/tests/qtp/qtp_animatedtiles/qtp_animatedtiles.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ - -SOURCES = main.cpp mainwindow.cpp autotest.cpp -HEADERS = mainwindow.h autotest.h - -RESOURCES = qtp_animatedtiles.qrc - -CONFIG += qt warn_on console depend_includepath - -qtAddLibrary(QtTest) - -# install -target.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_animatedtiles -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtp_animatedtiles.pro images -sources.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_animatedtiles -INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xED83EC03 - TARGET.CAPABILITY="ALL -TCB" - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - RSS_RULES ="group_name=\"QtTests\";" -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_animatedtiles/qtp_animatedtiles.qrc --- a/tests/qtp/qtp_animatedtiles/qtp_animatedtiles.qrc Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ - - - images/Time-For-Lunch-2.jpg - images/centered.png - images/ellipse.png - images/figure8.png - images/kinetic.png - images/random.png - images/tile.png - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/README.TXT diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/qtp_anomaly.pro --- a/tests/qtp/qtp_anomaly/qtp_anomaly.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -QT += network \ - webkit -HEADERS += \ - src/autotest.h \ - src/httpserver.h \ - src/BrowserWindow.h \ - src/BrowserView.h \ - src/TitleBar.h \ - src/HomeView.h \ - src/AddressBar.h \ - src/BookmarksView.h \ - src/flickcharm.h \ - src/ZoomStrip.h \ - src/ControlStrip.h -SOURCES += \ - src/autotest.cpp \ - src/httpserver.cpp \ - src/Main.cpp \ - src/BrowserWindow.cpp \ - src/BrowserView.cpp \ - src/TitleBar.cpp \ - src/HomeView.cpp \ - src/AddressBar.cpp \ - src/BookmarksView.cpp \ - src/flickcharm.cpp \ - src/ZoomStrip.cpp \ - src/ControlStrip.cpp -RESOURCES += src/anomaly.qrc - -CONFIG += qt warn_on console depend_includepath - -qtAddLibrary(QtTest) - -symbian { - TARGET.UID3 = 0xED83EC04 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h - LIBS += -lesock -linsock -lconnmon - TARGET.CAPABILITY = NetworkServices - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} - -target.path = $$[QT_INSTALL_DEMOS]/embedded/qtp_anomaly -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro src/images -sources.path = $$[QT_INSTALL_DEMOS]/embedded/qtp_anomaly -INSTALLS += target sources diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/AddressBar.cpp --- a/tests/qtp/qtp_anomaly/src/AddressBar.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,111 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "AddressBar.h" - -#include -#include - -class LineEdit: public QLineEdit -{ -public: - LineEdit(QWidget *parent = 0): QLineEdit(parent) {} - - void paintEvent(QPaintEvent *event) { - QLineEdit::paintEvent(event); - if (text().isEmpty()) { - QPainter p(this); - int flags = Qt::AlignLeft | Qt::AlignVCenter; - p.setPen(palette().color(QPalette::Disabled, QPalette::Text)); - p.drawText(rect().adjusted(10, 0, 0, 0), flags, "Enter address or search terms"); - p.end(); - } - } -}; - -AddressBar::AddressBar(QWidget *parent) - : QWidget(parent) -{ - m_lineEdit = new LineEdit(parent); - connect(m_lineEdit, SIGNAL(returnPressed()), SLOT(processAddress())); - m_toolButton = new QToolButton(parent); - m_toolButton->setText("Go"); - connect(m_toolButton, SIGNAL(clicked()), SLOT(processAddress())); -} - -QSize AddressBar::sizeHint() const -{ - return m_lineEdit->sizeHint(); -} - -void AddressBar::processAddress() -{ - if (!m_lineEdit->text().isEmpty()) - emit addressEntered(m_lineEdit->text()); -} - -void AddressBar::resizeEvent(QResizeEvent *event) -{ - int x, y, w, h; - - Q_UNUSED(event); - - m_toolButton->adjustSize(); - x = width() - m_toolButton->width(); - y = 0; - w = m_toolButton->width(); - h = height() - 1; - m_toolButton->setGeometry(x, y, w, h); - m_toolButton->show(); - - x = 0; - y = 0; - w = width() - m_toolButton->width(); - h = height() - 1; - m_lineEdit->setGeometry(x, y, w, h); - m_lineEdit->show(); -} - -void AddressBar::focusInEvent(QFocusEvent *event) -{ - m_lineEdit->setFocus(); - QWidget::focusInEvent(event); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/AddressBar.h --- a/tests/qtp/qtp_anomaly/src/AddressBar.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef ADDRESSBAR_H -#define ADDRESSBAR_H - -#include -#include - -class QLineEdit; -class QToolButton; - -class AddressBar : public QWidget -{ - Q_OBJECT - -public: - AddressBar(QWidget *parent = 0); - QSize sizeHint() const; - - QLineEdit *getLineEdit() { return m_lineEdit; }; - QToolButton *getToolButton() { return m_toolButton; }; - -protected: - void resizeEvent(QResizeEvent *event); - void focusInEvent(QFocusEvent *event); - -signals: - void addressEntered(const QString &address); - -private slots: - void processAddress(); - -private: - QLineEdit *m_lineEdit; - QToolButton *m_toolButton; -}; - -#endif // ADDRESSBAR_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/BookmarksView.cpp --- a/tests/qtp/qtp_anomaly/src/BookmarksView.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "BookmarksView.h" - -#include - -BookmarksView::BookmarksView(QWidget *parent) - : QWidget(parent) -{ - QListWidget *m_iconView = new QListWidget(this); - connect(m_iconView, SIGNAL(itemActivated(QListWidgetItem*)), SLOT(activate(QListWidgetItem*))); - - QVBoxLayout *layout = new QVBoxLayout(this); - setLayout(layout); - layout->addWidget(m_iconView); - - m_iconView->addItem("www.google.com"); - m_iconView->addItem("qt.nokia.com/doc/4.5"); - m_iconView->addItem("news.bbc.co.uk/text_only.stm"); - m_iconView->addItem("mobile.wikipedia.org"); - m_iconView->addItem("qt.nokia.com"); - m_iconView->addItem("en.wikipedia.org"); - - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); -} - -void BookmarksView::activate(QListWidgetItem *item) -{ - QUrl url = item->text().prepend("http://"); - emit urlSelected(url); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/BookmarksView.h --- a/tests/qtp/qtp_anomaly/src/BookmarksView.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef BOOKMARKSVIEW_H -#define BOOKMARKSVIEW_H - -#include - -class QListWidgetItem; -class QUrl; - -class BookmarksView : public QWidget -{ - Q_OBJECT - -public: - BookmarksView(QWidget *parent = 0); - -signals: - void urlSelected(const QUrl &url); - -private slots: - void activate(QListWidgetItem *item); -}; - -#endif // BOOKMARKSVIEW_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/BrowserView.cpp --- a/tests/qtp/qtp_anomaly/src/BrowserView.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,185 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "BrowserView.h" - -#include -#include -#include - -#include "ControlStrip.h" -#include "TitleBar.h" -#include "flickcharm.h" -#include "ZoomStrip.h" - -#if defined (Q_OS_SYMBIAN) -#include "sym_iap_util.h" -#endif - -BrowserView::BrowserView(QWidget *parent) - : QWidget(parent) - , m_titleBar(0) - , m_webView(0) - , m_progress(0) - , m_currentZoom(100) -{ - m_titleBar = new TitleBar(this); - m_webView = new QWebView(this); - m_zoomStrip = new ZoomStrip(this); - m_controlStrip = new ControlStrip(this); - - m_zoomLevels << 30 << 50 << 67 << 80 << 90; - m_zoomLevels << 100; - m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300; - - QTimer::singleShot(0, this, SLOT(initialize())); -} - -void BrowserView::initialize() -{ - connect(m_zoomStrip, SIGNAL(zoomInClicked()), SLOT(zoomIn())); - connect(m_zoomStrip, SIGNAL(zoomOutClicked()), SLOT(zoomOut())); - - connect(m_controlStrip, SIGNAL(menuClicked()), SIGNAL(menuButtonClicked())); - connect(m_controlStrip, SIGNAL(backClicked()), m_webView, SLOT(back())); - connect(m_controlStrip, SIGNAL(forwardClicked()), m_webView, SLOT(forward())); - - QPalette pal = m_webView->palette(); - pal.setBrush(QPalette::Base, Qt::white); - m_webView->setPalette(pal); - - FlickCharm *flickCharm = new FlickCharm(this); - flickCharm->activateOn(m_webView); - - m_webView->setZoomFactor(static_cast(m_currentZoom)/100.0); - connect(m_webView, SIGNAL(loadStarted()), SLOT(start())); - connect(m_webView, SIGNAL(loadProgress(int)), SLOT(setProgress(int))); - connect(m_webView, SIGNAL(loadFinished(bool)), SLOT(finish(bool))); - connect(m_webView, SIGNAL(urlChanged(QUrl)), SLOT(updateTitleBar())); - - m_webView->setHtml("Will try to load page soon!"); - m_webView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - m_webView->setFocus(); -#ifdef Q_OS_SYMBIAN - QTimer::singleShot(0, this, SLOT(setDefaultIap())); -#endif -} - -void BrowserView::start() -{ - m_progress = 0; - updateTitleBar(); - //m_titleBar->setText(m_webView->url().toString()); -} - -void BrowserView::setProgress(int percent) -{ - m_progress = percent; - updateTitleBar(); - //m_titleBar->setText(QString("Loading %1%").arg(percent)); -} - -void BrowserView::updateTitleBar() -{ - QUrl url = m_webView->url(); - m_titleBar->setHost(url.host()); - m_titleBar->setTitle(m_webView->title()); - m_titleBar->setProgress(m_progress); -} - -void BrowserView::finish(bool ok) -{ - m_progress = 0; - updateTitleBar(); - - // TODO: handle error - if (!ok) { - //m_titleBar->setText("Loading failed."); - } -} - -void BrowserView::zoomIn() -{ - int i = m_zoomLevels.indexOf(m_currentZoom); - Q_ASSERT(i >= 0); - if (i < m_zoomLevels.count() - 1) - m_currentZoom = m_zoomLevels[i + 1]; - - m_webView->setZoomFactor(static_cast(m_currentZoom)/100.0); -} - -void BrowserView::zoomOut() -{ - int i = m_zoomLevels.indexOf(m_currentZoom); - Q_ASSERT(i >= 0); - if (i > 0) - m_currentZoom = m_zoomLevels[i - 1]; - - m_webView->setZoomFactor(static_cast(m_currentZoom)/100.0); -} - -void BrowserView::resizeEvent(QResizeEvent *event) -{ - QWidget::resizeEvent(event); - - int h1 = m_titleBar->sizeHint().height(); - int h2 = m_controlStrip->sizeHint().height(); - - m_titleBar->setGeometry(0, 0, width(), h1); - m_controlStrip->setGeometry(0, height() - h2, width(), h2); - m_webView->setGeometry(0, h1, width(), height() - h1); - - int zw = m_zoomStrip->sizeHint().width(); - int zh = m_zoomStrip->sizeHint().height(); - m_zoomStrip->move(width() - zw, (height() - zh) / 2); -} -#ifdef Q_OS_SYMBIAN -void BrowserView::setDefaultIap() -{ - qt_SetDefaultIap(); - m_webView->load(QUrl("http://news.bbc.co.uk/text_only.stm")); -} -#endif - -void BrowserView::navigate(const QUrl &url) -{ - m_webView->load(url); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/BrowserView.h --- a/tests/qtp/qtp_anomaly/src/BrowserView.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef BROWSERVIEW_H -#define BROWSERVIEW_H - -#include -#include - -class QUrl; -class QWebView; -class TitleBar; -class ControlStrip; -class ZoomStrip; - -class BrowserView : public QWidget -{ - Q_OBJECT - -public: - BrowserView(QWidget *parent = 0); - -public slots: - void navigate(const QUrl &url); - void zoomIn(); - void zoomOut(); -#ifdef Q_OS_SYMBIAN - void setDefaultIap(); -#endif - -private slots: - void initialize(); - void start(); - void setProgress(int percent); - void finish(bool); - void updateTitleBar(); - -signals: - void menuButtonClicked(); - -protected: - void resizeEvent(QResizeEvent *event); - -private: - TitleBar *m_titleBar; - QWebView *m_webView; - ZoomStrip *m_zoomStrip; - ControlStrip *m_controlStrip; - int m_progress; - int m_currentZoom; - QVector m_zoomLevels; -}; - -#endif // BROWSERVIEW_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/BrowserWindow.cpp --- a/tests/qtp/qtp_anomaly/src/BrowserWindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,189 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "BrowserWindow.h" - -#include -#include - -#include "BrowserView.h" -#include "HomeView.h" - -BrowserWindow::BrowserWindow() - : QWidget() - , m_homeView(0) - , m_browserView(0) -{ - m_timeLine = new QTimeLine(300, this); - m_timeLine->setCurveShape(QTimeLine::EaseInOutCurve); - QTimer::singleShot(0, this, SLOT(initialize())); -} - -void BrowserWindow::initialize() -{ - m_homeView = new HomeView(this); - m_browserView = new BrowserView(this); - - m_homeView->hide(); - m_homeView->resize(size()); - m_homeView->move(0, 0); - - m_browserView->hide(); - m_browserView->resize(size()); - m_browserView->move(0, 0); - - connect(m_homeView, SIGNAL(addressEntered(QString)), SLOT(gotoAddress(QString))); - connect(m_homeView, SIGNAL(urlActivated(QUrl)), SLOT(navigate(QUrl))); - - connect(m_browserView, SIGNAL(menuButtonClicked()), SLOT(showHomeView())); - - m_homeView->setVisible(false); - m_browserView->setVisible(false); - slide(0); - - connect(m_timeLine, SIGNAL(frameChanged(int)), SLOT(slide(int))); -} - - -// from Demo Browser -QUrl guessUrlFromString(const QString &string) -{ - QString urlStr = string.trimmed(); - QRegExp test(QLatin1String("^[a-zA-Z]+\\:.*")); - - // Check if it looks like a qualified URL. Try parsing it and see. - bool hasSchema = test.exactMatch(urlStr); - if (hasSchema) { - QUrl url = QUrl::fromEncoded(urlStr.toUtf8(), QUrl::TolerantMode); - if (url.isValid()) - return url; - } - - // Might be a file. - if (QFile::exists(urlStr)) { - QFileInfo info(urlStr); - return QUrl::fromLocalFile(info.absoluteFilePath()); - } - - // Might be a shorturl - try to detect the schema. - if (!hasSchema) { - int dotIndex = urlStr.indexOf(QLatin1Char('.')); - if (dotIndex != -1) { - QString prefix = urlStr.left(dotIndex).toLower(); - QString schema = (prefix == QString("ftp")) ? prefix.toLatin1() : QString("http"); - QString location = schema + "://" + urlStr; - QUrl url = QUrl::fromEncoded(location.toUtf8(), QUrl::TolerantMode); - if (url.isValid()) - return url; - } - } - - // Fall back to QUrl's own tolerant parser. - QUrl url = QUrl::fromEncoded(string.toUtf8(), QUrl::TolerantMode); - - // finally for cases where the user just types in a hostname add http - if (url.scheme().isEmpty()) - url = QUrl::fromEncoded("http://" + string.toUtf8(), QUrl::TolerantMode); - return url; -} - -void BrowserWindow::gotoAddress(const QString &address) -{ - m_browserView->navigate(guessUrlFromString(address)); - showBrowserView(); -} - -void BrowserWindow::navigate(const QUrl &url) -{ - m_browserView->navigate(url); - showBrowserView(); -} - -void BrowserWindow::slide(int pos) -{ - m_browserView->move(pos, 0); - m_homeView->move(pos - width(), 0); - m_browserView->show(); - m_homeView->show(); -} - -void BrowserWindow::showHomeView() -{ - if (m_timeLine->state() != QTimeLine::NotRunning) - return; - - m_timeLine->setFrameRange(0, width()); - m_timeLine->start(); - m_homeView->setFocus(); -} - -void BrowserWindow::showBrowserView() -{ - if (m_timeLine->state() != QTimeLine::NotRunning) - return; - - m_timeLine->setFrameRange(width(), 0); - m_timeLine->start(); - m_browserView->setFocus(); -} - -void BrowserWindow::keyReleaseEvent(QKeyEvent *event) -{ - QWidget::keyReleaseEvent(event); - - if (event->key() == Qt::Key_F3) { - if (m_homeView->isVisible()) - showBrowserView(); - else - showHomeView(); - } -} - -void BrowserWindow::resizeEvent(QResizeEvent *event) -{ - Q_UNUSED(event); - - if (m_homeView) - m_homeView->resize(size()); - - if (m_browserView) - m_browserView->resize(size()); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/BrowserWindow.h --- a/tests/qtp/qtp_anomaly/src/BrowserWindow.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef BROWSERWINDOW_H -#define BROWSERWINDOW_H - -#include -class QTimeLine; -class QUrl; - -class BrowserView; -class HomeView; - -class BrowserWindow : public QWidget -{ - Q_OBJECT - -public: - BrowserWindow(); - - HomeView *getHomeView() { return m_homeView; }; - BrowserView *getBrowserView() { return m_browserView; }; - QTimeLine *getTimeLine() { return m_timeLine; }; - -private slots: - void initialize(); - void navigate(const QUrl &url); - void gotoAddress(const QString &address); - -public slots: - void showBrowserView(); - void showHomeView(); - void slide(int); - -protected: - void keyReleaseEvent(QKeyEvent *event); - void resizeEvent(QResizeEvent *event); - -private: - HomeView *m_homeView; - BrowserView *m_browserView; - QTimeLine *m_timeLine; -}; - -#endif // BROWSERWINDOW_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/ControlStrip.cpp --- a/tests/qtp/qtp_anomaly/src/ControlStrip.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "ControlStrip.h" - -#include -#include - -ControlStrip::ControlStrip(QWidget *parent) - : QWidget(parent) -{ - menuPixmap.load(":/images/edit-find.png"); - backPixmap.load(":/images/go-previous.png"); - forwardPixmap.load(":/images/go-next.png"); -} - -QSize ControlStrip::sizeHint() const -{ - return minimumSizeHint(); -} - -QSize ControlStrip::minimumSizeHint() const -{ - return QSize(320, 48); -} - -void ControlStrip::mousePressEvent(QMouseEvent *event) -{ - int h = height(); - int x = event->pos().x(); - - if (x < h) { - emit menuClicked(); - event->accept(); - return; - } - - if (x > width() - h) { - emit forwardClicked(); - event->accept(); - return; - } - - if ((x < width() - 2 * h) && (x > width() - 3 * h)) { - emit backClicked(); - event->accept(); - return; - } -} - -void ControlStrip::paintEvent(QPaintEvent *event) -{ - int h = height(); - int s = (h - menuPixmap.height()) / 2; - - QPainter p(this); - p.fillRect(event->rect(), QColor(32, 32, 32, 192)); - p.setCompositionMode(QPainter::CompositionMode_SourceOver); - p.drawPixmap(s, s, menuPixmap); - p.drawPixmap(width() - 3 * h + s, s, backPixmap); - p.drawPixmap(width() - h + s, s, forwardPixmap); - p.end(); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/ControlStrip.h --- a/tests/qtp/qtp_anomaly/src/ControlStrip.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef CONTROLSTRIP_H -#define CONTROLSTRIP_H - -#include - -class ControlStrip : public QWidget -{ - Q_OBJECT - -public: - ControlStrip(QWidget *parent = 0); - - QSize sizeHint() const; - QSize minimumSizeHint() const; - -signals: - void menuClicked(); - void backClicked(); - void forwardClicked(); - -protected: - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); - -private: - QPixmap menuPixmap; - QPixmap backPixmap; - QPixmap forwardPixmap; -}; - -#endif // CONTROLSTRIP_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/HomeView.cpp --- a/tests/qtp/qtp_anomaly/src/HomeView.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "HomeView.h" - -#include -#include - -#include "AddressBar.h" -#include "BookmarksView.h" - -HomeView::HomeView(QWidget *parent) - : QWidget(parent) - , m_addressBar(0) -{ - m_addressBar = new AddressBar(parent); - connect(m_addressBar, SIGNAL(addressEntered(QString)), SLOT(gotoAddress(QString))); - - m_bookmarks = new BookmarksView(parent); - connect(m_bookmarks, SIGNAL(urlSelected(QUrl)), SIGNAL(urlActivated(QUrl))); - - QVBoxLayout *layout = new QVBoxLayout(this); - layout->setMargin(4); - layout->setSpacing(4); - layout->addWidget(m_addressBar); - layout->addWidget(m_bookmarks); -} - -void HomeView::gotoAddress(const QString &address) -{ - emit addressEntered(address); -} - -void HomeView::focusInEvent(QFocusEvent *event) -{ - m_addressBar->setFocus(); - QWidget::focusInEvent(event); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/HomeView.h --- a/tests/qtp/qtp_anomaly/src/HomeView.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef HOMEVIEW_H -#define HOMEVIEW_H - -#include - -class QUrl; - -class AddressBar; -class BookmarksView; - -class HomeView : public QWidget -{ - Q_OBJECT - -public: - HomeView(QWidget *parent); - - AddressBar * getAddressBar() { return m_addressBar; }; - BookmarksView *getBookmarks() { return m_bookmarks; }; - -signals: - void urlActivated(const QUrl &url); - void addressEntered(const QString &address); - -private slots: - void gotoAddress(const QString &address); - -protected: - void focusInEvent(QFocusEvent *event); - -private: - AddressBar *m_addressBar; - BookmarksView *m_bookmarks; -}; - -#endif // HOMEVIEW_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/Main.cpp --- a/tests/qtp/qtp_anomaly/src/Main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include - -#include "BrowserWindow.h" -#include "autotest.h" - -QTEST_MAIN( autoTest ) diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/TitleBar.cpp --- a/tests/qtp/qtp_anomaly/src/TitleBar.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "TitleBar.h" - -#include -#include - -TitleBar::TitleBar(QWidget *parent) - : QWidget(parent) - , m_progress(0) -{ - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); -} - -void TitleBar::setHost(const QString &host) -{ - m_host = host; - update(); -} - -void TitleBar::setTitle(const QString &title) -{ - m_title = title; - update(); -} - -void TitleBar::setProgress(int percent) -{ - m_progress = percent; - update(); -} - -QSize TitleBar::sizeHint() const -{ - return minimumSizeHint(); -} - -QSize TitleBar::minimumSizeHint() const -{ - QFontMetrics fm = fontMetrics(); - return QSize(100, fm.height()); -} - -void TitleBar::paintEvent(QPaintEvent *event) -{ - QString title = m_host; - if (!m_title.isEmpty()) - title.append(": ").append(m_title); - - QPalette pal = palette(); - QPainter p(this); - p.fillRect(event->rect(), pal.color(QPalette::Highlight)); - - if (m_progress > 0) { - - QRect box = rect(); - box.setLeft(16); - box.setWidth(width() - box.left() - 110); - - p.setPen(pal.color(QPalette::HighlightedText)); - p.setOpacity(0.8); - p.drawText(box, Qt::AlignLeft + Qt::AlignVCenter, title); - - int x = width() - 100 - 5; - int y = 1; - int h = height() - 4; - - p.setOpacity(1.0); - p.setBrush(Qt::NoBrush); - p.setPen(pal.color(QPalette::HighlightedText)); - p.drawRect(x, y, 100, h); - p.setPen(Qt::NoPen); - p.setBrush(pal.color(QPalette::HighlightedText)); - p.drawRect(x, y, m_progress, h); - } else { - - QRect box = rect(); - box.setLeft(16); - box.setWidth(width() - box.left() - 5); - p.setPen(pal.color(QPalette::HighlightedText)); - p.drawText(box, Qt::AlignLeft + Qt::AlignVCenter, title); - } - - p.end(); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/TitleBar.h --- a/tests/qtp/qtp_anomaly/src/TitleBar.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef TITLEBAR_H -#define TITLEBAR_H - -#include - -class TitleBar : public QWidget -{ - Q_OBJECT - -public: - TitleBar(QWidget *parent = 0); - - void setHost(const QString &host); - void setTitle(const QString &title); - void setProgress(int percent); - - QSize sizeHint() const; - QSize minimumSizeHint() const; - -protected: - void paintEvent(QPaintEvent *event); - -private: - QString m_host; - QString m_title; - int m_progress; -}; - -#endif // TITLEBAR_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/ZoomStrip.cpp --- a/tests/qtp/qtp_anomaly/src/ZoomStrip.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "ZoomStrip.h" - -#include -#include - -ZoomStrip::ZoomStrip(QWidget *parent) - : QWidget(parent) -{ - zoomInPixmap.load(":/images/list-add.png"); - zoomOutPixmap.load(":/images/list-remove.png"); -} - -QSize ZoomStrip::sizeHint() const -{ - return minimumSizeHint(); -} - -QSize ZoomStrip::minimumSizeHint() const -{ - return QSize(48, 96); -} - -void ZoomStrip::mousePressEvent(QMouseEvent *event) -{ - if (event->pos().y() < height() / 2) - emit zoomInClicked(); - else - emit zoomOutClicked(); -} - -void ZoomStrip::paintEvent(QPaintEvent *event) -{ - int w = width(); - int s = (w - zoomInPixmap.width()) / 2; - - QPainter p(this); - p.fillRect(event->rect(), QColor(128, 128, 128, 128)); - p.drawPixmap(s, s, zoomInPixmap); - p.drawPixmap(s, s + w, zoomOutPixmap); - p.end(); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/ZoomStrip.h --- a/tests/qtp/qtp_anomaly/src/ZoomStrip.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef ZOOMSTRIP_H -#define ZOOMSTRIP_H - -#include - -class ZoomStrip : public QWidget -{ - Q_OBJECT - -public: - ZoomStrip(QWidget *parent = 0); - - QSize sizeHint() const; - QSize minimumSizeHint() const; - -signals: - void zoomInClicked(); - void zoomOutClicked(); - -protected: - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); - -private: - QPixmap zoomInPixmap; - QPixmap zoomOutPixmap; -}; - -#endif // ZOOMSTRIP_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/anomaly.qrc --- a/tests/qtp/qtp_anomaly/src/anomaly.qrc Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ - - - images/go-next.png - images/go-previous.png - images/edit-find.png - images/list-add.png - images/list-remove.png - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/autotest.cpp --- a/tests/qtp/qtp_anomaly/src/autotest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,213 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include -#include -#include - -#include "browserwindow.h" -#include "addressbar.h" -#include "homeview.h" -#include "browserview.h" -#include "httpserver.h" -#include "autotest.h" - - - - -// -class serverThread : public QThread -{ -public: - void run(); -}; - -void serverThread::run() -{ - httpServer testServer; - - while ( testServer.isDone() ) - { - QTest::qWait(1000); - } -} - - -// -// from here normal autotest stuff follows... -// - - -void autoTest::initTestCase() -{ -} - -void autoTest::testDefaults() -{ - BrowserWindow bw; - bw.show(); - - - // Test default values for widget properties - QCOMPARE( bw.acceptDrops(), false ); -// QCOMPARE( bw.hasEditFocus(), false ); -/* - QCOMPARE( bw.hasFocus(), false ); - QCOMPARE( bw.hasMouseTracking(), false ); - QCOMPARE( bw.isActiveWindow(), false ); - QCOMPARE( bw.isEnabled(), true ); - QCOMPARE( bw.isFullScreen(), false ); - QCOMPARE( bw.isHidden(), false ); - QCOMPARE( bw.isMaximized(), false ); - QCOMPARE( bw.isMinimized(), false ); - QCOMPARE( bw.isModal(), false ); - QCOMPARE( bw.isVisible(), true ); - QCOMPARE( bw.isWindow(), true ); - QCOMPARE( bw.isWindowModified(), false ); - QCOMPARE( bw.underMouse(), false ); - QCOMPARE( bw.updatesEnabled(), true ); -*/ - bw.hide(); -} - -void autoTest::testBrowser() -{ - BrowserWindow bw; - // bw.show(); - QWebSettings::globalSettings()->setObjectCacheCapacities(128*1024, 1024*1024, 1024*1024); - QWebSettings::globalSettings()->setMaximumPagesInCache(3); - - bw.showFullScreen(); - - HomeView *hView = NULL; - QList firstHiew = bw.findChildren(); - if ( firstHiew.count() > 0 ) - hView = firstHiew.at(0); - else - hView = bw.getHomeView(); - QVERIFY( !hView ); - - QTest::qWait(2000); - - QList secHiew = bw.findChildren(); - if ( secHiew.count() > 0 ) - hView = secHiew.at(0); - else - hView = bw.getHomeView(); - QVERIFY( hView ); - - BrowserView *bView = NULL; - QList browView = bw.findChildren(); - QVERIFY( browView.count() > 0 ); - bView = browView.at(0); - QVERIFY( bView ); - - AddressBar *addrBar = NULL; - QList allBars = hView->findChildren(); - QVERIFY( allBars.count() > 0 ); - addrBar = allBars.at(0); - QVERIFY( addrBar ); - - QLineEdit *addrEdit = NULL; - QList allLineEds = addrBar->findChildren(); - if ( allLineEds.count() > 0 ) - addrEdit = allLineEds.at(0); - else - addrEdit = addrBar->getLineEdit(); - QVERIFY( addrEdit ); - - QToolButton *goButton = NULL; - QList aToolBtn = addrBar->findChildren(); - if ( aToolBtn.count() > 0 ) - goButton = aToolBtn.at(0); - else - goButton = addrBar->getToolButton(); - QVERIFY( goButton ); - - serverThread mojave; - mojave.start(); - - QTest::qWait(2000); - - - // Fill in actual test set... (not much really) - // test at least these; - // class BookmarksView : public QWidget - // try to click these -// QPixmap zoomInPixmap; -// QPixmap zoomOutPixmap; -// QListWidget *m_iconView = new QListWidget(this); -// m_toolButton = new QToolButton(parent); -// m_toolButton->setText("Go"); - - QTest::qWait(3000); - addrEdit->clear(); - addrEdit->setFocus(Qt::OtherFocusReason); - QTest::keyClicks( addrEdit, "http://127.0.0.1/index.html" ); - addrEdit->clearFocus(); - goButton->click(); - QTest::qWait(2000); - - addrEdit->clear(); - addrEdit->setFocus(Qt::OtherFocusReason); - QTest::keyClicks( addrEdit, "http://www.example.net" ); - addrEdit->clearFocus(); - goButton->click(); - QTest::qWait(3000); - - if ( mojave.isRunning() ) - { - mojave.quit(); - QFAIL("GET not received by the stub server."); - } - - QTest::qWait(3000); - - bw.showBrowserView(); - QTest::qWait(2000); - - bw.hide(); - QTest::qWait(1000); - - bw.close(); - QTest::qWait(1000); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/autotest.h --- a/tests/qtp/qtp_anomaly/src/autotest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef AUTOTEST_H -#define AUTOTEST_H - -#include -#include -#include - - -class autoTest: public QObject -{ - Q_OBJECT - - void initTestCase(); - - private slots: - void testDefaults(); - void testBrowser(); -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/flickcharm.cpp --- a/tests/qtp/qtp_anomaly/src/flickcharm.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,335 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "flickcharm.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -struct FlickData { - typedef enum { Steady, Pressed, ManualScroll, AutoScroll, Stop } State; - State state; - QWidget *widget; - QPoint pressPos; - QPoint offset; - QPoint dragPos; - QPoint speed; - QList ignored; -}; - -class FlickCharmPrivate -{ -public: - QHash flickData; - QBasicTimer ticker; -}; - -FlickCharm::FlickCharm(QObject *parent): QObject(parent) -{ - d = new FlickCharmPrivate; -} - -FlickCharm::~FlickCharm() -{ - delete d; -} - -void FlickCharm::activateOn(QWidget *widget) -{ - QAbstractScrollArea *scrollArea = qobject_cast(widget); - if (scrollArea) { - scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - - QWidget *viewport = scrollArea->viewport(); - - viewport->installEventFilter(this); - scrollArea->installEventFilter(this); - - d->flickData.remove(viewport); - d->flickData[viewport] = new FlickData; - d->flickData[viewport]->widget = widget; - d->flickData[viewport]->state = FlickData::Steady; - - return; - } - - QWebView *webView = qobject_cast(widget); - if (webView) { - QWebFrame *frame = webView->page()->mainFrame(); - frame->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff); - frame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff); - - webView->installEventFilter(this); - - d->flickData.remove(webView); - d->flickData[webView] = new FlickData; - d->flickData[webView]->widget = webView; - d->flickData[webView]->state = FlickData::Steady; - - return; - } - - qWarning() << "FlickCharm only works on QAbstractScrollArea (and derived classes)"; - qWarning() << "or QWebView (and derived classes)"; -} - -void FlickCharm::deactivateFrom(QWidget *widget) -{ - QAbstractScrollArea *scrollArea = qobject_cast(widget); - if (scrollArea) { - QWidget *viewport = scrollArea->viewport(); - - viewport->removeEventFilter(this); - scrollArea->removeEventFilter(this); - - delete d->flickData[viewport]; - d->flickData.remove(viewport); - - return; - } - - QWebView *webView = qobject_cast(widget); - if (webView) { - webView->removeEventFilter(this); - - delete d->flickData[webView]; - d->flickData.remove(webView); - - return; - } -} - -static QPoint scrollOffset(QWidget *widget) -{ - int x = 0, y = 0; - - QAbstractScrollArea *scrollArea = qobject_cast(widget); - if (scrollArea) { - x = scrollArea->horizontalScrollBar()->value(); - y = scrollArea->verticalScrollBar()->value(); - } - - QWebView *webView = qobject_cast(widget); - if (webView) { - QWebFrame *frame = webView->page()->mainFrame(); - x = frame->evaluateJavaScript("window.scrollX").toInt(); - y = frame->evaluateJavaScript("window.scrollY").toInt(); - } - - return QPoint(x, y); -} - -static void setScrollOffset(QWidget *widget, const QPoint &p) -{ - QAbstractScrollArea *scrollArea = qobject_cast(widget); - if (scrollArea) { - scrollArea->horizontalScrollBar()->setValue(p.x()); - scrollArea->verticalScrollBar()->setValue(p.y()); - } - - QWebView *webView = qobject_cast(widget); - QWebFrame *frame = webView ? webView->page()->mainFrame() : 0; - if (frame) - frame->evaluateJavaScript(QString("window.scrollTo(%1,%2);").arg(p.x()).arg(p.y())); -} - -static QPoint deaccelerate(const QPoint &speed, int a = 1, int max = 64) -{ - int x = qBound(-max, speed.x(), max); - int y = qBound(-max, speed.y(), max); - x = (x == 0) ? x : (x > 0) ? qMax(0, x - a) : qMin(0, x + a); - y = (y == 0) ? y : (y > 0) ? qMax(0, y - a) : qMin(0, y + a); - return QPoint(x, y); -} - -bool FlickCharm::eventFilter(QObject *object, QEvent *event) -{ - if (!object->isWidgetType()) - return false; - - QEvent::Type type = event->type(); - if (type != QEvent::MouseButtonPress && - type != QEvent::MouseButtonRelease && - type != QEvent::MouseMove) - return false; - - QMouseEvent *mouseEvent = 0; - switch (event->type()) { - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseMove: - mouseEvent = static_cast(event); - break; - } - - if (!mouseEvent || mouseEvent->modifiers() != Qt::NoModifier) - return false; - - QWidget *viewport = qobject_cast(object); - FlickData *data = d->flickData.value(viewport); - if (!viewport || !data || data->ignored.removeAll(event)) - return false; - - bool consumed = false; - switch (data->state) { - - case FlickData::Steady: - if (mouseEvent->type() == QEvent::MouseButtonPress) - if (mouseEvent->buttons() == Qt::LeftButton) { - consumed = true; - data->state = FlickData::Pressed; - data->pressPos = mouseEvent->pos(); - data->offset = scrollOffset(data->widget); - } - break; - - case FlickData::Pressed: - if (mouseEvent->type() == QEvent::MouseButtonRelease) { - consumed = true; - data->state = FlickData::Steady; - - QMouseEvent *event1 = new QMouseEvent(QEvent::MouseButtonPress, - data->pressPos, Qt::LeftButton, - Qt::LeftButton, Qt::NoModifier); - QMouseEvent *event2 = new QMouseEvent(*mouseEvent); - - data->ignored << event1; - data->ignored << event2; - QApplication::postEvent(object, event1); - QApplication::postEvent(object, event2); - } - if (mouseEvent->type() == QEvent::MouseMove) { - consumed = true; - data->state = FlickData::ManualScroll; - data->dragPos = QCursor::pos(); - if (!d->ticker.isActive()) - d->ticker.start(20, this); - } - break; - - case FlickData::ManualScroll: - if (mouseEvent->type() == QEvent::MouseMove) { - consumed = true; - QPoint delta = mouseEvent->pos() - data->pressPos; - setScrollOffset(data->widget, data->offset - delta); - } - if (mouseEvent->type() == QEvent::MouseButtonRelease) { - consumed = true; - data->state = FlickData::AutoScroll; - } - break; - - case FlickData::AutoScroll: - if (mouseEvent->type() == QEvent::MouseButtonPress) { - consumed = true; - data->state = FlickData::Stop; - data->speed = QPoint(0, 0); - data->pressPos = mouseEvent->pos(); - data->offset = scrollOffset(data->widget); - } - if (mouseEvent->type() == QEvent::MouseButtonRelease) { - consumed = true; - data->state = FlickData::Steady; - data->speed = QPoint(0, 0); - } - break; - - case FlickData::Stop: - if (mouseEvent->type() == QEvent::MouseButtonRelease) { - consumed = true; - data->state = FlickData::Steady; - } - if (mouseEvent->type() == QEvent::MouseMove) { - consumed = true; - data->state = FlickData::ManualScroll; - data->dragPos = QCursor::pos(); - if (!d->ticker.isActive()) - d->ticker.start(20, this); - } - break; - - default: - break; - } - - return consumed; -} - -void FlickCharm::timerEvent(QTimerEvent *event) -{ - int count = 0; - QHashIterator item(d->flickData); - while (item.hasNext()) { - item.next(); - FlickData *data = item.value(); - - if (data->state == FlickData::ManualScroll) { - count++; - data->speed = QCursor::pos() - data->dragPos; - data->dragPos = QCursor::pos(); - } - - if (data->state == FlickData::AutoScroll) { - count++; - data->speed = deaccelerate(data->speed); - QPoint p = scrollOffset(data->widget); - setScrollOffset(data->widget, p - data->speed); - if (data->speed == QPoint(0, 0)) - data->state = FlickData::Steady; - } - } - - if (!count) - d->ticker.stop(); - - QObject::timerEvent(event); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/flickcharm.h --- a/tests/qtp/qtp_anomaly/src/flickcharm.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demos of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef FLICKCHARM_H -#define FLICKCHARM_H - -#include - -class FlickCharmPrivate; -class QWidget; - -class FlickCharm: public QObject -{ - Q_OBJECT -public: - FlickCharm(QObject *parent = 0); - ~FlickCharm(); - void activateOn(QWidget *widget); - void deactivateFrom(QWidget *widget); - bool eventFilter(QObject *object, QEvent *event); - -protected: - void timerEvent(QTimerEvent *event); - -private: - FlickCharmPrivate *d; -}; - -#endif // FLICKCHARM_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/httpserver.cpp --- a/tests/qtp/qtp_anomaly/src/httpserver.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,172 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include -#include - -#include "BrowserWindow.h" -#include "httpserver.h" - -#define HTTP_PORT 80 - -httpServer::httpServer( QObject *parent ) - : QTcpServer( parent ) -{ - httpSocket = NULL; - - tcpServer = new QTcpServer( /* this */ ); - not_done = true; - bool result = tcpServer->listen(QHostAddress::Any, HTTP_PORT ); - if ( !result ) - { - delete tcpServer; - close(); - not_done = false; - return; - } - connect(tcpServer, SIGNAL(newConnection()), this, SLOT(handleNewConnection())); - -} - -httpServer::~httpServer() -{ - if ( httpSocket ) - { - httpSocket->disconnect(SIGNAL(readyRead())); - httpSocket->disconnect(SIGNAL(error(QAbstractSocket::SocketError))); - httpSocket->close(); - httpSocket->abort(); - httpSocket->deleteLater(); - httpSocket = NULL; - } -} - - -bool httpServer::isDone() -{ - return not_done; -} -void httpServer::handleNewConnection() -{ - QTcpSocket *clientConnection = tcpServer->nextPendingConnection(); - clientConnection->setTextModeEnabled(true); - - if ( !httpSocket ) - { - httpSocket = clientConnection; - connect( httpSocket, - SIGNAL(readyRead()), - this, - SLOT(readConnection())); - connect(httpSocket, SIGNAL(error(QAbstractSocket::SocketError)), - this, SLOT(displayConnectionError(QAbstractSocket::SocketError))); - } - else - { - // We already are busy with open connection?! - // qDebug() << "Server busy.\n"; - clientConnection->disconnectFromHost(); - } -} - - -void httpServer::displayConnectionError(QAbstractSocket::SocketError /* socketError */ ) -{ - httpSocket->disconnect(SIGNAL(readyRead())); - httpSocket->disconnect(SIGNAL(error(QAbstractSocket::SocketError))); - httpSocket->close(); - httpSocket->abort(); - httpSocket->deleteLater(); - httpSocket = NULL; -} - - -void httpServer::readConnection() -{ - while (httpSocket->canReadLine()) - { - char buf[256]; - qint64 lineLength = httpSocket->readLine(buf, sizeof(buf)); - if (lineLength != -1) - { - QString tmpCommand(buf); - tmpCommand = tmpCommand.simplified(); - - // qDebug() << "Received: '" << buf << "'\n"; - - if ( tmpCommand.left(4) == QString("GET ") ) - { - qDebug() << "QTESTWEB: Received GET:" << buf << "\n"; - // Craft and send a response - QString answer("HTTP/1.x 200 OK\nDate: Tue, 06 Jul 2004 17:59:22 GMT\n"); - answer.append("Expires: Thu, 01 Jan 1970 00:00:00 GMT\n"); - answer.append("Cache-Control: private, must-revalidate\n"); - answer.append("Via: 1.0 cthulhu\n"); - answer.append("Server: Apache/1.3.29 (Unix) PHP/4.3.4\n"); - answer.append("X-Powered-By: PHP/4.3.4\n"); - answer.append("Set-Cookie: fiwikiSession=a8015bd32eee4e5bd46fd83aea40f159; path=/\n"); - answer.append("Vary: Accept-Encoding,Cookie\n"); - answer.append("Content-Language: fi\n"); - answer.append("Content-Type: text/html; charset=utf-8\n"); - answer.append("X-Cache: MISS from wikipedia.org\n"); - answer.append("Transfer-Encoding: chunked\n"); - answer.append("Connection: keep-alive\n"); - httpSocket->write(qPrintable(answer)); - QString content("Example Page\n"); - content.append("

Empty page sent by test server.

"); - httpSocket->write(qPrintable(content)); - httpSocket->flush(); - - QTest::qWait(200); - - not_done = false; - } -/* - else - { - qDebug() << "Received unknown:" << buf << "\n"; - } -*/ - } - } -} - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/httpserver.h --- a/tests/qtp/qtp_anomaly/src/httpserver.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef HTTPSERVER_H -#define HTTPSERVER_H - -#include -#include -#include -#include -#include - - -class httpServer : public QTcpServer // , public QThread - { - Q_OBJECT - - public: - httpServer( QObject *parent = 0 ); - ~httpServer(); - - bool isDone(); - -private slots: - void handleNewConnection(); - void readConnection(); - void displayConnectionError(QAbstractSocket::SocketError socketError); - - private: - QTcpServer *tcpServer; - QTcpSocket *httpSocket; - - bool not_done; -}; - - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/images/edit-find.png Binary file tests/qtp/qtp_anomaly/src/images/edit-find.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/images/go-next.png Binary file tests/qtp/qtp_anomaly/src/images/go-next.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/images/go-previous.png Binary file tests/qtp/qtp_anomaly/src/images/go-previous.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/images/list-add.png Binary file tests/qtp/qtp_anomaly/src/images/list-add.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_anomaly/src/images/list-remove.png Binary file tests/qtp/qtp_anomaly/src/images/list-remove.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_collidingmice/autotest.cpp --- a/tests/qtp/qtp_collidingmice/autotest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "mouse.h" -#include "autotest.h" - - -void autoTest::initTestCase() -{ -} - -void autoTest::testDefaults() -{ - Mouse clock; - clock.show(); -/* - // Test default values for widget properties - QCOMPARE( clock.acceptDrops(), false ); - QCOMPARE( clock.hasEditFocus(), false ); - QCOMPARE( clock.hasFocus(), false ); - QCOMPARE( clock.hasMouseTracking(), false ); - QCOMPARE( clock.isActiveWindow(), true ); - QCOMPARE( clock.isEnabled(), true ); - QCOMPARE( clock.isFullScreen(), false ); - QCOMPARE( clock.isHidden(), false ); - QCOMPARE( clock.isMaximized(), false ); - QCOMPARE( clock.isMinimized(), false ); - QCOMPARE( clock.isModal(), false ); - QCOMPARE( clock.isVisible(), true ); - QCOMPARE( clock.isWindow(), true ); - QCOMPARE( clock.isWindowModified(), false ); - QCOMPARE( clock.underMouse(), false ); - QCOMPARE( clock.updatesEnabled(), true ); -*/ - clock.hide(); -} - -void autoTest::testMouse() -{ - Mouse mouse; - mouse.show(); - - // Fill in actual test set... (not much really) - - - mouse.hide(); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_collidingmice/autotest.h --- a/tests/qtp/qtp_collidingmice/autotest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef AUTOTEST_H -#define AUTOTEST_H - -#include -#include -#include - - -class autoTest: public QObject -{ - Q_OBJECT - - void initTestCase(); - - private slots: - void testDefaults(); - void testMouse(); -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_collidingmice/images/cheese.jpg Binary file tests/qtp/qtp_collidingmice/images/cheese.jpg has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_collidingmice/main.cpp --- a/tests/qtp/qtp_collidingmice/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include -#include - -#include "mouse.h" -#include "autotest.h" - -static const int MouseCount = 7; - -QTEST_MAIN(autoTest) - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_collidingmice/mice.qrc --- a/tests/qtp/qtp_collidingmice/mice.qrc Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - images/cheese.jpg - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_collidingmice/mouse.cpp --- a/tests/qtp/qtp_collidingmice/mouse.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,201 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "mouse.h" - -#include -#include -#include - -#include - -static const double Pi = 3.14159265358979323846264338327950288419717; -static double TwoPi = 2.0 * Pi; - -static qreal normalizeAngle(qreal angle) -{ - while (angle < 0) - angle += TwoPi; - while (angle > TwoPi) - angle -= TwoPi; - return angle; -} - -//! [0] -Mouse::Mouse() - : angle(0), speed(0), mouseEyeDirection(0), - color(qrand() % 256, qrand() % 256, qrand() % 256) -{ - setRotation(qrand() % (360 * 16)); -} -//! [0] - -//! [1] -QRectF Mouse::boundingRect() const -{ - qreal adjust = 0.5; - return QRectF(-18 - adjust, -22 - adjust, - 36 + adjust, 60 + adjust); -} -//! [1] - -//! [2] -QPainterPath Mouse::shape() const -{ - QPainterPath path; - path.addRect(-10, -20, 20, 40); - return path; -} -//! [2] - -//! [3] -void Mouse::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) -{ - // Body - painter->setBrush(color); - painter->drawEllipse(-10, -20, 20, 40); - - // Eyes - painter->setBrush(Qt::white); - painter->drawEllipse(-10, -17, 8, 8); - painter->drawEllipse(2, -17, 8, 8); - - // Nose - painter->setBrush(Qt::black); - painter->drawEllipse(QRectF(-2, -22, 4, 4)); - - // Pupils - painter->drawEllipse(QRectF(-8.0 + mouseEyeDirection, -17, 4, 4)); - painter->drawEllipse(QRectF(4.0 + mouseEyeDirection, -17, 4, 4)); - - // Ears - painter->setBrush(scene()->collidingItems(this).isEmpty() ? Qt::darkYellow : Qt::red); - painter->drawEllipse(-17, -12, 16, 16); - painter->drawEllipse(1, -12, 16, 16); - - // Tail - QPainterPath path(QPointF(0, 20)); - path.cubicTo(-5, 22, -5, 22, 0, 25); - path.cubicTo(5, 27, 5, 32, 0, 30); - path.cubicTo(-5, 32, -5, 42, 0, 35); - painter->setBrush(Qt::NoBrush); - painter->drawPath(path); -} -//! [3] - -//! [4] -void Mouse::advance(int step) -{ - if (!step) - return; -//! [4] - // Don't move too far away -//! [5] - QLineF lineToCenter(QPointF(0, 0), mapFromScene(0, 0)); - if (lineToCenter.length() > 150) { - qreal angleToCenter = ::acos(lineToCenter.dx() / lineToCenter.length()); - if (lineToCenter.dy() < 0) - angleToCenter = TwoPi - angleToCenter; - angleToCenter = normalizeAngle((Pi - angleToCenter) + Pi / 2); - - if (angleToCenter < Pi && angleToCenter > Pi / 4) { - // Rotate left - angle += (angle < -Pi / 2) ? 0.25 : -0.25; - } else if (angleToCenter >= Pi && angleToCenter < (Pi + Pi / 2 + Pi / 4)) { - // Rotate right - angle += (angle < Pi / 2) ? 0.25 : -0.25; - } - } else if (::sin(angle) < 0) { - angle += 0.25; - } else if (::sin(angle) > 0) { - angle -= 0.25; -//! [5] //! [6] - } -//! [6] - - // Try not to crash with any other mice -//! [7] - QList dangerMice = scene()->items(QPolygonF() - << mapToScene(0, 0) - << mapToScene(-30, -50) - << mapToScene(30, -50)); - foreach (QGraphicsItem *item, dangerMice) { - if (item == this) - continue; - - QLineF lineToMouse(QPointF(0, 0), mapFromItem(item, 0, 0)); - qreal angleToMouse = ::acos(lineToMouse.dx() / lineToMouse.length()); - if (lineToMouse.dy() < 0) - angleToMouse = TwoPi - angleToMouse; - angleToMouse = normalizeAngle((Pi - angleToMouse) + Pi / 2); - - if (angleToMouse >= 0 && angleToMouse < Pi / 2) { - // Rotate right - angle += 0.5; - } else if (angleToMouse <= TwoPi && angleToMouse > (TwoPi - Pi / 2)) { - // Rotate left - angle -= 0.5; -//! [7] //! [8] - } -//! [8] //! [9] - } -//! [9] - - // Add some random movement -//! [10] - if (dangerMice.size() > 1 && (qrand() % 10) == 0) { - if (qrand() % 1) - angle += (qrand() % 100) / 500.0; - else - angle -= (qrand() % 100) / 500.0; - } -//! [10] - -//! [11] - speed += (-50 + qrand() % 100) / 100.0; - - qreal dx = ::sin(angle) * 10; - mouseEyeDirection = (qAbs(dx / 5) < 1) ? 0 : dx / 5; - - setRotation(rotation() + dx); - setPos(mapToParent(0, -(3 + sin(speed) * 3))); -} -//! [11] diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_collidingmice/mouse.h --- a/tests/qtp/qtp_collidingmice/mouse.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MOUSE_H -#define MOUSE_H - -#include - -//! [0] -class Mouse : public QGraphicsItem -{ -public: - Mouse(); - - QRectF boundingRect() const; - QPainterPath shape() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget); - -protected: - void advance(int step); - -private: - qreal angle; - qreal speed; - qreal mouseEyeDirection; - QColor color; -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_collidingmice/qtp_collidingmice.pro --- a/tests/qtp/qtp_collidingmice/qtp_collidingmice.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -HEADERS += \ - autotest.h \ - mouse.h -SOURCES += \ - autotest.cpp \ - main.cpp \ - mouse.cpp - -RESOURCES += \ - mice.qrc - -CONFIG += qt warn_on console depend_includepath - -qtAddLibrary(QtTest) - -# install -target.path = $$[QT_INSTALL_PREFIX]/tests/qtp/collidingmice -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS collidingmice.pro images -sources.path = $$[QT_INSTALL_PREFIX]/tests/qtp/collidingmice -INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xED83EC05 - TARGET.CAPABILITY="ALL -TCB" - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - RSS_RULES ="group_name=\"QtTests\";" -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/albumdetails.xml --- a/tests/qtp/qtp_masterdetail/albumdetails.xml Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,98 +0,0 @@ - - - Humming one of your songs - Are they saying goodbye - On off - I shot my heart - Drowning in Those Eyes - So you did it again - One more time - Headphone silence - What I want - Sleeping by the Fyris River - Wooden Body - Humming one of your songs (encore) - - - To let myself go - Rubber and Soul - Balloon ranger - My lover will go - Temporary dive - Laid in earth - This voice - Where friend rhymes with end - Song No.6 feat Ron Sexsmith - The Fight Song - - - From Grace - All's not last - That Great October Sound - Life Here Is Gold - Tomorrow Stays The Same - Postulate - Adelaide - John Wayne - Love's Lost - Dreamweaver - Outro - - - Rain down on me - Cecilia - Make a mess of yourself - Pale green eyes - Either way I'm gone - Honey - Rise in shame - Stray dogs - The willow - Stay home - Outro - - - - - Kontroll på kontinentet - Ompa til du dør - Bøn fra helvete - 170 - Rullett - Dr. Mowinckel - Fra sjåfør til passasjer - Resistansen - Dekk bord - Bak et halleluja - Bris - Mr. Kaizer, hans Constanze og meg - - - Di grind - Hevnervals - Evig pint - De involverte - Djevelens orkester - Container - Naade - Min kvite russer - Veterans klage - Til depotet - Salt og pepper - Drøm Hardt (Requiem Part I) - - - KGB - Maestro - Knekker deg til sist - Senor Flamingos Adieu - Blitzregn baby - Dieter Meyers Inst. - Christiania - Delikatessen - Jævel av en tango - Papa har lov - Auksjon (i Dieter Meyers hall) - På ditt skift - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/autotest.cpp --- a/tests/qtp/qtp_masterdetail/autotest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,191 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "mainwindow.h" -#include "autotest.h" - - -void autoTest::initTestCase() -{ -} - -void autoTest::testDefaults() -{ - QFile *albumDetails = new QFile("albumdetails.xml"); - - MainWindow mw("artists", "albums", albumDetails); - - mw.show(); - - // Test default values for widget properties - QCOMPARE( mw.acceptDrops(), false ); - QCOMPARE( mw.hasEditFocus(), false ); - QCOMPARE( mw.hasFocus(), false ); - QCOMPARE( mw.hasMouseTracking(), false ); - QCOMPARE( mw.isActiveWindow(), true ); - QCOMPARE( mw.isEnabled(), true ); - QCOMPARE( mw.isFullScreen(), false ); - QCOMPARE( mw.isHidden(), false ); - QCOMPARE( mw.isMaximized(), false ); - QCOMPARE( mw.isMinimized(), false ); - QCOMPARE( mw.isModal(), false ); - QCOMPARE( mw.isVisible(), true ); - QCOMPARE( mw.isWindow(), true ); - QCOMPARE( mw.isWindowModified(), false ); - QCOMPARE( mw.underMouse(), false ); - QCOMPARE( mw.updatesEnabled(), true ); - - mw.hide(); -} -void autoTest::testMainView() -{ - QFile *albumDetails = new QFile("albumdetails.xml"); - MainWindow mw("artists", "albums", albumDetails); - - mw.show(); - QComboBox *artv = mw.getArtistView(); - QTableView *albv = mw.getAlbumView(); - - // sanity checks for items in view - QVERIFY( artv ); - QVERIFY( albv ); - - // verify that combobox is in default state - QCOMPARE( artv->count(), 0 ); - QCOMPARE( artv->currentIndex(), -1 ); - - // verify that albumview shows correct items - QTest::mouseClick ( (QWidget *)artv, Qt::LeftButton ); - QTest::qWait(100); - artv->setCurrentIndex(0); - QTest::mouseClick ( (QWidget *)albv, Qt::LeftButton ); - QTest::qWait(100); - QCOMPARE( artv->currentIndex(), 0 ); - - // select one item from the combobox item list - // verify that albumview shows correct items - QTest::mouseClick ( (QWidget *)artv, Qt::LeftButton ); - QTest::qWait(100); - artv->setCurrentIndex(2); - QTest::mouseClick ( (QWidget *)albv, Qt::LeftButton ); - QTest::qWait(100); - QCOMPARE( artv->currentIndex(), 2 ); - - // select another item from the combobox item list - // verify that albumview shows correct items - QTest::mouseClick ( (QWidget *)artv, Qt::LeftButton ); - QTest::qWait(100); - artv->setCurrentIndex(1); - QTest::mouseClick ( (QWidget *)albv, Qt::LeftButton ); - QTest::qWait(100); - QCOMPARE( artv->currentIndex(), 1 ); - - mw.hide(); -} - -void autoTest::testAlbumView() -{ - QFile *albumDetails = new QFile("albumdetails.xml"); - MainWindow mw("artists", "albums", albumDetails); - - //mw.show(); - QTableView *albv = mw.getAlbumView(); - - // what is tested here? - QVERIFY( albv ); - - mw.hide(); -} - -void autoTest::testArtistView() -{ - QFile *albumDetails = new QFile("albumdetails.xml"); - MainWindow mw("artists", "albums", albumDetails); - - //mw.show(); - QComboBox *artv = mw.getArtistView(); - - // what is tested here? - QVERIFY( artv ); - - mw.hide(); -} - -void autoTest::testTrackList() -{ - QFile *albumDetails = new QFile("albumdetails.xml"); - MainWindow mw("artists", "albums", albumDetails); - - //mw.show(); - QListWidget *tl = mw.getTrackList(); - - // what is tested here? - QVERIFY( tl ); - - mw.hide(); -} - -void autoTest::testModel() -{ - QFile *albumDetails = new QFile("albumdetails.xml"); - MainWindow mw("artists", "albums", albumDetails); - - mw.show(); - QSqlRelationalTableModel *mdl = mw.getModel(); - - // what is tested here? - // adding more items into model? - // saving whole model? - // deleting items from model? - // reloading whole model? - - QVERIFY( mdl ); - - // check the default values - /* - QCOMPARE( mdl->columnCount(), 2 ); - QCOMPARE( mdl->rowCount(), 2 ); - */ - - mw.hide(); -} - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/autotest.h --- a/tests/qtp/qtp_masterdetail/autotest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef AUTOTEST_H -#define AUTOTEST_H - -#include -#include -#include - - -class autoTest: public QObject -{ - Q_OBJECT - - void initTestCase(); - - private slots: - void testDefaults(); - void testMainView(); - void testAlbumView(); - void testArtistView(); - void testTrackList(); - void testModel(); - -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/database.h --- a/tests/qtp/qtp_masterdetail/database.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef DATABASE_H -#define DATABASE_H - -#include -#include -#include -#include - -static bool createConnection() -{ - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); - db.setDatabaseName(":memory:"); - if (!db.open()) { - QMessageBox::critical(0, qApp->tr("Cannot open database"), - qApp->tr("Unable to establish a database connection.\n" - "This example needs SQLite support. Please read " - "the Qt SQL driver documentation for information how " - "to build it.\n\n" - "Click Cancel to exit."), QMessageBox::Cancel); - return false; - } - - QSqlQuery query; - - query.exec("create table artists (id int primary key, " - "artist varchar(40), " - "albumcount int)"); - - query.exec("insert into artists values(0, '', 0)"); - query.exec("insert into artists values(1, 'Ane Brun', 2)"); - query.exec("insert into artists values(2, 'Thomas Dybdahl', 3)"); - query.exec("insert into artists values(3, 'Kaizers Orchestra', 3)"); - - query.exec("create table albums (albumid int primary key, " - "title varchar(50), " - "artistid int, " - "year int)"); - - query.exec("insert into albums values(1, 'Spending Time With Morgan', 1, " - "2003)"); - query.exec("insert into albums values(2, 'A Temporary Dive', 1, 2005)"); - query.exec("insert into albums values(3, '...The Great October Sound', 2, " - "2002)"); - query.exec("insert into albums values(4, 'Stray Dogs', 2, 2003)"); - query.exec("insert into albums values(5, " - "'One day you`ll dance for me, New York City', 2, 2004)"); - query.exec("insert into albums values(6, 'Ompa Til Du D\xf8r', 3, 2001)"); - query.exec("insert into albums values(7, 'Evig Pint', 3, 2002)"); - query.exec("insert into albums values(8, 'Maestro', 3, 2005)"); - - return true; -} - -#endif - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/dialog.cpp --- a/tests/qtp/qtp_masterdetail/dialog.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,283 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "dialog.h" - -int uniqueAlbumId; -int uniqueArtistId; - -Dialog::Dialog(QSqlRelationalTableModel *albums, QDomDocument details, - QFile *output, QWidget *parent) - : QDialog(parent) -{ - model = albums; - albumDetails = details; - outputFile = output; - - QGroupBox *inputWidgetBox = createInputWidgets(); - QDialogButtonBox *buttonBox = createButtons(); - - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(inputWidgetBox); - layout->addWidget(buttonBox); - setLayout(layout); - - setWindowTitle(tr("Add Album")); -} - -void Dialog::submit() -{ - QString artist = artistEditor->text(); - QString title = titleEditor->text(); - - if (artist.isEmpty() || title.isEmpty()) { - QString message(tr("Please provide both the name of the artist " - "and the title of the album.")); - QMessageBox::information(this, tr("Add Album"), message); - } else { - int artistId = findArtistId(artist); - int albumId = addNewAlbum(title, artistId); - - QStringList tracks; - tracks = tracksEditor->text().split(',', QString::SkipEmptyParts); - addTracks(albumId, tracks); - - increaseAlbumCount(indexOfArtist(artist)); - accept(); - } -} - -int Dialog::findArtistId(const QString &artist) -{ - QSqlTableModel *artistModel = model->relationModel(2); - int row = 0; - - while (row < artistModel->rowCount()) { - QSqlRecord record = artistModel->record(row); - if (record.value("artist") == artist) - return record.value("id").toInt(); - else - row++; - } - return addNewArtist(artist); -} - - -int Dialog::addNewArtist(const QString &name) -{ - QSqlTableModel *artistModel = model->relationModel(2); - QSqlRecord record; - - int id = generateArtistId(); - - QSqlField f1("id", QVariant::Int); - QSqlField f2("artist", QVariant::String); - QSqlField f3("albumcount", QVariant::Int); - - f1.setValue(QVariant(id)); - f2.setValue(QVariant(name)); - f3.setValue(QVariant(0)); - record.append(f1); - record.append(f2); - record.append(f3); - - artistModel->insertRecord(-1, record); - return id; -} - -int Dialog::addNewAlbum(const QString &title, int artistId) -{ - int id = generateAlbumId(); - QSqlRecord record; - - QSqlField f1("albumid", QVariant::Int); - QSqlField f2("title", QVariant::String); - QSqlField f3("artistid", QVariant::Int); - QSqlField f4("year", QVariant::Int); - - f1.setValue(QVariant(id)); - f2.setValue(QVariant(title)); - f3.setValue(QVariant(artistId)); - f4.setValue(QVariant(yearEditor->value())); - record.append(f1); - record.append(f2); - record.append(f3); - record.append(f4); - - model->insertRecord(-1, record); - return id; -} - -void Dialog::addTracks(int albumId, QStringList tracks) -{ - QDomElement albumNode = albumDetails.createElement("album"); - albumNode.setAttribute("id", albumId); - - for (int i = 0; i < tracks.count(); i++) { - QString trackNumber = QString::number(i); - if (i < 10) - trackNumber.prepend("0"); - - QDomText textNode = albumDetails.createTextNode(tracks.at(i)); - - QDomElement trackNode = albumDetails.createElement("track"); - trackNode.setAttribute("number", trackNumber); - trackNode.appendChild(textNode); - - albumNode.appendChild(trackNode); - } - - QDomNodeList archive = albumDetails.elementsByTagName("archive"); - archive.item(0).appendChild(albumNode); - -/* - The following code is commented out since the example uses an in - memory database, i.e., altering the XML file will bring the data - out of sync. - - if (!outputFile->open(QIODevice::WriteOnly)) { - return; - } else { - QTextStream stream(outputFile); - archive.item(0).save(stream, 4); - outputFile->close(); - } -*/ -} - -void Dialog::increaseAlbumCount(QModelIndex artistIndex) -{ - QSqlTableModel *artistModel = model->relationModel(2); - - QModelIndex albumCountIndex; - albumCountIndex = artistIndex.sibling(artistIndex.row(), 2); - - int albumCount = albumCountIndex.data().toInt(); - artistModel->setData(albumCountIndex, QVariant(albumCount + 1)); -} - - -void Dialog::revert() -{ - artistEditor->clear(); - titleEditor->clear(); - yearEditor->setValue(QDate::currentDate().year()); - tracksEditor->clear(); -} - -QGroupBox *Dialog::createInputWidgets() -{ - QGroupBox *box = new QGroupBox(tr("Add Album")); - - QLabel *artistLabel = new QLabel(tr("Artist:")); - QLabel *titleLabel = new QLabel(tr("Title:")); - QLabel *yearLabel = new QLabel(tr("Year:")); - QLabel *tracksLabel = new QLabel(tr("Tracks (separated by comma):")); - - artistEditor = new QLineEdit; - titleEditor = new QLineEdit; - - yearEditor = new QSpinBox; - yearEditor->setMinimum(1900); - yearEditor->setMaximum(QDate::currentDate().year()); - yearEditor->setValue(yearEditor->maximum()); - yearEditor->setReadOnly(false); - - tracksEditor = new QLineEdit; - - QGridLayout *layout = new QGridLayout; - layout->addWidget(artistLabel, 0, 0); - layout->addWidget(artistEditor, 0, 1); - layout->addWidget(titleLabel, 1, 0); - layout->addWidget(titleEditor, 1, 1); - layout->addWidget(yearLabel, 2, 0); - layout->addWidget(yearEditor, 2, 1); - layout->addWidget(tracksLabel, 3, 0, 1, 2); - layout->addWidget(tracksEditor, 4, 0, 1, 2); - box->setLayout(layout); - - return box; -} - -QDialogButtonBox *Dialog::createButtons() -{ - QPushButton *closeButton = new QPushButton(tr("&Close")); - QPushButton *revertButton = new QPushButton(tr("&Revert")); - QPushButton *submitButton = new QPushButton(tr("&Submit")); - - closeButton->setDefault(true); - - connect(closeButton, SIGNAL(clicked()), this, SLOT(close())); - connect(revertButton, SIGNAL(clicked()), this, SLOT(revert())); - connect(submitButton, SIGNAL(clicked()), this, SLOT(submit())); - - QDialogButtonBox *buttonBox = new QDialogButtonBox; - buttonBox->addButton(submitButton, QDialogButtonBox::ResetRole); - buttonBox->addButton(revertButton, QDialogButtonBox::ResetRole); - buttonBox->addButton(closeButton, QDialogButtonBox::RejectRole); - - return buttonBox; -} - -QModelIndex Dialog::indexOfArtist(const QString &artist) -{ - QSqlTableModel *artistModel = model->relationModel(2); - - for (int i = 0; i < artistModel->rowCount(); i++) { - QSqlRecord record = artistModel->record(i); - if (record.value("artist") == artist) - return artistModel->index(i, 1); - } - - return QModelIndex(); -} - -int Dialog::generateArtistId() -{ - uniqueArtistId += 1; - return uniqueArtistId; -} - -int Dialog::generateAlbumId() -{ - uniqueAlbumId += 1; - return uniqueAlbumId; -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/dialog.h --- a/tests/qtp/qtp_masterdetail/dialog.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef DIALOG_H -#define DIALOG_H - -#include -#include -#include - -class Dialog : public QDialog -{ - Q_OBJECT - -public: - Dialog(QSqlRelationalTableModel *albums, QDomDocument details, - QFile *output, QWidget *parent = 0); - -private slots: - void revert(); - void submit(); - -private: - int addNewAlbum(const QString &title, int artistId); - int addNewArtist(const QString &name); - void addTracks(int albumId, QStringList tracks); - QDialogButtonBox *createButtons(); - QGroupBox *createInputWidgets(); - int findArtistId(const QString &artist); - int generateAlbumId(); - int generateArtistId(); - void increaseAlbumCount(QModelIndex artistIndex); - QModelIndex indexOfArtist(const QString &artist); - - QSqlRelationalTableModel *model; - QDomDocument albumDetails; - QFile *outputFile; - - QLineEdit *artistEditor; - QLineEdit *titleEditor; - QSpinBox *yearEditor; - QLineEdit *tracksEditor; -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/images/icon.png Binary file tests/qtp/qtp_masterdetail/images/icon.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/images/image.png Binary file tests/qtp/qtp_masterdetail/images/image.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/main.cpp --- a/tests/qtp/qtp_masterdetail/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include "database.h" -#include "mainwindow.h" -#include "autotest.h" - - -QTEST_MAIN(autoTest) diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/mainwindow.cpp --- a/tests/qtp/qtp_masterdetail/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,429 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "mainwindow.h" -#include "dialog.h" - -#include -#include -#include - -extern int uniqueAlbumId; -extern int uniqueArtistId; - -MainWindow::MainWindow(const QString &artistTable, const QString &albumTable, - QFile *albumDetails, QWidget *parent) - : QMainWindow(parent) -{ - file = albumDetails; - readAlbumData(); - - model = new QSqlRelationalTableModel(this); - model->setTable(albumTable); - model->setRelation(2, QSqlRelation(artistTable, "id", "artist")); - model->select(); - - QGroupBox *artists = createArtistGroupBox(); - QGroupBox *albums = createAlbumGroupBox(); - QGroupBox *details = createDetailsGroupBox(); - - artistView->setCurrentIndex(0); - uniqueAlbumId = model->rowCount(); - uniqueArtistId = artistView->count(); - - connect(model, SIGNAL(rowsInserted(QModelIndex, int, int)), - this, SLOT(updateHeader(QModelIndex, int, int))); - connect(model, SIGNAL(rowsRemoved(QModelIndex, int, int)), - this, SLOT(updateHeader(QModelIndex, int, int))); - - QGridLayout *layout = new QGridLayout; - layout->addWidget(artists, 0, 0); - layout->addWidget(albums, 1, 0); - layout->addWidget(details, 0, 1, 2, 1); - layout->setColumnStretch(1, 1); - layout->setColumnMinimumWidth(0, 500); - - QWidget *widget = new QWidget; - widget->setLayout(layout); - setCentralWidget(widget); - createMenuBar(); - - showImageLabel(); - resize(850, 400); - setWindowTitle(tr("Music Archive")); -} - -void MainWindow::changeArtist(int row) -{ - if (row > 0) { - QModelIndex index = model->relationModel(2)->index(row, 1); - model->setFilter("artist = '" + index.data().toString() + '\'') ; - showArtistProfile(index); - } else if (row == 0) { - model->setFilter(QString()); - showImageLabel(); - } else { - return; - } -} - -void MainWindow::showArtistProfile(QModelIndex index) -{ - QSqlRecord record = model->relationModel(2)->record(index.row()); - - QString name = record.value("artist").toString(); - QString count = record.value("albumcount").toString(); - profileLabel->setText(tr("Artist : %1 \n" \ - "Number of Albums: %2").arg(name).arg(count)); - - profileLabel->show(); - iconLabel->show(); - - titleLabel->hide(); - trackList->hide(); - imageLabel->hide(); -} - -void MainWindow::showAlbumDetails(QModelIndex index) -{ - QSqlRecord record = model->record(index.row()); - - QString artist = record.value("artist").toString(); - QString title = record.value("title").toString(); - QString year = record.value("year").toString(); - QString albumId = record.value("albumid").toString(); - - showArtistProfile(indexOfArtist(artist)); - titleLabel->setText(tr("Title: %1 (%2)").arg(title).arg(year)); - titleLabel->show(); - - QDomNodeList albums = albumData.elementsByTagName("album"); - for (int i = 0; i < albums.count(); i++) { - QDomNode album = albums.item(i); - if (album.toElement().attribute("id") == albumId) { - getTrackList(album.toElement()); - break; - } - } - if (!trackList->count() == 0) - trackList->show(); -} - -void MainWindow::getTrackList(QDomNode album) -{ - trackList->clear(); - - QDomNodeList tracks = album.childNodes(); - QDomNode track; - QString trackNumber; - - for (int j = 0; j < tracks.count(); j++) { - - track = tracks.item(j); - trackNumber = track.toElement().attribute("number"); - - QListWidgetItem *item = new QListWidgetItem(trackList); - item->setText(trackNumber + ": " + track.toElement().text()); - } -} - -void MainWindow::addAlbum() -{ - Dialog *dialog = new Dialog(model, albumData, file, this); - int accepted = dialog->exec(); - - if (accepted == 1) { - int lastRow = model->rowCount() - 1; - albumView->selectRow(lastRow); - albumView->scrollToBottom(); - showAlbumDetails(model->index(lastRow, 0)); - } -} - -void MainWindow::deleteAlbum() -{ - QModelIndexList selection = albumView->selectionModel()->selectedRows(0); - - if (!selection.empty()) { - QModelIndex idIndex = selection.at(0); - int id = idIndex.data().toInt(); - QString title = idIndex.sibling(idIndex.row(), 1).data().toString(); - QString artist = idIndex.sibling(idIndex.row(), 2).data().toString(); - - QMessageBox::StandardButton button; - button = QMessageBox::question(this, tr("Delete Album"), - QString(tr("Are you sure you want to " \ - "delete '%1' by '%2'?")) - .arg(title).arg(artist), - QMessageBox::Yes | QMessageBox::No); - - if (button == QMessageBox::Yes) { - removeAlbumFromFile(id); - removeAlbumFromDatabase(idIndex); - decreaseAlbumCount(indexOfArtist(artist)); - - showImageLabel(); - } - } else { - QMessageBox::information(this, tr("Delete Album"), - tr("Select the album you want to delete.")); - } -} - -void MainWindow::removeAlbumFromFile(int id) -{ - - QDomNodeList albums = albumData.elementsByTagName("album"); - - for (int i = 0; i < albums.count(); i++) { - QDomNode node = albums.item(i); - if (node.toElement().attribute("id").toInt() == id) { - albumData.elementsByTagName("archive").item(0).removeChild(node); - break; - } - } -/* - The following code is commented out since the example uses an in - memory database, i.e., altering the XML file will bring the data - out of sync. - - if (!file->open(QIODevice::WriteOnly)) { - return; - } else { - QTextStream stream(file); - albumData.elementsByTagName("archive").item(0).save(stream, 4); - file->close(); - } -*/ -} - -void MainWindow::removeAlbumFromDatabase(QModelIndex index) -{ - model->removeRow(index.row()); -} - -void MainWindow::decreaseAlbumCount(QModelIndex artistIndex) -{ - int row = artistIndex.row(); - QModelIndex albumCountIndex = artistIndex.sibling(row, 2); - int albumCount = albumCountIndex.data().toInt(); - - QSqlTableModel *artists = model->relationModel(2); - - if (albumCount == 1) { - artists->removeRow(row); - showImageLabel(); - } else { - artists->setData(albumCountIndex, QVariant(albumCount - 1)); - } -} - -void MainWindow::readAlbumData() -{ - if (!file->open(QIODevice::ReadOnly)) - return; - - if (!albumData.setContent(file)) { - file->close(); - return; - } - file->close(); -} - -QGroupBox* MainWindow::createArtistGroupBox() -{ - artistView = new QComboBox; - artistView->setModel(model->relationModel(2)); - artistView->setModelColumn(1); - - connect(artistView, SIGNAL(currentIndexChanged(int)), - this, SLOT(changeArtist(int))); - - QGroupBox *box = new QGroupBox(tr("Artist")); - - QGridLayout *layout = new QGridLayout; - layout->addWidget(artistView, 0, 0); - box->setLayout(layout); - - return box; -} - -QGroupBox* MainWindow::createAlbumGroupBox() -{ - QGroupBox *box = new QGroupBox(tr("Album")); - - albumView = new QTableView; - albumView->setEditTriggers(QAbstractItemView::NoEditTriggers); - albumView->setSortingEnabled(true); - albumView->setSelectionBehavior(QAbstractItemView::SelectRows); - albumView->setSelectionMode(QAbstractItemView::SingleSelection); - albumView->setShowGrid(false); - albumView->verticalHeader()->hide(); - albumView->setAlternatingRowColors(true); - albumView->setModel(model); - adjustHeader(); - - QLocale locale = albumView->locale(); - locale.setNumberOptions(QLocale::OmitGroupSeparator); - albumView->setLocale(locale); - - connect(albumView, SIGNAL(clicked(QModelIndex)), - this, SLOT(showAlbumDetails(QModelIndex))); - connect(albumView, SIGNAL(activated(QModelIndex)), - this, SLOT(showAlbumDetails(QModelIndex))); - - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(albumView, 0, 0); - box->setLayout(layout); - - return box; -} - -QGroupBox* MainWindow::createDetailsGroupBox() -{ - QGroupBox *box = new QGroupBox(tr("Details")); - - profileLabel = new QLabel; - profileLabel->setWordWrap(true); - profileLabel->setAlignment(Qt::AlignBottom); - - titleLabel = new QLabel; - titleLabel->setWordWrap(true); - titleLabel->setAlignment(Qt::AlignBottom); - - iconLabel = new QLabel(); - iconLabel->setAlignment(Qt::AlignBottom | Qt::AlignRight); - iconLabel->setPixmap(QPixmap(":/images/icon.png")); - - imageLabel = new QLabel; - imageLabel->setWordWrap(true); - imageLabel->setAlignment(Qt::AlignCenter); - imageLabel->setPixmap(QPixmap(":/images/image.png")); - - trackList = new QListWidget; - - QGridLayout *layout = new QGridLayout; - layout->addWidget(imageLabel, 0, 0, 3, 2); - layout->addWidget(profileLabel, 0, 0); - layout->addWidget(iconLabel, 0, 1); - layout->addWidget(titleLabel, 1, 0, 1, 2); - layout->addWidget(trackList, 2, 0, 1, 2); - layout->setRowStretch(2, 1); - box->setLayout(layout); - - return box; -} - -void MainWindow::createMenuBar() -{ - QAction *addAction = new QAction(tr("&Add album..."), this); - QAction *deleteAction = new QAction(tr("&Delete album..."), this); - QAction *quitAction = new QAction(tr("&Quit"), this); - QAction *aboutAction = new QAction(tr("&About"), this); - QAction *aboutQtAction = new QAction(tr("About &Qt"), this); - - addAction->setShortcut(tr("Ctrl+A")); - deleteAction->setShortcut(tr("Ctrl+D")); - quitAction->setShortcuts(QKeySequence::Quit); - - QMenu *fileMenu = menuBar()->addMenu(tr("&File")); - fileMenu->addAction(addAction); - fileMenu->addAction(deleteAction); - fileMenu->addSeparator(); - fileMenu->addAction(quitAction); - - QMenu *helpMenu = menuBar()->addMenu(tr("&Help")); - helpMenu->addAction(aboutAction); - helpMenu->addAction(aboutQtAction); - - connect(addAction, SIGNAL(triggered(bool)), this, SLOT(addAlbum())); - connect(deleteAction, SIGNAL(triggered(bool)), this, SLOT(deleteAlbum())); - connect(quitAction, SIGNAL(triggered(bool)), this, SLOT(close())); - connect(aboutAction, SIGNAL(triggered(bool)), this, SLOT(about())); - connect(aboutQtAction, SIGNAL(triggered(bool)), qApp, SLOT(aboutQt())); -} - -void MainWindow::showImageLabel() -{ - profileLabel->hide(); - titleLabel->hide(); - iconLabel->hide(); - trackList->hide(); - - imageLabel->show(); -} - -QModelIndex MainWindow::indexOfArtist(const QString &artist) -{ - QSqlTableModel *artistModel = model->relationModel(2); - - for (int i = 0; i < artistModel->rowCount(); i++) { - QSqlRecord record = artistModel->record(i); - if (record.value("artist") == artist) - return artistModel->index(i, 1); - } - return QModelIndex(); -} - -void MainWindow::updateHeader(QModelIndex, int, int) -{ - adjustHeader(); -} - -void MainWindow::adjustHeader() -{ - albumView->hideColumn(0); - albumView->resizeColumnToContents(2); - albumView->resizeColumnToContents(3); -} - -void MainWindow::about() -{ - QMessageBox::about(this, tr("About Music Archive"), - tr("

The Music Archive example shows how to present " - "data from different data sources in the same application. " - "The album titles, and the corresponding artists and release dates, " - "are kept in a database, while each album's tracks are stored " - "in an XML file.

The example also shows how to add as " - "well as remove data from both the database and the " - "associated XML file using the API provided by the QtSql and " - "QtXml modules, respectively.

")); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/mainwindow.h --- a/tests/qtp/qtp_masterdetail/mainwindow.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,110 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include -#include - -QT_BEGIN_NAMESPACE -class QComboBox; -class QFile; -class QGroupBox; -class QLabel; -class QListWidget; -class QSqlRelationalTableModel; -class QTableView; -QT_END_NAMESPACE - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - MainWindow(const QString &artistTable, const QString &albumTable, - QFile *albumDetails, QWidget *parent = 0); - - // for autotest set - QTableView *getAlbumView() { return albumView; }; - QComboBox *getArtistView() { return artistView; }; - QListWidget *getTrackList() { return trackList; }; - QSqlRelationalTableModel *getModel() { return model; } ; - -private slots: - void about(); - void addAlbum(); - void changeArtist(int row); - void deleteAlbum(); - void showAlbumDetails(QModelIndex index); - void showArtistProfile(QModelIndex index); - void updateHeader(QModelIndex, int, int); - -private: - void adjustHeader(); - QGroupBox *createAlbumGroupBox(); - QGroupBox *createArtistGroupBox(); - QGroupBox *createDetailsGroupBox(); - void createMenuBar(); - void decreaseAlbumCount(QModelIndex artistIndex); - void getTrackList(QDomNode album); - QModelIndex indexOfArtist(const QString &artist); - void readAlbumData(); - void removeAlbumFromDatabase(QModelIndex album); - void removeAlbumFromFile(int id); - void showImageLabel(); - - QTableView *albumView; - QComboBox *artistView; - QListWidget *trackList; - - QLabel *iconLabel; - QLabel *imageLabel; - QLabel *profileLabel; - QLabel *titleLabel; - - QDomDocument albumData; - QFile *file; - QSqlRelationalTableModel *model; -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/qtp_masterdetail.pro --- a/tests/qtp/qtp_masterdetail/qtp_masterdetail.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ - -HEADERS = autotest.h \ - database.h \ - dialog.h \ - mainwindow.h -RESOURCES = qtp_masterdetail.qrc -SOURCES = autotest.cpp \ - dialog.cpp \ - main.cpp \ - mainwindow.cpp - -QT += sql -QT += xml - -CONFIG += qt warn_on console depend_includepath - -qtAddLibrary(QtTest) - -# install -target.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_masterdetail -sources.files = $$SOURCES *.h $$RESOURCES $$FORMS qtp_masterdetail.pro *.xml images -sources.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_masterdetail -INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xED83EC07 - TARGET.CAPABILITY="ALL -TCB" - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - RSS_RULES ="group_name=\"QtTests\";" -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_masterdetail/qtp_masterdetail.qrc --- a/tests/qtp/qtp_masterdetail/qtp_masterdetail.qrc Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - images/icon.png - images/image.png - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_previewer/autotest.cpp --- a/tests/qtp/qtp_previewer/autotest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,263 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "mainwindow.h" -#include "autotest.h" - - - class aboutThread : public QThread - { - public: - void run(); - void setMainWindow(MainWindow *aPtr) { iPtr = aPtr; }; - private: - MainWindow *iPtr; - - }; - - void aboutThread::run() - { - qDebug() << "entered aboutThread"; - QTest::qWait(500); - QList allDialogs = iPtr->findChildren(); - QVERIFY( !allDialogs.isEmpty() ); - - QPushButton * okButton; - QList allPButtons = allDialogs.at(0)->findChildren(); - QVERIFY( allPButtons.count() == 1 ); - - okButton = allPButtons.at(0); - - QVERIFY(okButton); - okButton->click(); - - qDebug() << "exit aboutThread"; - } - - class openUrlThread : public QThread - { - public: - void run(); - void setMainWindow(MainWindow *aPtr) { iPtr = aPtr; }; - private: - MainWindow *iPtr; - - }; - - void openUrlThread::run() - { - QTest::qWait(500); - QList allDialogs = iPtr->findChildren(); - QVERIFY( allDialogs.count() == 1 ); - - QPushButton * cancelButton; - QPushButton * okButton; - QList allPButtons = allDialogs.at(0)->findChildren(); - QVERIFY( allPButtons.count() == 2 ); - - for ( int i = 0; i < allPButtons.count(); i++) - { - if ( allPButtons.at(i)->text() == QString("OK") ) - { - okButton = allPButtons.at(i); - } - else if ( allPButtons.at(i)->text() == QString("Cancel") ) - { - cancelButton = allPButtons.at(i); - } - else - { - QFAIL("This test application does not handle localised texts!"); - } - } - QVERIFY(okButton); - QVERIFY(cancelButton); - - QList allLineEdits = allDialogs.at(0)->findChildren(); - QVERIFY( allLineEdits.count() == 1 ); - QCOMPARE( allLineEdits.at(0)->text(), QString("http://") ); - - QTest::qWait(100); - allLineEdits.at(0)->setText(QString("http://www.google.fi")); - - QCOMPARE( allLineEdits.at(0)->text(), QString("http://www.google.fi") ); - QTest::qWait(100); - - cancelButton->click(); - } - -void autoTest::initTestCase() -{ -} - -void autoTest::testDefaults() -{ - MainWindow mw; - - mw.show(); - - // Test default values for widget properties -// QCOMPARE( mw.acceptDrops(), false ); -// QCOMPARE( mw.hasEditFocus(), false ); - QCOMPARE( mw.hasFocus(), false ); - QCOMPARE( mw.hasMouseTracking(), false ); - QCOMPARE( mw.isActiveWindow(), true ); - QCOMPARE( mw.isEnabled(), true ); - QCOMPARE( mw.isFullScreen(), false ); - QCOMPARE( mw.isHidden(), false ); - QCOMPARE( mw.isMaximized(), false ); - QCOMPARE( mw.isMinimized(), false ); - QCOMPARE( mw.isModal(), false ); - QCOMPARE( mw.isVisible(), true ); - QCOMPARE( mw.isWindow(), true ); - QCOMPARE( mw.isWindowModified(), false ); - QCOMPARE( mw.underMouse(), false ); - QCOMPARE( mw.updatesEnabled(), true ); - - mw.hide(); -} - -void autoTest::testMainWindow() -{ - aboutThread executioner; - openUrlThread disruptor; - MainWindow mw; - mw.show(); - - QList subObjects = mw.findChildren(); - QVERIFY( subObjects.count() == 1 ); - Previewer *prev = subObjects.at(0); - - QVERIFY( prev ); - - // Menu items to be tested initiated - QMenu *filemenu; - QMenu *helpmenu; - QList menuObjects = mw.findChildren(); - QVERIFY( menuObjects.count() == 2 ); - - for ( int i = 0; i < menuObjects.count(); i++) - { - if ( menuObjects.at(i)->title() == QString("&File") ) - { - filemenu = menuObjects.at(i); - } - else if ( menuObjects.at(i)->title() == QString("&Help") ) - { - helpmenu = menuObjects.at(i); - } - else - { - QFAIL("This test application does not handle localisated text items!"); - } - } - - QVERIFY( filemenu ); - QVERIFY( !filemenu->isEmpty() ); - QCOMPARE( filemenu->title(), QString("&File") ); - - QVERIFY( helpmenu ); - QVERIFY( !helpmenu->isEmpty() ); - QCOMPARE( helpmenu->title(), QString("&Help") ); - - QAction *openUrl; - QAction *about; - QList actionObjects = mw.findChildren(); - - QCOMPARE(actionObjects.count(), 9); - - for ( int i = 0; i < actionObjects.count(); i++) - { - if ( actionObjects.at(i)->text() == QString("&Open URL...") ) - { - openUrl = actionObjects.at(i); - } - else if ( actionObjects.at(i)->text() == QString("&About") ) - { - about = actionObjects.at(i); - } - else - { - // no test actions for these QACTION items, yet - } - } - QTest::qWait(1000); - -/* this part doesn't work yet, investigation underway... - filemenu->show(); - QTest::qWait(500); - - executioner.setMainWindow(&mw); - executioner.start(); - - about->trigger(); - QTest::qWait(3000); -*/ - - filemenu->show(); - QTest::qWait(500); - - disruptor.setMainWindow(&mw); - disruptor.start(); - - openUrl->trigger(); - QTest::qWait(1000); - - mw.hide(); -} - -void autoTest::testPreviewer() -{ - MainWindow mw; - - mw.show(); - - // What to test here? - QList subObjects = mw.findChildren(); - QVERIFY( subObjects.count() == 1 ); - Previewer *prev = subObjects.at(0); - - QVERIFY( prev ); - - mw.hide(); -} - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_previewer/autotest.h --- a/tests/qtp/qtp_previewer/autotest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef AUTOTEST_H -#define AUTOTEST_H - -#include -#include -#include - - -class autoTest: public QObject -{ - Q_OBJECT - - void initTestCase(); - - private slots: - void testDefaults(); - void testMainWindow(); - void testPreviewer(); -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_previewer/main.cpp --- a/tests/qtp/qtp_previewer/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include "mainwindow.h" -#include "autotest.h" - -QTEST_MAIN(autoTest) diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_previewer/mainwindow.cpp --- a/tests/qtp/qtp_previewer/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,197 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include "mainwindow.h" - -//! [0] -MainWindow::MainWindow() -{ - createActions(); - createMenus(); - centralWidget = new Previewer(this); - setCentralWidget(centralWidget); - - connect(centralWidget->webView, SIGNAL(loadFinished(bool)), - this, SLOT(updateTextEdit())); - setStartupText(); -} -//! [0] - -//! [1] -void MainWindow::createActions() -{ - openAct = new QAction(tr("&Open..."), this); - openAct->setShortcuts(QKeySequence::Open); - openAct->setStatusTip(tr("Open an existing HTML file")); - connect(openAct, SIGNAL(triggered()), this, SLOT(open())); - - openUrlAct = new QAction(tr("&Open URL..."), this); - openUrlAct->setShortcut(tr("Ctrl+U")); - openUrlAct->setStatusTip(tr("Open a URL")); - connect(openUrlAct, SIGNAL(triggered()), this, SLOT(openUrl())); -//! [1] - - saveAct = new QAction(tr("&Save"), this); - saveAct->setShortcuts(QKeySequence::Save); - saveAct->setStatusTip(tr("Save the HTML file to disk")); - connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); - - exitAct = new QAction(tr("E&xit"), this); - exitAct->setStatusTip(tr("Exit the application")); - exitAct->setShortcuts(QKeySequence::Quit); - connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); - - aboutAct = new QAction(tr("&About"), this); - aboutAct->setStatusTip(tr("Show the application's About box")); - connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); - - aboutQtAct = new QAction(tr("About &Qt"), this); - aboutQtAct->setStatusTip(tr("Show the Qt library's About box")); - connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt())); -} - -//! [2] -void MainWindow::createMenus() -{ - fileMenu = menuBar()->addMenu(tr("&File")); - fileMenu->addAction(openAct); - fileMenu->addAction(openUrlAct); - fileMenu->addAction(saveAct); - fileMenu->addSeparator(); - fileMenu->addAction(exitAct); - - menuBar()->addSeparator(); - - helpMenu = menuBar()->addMenu(tr("&Help")); - helpMenu->addAction(aboutAct); - helpMenu->addAction(aboutQtAct); -} -//! [2] - -//! [3] -void MainWindow::about() -{ - QMessageBox::about(this, tr("About Previewer"), - tr("The Previewer example demonstrates how to " - "view HTML documents using a QWebView.")); -} -//! [3] - -//! [4] -void MainWindow::open() -{ - QString fileName = QFileDialog::getOpenFileName(this); - if (!fileName.isEmpty()) { - // read from file - QFile file(fileName); - - if (!file.open(QIODevice::ReadOnly)) { - QMessageBox::information(this, tr("Unable to open file"), - file.errorString()); - return; - } - - QTextStream out(&file); - QString output = out.readAll(); - - // display contents - centralWidget->plainTextEdit->setPlainText(output); - centralWidget->setBaseUrl(QUrl::fromLocalFile(fileName)); - } -} -//! [4] - -//! [5] -void MainWindow::openUrl() -{ - bool ok; - QString url = QInputDialog::getText(this, tr("Enter a URL"), - tr("URL:"), QLineEdit::Normal, "http://", &ok); - - if (ok && !url.isEmpty()) { - centralWidget->webView->setUrl(url); - } -} -//! [5] - -//! [6] -void MainWindow::save() -{ - QString content = centralWidget->plainTextEdit->toPlainText(); - QString fileName = QFileDialog::getSaveFileName(this); - - if (!fileName.isEmpty()) { - // save to file - QFile file(fileName); - - if (!file.open(QIODevice::WriteOnly)) { - QMessageBox::information(this, tr("Unable to open file"), - file.errorString()); - return; - } - - QTextStream in(&file); - in << content; - } -} -//! [6] - -//! [7] -void MainWindow::updateTextEdit() -{ - QWebFrame *mainFrame = centralWidget->webView->page()->mainFrame(); - QString frameText = mainFrame->toHtml(); - centralWidget->plainTextEdit->setPlainText(frameText); -} -//! [7] - -//! [8] -void MainWindow::setStartupText() -{ - QString string = "

HTML Previewer

" - "

This example shows you how to use QWebView to" - " preview HTML data written in a QPlainTextEdit.

" - " "; - centralWidget->webView->setHtml(string); -} -//! [8] diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_previewer/mainwindow.h --- a/tests/qtp/qtp_previewer/mainwindow.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include "previewer.h" - -QT_BEGIN_NAMESPACE -class QAction; -class QMenu; -QT_END_NAMESPACE - -//! [0] -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - MainWindow(); - -private slots: - void open(); - void openUrl(); - void save(); - void about(); - void updateTextEdit(); -//! [0] - -//! [1] -private: - Previewer *centralWidget; - QMenu *fileMenu; - QMenu *helpMenu; - QAction *openAct; - QAction *openUrlAct; - QAction *saveAct; - QAction *exitAct; - QAction *aboutAct; - QAction *aboutQtAct; - - void createActions(); - void createMenus(); - void setStartupText(); -}; -//! [1] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_previewer/previewer.cpp --- a/tests/qtp/qtp_previewer/previewer.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "previewer.h" - -//! [0] -Previewer::Previewer(QWidget *parent) - : QWidget(parent) -{ - setupUi(this); -} -//! [0] - -void Previewer::setBaseUrl(const QUrl &url) -{ - baseUrl = url; -} - -//! [1] -void Previewer::on_previewButton_clicked() -{ - // Update the contents in web viewer - QString text = plainTextEdit->toPlainText(); - webView->setHtml(text, baseUrl); -} -//! [1] diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_previewer/previewer.h --- a/tests/qtp/qtp_previewer/previewer.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef PREVIEWER_H -#define PREVIEWER_H - -#include "ui_previewer.h" - -//! [0] -class Previewer : public QWidget, public Ui::Form -{ - Q_OBJECT - -public: - Previewer(QWidget *parent = 0); - - void setBaseUrl(const QUrl &url); - -public slots: - void on_previewButton_clicked(); - -private: - QUrl baseUrl; -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_previewer/previewer.pro --- a/tests/qtp/qtp_previewer/previewer.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -QT += webkit network -HEADERS = previewer.h \ - mainwindow.h -SOURCES = main.cpp \ - previewer.cpp \ - mainwindow.cpp -FORMS = previewer.ui - -# install -target.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_previewer -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_previewer -INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xED83EC08 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - INCLUDEPATH +=tmp $$QMAKE_INCDIR_QT/QtXmlPatterns -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_previewer/previewer.ui --- a/tests/qtp/qtp_previewer/previewer.ui Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,99 +0,0 @@ - - Form - - - - 0 - 0 - 911 - 688 - - - - Form - - - - - - Qt::Horizontal - - - - HTML Editor - - - - - - - - - - - - - Clear - - - - - - - Preview - - - - - - - - - - - - HTML Preview - - - - - - - about:blank - - - - - - - - - - - - - QWebView - QWidget -
QtWebKit/QWebView
- - - - - - clearButton - clicked() - plainTextEdit - clear() - - - 56 - 653 - - - 98 - 551 - - - - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/autotest.cpp --- a/tests/qtp/qtp_qftp/autotest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,165 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include -#include "ftpserver.h" -#include "ftpwindow.h" -#include "autotest.h" - - - class serverThread : public QThread - { - public: - void run(); - }; - - void serverThread::run() - { - ftpServer testServer; - - while ( testServer.isDone() ) - { - QTest::qWait(1000); - } - } - -void autoTest::initTestCase() -{ -} - -void autoTest::testDefaults() -{ - FtpWindow fw; - - fw.show(); - - // Test default values for widget properties -// QCOMPARE( fw.acceptDrops(), false ); -// QCOMPARE( fw.hasEditFocus(), false ); - QCOMPARE( fw.hasFocus(), false ); - QCOMPARE( fw.hasMouseTracking(), false ); - /* - QCOMPARE( fw.isActiveWindow(), true ); - QCOMPARE( fw.isEnabled(), true ); - QCOMPARE( fw.isFullScreen(), false ); - QCOMPARE( fw.isHidden(), false ); - QCOMPARE( fw.isMaximized(), false ); - QCOMPARE( fw.isMinimized(), false ); - QCOMPARE( fw.isModal(), false ); - QCOMPARE( fw.isVisible(), true ); - QCOMPARE( fw.isWindow(), true ); - QCOMPARE( fw.isWindowModified(), false ); - QCOMPARE( fw.underMouse(), false ); - QCOMPARE( fw.updatesEnabled(), true ); - */ - - fw.hide(); -} - -void autoTest::testFtpWindow() -{ - FtpWindow fw; - - fw.show(); - - // what to test here - serverThread testThread; - testThread.start(); - - QPushButton * connectButton; - QList allPButtons = fw.findChildren(); - QVERIFY( allPButtons.count() > 0 ); - - for ( int i = 0; i < allPButtons.count(); i++) - { - if ( allPButtons.at(i)->text() == QString("Connect") ) - { - connectButton = allPButtons.at(i); - } - else - { - // Other buttons than connect ignored so far... - } - } - QVERIFY(connectButton); - - QLineEdit * addressLine; - QList allLineEds = fw.findChildren(); - QVERIFY( allLineEds.count() == 1 ); - - addressLine = allLineEds.at(0); - - while ( !addressLine->text().isEmpty() ) - { - QTest::keyClick ( addressLine, Qt::Key_Backspace, Qt::NoModifier, 100 ); - } - - QTest::qWait(2000); - QTest::keyClicks( addressLine, "127.0.0.1" ); - - QTest::qWait(2000); - connectButton->click(); - - QLabel * statusLabel; - QList allLabels = fw.findChildren(); - QVERIFY( allLabels.count() > 0 ); - - for ( int i = 0; i < allLabels.count(); i++) - { - if ( allLabels.at(i)->text() == QString("Logged onto 127.0.0.1.") ) - { - statusLabel = allLabels.at(i); - } - else - { - // Other buttons than connect ignored so far... - } - } - QVERIFY(statusLabel); - - QTest::qWait(2000); - - fw.hide(); -} - - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/autotest.h --- a/tests/qtp/qtp_qftp/autotest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef AUTOTEST_H -#define AUTOTEST_H - -#include -#include -#include - - -class autoTest: public QObject -{ - Q_OBJECT - - void initTestCase(); - - private slots: - void testDefaults(); - void testFtpWindow(); -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/ftpserver.cpp --- a/tests/qtp/qtp_qftp/ftpserver.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,276 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "ftpserver.h" - -#define FTP_CMND_PORT 21 -#define FTP_DATA_PORT 9801 - -ftpServer::ftpServer( QObject *parent ) - : QTcpServer( parent ) -{ - ftpSocket = NULL; - dataSocket = NULL; - - tcpServer = new QTcpServer( /* this */ ); - not_done = true; - bool result = tcpServer->listen(QHostAddress::Any, FTP_CMND_PORT ); - if ( !result ) - { - delete tcpServer; - close(); - not_done = false; - return; - } - connect(tcpServer, SIGNAL(newConnection()), this, SLOT(handleNewConnection())); - -/* - dataServer = new QTcpServer( ); - result = dataServer->listen(QHostAddress::Any, FTP_DATA_PORT ); - if ( !result ) - { - delete tcpServer; - close(); - not_done = false; - - delete dataServer; - close(); - return; - } - - connect(dataServer, SIGNAL(newConnection()), this, SLOT(handleNewDataConnection())); -*/ -} - -ftpServer::~ftpServer() -{ - if ( ftpSocket ) - { - ftpSocket->disconnect(SIGNAL(readyRead())); - ftpSocket->disconnect(SIGNAL(error(QAbstractSocket::SocketError))); - ftpSocket->close(); - ftpSocket->abort(); - ftpSocket->deleteLater(); - ftpSocket = NULL; - } -} - -bool ftpServer::isDone() -{ - return not_done; -} -void ftpServer::handleNewConnection() -{ - QTcpSocket *clientConnection = tcpServer->nextPendingConnection(); - clientConnection->setTextModeEnabled(true); - - if ( !ftpSocket ) - { - ftpSocket = clientConnection; - connect( ftpSocket, - SIGNAL(readyRead()), - this, - SLOT(readConnection())); - connect(ftpSocket, SIGNAL(error(QAbstractSocket::SocketError)), - this, SLOT(displayConnectionError(QAbstractSocket::SocketError))); - - QString greet("220 Service ready\n"); - ftpSocket->write(qPrintable(greet)); - - } - else if ( !dataSocket ) - { - dataSocket = clientConnection; - connect( dataSocket, - SIGNAL(readyRead()), - this, - SLOT(readConnection())); - connect(dataSocket, SIGNAL(error(QAbstractSocket::SocketError)), - this, SLOT(displayConnectionError(QAbstractSocket::SocketError))); - - if ( dataSocket->waitForConnected() ) - { - //qDebug() << "Data connection accepted.\n"; - } - - - } - else - { - // We already are busy with open connection?! - // qDebug() << "Server busy.\n"; - clientConnection->disconnectFromHost(); - } -} - -void ftpServer::handleNewDataConnection() -{ - QTcpSocket *dataConnection = tcpServer->nextPendingConnection(); - dataConnection->setTextModeEnabled(true); - - if ( !dataSocket ) - { - dataSocket = dataConnection; - connect( dataSocket, - SIGNAL(readyRead()), - this, - SLOT(readConnection())); - connect(dataSocket, SIGNAL(error(QAbstractSocket::SocketError)), - this, SLOT(displayConnectionError(QAbstractSocket::SocketError))); - - QString list(".\n..\nasdf.txt\nqwerty.txt\n"); - ftpSocket->write(qPrintable(list)); - - } - else - { - // We already are busy with open connection?! - //qDebug() << "Data Server busy.\n"; - dataConnection->disconnectFromHost(); - } -} - -void ftpServer::displayConnectionError(QAbstractSocket::SocketError socketError) -{ - Q_UNUSED(socketError); - ftpSocket->disconnect(SIGNAL(readyRead())); - ftpSocket->disconnect(SIGNAL(error(QAbstractSocket::SocketError))); - ftpSocket->close(); - ftpSocket->abort(); - ftpSocket->deleteLater(); - ftpSocket = NULL; -} - -void ftpServer::displayDataConnectionError(QAbstractSocket::SocketError socketError) -{ - Q_UNUSED(socketError); - dataSocket->disconnect(SIGNAL(readyRead())); - dataSocket->disconnect(SIGNAL(error(QAbstractSocket::SocketError))); - dataSocket->close(); - dataSocket->abort(); - dataSocket->deleteLater(); - dataSocket = NULL; -} - -void ftpServer::readDataConnection() -{ - while (dataSocket->canReadLine()) - { - dataSocket->readAll(); - } -} - -void ftpServer::readConnection() -{ - while (ftpSocket->canReadLine()) - { - char buf[256]; - qint64 lineLength = ftpSocket->readLine(buf, sizeof(buf)); - if (lineLength != -1) - { - QString tmpCommand(buf); - tmpCommand = tmpCommand.simplified(); - - // qDebug() << "Received: '" << buf << "'\n"; - if ( tmpCommand.left(5) == QString("USER ") ) - { - QString acceptuser("331 User name ok\n"); - ftpSocket->write(qPrintable(acceptuser)); - } - else if ( tmpCommand.left(5) == QString("PASS ") ) - { - QString acceptCommand("230 User logged in\n"); - ftpSocket->write(qPrintable(acceptCommand)); - } - else if ( tmpCommand.left(5) == QString("TYPE ") ) - { - QString acceptCommand("200 Command OK\n"); - // QString acceptCommand("227 Entering Passive Mode. 21,21,21,21,21,21\n"); - ftpSocket->write(qPrintable(acceptCommand)); - } - else if ( tmpCommand.left(4) == QString("PASV") ) - { - QString acceptCommand("227 Entering Passive Mode. (127,0,0,1,0,21)\n"); - // QString acceptCommand("200 Command OK\n"); - ftpSocket->write(qPrintable(acceptCommand)); - } - else if ( tmpCommand.left(4) == QString("LIST") ) - { - // QString acceptuser("502 Command not implemented\n"); - // QString acceptuser("-rw-r--r-- 1 vogel user 1209041 May 1 13:55 IMPJET24.CAS\n-rw-r--r-- 1 vogel user 10259798 May 1 20:57 IMPJET24.DAT\n"); - // qDebug() << "sending 200...\n"; - QString acceptCommand("200 Command OK\n"); - ftpSocket->write(qPrintable(acceptCommand)); - // qDebug() << "sending 150...\n"; - QString port; - port.setNum(dataSocket->localPort()); - QString dataCommand("150 ASCII data connection for /bin/ls (127.0.0.1,"); - dataCommand.append( port ); - dataCommand.append(") (0 bytes)."); - ftpSocket->write(qPrintable(dataCommand)); - // not_done = false; - - // - //QString list(".\n..\nasdf.txt\nqwerty.txt\n"); - QString list("07.12.2009\t13:49\t\tinclude\n03.12.2009\t14:01\t721\tINSTALL\n"); - - - dataSocket->write(qPrintable(list)); - dataSocket->flush(); - dataSocket->disconnectFromHost(); - dataSocket = NULL; - - // qDebug() << "sending 226...\n"; - QString finishCommand("226 Closing data connection, file transfer successful.\n"); - ftpSocket->write(qPrintable(finishCommand)); - - not_done = false; - - } - else - { - // qDebug() << "Received unknown:" << buf << "\n"; - } - } - } -} - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/ftpserver.h --- a/tests/qtp/qtp_qftp/ftpserver.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -#ifndef FTPSERVER_H -#define FTPSERVER_H - -#include -#include - - class ftpServer : public QTcpServer // , public QThread - { - Q_OBJECT - - public: - ftpServer( QObject *parent = 0 ); - ~ftpServer(); - - bool isDone(); -// void run(); -/* -private: - void sendSomething( QTcpSocket *outSock, quint16 port ); -*/ -private slots: - void handleNewConnection(); - void readConnection(); - void displayConnectionError(QAbstractSocket::SocketError socketError); - - void readDataConnection(); - void handleNewDataConnection(); - void displayDataConnectionError(QAbstractSocket::SocketError socketError); - - private: - QTcpServer *tcpServer; - QTcpSocket *ftpSocket; - - QTcpServer *dataServer; - QTcpSocket *dataSocket; - - bool not_done; -}; - -#endif // FTPSERVER_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/ftpwindow.cpp --- a/tests/qtp/qtp_qftp/ftpwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,379 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#include "ftpwindow.h" - -#ifdef Q_OS_SYMBIAN -#include "sym_iap_util.h" -#endif - -FtpWindow::FtpWindow(QWidget *parent) - : QDialog(parent), ftp(0) -{ - ftpServerLabel = new QLabel(tr("Ftp &server:")); - ftpServerLineEdit = new QLineEdit("ftp.qt.nokia.com"); - ftpServerLabel->setBuddy(ftpServerLineEdit); - - statusLabel = new QLabel(tr("Please enter the name of an FTP server.")); -#ifdef Q_OS_SYMBIAN - // Use word wrapping to fit the text on screen - statusLabel->setWordWrap( true ); -#endif - - fileList = new QTreeWidget; - fileList->setEnabled(false); - fileList->setRootIsDecorated(false); - fileList->setHeaderLabels(QStringList() << tr("Name") << tr("Size") << tr("Owner") << tr("Group") << tr("Time")); - fileList->header()->setStretchLastSection(false); - - connectButton = new QPushButton(tr("Connect")); - connectButton->setDefault(true); - - cdToParentButton = new QPushButton; - cdToParentButton->setIcon(QPixmap(":/images/cdtoparent.png")); - cdToParentButton->setEnabled(false); - - downloadButton = new QPushButton(tr("Download")); - downloadButton->setEnabled(false); - - quitButton = new QPushButton(tr("Quit")); - - buttonBox = new QDialogButtonBox; - buttonBox->addButton(downloadButton, QDialogButtonBox::ActionRole); - buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole); - - progressDialog = new QProgressDialog(this); - - connect(fileList, SIGNAL(itemActivated(QTreeWidgetItem *, int)), - this, SLOT(processItem(QTreeWidgetItem *, int))); - connect(fileList, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), - this, SLOT(enableDownloadButton())); - connect(progressDialog, SIGNAL(canceled()), this, SLOT(cancelDownload())); - connect(connectButton, SIGNAL(clicked()), this, SLOT(connectOrDisconnect())); - connect(cdToParentButton, SIGNAL(clicked()), this, SLOT(cdToParent())); - connect(downloadButton, SIGNAL(clicked()), this, SLOT(downloadFile())); - connect(quitButton, SIGNAL(clicked()), this, SLOT(close())); - - QHBoxLayout *topLayout = new QHBoxLayout; - topLayout->addWidget(ftpServerLabel); - topLayout->addWidget(ftpServerLineEdit); -#ifndef Q_OS_SYMBIAN - topLayout->addWidget(cdToParentButton); - topLayout->addWidget(connectButton); -#else - // Make app better lookin on small screen - QHBoxLayout *topLayout2 = new QHBoxLayout; - topLayout2->addWidget(cdToParentButton); - topLayout2->addWidget(connectButton); -#endif - - QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addLayout(topLayout); -#ifdef Q_OS_SYMBIAN - // Make app better lookin on small screen - mainLayout->addLayout(topLayout2); -#endif - mainLayout->addWidget(fileList); - mainLayout->addWidget(statusLabel); - mainLayout->addWidget(buttonBox); - setLayout(mainLayout); - -#ifdef Q_OS_SYMBIAN - bDefaultIapSet = false; -#endif - - setWindowTitle(tr("FTP")); -} - -QSize FtpWindow::sizeHint() const -{ - return QSize(500, 300); -} - -//![0] -void FtpWindow::connectOrDisconnect() -{ -#ifdef Q_OS_SYMBIAN - if(!bDefaultIapSet) { - qt_SetDefaultIap(); - bDefaultIapSet = true; - } -#endif - if (ftp) { - ftp->abort(); - ftp->deleteLater(); - ftp = 0; -//![0] - fileList->setEnabled(false); - cdToParentButton->setEnabled(false); - downloadButton->setEnabled(false); - connectButton->setEnabled(true); - connectButton->setText(tr("Connect")); -#ifndef QT_NO_CURSOR - setCursor(Qt::ArrowCursor); -#endif - statusLabel->setText(tr("Please enter the name of an FTP server.")); - return; - } - -#ifndef QT_NO_CURSOR - setCursor(Qt::WaitCursor); -#endif - -//![1] - ftp = new QFtp(this); - connect(ftp, SIGNAL(commandFinished(int, bool)), - this, SLOT(ftpCommandFinished(int, bool))); - connect(ftp, SIGNAL(listInfo(const QUrlInfo &)), - this, SLOT(addToList(const QUrlInfo &))); - connect(ftp, SIGNAL(dataTransferProgress(qint64, qint64)), - this, SLOT(updateDataTransferProgress(qint64, qint64))); - - fileList->clear(); - currentPath.clear(); - isDirectory.clear(); -//![1] - -//![2] - QUrl url(ftpServerLineEdit->text()); - if (!url.isValid() || url.scheme().toLower() != QLatin1String("ftp")) { - ftp->connectToHost(ftpServerLineEdit->text(), 21); - ftp->login(); - } else { - ftp->connectToHost(url.host(), url.port(21)); - - if (!url.userName().isEmpty()) - ftp->login(QUrl::fromPercentEncoding(url.userName().toLatin1()), url.password()); - else - ftp->login(); - if (!url.path().isEmpty()) - ftp->cd(url.path()); - } -//![2] - - fileList->setEnabled(true); - connectButton->setEnabled(false); - connectButton->setText(tr("Disconnect")); - statusLabel->setText(tr("Connecting to FTP server %1...") - .arg(ftpServerLineEdit->text())); -} - -//![3] -void FtpWindow::downloadFile() -{ - QString fileName = fileList->currentItem()->text(0); -//![3] -// - if (QFile::exists(fileName)) { - QMessageBox::information(this, tr("FTP"), - tr("There already exists a file called %1 in " - "the current directory.") - .arg(fileName)); - return; - } - -//![4] - file = new QFile(fileName); - if (!file->open(QIODevice::WriteOnly)) { - QMessageBox::information(this, tr("FTP"), - tr("Unable to save the file %1: %2.") - .arg(fileName).arg(file->errorString())); - delete file; - return; - } - - ftp->get(fileList->currentItem()->text(0), file); - - progressDialog->setLabelText(tr("Downloading %1...").arg(fileName)); - downloadButton->setEnabled(false); - progressDialog->exec(); -} -//![4] - -//![5] -void FtpWindow::cancelDownload() -{ - ftp->abort(); -} -//![5] - -//![6] -void FtpWindow::ftpCommandFinished(int, bool error) -{ -#ifndef QT_NO_CURSOR - setCursor(Qt::ArrowCursor); -#endif - - if (ftp->currentCommand() == QFtp::ConnectToHost) { - if (error) { - QMessageBox::information(this, tr("FTP"), - tr("Unable to connect to the FTP server " - "at %1. Please check that the host " - "name is correct.") - .arg(ftpServerLineEdit->text())); - connectOrDisconnect(); - return; - } - statusLabel->setText(tr("Logged onto %1.") - .arg(ftpServerLineEdit->text())); - fileList->setFocus(); - downloadButton->setDefault(true); - connectButton->setEnabled(true); - return; - } -//![6] - -//![7] - if (ftp->currentCommand() == QFtp::Login) - ftp->list(); -//![7] - -//![8] - if (ftp->currentCommand() == QFtp::Get) { - if (error) { - statusLabel->setText(tr("Canceled download of %1.") - .arg(file->fileName())); - file->close(); - file->remove(); - } else { - statusLabel->setText(tr("Downloaded %1 to current directory.") - .arg(file->fileName())); - file->close(); - } - delete file; - enableDownloadButton(); - progressDialog->hide(); -//![8] -//![9] - } else if (ftp->currentCommand() == QFtp::List) { - if (isDirectory.isEmpty()) { - fileList->addTopLevelItem(new QTreeWidgetItem(QStringList() << tr(""))); - fileList->setEnabled(false); - } - } -//![9] -} - -//![10] -void FtpWindow::addToList(const QUrlInfo &urlInfo) -{ - QTreeWidgetItem *item = new QTreeWidgetItem; - item->setText(0, urlInfo.name()); - item->setText(1, QString::number(urlInfo.size())); - item->setText(2, urlInfo.owner()); - item->setText(3, urlInfo.group()); - item->setText(4, urlInfo.lastModified().toString("MMM dd yyyy")); - - QPixmap pixmap(urlInfo.isDir() ? ":/images/dir.png" : ":/images/file.png"); - item->setIcon(0, pixmap); - - isDirectory[urlInfo.name()] = urlInfo.isDir(); - fileList->addTopLevelItem(item); - if (!fileList->currentItem()) { - fileList->setCurrentItem(fileList->topLevelItem(0)); - fileList->setEnabled(true); - } -} -//![10] - -//![11] -void FtpWindow::processItem(QTreeWidgetItem *item, int /*column*/) -{ - QString name = item->text(0); - if (isDirectory.value(name)) { - fileList->clear(); - isDirectory.clear(); - currentPath += "/" + name; - ftp->cd(name); - ftp->list(); - cdToParentButton->setEnabled(true); -#ifndef QT_NO_CURSOR - setCursor(Qt::WaitCursor); -#endif - return; - } -} -//![11] - -//![12] -void FtpWindow::cdToParent() -{ -#ifndef QT_NO_CURSOR - setCursor(Qt::WaitCursor); -#endif - fileList->clear(); - isDirectory.clear(); - currentPath = currentPath.left(currentPath.lastIndexOf('/')); - if (currentPath.isEmpty()) { - cdToParentButton->setEnabled(false); - ftp->cd("/"); - } else { - ftp->cd(currentPath); - } - ftp->list(); -} -//![12] - -//![13] -void FtpWindow::updateDataTransferProgress(qint64 readBytes, - qint64 totalBytes) -{ - progressDialog->setMaximum(totalBytes); - progressDialog->setValue(readBytes); -} -//![13] - -//![14] -void FtpWindow::enableDownloadButton() -{ - QTreeWidgetItem *current = fileList->currentItem(); - if (current) { - QString currentFile = current->text(0); - downloadButton->setEnabled(!isDirectory.value(currentFile)); - } else { - downloadButton->setEnabled(false); - } -} -//![14] - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/ftpwindow.h --- a/tests/qtp/qtp_qftp/ftpwindow.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef FTPWINDOW_H -#define FTPWINDOW_H - -#include -#include - -QT_BEGIN_NAMESPACE -class QDialogButtonBox; -class QFile; -class QFtp; -class QLabel; -class QLineEdit; -class QTreeWidget; -class QTreeWidgetItem; -class QProgressDialog; -class QPushButton; -class QUrlInfo; -QT_END_NAMESPACE - -class FtpWindow : public QDialog -{ - Q_OBJECT - -public: - FtpWindow(QWidget *parent = 0); - QSize sizeHint() const; - -//![0] -private slots: - void connectOrDisconnect(); - void downloadFile(); - void cancelDownload(); - - void ftpCommandFinished(int commandId, bool error); - void addToList(const QUrlInfo &urlInfo); - void processItem(QTreeWidgetItem *item, int column); - void cdToParent(); - void updateDataTransferProgress(qint64 readBytes, - qint64 totalBytes); - void enableDownloadButton(); -//![0] - -private: - QLabel *ftpServerLabel; - QLineEdit *ftpServerLineEdit; - QLabel *statusLabel; - QTreeWidget *fileList; - QPushButton *cdToParentButton; - QPushButton *connectButton; - QPushButton *downloadButton; - QPushButton *quitButton; - QDialogButtonBox *buttonBox; - QProgressDialog *progressDialog; - -//![1] - QHash isDirectory; - QString currentPath; - QFtp *ftp; - QFile *file; - -#ifdef Q_OS_SYMBIAN - bool bDefaultIapSet; -#endif -//![1] -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/images/cdtoparent.png Binary file tests/qtp/qtp_qftp/images/cdtoparent.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/images/dir.png Binary file tests/qtp/qtp_qftp/images/dir.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/images/file.png Binary file tests/qtp/qtp_qftp/images/file.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/main.cpp --- a/tests/qtp/qtp_qftp/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include "ftpwindow.h" -#include "autotest.h" - - -#ifdef Q_OS_SYMBIAN -#include -#include -#endif - - -QTEST_MAIN(autoTest) diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/qtp_ftp.qrc --- a/tests/qtp/qtp_qftp/qtp_ftp.qrc Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ - - - images/cdtoparent.png - images/dir.png - images/file.png - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/qtp_qftp.pro --- a/tests/qtp/qtp_qftp/qtp_qftp.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -HEADERS = autotest.h \ - ftpwindow.h \ - ftpserver.h -SOURCES = autotest.cpp \ - ftpwindow.cpp \ - main.cpp \ - ftpserver.cpp - -RESOURCES += qtp_ftp.qrc -QT += network -CONFIG += qt \ - warn_on \ - console \ - depend_includepath -qtAddLibrary(QtTest) - -# install -target.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_qftp -sources.files = $$SOURCES \ - $$HEADERS \ - $$RESOURCES \ - $$FORMS \ - *.pro \ - images -sources.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_qftp -INSTALLS += target \ - sources -symbian { - TARGET.UID3 = 0xED83EC09 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - HEADERS += sym_iap_util.h - INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE - TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData" - LIBS += -lesock \ - -lcommdb \ - -linsock # For IAP selection -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_qftp/sym_iap_util.h --- a/tests/qtp/qtp_qftp/sym_iap_util.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,510 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QSYM_IAP_UTIL_H -#define QSYM_IAP_UTIL_H - -// Symbian -#include -#include -#include -#include -#include -#include -#include - -// OpenC -#include -#include - -//Qt -#include -#include -//#include - -_LIT(KIapNameSetting, "IAP\\Name"); // text - mandatory -_LIT(KIapDialogPref, "IAP\\DialogPref"); // TUnit32 - optional -_LIT(KIapService, "IAP\\IAPService"); // TUnit32 - mandatory -_LIT(KIapServiceType, "IAP\\IAPServiceType"); // text - mandatory -_LIT(KIapBearer, "IAP\\IAPBearer"); // TUint32 - optional -_LIT(KIapBearerType, "IAP\\IAPBearerType"); // text - optional -_LIT(KIapNetwork, "IAP\\IAPNetwork"); // TUint32 - optional - -const QLatin1String qtOrganizationTag("Trolltech"); -const QLatin1String qtNetworkModuleTag("QtNetwork"); -const QLatin1String iapGroupTag("IAP"); -const QLatin1String iapNamesArrayTag("Names"); -const QLatin1String iapNameItemTag("Name"); - -static QTextCodec *utf16LETextCodec = 0; - -void clearIapNamesSettings(QSettings &settings) { - settings.beginGroup(qtNetworkModuleTag); - settings.beginGroup(iapGroupTag); - settings.remove(iapNamesArrayTag); - settings.endGroup(); - settings.endGroup(); -} - -void writeIapNamesSettings(QSettings &settings, const QStringList& iapNames) { - clearIapNamesSettings(settings); - settings.beginGroup(qtNetworkModuleTag); - settings.beginGroup(iapGroupTag); - settings.beginWriteArray(iapNamesArrayTag); - for (int index = 0; index < iapNames.size(); ++index) { - settings.setArrayIndex(index); - settings.setValue(iapNameItemTag, iapNames.at(index)); - } - settings.endArray(); - settings.endGroup(); - settings.endGroup(); -} - -void readIapNamesSettings(QSettings &settings, QStringList& iapNames) { - settings.beginGroup(qtNetworkModuleTag); - settings.beginGroup(iapGroupTag); - int last = settings.beginReadArray(iapNamesArrayTag); - for (int index = 0; index < last; ++index) { - settings.setArrayIndex(index); - iapNames.append(settings.value(iapNameItemTag).toString()); - } - settings.endArray(); - settings.endGroup(); - settings.endGroup(); -} - -static QString qt_TNameToQString(TName data) { - if(utf16LETextCodec == 0) - utf16LETextCodec = QTextCodec::codecForName("UTF-16LE"); - - QByteArray tmpByteArray = QByteArray::fromRawData((char*)(data.PtrZ()), data.Length() * 2); - return utf16LETextCodec->toUnicode(tmpByteArray); -} - -static QString qt_InterfaceInfoL() -{ - QString output; - - TBuf8<512> buffer; - TBuf<128> t; - TAutoClose ss; - User::LeaveIfError(ss.iObj.Connect()); - ss.PushL(); - - TAutoClose sock; - User::LeaveIfError(sock.iObj.Open(ss.iObj, _L("udp"))); - sock.PushL(); - - User::LeaveIfError(sock.iObj.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl)); - - TProtocolDesc in; - User::LeaveIfError(sock.iObj.Info(in)); - printf("EPOC32 IP Configuration TCPIP Version %d.%d.%d\n", in.iVersion.iMajor, in.iVersion.iMinor, in.iVersion.iBuild); - - TPckgBuf info, next; - - TInt res=sock.iObj.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info); - if(res!=KErrNone) - User::Leave(res); - TInt count = 0; - while(res==KErrNone) { - res=sock.iObj.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, next); - - if(info().iName != _L("") && info().iName != _L("loop6") && info().iName != _L("loop4")) { - printf("Interface %d\n", count++); - - printf("Name \"%s\"\n", qt_TNameToQString(info().iName).toLatin1().data()); - printf("NIF tag \"%s\"\n", qt_TNameToQString(info().iTag).toLatin1().data()); - - printf("State "); - switch (info().iState) - { - case EIfPending: - printf("pending\n"); - break; - case EIfUp: - printf("up\n"); - break; - case EIfBusy: - printf("busy\n"); - break; - default: - printf("down\n"); - break; - } - - printf("Mtu %d\n", info().iMtu); - printf("Speed Metric %d\n", info().iSpeedMetric); - - printf("Features:"); - info().iFeatures & KIfIsLoopback ? printf(" loopback") : printf(""); - info().iFeatures & KIfIsDialup ? printf(" dialup") : printf(""); - info().iFeatures & KIfIsPointToPoint ? printf(" pointtopoint") : printf(""); - info().iFeatures & KIfCanBroadcast ? printf(" canbroadcast") : printf(""); - info().iFeatures & KIfCanMulticast ? printf(" canmulticast") : printf(""); - info().iFeatures & KIfCanSetMTU ? printf(" cansetmtu") : printf(""); - info().iFeatures & KIfHasHardwareAddr ? printf(" hardwareaddr") : printf(""); - info().iFeatures & KIfCanSetHardwareAddr ? printf(" cansethardwareaddr") : printf(""); - printf("\n"); - - TName address; - info().iAddress.Output(address); - printf("Addr: %s\n", qt_TNameToQString(address).toLatin1().data()); - - if(info().iAddress.IsLinkLocal()) { - printf(" -link local\n"); - } else if(info().iAddress.IsSiteLocal()) { - printf(" -site local\n"); - } else { - printf(" -global\n"); - } - - info().iNetMask.Output(address); - printf("Netmask %s\n", qt_TNameToQString(address).toLatin1().data()); - - info().iBrdAddr.Output(address); - printf("Broadcast address %s\n", qt_TNameToQString(address).toLatin1().data()); - - info().iDefGate.Output(address); - printf("Gatew: %s\n", qt_TNameToQString(address).toLatin1().data()); - - info().iNameSer1.Output(address); - printf("DNS 1: %s\n", qt_TNameToQString(address).toLatin1().data()); - - info().iNameSer2.Output(address); - printf("DNS 2: %s\n", qt_TNameToQString(address).toLatin1().data()); - - if (info().iHwAddr.Family() != KAFUnspec) { - printf("Hardware address "); - TUint j; - for(j = sizeof(SSockAddr) ; j < sizeof(SSockAddr) + 6 ; ++j) { - if(j < (TUint)info().iHwAddr.Length()) { - printf("%02X", info().iHwAddr[j]); - } else { - printf("??"); - } - if(j < sizeof(SSockAddr) + 5) - printf("-"); - else - printf("\n"); - } - } - } - if(res == KErrNone) { - info = next; - printf("\n"); - } else { - printf("\n"); - } - } - - sock.Pop(); - ss.Pop(); - - return output; -} - -static QString qt_RouteInfoL() { - QString output; - TAutoClose ss; - User::LeaveIfError(ss.iObj.Connect()); - ss.PushL(); - - TAutoClose sock; - User::LeaveIfError(sock.iObj.Open(ss.iObj, _L("udp"))); - sock.PushL(); - - TSoInetRouteInfo routeInfo; - TPckg routeInfoPkg(routeInfo); - - TName destAddr; - TName netMask; - TName gateway; - TName ifAddr; - - // Begins enumeration of routes by setting this option - User::LeaveIfError(sock.iObj.SetOpt(KSoInetEnumRoutes, KSolInetRtCtrl)); - - // The TSoInetRouteInfo contains information for a new route each time GetOpt returns KErrNone - for(TInt i = 0; sock.iObj.GetOpt(KSoInetNextRoute, KSolInetRtCtrl, routeInfoPkg) == KErrNone ; i++) - { - // Extract the destination and netmask - routeInfo.iDstAddr.Output(destAddr); - routeInfo.iNetMask.Output(netMask); - routeInfo.iGateway.Output(gateway); - routeInfo.iIfAddr.Output(ifAddr); -/* - if(destAddr.Length() <= 2) - continue; - - if(netMask.Find(_L("255.255.255.255")) != KErrNotFound - || netMask.Find(_L("0.0.0.0")) != KErrNotFound - || netMask.Find(_L("ffff:ffff:ffff:ffff")) != KErrNotFound) - continue; -*/ - printf("Route Info #[%i]\n", i); - printf("DstAddr %s\n", qt_TNameToQString(destAddr).toLatin1().data()); - printf("NetMask %s\n", qt_TNameToQString(netMask).toLatin1().data()); - printf("Gateway %s\n", qt_TNameToQString(gateway).toLatin1().data()); - printf("IfAddr %s\n", qt_TNameToQString(ifAddr).toLatin1().data()); - printf("\n"); - } - - sock.Pop(); - ss.Pop(); - - return output; -} - -QString qt_TDesC2QStringL(const TDesC& aDescriptor) -{ -#ifdef QT_NO_UNICODE - return QString::fromLocal8Bit(aDescriptor.Ptr(), aDescriptor.Length()); -#else - return QString::fromUtf16(aDescriptor.Ptr(), aDescriptor.Length()); -#endif -} - -static bool qt_SetDefaultIapName(const QString &iapName, int &error) { - struct ifreq ifReq; - // clear structure - memset(&ifReq, 0, sizeof(struct ifreq)); - // set IAP name value - // make sure it is in UTF8 - strcpy(ifReq.ifr_name, iapName.toUtf8().data()); - - if(setdefaultif(&ifReq) == 0) { - // OK - error = 0; - return true; - } else { - error = errno; - return false; - } - -} -static bool qt_SetDefaultSnapId(const int snapId, int &error) { - struct ifreq ifReq; - // clear structure - memset(&ifReq, 0, sizeof(struct ifreq)); - // set SNAP ID value - ifReq.ifr_ifru.snap_id = snapId; - - if(setdefaultif(&ifReq) == 0) { - // OK - error = 0; - return true; - } else { - error = errno; - return false; - } - -} - -static void qt_SaveIapName(QSettings& settings, QStringList& iapNames, QString& iapNameValue) { - if(iapNames.contains(iapNameValue) && iapNames.first() == iapNameValue) { - // no need to update - } else { - if(iapNameValue != QString("Easy WLAN")) { - // new selection alway on top - iapNames.removeAll(iapNameValue); - iapNames.prepend(iapNameValue); - writeIapNamesSettings(settings, iapNames); - } else { - // Unbeliveable ... if IAP dodn't exist before - // no matter what you choose from IAP selection list - // you will get "Easy WLAN" as IAP name value - - // somehow commsdb is not in sync - } - } -} - -static QString qt_OfferIapDialog() { - TBuf8<256> iapName; - - RSocketServ socketServ; - CleanupClosePushL(socketServ); - - RConnection connection; - CleanupClosePushL(connection); - - socketServ.Connect(); - connection.Open(socketServ); - connection.Start(); - - connection.GetDesSetting(TPtrC(KIapNameSetting), iapName); - - //connection.Stop(); - - iapName.ZeroTerminate(); - QString strIapName((char*)iapName.Ptr()); - - int error = 0; - if(!qt_SetDefaultIapName(strIapName, error)) { - //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error); - strIapName = QString(""); - } - - CleanupStack::PopAndDestroy(&connection); - CleanupStack::PopAndDestroy(&socketServ); - - return strIapName; -} - -static QString qt_CheckForActiveConnection() { - TUint count; - - RSocketServ serv; - CleanupClosePushL(serv); - - RConnection conn; - CleanupClosePushL(conn); - - serv.Connect(); - conn.Open(serv); - - TConnectionInfoBuf connInfo; - - TBuf8<256> iapName; - TBuf8<256> iapServiceType; - - QString strIapName; - - if (conn.EnumerateConnections(count) == KErrNone) { - if(count > 0) { - for (TUint i = 1; i <= count; i++) { - if (conn.GetConnectionInfo(i, connInfo) == KErrNone) { - RConnection tempConn; - CleanupClosePushL(tempConn); - tempConn.Open(serv); - if (tempConn.Attach(connInfo, RConnection::EAttachTypeNormal) == KErrNone) { - tempConn.GetDesSetting(TPtrC(KIapNameSetting), iapName); - tempConn.GetDesSetting(TPtrC(KIapServiceType), iapServiceType); - //tempConn.Stop(); - iapName.ZeroTerminate(); - iapServiceType.ZeroTerminate(); - -// if(iapServiceType.Find(_L8("LANService")) != KErrNotFound) { -// activeLanConnectionFound = ETrue; -// break; -// } - strIapName = QString((char*)iapName.Ptr()); - int error = 0; - if(!qt_SetDefaultIapName(strIapName, error)) { - //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error); - strIapName = QString(""); - } - - CleanupStack::PopAndDestroy(&tempConn); - break; - } - } - } - } - } - - //conn.Stop(); - - CleanupStack::PopAndDestroy(&conn); - CleanupStack::PopAndDestroy(&serv); - - return strIapName; -} - -static QString qt_CheckSettingsForConnection(QStringList& iapNames) { - QString strIapName; - for(int index = 0; index < iapNames.size(); ++index) { - strIapName = iapNames.at(index); - int error = 0; - if(!qt_SetDefaultIapName(strIapName, error)) { - //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error); - strIapName = QString(""); - } else { - return strIapName; - } - } - return strIapName; -} - -static void qt_SetDefaultIapL() -{ - // settings @ /c/data/.config/Trolltech.com - QSettings settings(QSettings::UserScope, qtOrganizationTag); - // populate iap name list - QStringList iapNames; - readIapNamesSettings(settings, iapNames); - - QString iapNameValue; - - iapNameValue = qt_CheckForActiveConnection(); - - if(!iapNameValue.isEmpty()) { - qt_SaveIapName(settings, iapNames, iapNameValue); - return; - } - - iapNameValue = qt_CheckSettingsForConnection(iapNames); - - if(!iapNameValue.isEmpty()) { - qt_SaveIapName(settings, iapNames, iapNameValue); - return; - } - - /* - * no active LAN connections yet - * no IAP in settings - * offer IAP dialog to user - */ - iapNameValue = qt_OfferIapDialog(); - qt_SaveIapName(settings, iapNames, iapNameValue); - return; - -} - -static int qt_SetDefaultIap() -{ - TRAPD(err1, qt_SetDefaultIapL()); -// TRAPD(err2, qt_InterfaceInfoL()); -// TRAPD(err3, qt_RouteInfoL()); - return err1; -} - -#endif // QSYM_IAP_UTIL_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_raycasting/autotest.cpp --- a/tests/qtp/qtp_raycasting/autotest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,99 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "raycasting.h" -#include "autotest.h" - - -void autoTest::initTestCase() -{ - Q_INIT_RESOURCE(qtp_raycasting); -} - -void autoTest::testDefaults() -{ - - Raycasting mw; - mw.show(); - - // mw.openFile(":/files/bubbles.svg"); - - // Test default values for widget properties - QCOMPARE( mw.acceptDrops(), false ); -/* - QCOMPARE( mw.hasEditFocus(), false ); - QCOMPARE( mw.hasFocus(), false ); - QCOMPARE( mw.hasMouseTracking(), false ); - QCOMPARE( mw.isActiveWindow(), true ); - QCOMPARE( mw.isEnabled(), true ); - QCOMPARE( mw.isFullScreen(), false ); - QCOMPARE( mw.isHidden(), false ); - QCOMPARE( mw.isMaximized(), false ); - QCOMPARE( mw.isMinimized(), false ); - QCOMPARE( mw.isModal(), false ); - QCOMPARE( mw.isVisible(), true ); - QCOMPARE( mw.isWindow(), true ); - QCOMPARE( mw.isWindowModified(), false ); - QCOMPARE( mw.underMouse(), false ); -*/ - QCOMPARE( mw.updatesEnabled(), true ); - - mw.hide(); -} - -void autoTest::testRaycasting() -{ - - ray = new Raycasting; - ray->show(); - - // mw.openFile(":/files/bubbles.svg"); - - // Test at least playerpos with keyboard input - // what else? - /* - QCOMPARE( ray->playerPos.x(), 1.50f ); - QCOMPARE( ray->playerPos.y(), 1.50f ); - */ - ray->hide(); - delete ray; -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_raycasting/autotest.h --- a/tests/qtp/qtp_raycasting/autotest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef AUTOTEST_H -#define AUTOTEST_H - -#include -#include -#include - -class Raycasting; - -class autoTest: public QObject/* , private Raycasting */ -{ - Q_OBJECT - - void initTestCase(); - - private slots: - void testDefaults(); - void testRaycasting(); - - private: - Raycasting *ray; - - private: - friend class Raycasting; -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_raycasting/main.cpp --- a/tests/qtp/qtp_raycasting/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include "raycasting.h" -#include "autotest.h" - -/* -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - - Raycasting w; - w.setWindowTitle("Raycasting"); -#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) - w.showMaximized(); -#else - w.resize(640, 480); - w.show(); -#endif - - return app.exec(); -} -*/ - -QTEST_MAIN(autoTest) diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_raycasting/qtp_raycasting.pro --- a/tests/qtp/qtp_raycasting/qtp_raycasting.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - -TEMPLATE = app -HEADERS = autotest.h \ - raycasting.h -SOURCES = autotest.cpp \ - raycasting.cpp \ - main.cpp -RESOURCES += qtp_raycasting.qrc - -CONFIG += qt warn_on console depend_includepath - -qtAddLibrary(QtTest) - -symbian { - TARGET.UID3 = 0xED83EC0A - TARGET.CAPABILITY="ALL -TCB" - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - RSS_RULES ="group_name=\"QtTests\";" -} - -target.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_raycasting -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_raycasting -INSTALLS += target sources diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_raycasting/qtp_raycasting.qrc --- a/tests/qtp/qtp_raycasting/qtp_raycasting.qrc Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - textures.png - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_raycasting/raycasting.cpp --- a/tests/qtp/qtp_raycasting/raycasting.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,354 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the demonstration applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include "raycasting.h" - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - -#define WORLD_SIZE 8 -int world_map[WORLD_SIZE][WORLD_SIZE] = { - { 1, 1, 1, 1, 6, 1, 1, 1 }, - { 1, 0, 0, 1, 0, 0, 0, 7 }, - { 1, 1, 0, 1, 0, 1, 1, 1 }, - { 6, 0, 0, 0, 0, 0, 0, 3 }, - { 1, 8, 8, 0, 8, 0, 8, 1 }, - { 2, 2, 0, 0, 8, 8, 7, 1 }, - { 3, 0, 0, 0, 0, 0, 0, 5 }, - { 2, 2, 2, 2, 7, 4, 4, 4 }, -}; - -#define TEXTURE_SIZE 64 -#define TEXTURE_BLOCK (TEXTURE_SIZE * TEXTURE_SIZE) - -Raycasting::Raycasting(QWidget *parent) - : QWidget(parent) - , angle(0.5) - , playerPos(1.5, 1.5) - , angleDelta(0) - , moveDelta(0) - , touchDevice(false) { - - // http://www.areyep.com/RIPandMCS-TextureLibrary.html - textureImg.load(":/textures.png"); - textureImg = textureImg.convertToFormat(QImage::Format_ARGB32); - Q_ASSERT(textureImg.width() == TEXTURE_SIZE * 2); - Q_ASSERT(textureImg.bytesPerLine() == 4 * TEXTURE_SIZE * 2); - textureCount = textureImg.height() / TEXTURE_SIZE; - - watch.start(); - ticker.start(25, this); - setAttribute(Qt::WA_OpaquePaintEvent, true); - setMouseTracking(false); - } - - void Raycasting::updatePlayer() { - int interval = qBound(20, watch.elapsed(), 250); - watch.start(); - angle += angleDelta * interval / 1000; - qreal step = moveDelta * interval / 1000; - qreal dx = cos(angle) * step; - qreal dy = sin(angle) * step; - QPointF pos = playerPos + 3 * QPointF(dx, dy); - int xi = static_cast(pos.x()); - int yi = static_cast(pos.y()); - if (world_map[yi][xi] == 0) - playerPos = playerPos + QPointF(dx, dy); - } - - void Raycasting::showFps() { - static QTime frameTick; - static int totalFrame = 0; - if (!(totalFrame & 31)) { - int elapsed = frameTick.elapsed(); - frameTick.start(); - int fps = 32 * 1000 / (1 + elapsed); - setWindowTitle(QString("Raycasting (%1 FPS)").arg(fps)); - } - totalFrame++; - } - - void Raycasting::render() { - - // setup the screen surface - if (buffer.size() != bufferSize) - buffer = QImage(bufferSize, QImage::Format_ARGB32); - int bufw = buffer.width(); - int bufh = buffer.height(); - if (bufw <= 0 || bufh <= 0) - return; - - // we intentionally cheat here, to avoid detach - const uchar *ptr = buffer.bits(); - QRgb *start = (QRgb*)(ptr); - QRgb stride = buffer.bytesPerLine() / 4; - QRgb *finish = start + stride * bufh; - - // prepare the texture pointer - const uchar *src = textureImg.bits(); - const QRgb *texsrc = reinterpret_cast(src); - - // cast all rays here - qreal sina = sin(angle); - qreal cosa = cos(angle); - qreal u = cosa - sina; - qreal v = sina + cosa; - qreal du = 2 * sina / bufw; - qreal dv = -2 * cosa / bufw; - - for (int ray = 0; ray < bufw; ++ray, u += du, v += dv) { - // everytime this ray advances 'u' units in x direction, - // it also advanced 'v' units in y direction - qreal uu = (u < 0) ? -u : u; - qreal vv = (v < 0) ? -v : v; - qreal duu = 1 / uu; - qreal dvv = 1 / vv; - int stepx = (u < 0) ? -1 : 1; - int stepy = (v < 0) ? -1 : 1; - - // the cell in the map that we need to check - qreal px = playerPos.x(); - qreal py = playerPos.y(); - int mapx = static_cast(px); - int mapy = static_cast(py); - - // the position and texture for the hit - int texture = 0; - qreal hitdist = 0.1; - qreal texofs = 0; - bool dark = false; - - // first hit at constant x and constant y lines - qreal distx = (u > 0) ? (mapx + 1 - px) * duu : (px - mapx) * duu; - qreal disty = (v > 0) ? (mapy + 1 - py) * dvv : (py - mapy) * dvv; - - // loop until we hit something - while (texture <= 0) { - if (distx > disty) { - // shorter distance to a hit in constant y line - hitdist = disty; - disty += dvv; - mapy += stepy; - texture = world_map[mapy][mapx]; - if (texture > 0) { - dark = true; - if (stepy > 0) { - qreal ofs = px + u * (mapy - py) / v; - texofs = ofs - floor(ofs); - } else { - qreal ofs = px + u * (mapy + 1 - py) / v; - texofs = ofs - floor(ofs); - } - } - } else { - // shorter distance to a hit in constant x line - hitdist = distx; - distx += duu; - mapx += stepx; - texture = world_map[mapy][mapx]; - if (texture > 0) { - if (stepx > 0) { - qreal ofs = py + v * (mapx - px) / u; - texofs = ofs - floor(ofs); - } else { - qreal ofs = py + v * (mapx + 1 - px) / u; - texofs = ceil(ofs) - ofs; - } - } - } - } - - // get the texture, note that the texture image - // has two textures horizontally, "normal" vs "dark" - int col = static_cast(texofs * TEXTURE_SIZE); - col = qBound(0, col, TEXTURE_SIZE - 1); - texture = (texture - 1) % textureCount; - const QRgb *tex = texsrc + TEXTURE_BLOCK * texture * 2 + - (TEXTURE_SIZE * 2 * col); - if (dark) - tex += TEXTURE_SIZE; - - // start from the texture center (horizontally) - int h = static_cast(bufw / hitdist / 2); - int dy = (TEXTURE_SIZE << 12) / h; - int p1 = ((TEXTURE_SIZE / 2) << 12) - dy; - int p2 = p1 + dy; - - // start from the screen center (vertically) - // y1 will go up (decrease), y2 will go down (increase) - int y1 = bufh / 2; - int y2 = y1 + 1; - QRgb *pixel1 = start + y1 * stride + ray; - QRgb *pixel2 = pixel1 + stride; - - // map the texture to the sliver - while (y1 >= 0 && y2 < bufh && p1 >= 0) { - *pixel1 = tex[p1 >> 12]; - *pixel2 = tex[p2 >> 12]; - p1 -= dy; - p2 += dy; - --y1; - ++y2; - pixel1 -= stride; - pixel2 += stride; - } - - // ceiling and floor - for (; pixel1 > start; pixel1 -= stride) - *pixel1 = qRgb(0, 0, 0); - for (; pixel2 < finish; pixel2 += stride) - *pixel2 = qRgb(96, 96, 96); - } - - update(QRect(QPoint(0, 0), bufferSize)); - } - - void Raycasting::resizeEvent(QResizeEvent*) { -#if defined(Q_OS_WINCE_WM) - touchDevice = true; -#elif defined(Q_OS_SYMBIAN) - // FIXME: use HAL - if (width() > 480 || height() > 480) - touchDevice = true; -#else - touchDevice = false; -#endif - if (touchDevice) { - if (width() < height()) { - trackPad = QRect(0, height() / 2, width(), height() / 2); - centerPad = QPoint(width() / 2, height() * 3 / 4); - bufferSize = QSize(width(), height() / 2); - } else { - trackPad = QRect(width() / 2, 0, width() / 2, height()); - centerPad = QPoint(width() * 3 / 4, height() / 2); - bufferSize = QSize(width() / 2, height()); - } - } else { - trackPad = QRect(); - bufferSize = size(); - } - update(); - } - - void Raycasting::timerEvent(QTimerEvent*) { - updatePlayer(); - render(); - showFps(); - } - - void Raycasting::paintEvent(QPaintEvent *event) { - QPainter p(this); - p.setCompositionMode(QPainter::CompositionMode_Source); - - p.drawImage(event->rect(), buffer, event->rect()); - - if (touchDevice && event->rect().intersects(trackPad)) { - p.fillRect(trackPad, Qt::white); - p.setPen(QPen(QColor(224, 224, 224), 6)); - int rad = qMin(trackPad.width(), trackPad.height()) * 0.3; - p.drawEllipse(centerPad, rad, rad); - - p.setPen(Qt::NoPen); - p.setBrush(Qt::gray); - - QPolygon poly; - poly << QPoint(-30, 0); - poly << QPoint(0, -40); - poly << QPoint(30, 0); - - p.translate(centerPad); - for (int i = 0; i < 4; ++i) { - p.rotate(90); - p.translate(0, 20 - rad); - p.drawPolygon(poly); - p.translate(0, rad - 20); - } - } - - p.end(); - } - - void Raycasting::keyPressEvent(QKeyEvent *event) { - event->accept(); - if (event->key() == Qt::Key_Left) - angleDelta = 1.3 * M_PI; - if (event->key() == Qt::Key_Right) - angleDelta = -1.3 * M_PI; - if (event->key() == Qt::Key_Up) - moveDelta = 2.5; - if (event->key() == Qt::Key_Down) - moveDelta = -2.5; - } - - void Raycasting::keyReleaseEvent(QKeyEvent *event) { - event->accept(); - if (event->key() == Qt::Key_Left) - angleDelta = (angleDelta > 0) ? 0 : angleDelta; - if (event->key() == Qt::Key_Right) - angleDelta = (angleDelta < 0) ? 0 : angleDelta; - if (event->key() == Qt::Key_Up) - moveDelta = (moveDelta > 0) ? 0 : moveDelta; - if (event->key() == Qt::Key_Down) - moveDelta = (moveDelta < 0) ? 0 : moveDelta; - } - - void Raycasting::mousePressEvent(QMouseEvent *event) { - qreal dx = centerPad.x() - event->pos().x(); - qreal dy = centerPad.y() - event->pos().y(); - angleDelta = dx * 2 * M_PI / width(); - moveDelta = dy * 10 / height(); - } - - void Raycasting::mouseMoveEvent(QMouseEvent *event) { - qreal dx = centerPad.x() - event->pos().x(); - qreal dy = centerPad.y() - event->pos().y(); - angleDelta = dx * 2 * M_PI / width(); - moveDelta = dy * 10 / height(); - } - - void Raycasting::mouseReleaseEvent(QMouseEvent*) { - angleDelta = 0; - moveDelta = 0; - } - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_raycasting/raycasting.h --- a/tests/qtp/qtp_raycasting/raycasting.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef RAYCASTING_H -#define RAYCASTING_H - -#include -#include -#include -#include "autotest.h" - -QT_BEGIN_NAMESPACE -class QAction; -class QMenu; -QT_END_NAMESPACE - -//! [0] -class Raycasting: public QWidget -{ -public: - Raycasting(QWidget *parent = 0); - - void updatePlayer(); - - void showFps(); - - void render(); - -protected: - - void resizeEvent(QResizeEvent*); - - void timerEvent(QTimerEvent*); - - void paintEvent(QPaintEvent *event); - - void keyPressEvent(QKeyEvent *event); - - void keyReleaseEvent(QKeyEvent *event); - - void mousePressEvent(QMouseEvent *event); - - void mouseMoveEvent(QMouseEvent *event); - - void mouseReleaseEvent(QMouseEvent*); - -private: - QTime watch; - QBasicTimer ticker; - QImage buffer; - qreal angle; - QPointF playerPos; - qreal angleDelta; - qreal moveDelta; - QImage textureImg; - int textureCount; - bool touchDevice; - QRect trackPad; - QPoint centerPad; - QSize bufferSize; - - // friend class autotest; -}; -//! [1] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_raycasting/textures.png Binary file tests/qtp/qtp_raycasting/textures.png has changed diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_star/main.cpp --- a/tests/qtp/qtp_star/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtOpenGL module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include -#include "startest.h" -#include "starwidget.h" - -QTEST_MAIN(starTests) diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_star/qtp_star.pro --- a/tests/qtp/qtp_star/qtp_star.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -TEMPLATE = app -TARGET = qtp_star -CONFIG += qt debug warn_on qtestlib console depend_includepath -QT += openvg -SOURCES = starwidget.cpp startest.cpp main.cpp -HEADERS = starwidget.h startest.h -LIBS += $$QMAKE_LIBS_OPENVG - -qtAddLibrary(QtTest) - -symbian { - TARGET.UID3 = 0xED83EC0B - TARGET.CAPABILITY="ALL -TCB" - // TARGET.CAPABILITY="TCB" - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - RSS_RULES ="group_name=\"QtTests\";" -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_star/startest.cpp --- a/tests/qtp/qtp_star/startest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtOpenGL module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "startest.h" -#include "starwidget.h" - - -void starTests::initTestCase() -{ - /* - QApplication::setGraphicsSystem("openvg"); -*/ -} - -void starTests::testVoid() -{ - StarWidget mw; - - // Test default values for widget properties - QVERIFY( !mw.acceptDrops() ); - QVERIFY( !mw.hasEditFocus() ); - QVERIFY( !mw.hasFocus() ); - QVERIFY( !mw.hasMouseTracking() ); - QVERIFY( mw.isActiveWindow() ); -// QVERIFY( mw.isAncestorOf() ); - QVERIFY( mw.isEnabled() ); -// QVERIFY( mw.isEnabledTo() ); - QVERIFY( mw.isFullScreen() ); - QVERIFY( mw.isHidden() ); - QVERIFY( mw.isMaximized() ); - QVERIFY( mw.isMinimized() ); - QVERIFY( mw.isModal() ); - QVERIFY( !mw.isVisible() ); -// QVERIFY( mw.isVisibleTo() ); - QVERIFY( mw.isWindow() ); - QVERIFY( mw.isWindowModified() ); - QVERIFY( mw.underMouse() ); - QVERIFY( mw.updatesEnabled() ); - - QVERIFY( 1 == 1 ); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_star/startest.h --- a/tests/qtp/qtp_star/startest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtOpenGL module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef STARTEST_H -#define STARTEST_H - -#include -#include - -class starTests: public QObject -{ - Q_OBJECT - - void initTestCase(); - - private slots: - void testVoid(); -}; - - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_star/starwidget.cpp --- a/tests/qtp/qtp_star/starwidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,115 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtOpenGL module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "starwidget.h" - -StarWidget::StarWidget(QWidget *parent) - : QWidget(parent) - , path(VG_INVALID_HANDLE) - , pen(Qt::red, 4.0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin) - , brush(Qt::yellow) -{ - setMinimumSize(220, 250); - setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); -} - -static VGubyte const starSegments[] = { - VG_MOVE_TO_ABS, - VG_LINE_TO_REL, - VG_LINE_TO_REL, - VG_LINE_TO_REL, - VG_LINE_TO_REL, - VG_CLOSE_PATH -}; -static VGfloat const starCoords[] = { - 110, 35, - 50, 160, - -130, -100, - 160, 0, - -130, 100 -}; - -void StarWidget::paintEvent(QPaintEvent *) -{ - QPainter painter; - painter.begin(this); - - // Make sure that we are using the OpenVG paint engine. - if (painter.paintEngine()->type() != QPaintEngine::OpenVG) { -#ifdef Q_WS_QWS - qWarning("Not using OpenVG: use the '-display' option to specify an OpenVG driver"); -#else - qWarning("Not using OpenVG: specify '-graphicssystem OpenVG'"); -#endif - return; - } - - // Select a pen and a brush for drawing the star. - painter.setPen(pen); - painter.setBrush(brush); - - // We want the star border to be anti-aliased. - painter.setRenderHints(QPainter::Antialiasing); - - // Flush the state changes to the OpenVG implementation - // and prepare to perform raw OpenVG calls. - painter.beginNativePainting(); - - // Cache the path if we haven't already. - if (path == VG_INVALID_HANDLE) { - path = vgCreatePath(VG_PATH_FORMAT_STANDARD, - VG_PATH_DATATYPE_F, - 1.0f, // scale - 0.0f, // bias - 6, // segmentCapacityHint - 10, // coordCapacityHint - VG_PATH_CAPABILITY_ALL); - vgAppendPathData(path, sizeof(starSegments), starSegments, starCoords); - } - - // Draw the star directly using the OpenVG API. - vgDrawPath(path, VG_FILL_PATH | VG_STROKE_PATH); - - // Restore normal QPainter operations. - painter.endNativePainting(); - - painter.end(); -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_star/starwidget.h --- a/tests/qtp/qtp_star/starwidget.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtOpenGL module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef STARWIDGET_H -#define STARWIDGET_H - -#include -#include -#include -#include "qvg.h" - -class StarWidget : public QWidget -{ - Q_OBJECT -public: - StarWidget(QWidget *parent = 0); - ~StarWidget() {} - -protected: - void paintEvent(QPaintEvent *); - -private: - VGPath path; - QPen pen; - QBrush brush; -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/autotest.cpp --- a/tests/qtp/qtp_svgviewer/autotest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,210 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "mainwindow.h" -#include "autotest.h" - - -void autoTest::initTestCase() -{ - Q_INIT_RESOURCE(qtp_svgviewer); -} - -void autoTest::testDefaults() -{ - - MainWindow mw; - mw.openFile(":/files/bubbles.svg"); - mw.show(); - - // Test default values for widget properties -// QVERIFY( !mw.acceptDrops() ); -// QVERIFY( !mw.hasEditFocus() ); - QVERIFY( !mw.hasFocus() ); - QVERIFY( !mw.hasMouseTracking() ); - QVERIFY( mw.isActiveWindow() ); - QVERIFY( mw.isEnabled() ); - /* -// QVERIFY( mw.isFullScreen() ); -// QVERIFY( mw.isHidden() ); - QVERIFY( mw.isMaximized() ); - QVERIFY( mw.isMinimized() ); - QVERIFY( mw.isModal() ); - QVERIFY( !mw.isVisible() ); - QVERIFY( mw.isWindow() ); - QVERIFY( mw.isWindowModified() ); - QVERIFY( mw.underMouse() ); - QVERIFY( mw.updatesEnabled() ); - */ - - mw.hide(); - -} - -void autoTest::testMainWindow() -{ - MainWindow mw; - mw.openFile(":/files/bubbles.svg"); - mw.show(); - - // What to test here... - // renderer switch - // - - QMenu *rendererMenu = NULL; - QMenu *viewMenu = NULL; - QList allMenus = mw.findChildren(); - QVERIFY( allMenus.count() > 0 ); - - for ( int i = 0; i < allMenus.count(); i++ ) - { - if ( allMenus.at(i)->title() == QString("&Renderer")) - { - rendererMenu = allMenus.at(i); - } - else if ( allMenus.at(i)->title() == QString("&View")) - { - viewMenu = allMenus.at(i); - } - else - { - // not currently tested by this autotest - } - } - QVERIFY( rendererMenu ); - QVERIFY( !rendererMenu->isEmpty() ); - - QVERIFY( viewMenu ); - QVERIFY( !viewMenu->isEmpty() ); - - QAction *backgroundAction = NULL; - QAction *outlineAction = NULL; - QAction *nativeAction = NULL; - QAction *openglAction = NULL; - QAction *imageAction = NULL; - QList allActions = mw.findChildren(); - QVERIFY( allActions.count() > 0 ); - - for ( int i = 0; i < allActions.count(); i++ ) - { - if ( allActions.at(i)->text() == QString("&Background")) - { - backgroundAction = allActions.at(i); - } - else if ( allActions.at(i)->text() == QString("&Outline")) - { - outlineAction = allActions.at(i); - } - else if ( allActions.at(i)->text() == QString("&Native")) - { - nativeAction = allActions.at(i); - } - else if ( allActions.at(i)->text() == QString("&OpenGL")) - { - openglAction = allActions.at(i); - } - else if ( allActions.at(i)->text() == QString("&Image")) - { - imageAction = allActions.at(i); - } - else - { - // not currently tested by this autotest - } - } - QVERIFY( backgroundAction ); - QVERIFY( outlineAction ); - - rendererMenu->show(); - QTest::qWait(300); - imageAction->trigger(); - QTest::qWait(200); - rendererMenu->hide(); - QTest::qWait(1000); - -#ifndef QT_NO_OPENGL - rendererMenu->show(); - QTest::qWait(300); - openglAction->trigger(); - QTest::qWait(200); - rendererMenu->hide(); - QTest::qWait(1000); -#endif - - rendererMenu->show(); - QTest::qWait(300); - nativeAction->trigger(); - QTest::qWait(200); - rendererMenu->hide(); - QTest::qWait(1000); - - viewMenu->show(); - QTest::qWait(300); - backgroundAction->trigger(); - QTest::qWait(200); - viewMenu->hide(); - QTest::qWait(500); - - viewMenu->show(); - QTest::qWait(300); - backgroundAction->trigger(); - QTest::qWait(200); - viewMenu->hide(); - QTest::qWait(500); - - viewMenu->show(); - QTest::qWait(300); - outlineAction->trigger(); - viewMenu->hide(); // calling trigger directly doesn't hide menu item - QTest::qWait(500); - - viewMenu->show(); - QTest::qWait(300); - outlineAction->trigger(); // have to use trigger method, because qaction won't accept mouse clicks - viewMenu->hide(); // calling trigger directly doesn't hide menu item - QTest::qWait(1000); - - QTest::qWait(2000); - mw.hide(); - - -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/autotest.h --- a/tests/qtp/qtp_svgviewer/autotest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef AUTOTEST_H -#define AUTOTEST_H - -#include -#include -#include - - -class autoTest: public QObject -{ - Q_OBJECT - - void initTestCase(); - - private slots: - void testDefaults(); - void testMainWindow(); -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/files/bubbles.svg --- a/tests/qtp/qtp_svgviewer/files/bubbles.svg Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,215 +0,0 @@ - - - - Spheres - Semi-transparent bubbles on a colored background. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/files/cubic.svg --- a/tests/qtp/qtp_svgviewer/files/cubic.svg Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ - - - Example cubic02 - cubic Bezier commands in path data - Picture showing examples of "C" and "S" commands, - along with annotations showing the control points - and end points - - - - - - - - - - - - M100,200 C100,100 400,100 400,200 - - - - - - - - - - M100,500 C25,400 475,400 400,500 - - - - - - - - - - M100,800 C175,700 325,700 400,800 - - - - - - - - - - M600,200 C675,100 975,100 900,200 - - - - - - - - - - M600,500 C600,350 900,650 900,500 - - - - - - - - - - - - - - - M600,800 C625,700 725,700 750,800 - S875,900 900,800 - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/files/spheres.svg --- a/tests/qtp/qtp_svgviewer/files/spheres.svg Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ - - - Spheres - Gradient filled spheres with different colors. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/main.cpp --- a/tests/qtp/qtp_svgviewer/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include - -#ifndef QT_NO_OPENGL -#include -#endif - -#include "mainwindow.h" -#include "autotest.h" - -QTEST_MAIN(autoTest) diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/mainwindow.cpp --- a/tests/qtp/qtp_svgviewer/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,164 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "mainwindow.h" - -#include - -#include "svgview.h" - -MainWindow::MainWindow() - : QMainWindow() - , m_view(new SvgView) -{ - QMenu *fileMenu = new QMenu(tr("&File"), this); - QAction *openAction = fileMenu->addAction(tr("&Open...")); - openAction->setShortcut(QKeySequence(tr("Ctrl+O"))); - QAction *quitAction = fileMenu->addAction(tr("E&xit")); - quitAction->setShortcuts(QKeySequence::Quit); - - menuBar()->addMenu(fileMenu); - - QMenu *viewMenu = new QMenu(tr("&View"), this); - m_backgroundAction = viewMenu->addAction(tr("&Background")); - m_backgroundAction->setEnabled(false); - m_backgroundAction->setCheckable(true); - m_backgroundAction->setChecked(false); - connect(m_backgroundAction, SIGNAL(toggled(bool)), m_view, SLOT(setViewBackground(bool))); - - m_outlineAction = viewMenu->addAction(tr("&Outline")); - m_outlineAction->setEnabled(false); - m_outlineAction->setCheckable(true); - m_outlineAction->setChecked(true); - connect(m_outlineAction, SIGNAL(toggled(bool)), m_view, SLOT(setViewOutline(bool))); - - menuBar()->addMenu(viewMenu); - - QMenu *rendererMenu = new QMenu(tr("&Renderer"), this); - m_nativeAction = rendererMenu->addAction(tr("&Native")); - m_nativeAction->setCheckable(true); - m_nativeAction->setChecked(true); -#ifndef QT_NO_OPENGL - m_glAction = rendererMenu->addAction(tr("&OpenGL")); - m_glAction->setCheckable(true); -#endif - m_imageAction = rendererMenu->addAction(tr("&Image")); - m_imageAction->setCheckable(true); - -#ifndef QT_NO_OPENGL - rendererMenu->addSeparator(); - m_highQualityAntialiasingAction = rendererMenu->addAction(tr("&High Quality Antialiasing")); - m_highQualityAntialiasingAction->setEnabled(false); - m_highQualityAntialiasingAction->setCheckable(true); - m_highQualityAntialiasingAction->setChecked(false); - connect(m_highQualityAntialiasingAction, SIGNAL(toggled(bool)), m_view, SLOT(setHighQualityAntialiasing(bool))); -#endif - - QActionGroup *rendererGroup = new QActionGroup(this); - rendererGroup->addAction(m_nativeAction); -#ifndef QT_NO_OPENGL - rendererGroup->addAction(m_glAction); -#endif - rendererGroup->addAction(m_imageAction); - - menuBar()->addMenu(rendererMenu); - - connect(openAction, SIGNAL(triggered()), this, SLOT(openFile())); - connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); - connect(rendererGroup, SIGNAL(triggered(QAction *)), - this, SLOT(setRenderer(QAction *))); - - setCentralWidget(m_view); - setWindowTitle(tr("SVG Viewer")); -} - -void MainWindow::openFile(const QString &path) -{ - QString fileName; - if (path.isNull()) - fileName = QFileDialog::getOpenFileName(this, tr("Open SVG File"), - m_currentPath, "SVG files (*.svg *.svgz *.svg.gz)"); - else - fileName = path; - - if (!fileName.isEmpty()) { - QFile file(fileName); - if (!file.exists()) { - QMessageBox::critical(this, tr("Open SVG File"), - QString("Could not open file '%1'.").arg(fileName)); - - m_outlineAction->setEnabled(false); - m_backgroundAction->setEnabled(false); - return; - } - - m_view->openFile(file); - - if (!fileName.startsWith(":/")) { - m_currentPath = fileName; - setWindowTitle(tr("%1 - SVGViewer").arg(m_currentPath)); - } - - m_outlineAction->setEnabled(true); - m_backgroundAction->setEnabled(true); - - resize(m_view->sizeHint() + QSize(80, 80 + menuBar()->height())); - } -} - -void MainWindow::setRenderer(QAction *action) -{ -#ifndef QT_NO_OPENGL - m_highQualityAntialiasingAction->setEnabled(false); -#endif - - if (action == m_nativeAction) - m_view->setRenderer(SvgView::Native); -#ifndef QT_NO_OPENGL - else if (action == m_glAction) { - m_highQualityAntialiasingAction->setEnabled(true); - m_view->setRenderer(SvgView::OpenGL); - } -#endif - else if (action == m_imageAction) { - m_view->setRenderer(SvgView::Image); - } -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/mainwindow.h --- a/tests/qtp/qtp_svgviewer/mainwindow.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include - -class SvgView; - -QT_BEGIN_NAMESPACE -class QAction; -class QGraphicsView; -class QGraphicsScene; -class QGraphicsRectItem; -QT_END_NAMESPACE - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - MainWindow(); - -public slots: - void openFile(const QString &path = QString()); - void setRenderer(QAction *action); - -private: - QAction *m_nativeAction; - QAction *m_glAction; - QAction *m_imageAction; - QAction *m_highQualityAntialiasingAction; - QAction *m_backgroundAction; - QAction *m_outlineAction; - - SvgView *m_view; - - QString m_currentPath; -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/qtp_svgviewer.pro --- a/tests/qtp/qtp_svgviewer/qtp_svgviewer.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ - -HEADERS = autotest.h \ - mainwindow.h \ - svgview.h -RESOURCES = qtp_svgviewer.qrc -SOURCES = autotest.cpp \ - main.cpp \ - mainwindow.cpp \ - svgview.cpp -QT += svg xml - -contains(QT_CONFIG, opengl): QT += opengl - -CONFIG += qt warn_on console depend_includepath - -qtAddLibrary(QtTest) - -# install -target.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_svgviewer -sources.files = $$SOURCES $$HEADERS $$RESOURCES qtp_svgviewer.pro files -sources.path = $$[QT_INSTALL_PREFIX]/tests/qtp/qtp_svgviewer -INSTALLS += target sources - -wince*: { - addFiles.sources = files\*.svg - addFiles.path = \My Documents - DEPLOYMENT += addFiles -} - -symbian: { - TARGET.UID3 = 0xED83EC0C - TARGET.CAPABILITY="ALL -TCB" - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - addFiles.sources = files\*.svg - addFiles.path = . - DEPLOYMENT += addFiles - RSS_RULES ="group_name=\"QtTests\";" -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/qtp_svgviewer.qrc --- a/tests/qtp/qtp_svgviewer/qtp_svgviewer.qrc Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - files/bubbles.svg - - - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/svgview.cpp --- a/tests/qtp/qtp_svgviewer/svgview.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,189 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include "svgview.h" - -#include -#include -#include -#include -#include -#include -#include - -#ifndef QT_NO_OPENGL -#include -#endif - -SvgView::SvgView(QWidget *parent) - : QGraphicsView(parent) - , m_renderer(Native) - , m_svgItem(0) - , m_backgroundItem(0) - , m_outlineItem(0) -{ - setScene(new QGraphicsScene(this)); - setTransformationAnchor(AnchorUnderMouse); - setDragMode(ScrollHandDrag); - setViewportUpdateMode(FullViewportUpdate); - - // Prepare background check-board pattern - QPixmap tilePixmap(64, 64); - tilePixmap.fill(Qt::white); - QPainter tilePainter(&tilePixmap); - QColor color(220, 220, 220); - tilePainter.fillRect(0, 0, 32, 32, color); - tilePainter.fillRect(32, 32, 32, 32, color); - tilePainter.end(); - - setBackgroundBrush(tilePixmap); -} - -void SvgView::drawBackground(QPainter *p, const QRectF &) -{ - p->save(); - p->resetTransform(); - p->drawTiledPixmap(viewport()->rect(), backgroundBrush().texture()); - p->restore(); -} - -void SvgView::openFile(const QFile &file) -{ - if (!file.exists()) - return; - - QGraphicsScene *s = scene(); - - bool drawBackground = (m_backgroundItem ? m_backgroundItem->isVisible() : false); - bool drawOutline = (m_outlineItem ? m_outlineItem->isVisible() : true); - - s->clear(); - resetTransform(); - - m_svgItem = new QGraphicsSvgItem(file.fileName()); - m_svgItem->setFlags(QGraphicsItem::ItemClipsToShape); - m_svgItem->setCacheMode(QGraphicsItem::NoCache); - m_svgItem->setZValue(0); - - m_backgroundItem = new QGraphicsRectItem(m_svgItem->boundingRect()); - m_backgroundItem->setBrush(Qt::white); - m_backgroundItem->setPen(Qt::NoPen); - m_backgroundItem->setVisible(drawBackground); - m_backgroundItem->setZValue(-1); - - m_outlineItem = new QGraphicsRectItem(m_svgItem->boundingRect()); - QPen outline(Qt::black, 2, Qt::DashLine); - outline.setCosmetic(true); - m_outlineItem->setPen(outline); - m_outlineItem->setBrush(Qt::NoBrush); - m_outlineItem->setVisible(drawOutline); - m_outlineItem->setZValue(1); - - s->addItem(m_backgroundItem); - s->addItem(m_svgItem); - s->addItem(m_outlineItem); - - s->setSceneRect(m_outlineItem->boundingRect().adjusted(-10, -10, 10, 10)); -} - -void SvgView::setRenderer(RendererType type) -{ - m_renderer = type; - - if (m_renderer == OpenGL) { -#ifndef QT_NO_OPENGL - setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers))); -#endif - } else { - setViewport(new QWidget); - } -} - -void SvgView::setHighQualityAntialiasing(bool highQualityAntialiasing) -{ -#ifndef QT_NO_OPENGL - setRenderHint(QPainter::HighQualityAntialiasing, highQualityAntialiasing); -#else - Q_UNUSED(highQualityAntialiasing); -#endif -} - -void SvgView::setViewBackground(bool enable) -{ - if (!m_backgroundItem) - return; - - m_backgroundItem->setVisible(enable); -} - -void SvgView::setViewOutline(bool enable) -{ - if (!m_outlineItem) - return; - - m_outlineItem->setVisible(enable); -} - -void SvgView::paintEvent(QPaintEvent *event) -{ - if (m_renderer == Image) { - if (m_image.size() != viewport()->size()) { - m_image = QImage(viewport()->size(), QImage::Format_ARGB32_Premultiplied); - } - - QPainter imagePainter(&m_image); - QGraphicsView::render(&imagePainter); - imagePainter.end(); - - QPainter p(viewport()); - p.drawImage(0, 0, m_image); - - } else { - QGraphicsView::paintEvent(event); - } -} - -void SvgView::wheelEvent(QWheelEvent *event) -{ - qreal factor = qPow(1.2, event->delta() / 240.0); - scale(factor, factor); - event->accept(); -} - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_svgviewer/svgview.h --- a/tests/qtp/qtp_svgviewer/svgview.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef SVGVIEW_H -#define SVGVIEW_H - -#include - -QT_BEGIN_NAMESPACE -class QWheelEvent; -class QPaintEvent; -class QFile; -QT_END_NAMESPACE - -class SvgView : public QGraphicsView -{ - Q_OBJECT - -public: - enum RendererType { Native, OpenGL, Image }; - - SvgView(QWidget *parent = 0); - - void openFile(const QFile &file); - void setRenderer(RendererType type = Native); - void drawBackground(QPainter *p, const QRectF &rect); - -public slots: - void setHighQualityAntialiasing(bool highQualityAntialiasing); - void setViewBackground(bool enable); - void setViewOutline(bool enable); - -protected: - void wheelEvent(QWheelEvent *event); - void paintEvent(QPaintEvent *event); - -private: - RendererType m_renderer; - - QGraphicsItem *m_svgItem; - QGraphicsRectItem *m_backgroundItem; - QGraphicsRectItem *m_outlineItem; - - QImage m_image; -}; -#endif // SVGVIEW_H diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_wiggly/autotest.cpp --- a/tests/qtp/qtp_wiggly/autotest.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,147 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "dialog.h" -#include "wigglywidget.h" -#include "autotest.h" - - -void autoTest::initTestCase() -{ -} - -void autoTest::testDefaults() -{ - Dialog dialog(0,false); - dialog.show(); - - // Test default values for widget properties - // QCOMPARE( dialog.acceptDrops(), false ); - // QCOMPARE( dialog.hasEditFocus(), false ); - QCOMPARE( dialog.hasFocus(), false ); - QCOMPARE( dialog.hasMouseTracking(), false ); - QCOMPARE( dialog.isActiveWindow(), true ); - QCOMPARE( dialog.isEnabled(), true ); - QCOMPARE( dialog.isFullScreen(), false ); - QCOMPARE( dialog.isHidden(), false ); - QCOMPARE( dialog.isMaximized(), false ); - QCOMPARE( dialog.isMinimized(), false ); - QCOMPARE( dialog.isModal(), false ); - QCOMPARE( dialog.isVisible(), true ); - QCOMPARE( dialog.isWindow(), true ); - QCOMPARE( dialog.isWindowModified(), false ); - QCOMPARE( dialog.underMouse(), false ); - QCOMPARE( dialog.updatesEnabled(), true ); - - dialog.hide(); -} - -void autoTest::testWigglyWidget() -{ - Dialog dialog(0,false); - dialog.show(); - - QList subObjects = dialog.findChildren(); - QVERIFY( subObjects.count() == 1 ); - QWidget *wg = subObjects.at(0); - - QVERIFY( wg != 0 ); - - // Some sanity checks for wiggle widget - QVERIFY( wg->width() > 0 ); - QVERIFY( wg->height() > 0 ); - - QVERIFY( wg->width() <= dialog.width() ); - QVERIFY( wg->height() <= dialog.height() ); - - // but not much more to be verified here - - dialog.hide(); -} - -void autoTest::testInputWidget() -{ - Dialog dialog(0,false); - dialog.show(); - - QList editObjects = dialog.findChildren(); - QVERIFY( editObjects.count() == 1 ); - QLineEdit *le = editObjects.at(0); - - QList subObjects = dialog.findChildren(); - QVERIFY( subObjects.count() == 1 ); - WigglyWidget *wg = subObjects.at(0); - - QVERIFY( le != 0 ); - - // Some sanity checks for text input widget - QVERIFY( le->width() > 0 ); - QVERIFY( le->height() > 0 ); - - QVERIFY( le->width() <= dialog.width() ); - QVERIFY( le->height() <= dialog.height() ); - - // Tests the generic behaviour of the line edit widget - le->setFocus(Qt::OtherFocusReason); - - QTest::qWait(1000); - - QTest::keyClick ( le, Qt::Key_Backspace, Qt::NoModifier, 10 ); - QTest::keyClick ( le, Qt::Key_Backspace, Qt::NoModifier, 10 ); - QTest::keyClick ( le, Qt::Key_Backspace, Qt::NoModifier, 10 ); - QTest::keyClick ( le, Qt::Key_Backspace, Qt::NoModifier, 10 ); - QTest::keyClick ( le, Qt::Key_Backspace, Qt::NoModifier, 10 ); - QTest::keyClick ( le, Qt::Key_Backspace, Qt::NoModifier, 10 ); - QTest::keyClick ( le, Qt::Key_Backspace, Qt::NoModifier, 10 ); - - QTest::keyClicks( le, "!!!" ); - le->clearFocus(); - - // Verifies that edited line information is correctly copied - QCOMPARE( le->text(), QString("Hello!!!") ); - QCOMPARE( le->text(), wg->getText() ); - - QTest::qWait(1000); - - dialog.hide(); -} - diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_wiggly/autotest.h --- a/tests/qtp/qtp_wiggly/autotest.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef AUTOTEST_H -#define AUTOTEST_H - -#include -#include -#include - - -class autoTest: public QObject -{ - Q_OBJECT - - void initTestCase(); - - private slots: - void testDefaults(); - void testWigglyWidget(); - void testInputWidget(); -}; - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_wiggly/dialog.cpp --- a/tests/qtp/qtp_wiggly/dialog.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include "dialog.h" -#include "wigglywidget.h" - -//! [0] -Dialog::Dialog(QWidget *parent, bool smallScreen) - : QDialog(parent) -{ - WigglyWidget *wigglyWidget = new WigglyWidget; - QLineEdit *lineEdit = new QLineEdit; - - QVBoxLayout *layout = new QVBoxLayout; - layout->addWidget(wigglyWidget); - layout->addWidget(lineEdit); - setLayout(layout); - - connect(lineEdit, SIGNAL(textChanged(QString)), - wigglyWidget, SLOT(setText(QString))); - if (!smallScreen){ - lineEdit->setText(tr("Hello world!")); - } - else{ - lineEdit->setText(tr("Hello!")); - } - setWindowTitle(tr("Wiggly")); - resize(360, 145); -} -//! [0] diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_wiggly/dialog.h --- a/tests/qtp/qtp_wiggly/dialog.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef DIALOG_H -#define DIALOG_H - -#include - -//! [0] -class Dialog : public QDialog -{ - Q_OBJECT - -public: - Dialog(QWidget *parent = 0, bool smallScreen = false); -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_wiggly/main.cpp --- a/tests/qtp/qtp_wiggly/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include "dialog.h" -#include "autotest.h" - - -QTEST_MAIN(autoTest) diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_wiggly/qtp_wiggly.pro --- a/tests/qtp/qtp_wiggly/qtp_wiggly.pro Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ - -HEADERS = autotest.h \ - wigglywidget.h \ - dialog.h -SOURCES = autotest.cpp \ - wigglywidget.cpp \ - dialog.cpp \ - main.cpp - -CONFIG += qt warn_on console depend_includepath - -qtAddLibrary(QtTest) - -# install -target.path = $$[QT_INSTALL_PREFIX]/tests/qtp/wiggly -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtp_wiggly.pro -sources.path = $$[QT_INSTALL_PREFIX]/tests/qtp/wiggly -INSTALLS += target sources - -symbian { - TARGET.UID3 = 0xED83EC0D - TARGET.CAPABILITY="ALL -TCB" - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - RSS_RULES ="group_name=\"QtTests\";" -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_wiggly/wigglywidget.cpp --- a/tests/qtp/qtp_wiggly/wigglywidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include "wigglywidget.h" - -//! [0] -WigglyWidget::WigglyWidget(QWidget *parent) - : QWidget(parent) -{ - setBackgroundRole(QPalette::Midlight); - setAutoFillBackground(true); - - QFont newFont = font(); - newFont.setPointSize(newFont.pointSize() + 20); - setFont(newFont); - - step = 0; - timer.start(60, this); -} -//! [0] - -//! [1] -void WigglyWidget::paintEvent(QPaintEvent * /* event */) -//! [1] //! [2] -{ - static const int sineTable[16] = { - 0, 38, 71, 92, 100, 92, 71, 38, 0, -38, -71, -92, -100, -92, -71, -38 - }; - - QFontMetrics metrics(font()); - int x = (width() - metrics.width(text)) / 2; - int y = (height() + metrics.ascent() - metrics.descent()) / 2; - QColor color; -//! [2] - -//! [3] - QPainter painter(this); -//! [3] //! [4] - for (int i = 0; i < text.size(); ++i) { - int index = (step + i) % 16; - color.setHsv((15 - index) * 16, 255, 191); - painter.setPen(color); - painter.drawText(x, y - ((sineTable[index] * metrics.height()) / 400), - QString(text[i])); - x += metrics.width(text[i]); - } -} -//! [4] - -//! [5] -void WigglyWidget::timerEvent(QTimerEvent *event) -//! [5] //! [6] -{ - if (event->timerId() == timer.timerId()) { - ++step; - update(); - } else { - QWidget::timerEvent(event); - } -//! [6] -} diff -r ef0373b55136 -r 758a864f9613 tests/qtp/qtp_wiggly/wigglywidget.h --- a/tests/qtp/qtp_wiggly/wigglywidget.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef WIGGLYWIDGET_H -#define WIGGLYWIDGET_H - -#include -#include - -//! [0] -class WigglyWidget : public QWidget -{ - Q_OBJECT - -public: - WigglyWidget(QWidget *parent = 0); - - // for automated testing - QString getText() { return text; }; - -public slots: - void setText(const QString &newText) { text = newText; } - -protected: - void paintEvent(QPaintEvent *event); - void timerEvent(QTimerEvent *event); - -private: - QBasicTimer timer; - QString text; - int step; -}; -//! [0] - -#endif diff -r ef0373b55136 -r 758a864f9613 tests/tests.pro --- a/tests/tests.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tests/tests.pro Mon Oct 04 01:19:32 2010 +0300 @@ -1,2 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = qtp +SUBDIRS = auto \ + benchmarks diff -r ef0373b55136 -r 758a864f9613 tools/activeqt/testcon/changeproperties.cpp --- a/tools/activeqt/testcon/changeproperties.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/activeqt/testcon/changeproperties.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -111,10 +111,10 @@ value = qVariantFromValue(col); } else { QMessageBox::warning(this, tr("Can't parse input"), - QString(tr("Failed to create a color from %1\n" + tr("Failed to create a color from %1\n" "The string has to be a valid color name (e.g. 'red')\n" "or a RGB triple of format '#rrggbb'." - ).arg(editValue->text()))); + ).arg(editValue->text())); } } break; @@ -125,10 +125,10 @@ value = qVariantFromValue(fnt); } else { QMessageBox::warning(this, tr("Can't parse input"), - (tr("Failed to create a font from %1\n" + tr("Failed to create a font from %1\n" "The string has to have a format family, or\n" "family,pointsize,stylehint,weight,italic,underline,strikeout,fixedpitch,rawmode." - ).arg(editValue->text()))); + ).arg(editValue->text())); } } break; diff -r ef0373b55136 -r 758a864f9613 tools/assistant/lib/fulltextsearch/qsort_p.h --- a/tools/assistant/lib/fulltextsearch/qsort_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/lib/fulltextsearch/qsort_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -64,15 +64,15 @@ class QHELP_EXPORT QCLuceneSort { public: - QCLuceneSort(); - QCLuceneSort(const QStringList &fieldNames); - QCLuceneSort(const QString &field, bool reverse = false); + QCLuceneSort(); + explicit QCLuceneSort(const QStringList &fieldNames); + explicit QCLuceneSort(const QString &field, bool reverse = false); virtual ~QCLuceneSort(); QString toString() const; void setSort(const QStringList &fieldNames); - void setSort(const QString &field, bool reverse = false); + void setSort(const QString &field, bool reverse = false); protected: friend class QCLuceneHits; diff -r ef0373b55136 -r 758a864f9613 tools/assistant/lib/qhelpcollectionhandler_p.h --- a/tools/assistant/lib/qhelpcollectionhandler_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/lib/qhelpcollectionhandler_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -76,7 +76,8 @@ }; typedef QList DocInfoList; - QHelpCollectionHandler(const QString &collectionFile, QObject *parent = 0); + explicit QHelpCollectionHandler(const QString &collectionFile, + QObject *parent = 0); ~QHelpCollectionHandler(); QString collectionFile() const; diff -r ef0373b55136 -r 758a864f9613 tools/assistant/lib/qhelpengine.h --- a/tools/assistant/lib/qhelpengine.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/lib/qhelpengine.h Mon Oct 04 01:19:32 2010 +0300 @@ -62,7 +62,7 @@ Q_OBJECT public: - QHelpEngine(const QString &collectionFile, QObject *parent = 0); + explicit QHelpEngine(const QString &collectionFile, QObject *parent = 0); ~QHelpEngine(); QHelpContentModel *contentModel() const; diff -r ef0373b55136 -r 758a864f9613 tools/assistant/lib/qhelpenginecore.cpp --- a/tools/assistant/lib/qhelpenginecore.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/lib/qhelpenginecore.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -706,7 +706,7 @@ } /*! - Returns a description of the last error that occured. + Returns a description of the last error that occurred. */ QString QHelpEngineCore::error() const { diff -r ef0373b55136 -r 758a864f9613 tools/assistant/lib/qhelpenginecore.h --- a/tools/assistant/lib/qhelpenginecore.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/lib/qhelpenginecore.h Mon Oct 04 01:19:32 2010 +0300 @@ -65,7 +65,7 @@ Q_PROPERTY(QString currentFilter READ currentFilter WRITE setCurrentFilter) public: - QHelpEngineCore(const QString &collectionFile, QObject *parent = 0); + explicit QHelpEngineCore(const QString &collectionFile, QObject *parent = 0); virtual ~QHelpEngineCore(); bool setupData(); diff -r ef0373b55136 -r 758a864f9613 tools/assistant/lib/qhelpsearchengine.cpp --- a/tools/assistant/lib/qhelpsearchengine.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/lib/qhelpsearchengine.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -263,17 +263,17 @@ engines setupFinished() signal to know when it can start to index documentation. After starting the indexing process the signal indexingStarted() is emitted and - on the end of the indexing process the indexingFinished() is emited. To stop + on the end of the indexing process the indexingFinished() is emitted. To stop the indexing one can call cancelIndexing(). While the indexing process has finished, the search engine can now be used to search thru its index for a given term. To do this one may use the possibility of creating the QHelpSearchQuery list by self or reuse the QHelpSearchQueryWidget which has the inbuild - functionality to set up a proper search querys list that get's passed to the search engines + functionality to set up a proper search queries list that get's passed to the search engines search() function. After the list of querys has been passed to the search engine, the signal searchingStarted() - is emited and after the search has finished the searchingFinished() signal is emited. The + is emitted and after the search has finished the searchingFinished() signal is emitted. The search process can be stopped by calling cancelSearching(). If the search succeeds, the searchingFinished() will be called with the search hits count, @@ -318,7 +318,7 @@ uses the given \a helpEngine to access the documentation that needs to be indexed. The QHelpEngine's setupFinished() signal is automatically connected to the QHelpSearchEngine's indexing function, so that new documentation will be indexed - after the signal is emited. + after the signal is emitted. */ QHelpSearchEngine::QHelpSearchEngine(QHelpEngineCore *helpEngine, QObject *parent) : QObject(parent) @@ -434,7 +434,7 @@ } /*! - Starts the search process using the given list of querys \a queryList + Starts the search process using the given list of queries \a queryList build by the search field name and the values to search for. */ void QHelpSearchEngine::search(const QList &queryList) diff -r ef0373b55136 -r 758a864f9613 tools/assistant/lib/qhelpsearchengine.h --- a/tools/assistant/lib/qhelpsearchengine.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/lib/qhelpsearchengine.h Mon Oct 04 01:19:32 2010 +0300 @@ -80,7 +80,8 @@ Q_OBJECT public: - QHelpSearchEngine(QHelpEngineCore *helpEngine, QObject *parent = 0); + explicit QHelpSearchEngine(QHelpEngineCore *helpEngine, + QObject *parent = 0); ~QHelpSearchEngine(); QHelpSearchQueryWidget* queryWidget(); diff -r ef0373b55136 -r 758a864f9613 tools/assistant/lib/qhelpsearchindexreader_clucene.cpp --- a/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -173,7 +173,7 @@ QCLuceneDocument document; const QStringList namespaceList = engine.registeredDocumentations(); - foreach (QSharedPointer hits, cluceneHitsList) { + foreach (const QSharedPointer &hits, cluceneHitsList) { for (qint32 i = 0; i < hits->length(); i++) { document = hits->document(i); const QString path = document.get(PathField); @@ -415,7 +415,7 @@ void QHelpSearchIndexReaderClucene::boostSearchHits(const QHelpEngineCore &engine, QList &hitList, const QList &queryList) { - foreach (const QHelpSearchQuery query, queryList) { + foreach (const QHelpSearchQuery &query, queryList) { if (query.fieldName != QHelpSearchQuery::DEFAULT) continue; diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/bookmarkfiltermodel.cpp --- a/tools/assistant/tools/assistant/bookmarkfiltermodel.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/bookmarkfiltermodel.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -319,4 +319,4 @@ && model->data(model->index(row, 0, parent), UserRoleFolder).toBool()) return true; return false; -} \ No newline at end of file +} diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/bookmarkitem.cpp --- a/tools/assistant/tools/assistant/bookmarkitem.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/bookmarkitem.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -41,6 +41,7 @@ #include "bookmarkitem.h" +#include #include QT_BEGIN_NAMESPACE @@ -147,7 +148,9 @@ for (int row = 0; row < count; ++row) { m_children.insert(position, new BookmarkItem(DataVector() - << QObject::tr(isFolder ? "New Folder" : "Untitled") + << (isFolder + ? QCoreApplication::translate("BookmarkItem", "New Folder") + : QCoreApplication::translate("BookmarkItem", "Untitled")) << (isFolder ? "Folder" : "about:blank") << false, this)); } diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/bookmarkitem.h --- a/tools/assistant/tools/assistant/bookmarkitem.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/bookmarkitem.h Mon Oct 04 01:19:32 2010 +0300 @@ -58,7 +58,7 @@ class BookmarkItem { public: - BookmarkItem(const DataVector &data, BookmarkItem *parent = 0); + explicit BookmarkItem(const DataVector &data, BookmarkItem *parent = 0); ~BookmarkItem(); BookmarkItem *parent() const; diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/bookmarkmanagerwidget.h --- a/tools/assistant/tools/assistant/bookmarkmanagerwidget.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/bookmarkmanagerwidget.h Mon Oct 04 01:19:32 2010 +0300 @@ -57,7 +57,8 @@ { Q_OBJECT public: - BookmarkManagerWidget(BookmarkModel *bookmarkModel, QWidget *parent = 0); + explicit BookmarkManagerWidget(BookmarkModel *bookmarkModel, + QWidget *parent = 0); ~BookmarkManagerWidget(); protected: @@ -99,4 +100,4 @@ QT_END_NAMESPACE -#endif // BOOKMARKMANAGERWIDGET_H \ No newline at end of file +#endif // BOOKMARKMANAGERWIDGET_H diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/centralwidget.cpp --- a/tools/assistant/tools/assistant/centralwidget.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/centralwidget.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1011,7 +1011,7 @@ case QHelpSearchQuery::DEFAULT: case QHelpSearchQuery::ATLEAST: foreach (QString term, query.wordList) - terms.append(term.remove(QLatin1String("\""))); + terms.append(term.remove(QLatin1Char('"'))); } } } diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/cmdlineparser.cpp --- a/tools/assistant/tools/assistant/cmdlineparser.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/cmdlineparser.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -const QString CmdLineParser::m_helpMessage = QLatin1String( +static const char helpMessage[] = QT_TRANSLATE_NOOP("CmdLineParser", "Usage: assistant [Options]\n\n" "-collectionFile file Uses the specified collection\n" " file instead of the default one\n" @@ -138,10 +138,10 @@ } if (!m_error.isEmpty()) { - showMessage(m_error + QLatin1String("\n\n\n") + m_helpMessage, true); + showMessage(m_error + QLatin1String("\n\n\n") + tr(helpMessage), true); return Error; } else if (showHelp) { - showMessage(m_helpMessage, false); + showMessage(tr(helpMessage), false); return Help; } return Ok; diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/cmdlineparser.h --- a/tools/assistant/tools/assistant/cmdlineparser.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/cmdlineparser.h Mon Oct 04 01:19:32 2010 +0300 @@ -93,7 +93,6 @@ QStringList m_arguments; int m_pos; - static const QString m_helpMessage; QString m_collectionFile; QString m_cloneFile; QString m_helpFile; diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/helpviewer_qtb.h --- a/tools/assistant/tools/assistant/helpviewer_qtb.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/helpviewer_qtb.h Mon Oct 04 01:19:32 2010 +0300 @@ -61,7 +61,7 @@ Q_OBJECT public: - HelpViewer(CentralWidget *parent, qreal zoom = 0.0); + explicit HelpViewer(CentralWidget *parent, qreal zoom = 0.0); ~HelpViewer(); QFont viewerFont() const; diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/helpviewer_qwv.h --- a/tools/assistant/tools/assistant/helpviewer_qwv.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/helpviewer_qwv.h Mon Oct 04 01:19:32 2010 +0300 @@ -58,7 +58,7 @@ Q_OBJECT public: - HelpViewer(CentralWidget *parent, qreal zoom = 0.0); + explicit HelpViewer(CentralWidget *parent, qreal zoom = 0.0); ~HelpViewer(); QFont viewerFont() const; diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/installdialog.h --- a/tools/assistant/tools/assistant/installdialog.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/installdialog.h Mon Oct 04 01:19:32 2010 +0300 @@ -61,7 +61,7 @@ Q_OBJECT public: - InstallDialog(QHelpEngineCore *helpEngine, QWidget *parent = 0, + explicit InstallDialog(QHelpEngineCore *helpEngine, QWidget *parent = 0, const QString &host = QString(), int port = -1); ~InstallDialog(); diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/main.cpp --- a/tools/assistant/tools/assistant/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -316,6 +316,7 @@ TRACE_OBJ QApplication a(argc, argv, useGui(argc, argv)); a.addLibraryPath(a.applicationDirPath() + QLatin1String("/plugins")); + setupTranslations(); // Parse arguments. CmdLineParser cmd(a.arguments()); @@ -355,7 +356,7 @@ QHelpEngineCore cachedCollection(cachedCollectionFile); if (!cachedCollection.setupData()) { cmd.showMessage(QCoreApplication::translate("Assistant", - "Error reading collection file '%1': %2"). + "Error reading collection file '%1': %2."). arg(cachedCollectionFile). arg(cachedCollection.error()), true); return EXIT_FAILURE; @@ -419,8 +420,6 @@ cachedCollection.setCurrentFilter(cmd.currentFilter()); } - setupTranslations(); - /* * We need to be careful here: The main window has to be deleted before * the help engine wrapper, which has to be deleted before the diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/mainwindow.cpp --- a/tools/assistant/tools/assistant/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/mainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -831,7 +831,7 @@ aboutDia.setWindowTitle(aboutDia.documentTitle()); } else { QByteArray resources; - aboutDia.setText(QString::fromLatin1("
" + aboutDia.setText(tr("
" "

%1

" "

Version %2

" "

Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).

") diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/mainwindow.h --- a/tools/assistant/tools/assistant/mainwindow.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/mainwindow.h Mon Oct 04 01:19:32 2010 +0300 @@ -66,7 +66,7 @@ Q_OBJECT public: - MainWindow(CmdLineParser *cmdLine, QWidget *parent = 0); + explicit MainWindow(CmdLineParser *cmdLine, QWidget *parent = 0); ~MainWindow(); static void activateCurrentBrowser(); diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/assistant/searchwidget.h --- a/tools/assistant/tools/assistant/searchwidget.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/assistant/searchwidget.h Mon Oct 04 01:19:32 2010 +0300 @@ -58,7 +58,7 @@ Q_OBJECT public: - SearchWidget(QHelpSearchEngine *engine, QWidget *parent = 0); + explicit SearchWidget(QHelpSearchEngine *engine, QWidget *parent = 0); ~SearchWidget(); void zoomIn(); diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/qcollectiongenerator/main.cpp --- a/tools/assistant/tools/qcollectiongenerator/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/qcollectiongenerator/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -49,15 +49,21 @@ #include #include #include -#include #include #include +#include +#include +#include #include #include QT_USE_NAMESPACE +class QCG { + Q_DECLARE_TR_FUNCTIONS(QCollectionGenerator) +}; + class CollectionConfigReader : public QXmlStreamReader { public: @@ -123,9 +129,7 @@ void CollectionConfigReader::raiseErrorWithLine() { - raiseError(QCoreApplication::translate("QCollectionGenerator", - "Unknown token at line %1.") - .arg(lineNumber())); + raiseError(QCG::tr("Unknown token at line %1.").arg(lineNumber())); } void CollectionConfigReader::readData(const QByteArray &contents) @@ -144,9 +148,8 @@ && attributes().value(QLatin1String("version")) == QLatin1String("1.0")) readConfig(); else - raiseError(QCoreApplication::translate("QCollectionGenerator", - "Unknown token at line %1. " - "Expected \"QtHelpCollectionProject\"!") + raiseError(QCG::tr("Unknown token at line %1. " + "Expected \"QtHelpCollectionProject\".") .arg(lineNumber())); } } @@ -169,7 +172,7 @@ } } if (!ok && !hasError()) - raiseError(QLatin1String("Missing end tags.")); + raiseError(QCG::tr("Missing end tags.")); } void CollectionConfigReader::readAssistantSettings() @@ -311,7 +314,7 @@ } } if (input.isEmpty() || output.isEmpty()) { - raiseError(QLatin1String("Missing input or output file for help file generation!")); + raiseError(QCG::tr("Missing input or output file for help file generation.")); return; } m_filesToGenerate.insert(input, output); @@ -350,6 +353,20 @@ bool showHelp = false; bool showVersion = false; + QCoreApplication app(argc, argv); + QTranslator translator; + QTranslator qtTranslator; + QTranslator qt_helpTranslator; + QString sysLocale = QLocale::system().name(); + QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + if (translator.load(QLatin1String("assistant_") + sysLocale, resourceDir) + && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir) + && qt_helpTranslator.load(QLatin1String("qt_help_") + sysLocale, resourceDir)) { + app.installTranslator(&translator); + app.installTranslator(&qtTranslator); + app.installTranslator(&qt_helpTranslator); + } + for (int i=1; i [options]\n\n" " -o Generates a collection file\n" " called . If\n" @@ -391,7 +406,7 @@ " qcollectiongenerator.\n\n"); if (showHelp) { - fprintf(stdout, "%s", qPrintable(help)); + fputs(qPrintable(help), stdout); return 0; }else if (!error.isEmpty()) { fprintf(stderr, "%s\n\n%s", qPrintable(error), qPrintable(help)); @@ -400,7 +415,7 @@ QFile file(configFile); if (!file.open(QIODevice::ReadOnly)) { - fprintf(stderr, "Could not open %s!\n", qPrintable(configFile)); + fputs(qPrintable(QCG::tr("Could not open %1.\n").arg(configFile)), stderr); return -1; } @@ -410,19 +425,18 @@ + fi.baseName() + QLatin1String(".qhc"); } - QCoreApplication app(argc, argv); - - fprintf(stdout, "Reading collection config file...\n"); + fputs(qPrintable(QCG::tr("Reading collection config file...\n")), stdout); CollectionConfigReader config; config.readData(file.readAll()); if (config.hasError()) { - fprintf(stderr, "Collection config file error: %s\n", qPrintable(config.errorString())); + fputs(qPrintable(QCG::tr("Collection config file error: %1\n") + .arg(config.errorString())), stderr); return -1; } QMap::const_iterator it = config.filesToGenerate().constBegin(); while (it != config.filesToGenerate().constEnd()) { - fprintf(stdout, "Generating help for %s...\n", qPrintable(it.key())); + fputs(qPrintable(QCG::tr("Generating help for %1...\n").arg(it.key())), stdout); QHelpProjectData helpData; if (!helpData.readData(absoluteFileName(basePath, it.key()))) { fprintf(stderr, "%s\n", qPrintable(helpData.errorMessage())); @@ -437,12 +451,13 @@ ++it; } - fprintf(stdout, "Creating collection file...\n"); + fputs(qPrintable(QCG::tr("Creating collection file...\n")), stdout); QFileInfo colFi(collectionFile); if (colFi.exists()) { if (!colFi.dir().remove(colFi.fileName())) { - fprintf(stderr, "The file %s cannot be overwritten!\n", qPrintable(collectionFile)); + fputs(qPrintable(QCG::tr("The file %1 cannot be overwritten.\n") + .arg(collectionFile)), stderr); return -1; } } @@ -500,7 +515,7 @@ if (!config.applicationIcon().isEmpty()) { QFile icon(absoluteFileName(basePath, config.applicationIcon())); if (!icon.open(QIODevice::ReadOnly)) { - fprintf(stderr, "Cannot open %s!\n", qPrintable(icon.fileName())); + fputs(qPrintable(QCG::tr("Cannot open %1.\n").arg(icon.fileName())), stderr); return -1; } CollectionConfiguration::setApplicationIcon(helpEngine, icon.readAll()); @@ -521,7 +536,7 @@ if (!config.aboutIcon().isEmpty()) { QFile icon(absoluteFileName(basePath, config.aboutIcon())); if (!icon.open(QIODevice::ReadOnly)) { - fprintf(stderr, "Cannot open %s!\n", qPrintable(icon.fileName())); + fputs(qPrintable(QCG::tr("Cannot open %1.\n").arg(icon.fileName())), stderr); return -1; } CollectionConfiguration::setAboutIcon(helpEngine, icon.readAll()); @@ -543,7 +558,7 @@ QFileInfo fi(absoluteFileName(basePath, it.value())); QFile f(fi.absoluteFilePath()); if (!f.open(QIODevice::ReadOnly)) { - fprintf(stderr, "Cannot open %s!\n", qPrintable(f.fileName())); + fputs(qPrintable(QCG::tr("Cannot open %1.\n").arg(f.fileName())), stderr); return -1; } QByteArray data = f.readAll(); @@ -565,8 +580,8 @@ if (!imgData.contains(src)) imgData.insert(src, img.readAll()); } else { - fprintf(stderr, "Cannot open referenced image file %s!\n", - qPrintable(img.fileName())); + fputs(qPrintable(QCG::tr("Cannot open referenced image file %1.\n") + .arg(img.fileName())), stderr); } } } diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/qhelpconverter/filterpage.cpp --- a/tools/assistant/tools/qhelpconverter/filterpage.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/qhelpconverter/filterpage.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -127,7 +127,7 @@ { QTreeWidgetItem *item = new QTreeWidgetItem(m_ui.customFilterWidget); item->setFlags(Qt::ItemIsEnabled|Qt::ItemIsEditable|Qt::ItemIsSelectable); - item->setText(0, QLatin1String("unfiltered")); + item->setText(0, tr("unfiltered", "list of available documentation")); item->setText(1, QLatin1String("")); m_ui.customFilterWidget->editItem(item, 0); m_ui.removeButton->setDisabled(false); diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/qhelpconverter/finishpage.cpp --- a/tools/assistant/tools/qhelpconverter/finishpage.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/qhelpconverter/finishpage.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -52,8 +52,7 @@ : QWizardPage(parent) { setTitle(tr("Converting File")); - setSubTitle(QLatin1String("Creating the new Qt help files from the " - "old .adp file.")); + setSubTitle(tr("Creating the new Qt help files from the old ADP file.")); setFinalPage(true); QVBoxLayout *layout = new QVBoxLayout(this); diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/qhelpconverter/helpwindow.cpp --- a/tools/assistant/tools/qhelpconverter/helpwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/qhelpconverter/helpwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -64,7 +64,7 @@ layout = new QVBoxLayout(frame); layout->setMargin(2); - QLabel *l = new QLabel(QLatin1String("
Wizard Assistant
")); + QLabel *l = new QLabel(tr("
Wizard Assistant
")); layout->addWidget(l); m_textEdit = new QTextEdit(); m_textEdit->setFrameStyle(QFrame::NoFrame); diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/qhelpconverter/inputpage.h --- a/tools/assistant/tools/qhelpconverter/inputpage.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/qhelpconverter/inputpage.h Mon Oct 04 01:19:32 2010 +0300 @@ -54,7 +54,7 @@ Q_OBJECT public: - InputPage(AdpReader *reader, QWidget *parent = 0); + explicit InputPage(AdpReader *reader, QWidget *parent = 0); private slots: void getFileName(); diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/qhelpconverter/main.cpp --- a/tools/assistant/tools/qhelpconverter/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/qhelpconverter/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -40,6 +40,9 @@ ****************************************************************************/ #include +#include +#include +#include #include #include "conversionwizard.h" @@ -49,6 +52,18 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); + QTranslator translator; + QTranslator qtTranslator; + QTranslator qt_helpTranslator; + QString sysLocale = QLocale::system().name(); + QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + if (translator.load(QLatin1String("assistant_") + sysLocale, resourceDir) + && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir) + && qt_helpTranslator.load(QLatin1String("qt_help_") + sysLocale, resourceDir)) { + app.installTranslator(&translator); + app.installTranslator(&qtTranslator); + app.installTranslator(&qt_helpTranslator); + } ConversionWizard w; if (argc == 2) { diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/qhelpgenerator/main.cpp --- a/tools/assistant/tools/qhelpgenerator/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/qhelpgenerator/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -44,11 +44,18 @@ #include #include #include +#include +#include +#include #include QT_USE_NAMESPACE +class QHG { + Q_DECLARE_TR_FUNCTIONS(QHelpGenerator) +}; + int main(int argc, char *argv[]) { QString error; @@ -60,6 +67,20 @@ bool showVersion = false; bool checkLinks = false; + QCoreApplication app(argc, argv); + QTranslator translator; + QTranslator qtTranslator; + QTranslator qt_helpTranslator; + QString sysLocale = QLocale::system().name(); + QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + if (translator.load(QLatin1String("assistant_") + sysLocale, resourceDir) + && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir) + && qt_helpTranslator.load(QLatin1String("qt_help_") + sysLocale, resourceDir)) { + app.installTranslator(&translator); + app.installTranslator(&qtTranslator); + app.installTranslator(&qt_helpTranslator); + } + for (int i = 1; i < argc; ++i) { arg = QString::fromLocal8Bit(argv[i]); if (arg == QLatin1String("-o")) { @@ -67,8 +88,7 @@ QFileInfo fi(QString::fromLocal8Bit(argv[i])); compressedFile = fi.absoluteFilePath(); } else { - error = QCoreApplication::translate("QHelpGenerator", - "Missing output file name!"); + error = QHG::tr("Missing output file name."); } } else if (arg == QLatin1String("-v")) { showVersion = true; @@ -84,16 +104,15 @@ } if (showVersion) { - fprintf(stdout, "Qt Help Generator version 1.0 (Qt %s)\n", - QT_VERSION_STR); + fputs(qPrintable(QHG::tr("Qt Help Generator version 1.0 (Qt %1)\n") + .arg(QT_VERSION_STR)), stdout); return 0; } if (projectFile.isEmpty() && !showHelp) - error = QCoreApplication::translate("QHelpGenerator", - "Missing Qt help project file!"); + error = QHG::tr("Missing Qt help project file."); - QString help = QCoreApplication::translate("QHelpGenerator", "\nUsage:\n\n" + QString help = QHG::tr("\nUsage:\n\n" "qhelpgenerator [options]\n\n" " -o Generates a Qt compressed help\n" " file called .\n" @@ -105,7 +124,7 @@ " qhelpgenerator.\n\n"); if (showHelp) { - fprintf(stdout, "%s", qPrintable(help)); + fputs(qPrintable(help), stdout); return 0; }else if (!error.isEmpty()) { fprintf(stderr, "%s\n\n%s", qPrintable(error), qPrintable(help)); @@ -114,7 +133,7 @@ QFile file(projectFile); if (!file.open(QIODevice::ReadOnly)) { - fprintf(stderr, "Could not open %s!\n", qPrintable(projectFile)); + fputs(qPrintable(QHG::tr("Could not open %1.\n").arg(projectFile)), stderr); return -1; } @@ -130,8 +149,8 @@ QDir parentDir = fi.dir(); if (!parentDir.exists()) { if (!parentDir.mkpath(QLatin1String("."))) { - fprintf(stderr, "Could not create output directory: %s\n", - qPrintable(parentDir.path())); + fputs(qPrintable(QHG::tr("Could not create output directory: %1\n") + .arg(parentDir.path())), stderr); } } } @@ -142,7 +161,6 @@ return -1; } - QCoreApplication app(argc, argv); HelpGenerator generator; bool success = true; if (checkLinks) diff -r ef0373b55136 -r 758a864f9613 tools/assistant/tools/shared/helpgenerator.cpp --- a/tools/assistant/tools/shared/helpgenerator.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/assistant/tools/shared/helpgenerator.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -73,12 +73,12 @@ void HelpGenerator::printStatus(const QString &msg) { - fprintf(stdout, "%s\n", qPrintable(msg)); + puts(qPrintable(msg)); } void HelpGenerator::printWarning(const QString &msg) { - fprintf(stdout, "Warning: %s\n", qPrintable(msg)); + puts(qPrintable(tr("Warning: %1").arg(msg))); } QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 tools/configure/configure.pro --- a/tools/configure/configure.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/configure/configure.pro Mon Oct 04 01:19:32 2010 +0300 @@ -28,7 +28,7 @@ $$QT_SOURCE_TREE/src/corelib/global \ $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ - $$QT_BUILD_TREE/tools/shared + $$QT_SOURCE_TREE/tools/shared HEADERS = configureapp.h environment.h tools.h\ $$QT_SOURCE_TREE/src/corelib/tools/qbytearray.h \ diff -r ef0373b55136 -r 758a864f9613 tools/configure/configureapp.cpp --- a/tools/configure/configureapp.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/configure/configureapp.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -341,7 +341,7 @@ dictionary[ "ACCESSIBILITY" ] = "yes"; dictionary[ "OPENGL" ] = "yes"; dictionary[ "OPENVG" ] = "no"; - dictionary[ "IPV6" ] = "yes"; // Always, dynamicly loaded + dictionary[ "IPV6" ] = "yes"; // Always, dynamically loaded dictionary[ "OPENSSL" ] = "auto"; dictionary[ "DBUS" ] = "auto"; dictionary[ "S60" ] = "yes"; @@ -381,6 +381,7 @@ dictionary[ "INCREDIBUILD_XGE" ] = "auto"; dictionary[ "LTCG" ] = "no"; dictionary[ "NATIVE_GESTURES" ] = "yes"; + dictionary[ "MSVC_MP" ] = "no"; } Configure::~Configure() @@ -534,6 +535,13 @@ else if (configCmdLine.at(i) == "-no-ltcg") { dictionary[ "LTCG" ] = "no"; } + else if (configCmdLine.at(i) == "-mp") { + dictionary[ "MSVC_MP" ] = "yes"; + } + else if (configCmdLine.at(i) == "-no-mp") { + dictionary[ "MSVC_MP" ] = "no"; + } + #endif else if (configCmdLine.at(i) == "-platform") { @@ -988,7 +996,6 @@ ++i; if (i == argCount) break; - qmakeDefines += "QT_NAMESPACE="+configCmdLine.at(i); dictionary[ "QT_NAMESPACE" ] = configCmdLine.at(i); } else if (configCmdLine.at(i) == "-qtlibinfix") { ++i; @@ -1029,6 +1036,10 @@ opensslLibs = configCmdLine.at(i); } else if (configCmdLine.at(i).startsWith("PSQL_LIBS=")) { psqlLibs = configCmdLine.at(i); + } else if (configCmdLine.at(i).startsWith("SYBASE=")) { + sybase = configCmdLine.at(i); + } else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) { + sybaseLibs = configCmdLine.at(i); } else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){ @@ -1159,6 +1170,13 @@ dictionary["GRAPHICS_SYSTEM"] = configCmdLine.at(i); } + else if (configCmdLine.at(i) == "-runtimegraphicssystem") { + ++i; + if (i == argCount) + break; + dictionary["RUNTIME_SYSTEM"] = configCmdLine.at(i); + } + else if (configCmdLine.at(i).indexOf(QRegExp("^-(en|dis)able-")) != -1) { // Scan to see if any specific modules and drivers are enabled or disabled for (QStringList::Iterator module = modules.begin(); module != modules.end(); ++module) { @@ -1502,6 +1520,10 @@ dictionary[ "QT3SUPPORT" ] = "no"; dictionary[ "OPENGL" ] = "no"; dictionary[ "OPENSSL" ] = "yes"; + // We accidently enabled IPv6 for Qt Symbian in 4.6.x. However the underlying OpenC does not fully support IPV6. + // Therefore for 4.7.1 and following we disable it until OpenC either supports it or we have the native Qt + // symbian socket engine. + dictionary[ "IPV6" ] = "no"; dictionary[ "STL" ] = "yes"; dictionary[ "EXCEPTIONS" ] = "yes"; dictionary[ "RTTI" ] = "yes"; @@ -1627,7 +1649,7 @@ "[-phonon] [-no-phonon-backend] [-phonon-backend]\n" "[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n" "[-no-script] [-script] [-no-scripttools] [-scripttools]\n" - "[-no-webkit] [-webkit] [-graphicssystem raster|opengl|openvg|runtime]\n\n", 0, 7); + "[-no-webkit] [-webkit] [-graphicssystem raster|opengl|openvg]\n\n", 0, 7); desc("Installation options:\n\n"); @@ -1732,9 +1754,7 @@ "Available values for :"); desc("GRAPHICS_SYSTEM", "raster", "", " raster - Software rasterizer", ' '); desc("GRAPHICS_SYSTEM", "opengl", "", " opengl - Using OpenGL acceleration, experimental!", ' '); - desc("GRAPHICS_SYSTEM", "openvg", "", " openvg - Using OpenVG acceleration, experimental!", ' '); - desc("GRAPHICS_SYSTEM", "runtime", "", " runtime - Runtime switching of graphics sytems", ' '); - + desc("GRAPHICS_SYSTEM", "openvg", "", " openvg - Using OpenVG acceleration, experimental!\n", ' '); desc( "-help, -h, -?", "Display this information.\n"); @@ -1843,6 +1863,8 @@ desc("STYLE_S60" , "yes", "", " s60\n", ' '); desc("NATIVE_GESTURES", "no", "-no-native-gestures", "Do not use native gestures on Windows 7."); desc("NATIVE_GESTURES", "yes", "-native-gestures", "Use native gestures on Windows 7."); + desc("MSVC_MP", "no", "-no-mp", "Do not use multiple processors for compiling with MSVC"); + desc("MSVC_MP", "yes", "-mp", "Use multiple processors for compiling with MSVC (-MP)"); /* We do not support -qconfig on Windows yet @@ -2144,7 +2166,7 @@ available = (paths.size() == 0); if (!available) { - if (epocRoot.isNull() || epocRoot == "") + if (epocRoot.isEmpty()) epocRoot = ""; cout << endl << "The QtMultimedia audio backend will not be built because required" << endl @@ -2662,8 +2684,13 @@ qtConfig += "audio-backend"; } - if (dictionary["WEBKIT"] == "yes") - qtConfig += "webkit"; + if (dictionary["WEBKIT"] == "yes") { + // This include takes care of adding "webkit" to QT_CONFIG. + QString src = sourcePath + "/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri"; + QString dst = buildPath + "/mkspecs/modules/qt_webkit_version.pri"; + QFile::remove(dst); + QFile::copy(src, dst); + } if (dictionary["DECLARATIVE"] == "yes") { if (dictionary[ "SCRIPT" ] == "no") { @@ -2690,7 +2717,7 @@ QString set_config = dictionary["QCONFIG"]; if (possible_configs.contains(set_config)) { - foreach(QString cfg, possible_configs) { + foreach (const QString &cfg, possible_configs) { qtConfig += (cfg + "-config"); if (cfg == set_config) break; @@ -2750,6 +2777,17 @@ } if (!psqlLibs.isEmpty()) qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1); + + { + QStringList lflagsTDS; + if (!sybase.isEmpty()) + lflagsTDS += QString("-L") + fixSeparators(sybase.section("=", 1) + "/lib"); + if (!sybaseLibs.isEmpty()) + lflagsTDS += sybaseLibs.section("=", 1); + if (!lflagsTDS.isEmpty()) + qmakeVars += QString("QT_LFLAGS_TDS=") + lflagsTDS.join(" "); + } + if (!qmakeSql.isEmpty()) qmakeVars += QString("sql-drivers += ") + qmakeSql.join(" "); if (!qmakeSqlPlugins.isEmpty()) @@ -2801,11 +2839,11 @@ for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) { cacheStream << (*var) << endl; } - cacheStream << "CONFIG += " << qmakeConfig.join(" ") << " incremental create_prl link_prl depend_includepath QTDIR_build" << endl; + cacheStream << "CONFIG += " << qmakeConfig.join(" ") << " incremental msvc_mp create_prl link_prl depend_includepath QTDIR_build" << endl; QStringList buildParts; buildParts << "libs" << "tools" << "examples" << "demos" << "docs" << "translations"; - foreach(QString item, disabledBuildParts) { + foreach (const QString &item, disabledBuildParts) { buildParts.removeAll(item); } cacheStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl; @@ -2864,6 +2902,8 @@ if (dictionary[ "LTCG" ] == "yes") configStream << " ltcg"; + if (dictionary[ "MSVC_MP" ] == "yes") + configStream << " msvc_mp"; if (dictionary[ "STL" ] == "yes") configStream << " stl"; if (dictionary[ "EXCEPTIONS" ] == "yes") @@ -2928,8 +2968,6 @@ configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; } - configStream << "#modules" << endl << "for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod)" << endl; - configStream.flush(); configFile.close(); } @@ -3028,6 +3066,9 @@ tmpStream << endl << "// Compile time features" << endl; tmpStream << "#define QT_ARCH_" << dictionary["ARCHITECTURE"].toUpper() << endl; + if (dictionary["GRAPHICS_SYSTEM"] == "runtime" && dictionary["RUNTIME_SYSTEM"] != "runtime") + tmpStream << "#define QT_DEFAULT_RUNTIME_SYSTEM \"" << dictionary["RUNTIME_SYSTEM"] << "\"" << endl; + QStringList qconfigList; if (dictionary["STL"] == "no") qconfigList += "QT_NO_STL"; if (dictionary["STYLE_WINDOWS"] != "yes") qconfigList += "QT_NO_STYLE_WINDOWS"; @@ -3117,7 +3158,7 @@ QStringList kbdDrivers = dictionary["KBD_DRIVERS"].split(" ");; QStringList allKbdDrivers; allKbdDrivers<<"tty"<<"usb"<<"sl5000"<<"yopy"<<"vr41xx"<<"qvfb"<<"um"; - foreach(QString kbd, allKbdDrivers) { + foreach (const QString &kbd, allKbdDrivers) { if (!kbdDrivers.contains(kbd)) tmpStream<<"#define QT_NO_QWS_KBD_"< licenseInfo; QString outputLine; diff -r ef0373b55136 -r 758a864f9613 tools/configure/environment.cpp --- a/tools/configure/environment.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/configure/environment.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -281,8 +281,7 @@ pos += tmpSize; } // add the user environment - for (QStringList::ConstIterator it = environment.begin(); it != environment.end(); it++ ) { - QString tmp = *it; + foreach (const QString &tmp, environment) { uint tmpSize = sizeof(wchar_t) * (tmp.length() + 1); envlist.resize(envlist.size() + tmpSize); memcpy(envlist.data() + pos, tmp.utf16(), tmpSize); @@ -386,7 +385,7 @@ switch(GetLastError()) { case E2BIG: cerr << "execute: Argument list exceeds 1024 bytes" << endl; - foreach(QString arg, arguments) + foreach (const QString &arg, arguments) cerr << " (" << arg.toLocal8Bit().constData() << ")" << endl; break; case ENOENT: @@ -400,7 +399,7 @@ break; default: cerr << "execute: Unknown error" << endl; - foreach(QString arg, arguments) + foreach (const QString &arg, arguments) cerr << " (" << arg.toLocal8Bit().constData() << ")" << endl; break; } diff -r ef0373b55136 -r 758a864f9613 tools/configure/tools.cpp --- a/tools/configure/tools.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/configure/tools.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -91,8 +91,8 @@ QStringList components = buffer.split( '=' ); if ( components.size() >= 2 ) { QStringList::Iterator it = components.begin(); - QString key = (*it++).trimmed().replace( "\"", QString() ).toUpper(); - QString value = (*it++).trimmed().replace( "\"", QString() ); + QString key = (*it++).trimmed().remove('"').toUpper(); + QString value = (*it++).trimmed().remove('"'); licenseInfo[ key ] = value; } } @@ -111,7 +111,7 @@ // Verify license info... QString licenseKey = licenseInfo["LICENSEKEYEXT"]; QByteArray clicenseKey = licenseKey.toLatin1(); - //We check the licence + //We check the license static const char * const SEP = "-"; char *licenseParts[NUMBER_OF_PARTS]; int partNumber = 0; @@ -218,7 +218,7 @@ if (QFile::exists(dictionary["QT_SOURCE_TREE"] + "/.LICENSE")) { // Generic, no-suffix license - dictionary["LICENSE_EXTENSION"] = QString(); + dictionary["LICENSE_EXTENSION"].clear(); } else if (dictionary["LICENSE_EXTENSION"].isEmpty()) { cout << "License file does not contain proper license key." << endl; dictionary["DONE"] = "error"; @@ -239,7 +239,7 @@ fromLicenseFile += "-US"; if (!CopyFile((wchar_t*)QDir::toNativeSeparators(fromLicenseFile).utf16(), - (wchar_t*)QDir::toNativeSeparators(toLicenseFile).utf16(), FALSE)) { + (wchar_t*)QDir::toNativeSeparators(toLicenseFile).utf16(), false)) { cout << "Failed to copy license file (" << fromLicenseFile << ")"; dictionary["DONE"] = "error"; return; diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/components/propertyeditor/defs.cpp --- a/tools/designer/src/components/propertyeditor/defs.cpp Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "defs.h" - -QT_BEGIN_NAMESPACE - -namespace qdesigner_internal { - -int size_type_to_int( QSizePolicy::Policy t ) -{ - if ( t == QSizePolicy::Fixed ) - return 0; - if ( t == QSizePolicy::Minimum ) - return 1; - if ( t == QSizePolicy::Maximum ) - return 2; - if ( t == QSizePolicy::Preferred ) - return 3; - if ( t == QSizePolicy::MinimumExpanding ) - return 4; - if ( t == QSizePolicy::Expanding ) - return 5; - if ( t == QSizePolicy::Ignored ) - return 6; - return 0; -} - -QString size_type_to_string( QSizePolicy::Policy t ) -{ - if ( t == QSizePolicy::Fixed ) - return QString::fromUtf8("Fixed"); - if ( t == QSizePolicy::Minimum ) - return QString::fromUtf8("Minimum"); - if ( t == QSizePolicy::Maximum ) - return QString::fromUtf8("Maximum"); - if ( t == QSizePolicy::Preferred ) - return QString::fromUtf8("Preferred"); - if ( t == QSizePolicy::MinimumExpanding ) - return QString::fromUtf8("MinimumExpanding"); - if ( t == QSizePolicy::Expanding ) - return QString::fromUtf8("Expanding"); - if ( t == QSizePolicy::Ignored ) - return QString::fromUtf8("Ignored"); - return QString(); -} - -QSizePolicy::Policy int_to_size_type( int i ) -{ - if ( i == 0 ) - return QSizePolicy::Fixed; - if ( i == 1 ) - return QSizePolicy::Minimum; - if ( i == 2 ) - return QSizePolicy::Maximum; - if ( i == 3 ) - return QSizePolicy::Preferred; - if ( i == 4 ) - return QSizePolicy::MinimumExpanding; - if ( i == 5 ) - return QSizePolicy::Expanding; - if ( i == 6 ) - return QSizePolicy::Ignored; - return QSizePolicy::Preferred; -} - -} // namespace qdesigner_internal - -QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/components/propertyeditor/defs.h --- a/tools/designer/src/components/propertyeditor/defs.h Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef DEFS_H -#define DEFS_H - -#include -#include - -QT_BEGIN_NAMESPACE - -namespace qdesigner_internal { - -int size_type_to_int(QSizePolicy::Policy t); -QString size_type_to_string(QSizePolicy::Policy t); -QSizePolicy::Policy int_to_size_type(int i); - -} // namespace qdesigner_internal - -QT_END_NAMESPACE - -#endif // DEFS_H diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/components/propertyeditor/propertyeditor.pri --- a/tools/designer/src/components/propertyeditor/propertyeditor.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/designer/src/components/propertyeditor/propertyeditor.pri Mon Oct 04 01:19:32 2010 +0300 @@ -45,10 +45,8 @@ HEADERS += \ $$PWD/propertyeditor_global.h \ - $$PWD/defs.h \ $$PWD/qlonglongvalidator.h -SOURCES += $$PWD/defs.cpp \ - $$PWD/qlonglongvalidator.cpp +SOURCES += $$PWD/qlonglongvalidator.cpp RESOURCES += $$PWD/propertyeditor.qrc diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/components/taskmenu/itemlisteditor.cpp --- a/tools/designer/src/components/taskmenu/itemlisteditor.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/designer/src/components/taskmenu/itemlisteditor.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -114,20 +114,20 @@ } static const char * const itemFlagNames[] = { - "Selectable", - "Editable", - "DragEnabled", - "DropEnabled", - "UserCheckable", - "Enabled", - "Tristate", + QT_TRANSLATE_NOOP("AbstractItemEditor", "Selectable"), + QT_TRANSLATE_NOOP("AbstractItemEditor", "Editable"), + QT_TRANSLATE_NOOP("AbstractItemEditor", "DragEnabled"), + QT_TRANSLATE_NOOP("AbstractItemEditor", "DropEnabled"), + QT_TRANSLATE_NOOP("AbstractItemEditor", "UserCheckable"), + QT_TRANSLATE_NOOP("AbstractItemEditor", "Enabled"), + QT_TRANSLATE_NOOP("AbstractItemEditor", "Tristate"), 0 }; static const char * const checkStateNames[] = { - "Unchecked", - "PartiallyChecked", - "Checked", + QT_TRANSLATE_NOOP("AbstractItemEditor", "Unchecked"), + QT_TRANSLATE_NOOP("AbstractItemEditor", "PartiallyChecked"), + QT_TRANSLATE_NOOP("AbstractItemEditor", "Checked"), 0 }; @@ -135,7 +135,7 @@ { QStringList out; for (int i = 0; in[i]; i++) - out << QLatin1String(in[i]); + out << AbstractItemEditor::tr(in[i]); return out; } diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/designer/assistantclient.cpp --- a/tools/designer/src/designer/assistantclient.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/designer/src/designer/assistantclient.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -101,7 +101,7 @@ return false; } QTextStream str(m_process); - str << cmd << QLatin1Char('\0') << endl; + str << cmd << QLatin1Char('\n') << endl; return true; } diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/lib/shared/actionrepository.cpp --- a/tools/designer/src/lib/shared/actionrepository.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/designer/src/lib/shared/actionrepository.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -397,9 +397,10 @@ emit contextMenuRequested(event, m_model->actionAt(indexAt(event->pos()))); } -void ActionTreeView::currentChanged(const QModelIndex ¤t, const QModelIndex &/*previous*/) +void ActionTreeView::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { emit currentChanged(m_model->actionAt(current)); + QTreeView::currentChanged(current, previous); } void ActionTreeView::slotActivated(const QModelIndex &index) @@ -478,9 +479,10 @@ emit contextMenuRequested(event, m_model->actionAt(indexAt(event->pos()))); } -void ActionListView::currentChanged(const QModelIndex ¤t, const QModelIndex & /*previous*/) +void ActionListView::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { emit currentChanged(m_model->actionAt(current)); + QListView::currentChanged(current, previous); } void ActionListView::slotActivated(const QModelIndex &index) diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/lib/shared/plugindialog.cpp --- a/tools/designer/src/lib/shared/plugindialog.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/designer/src/lib/shared/plugindialog.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -102,7 +102,7 @@ const QStringList fileNames = pluginManager->registeredPlugins(); if (!fileNames.isEmpty()) { - QTreeWidgetItem *topLevelItem = setTopLevelItem(QLatin1String("Loaded Plugins")); + QTreeWidgetItem *topLevelItem = setTopLevelItem(tr("Loaded Plugins")); QFont boldFont = topLevelItem->font(0); foreach (const QString &fileName, fileNames) { @@ -125,7 +125,7 @@ const QStringList notLoadedPlugins = pluginManager->failedPlugins(); if (!notLoadedPlugins.isEmpty()) { - QTreeWidgetItem *topLevelItem = setTopLevelItem(QLatin1String("Failed Plugins")); + QTreeWidgetItem *topLevelItem = setTopLevelItem(tr("Failed Plugins")); const QFont boldFont = topLevelItem->font(0); foreach (const QString &plugin, notLoadedPlugins) { const QString failureReason = pluginManager->failureReason(plugin); diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/lib/shared/stylesheeteditor.cpp --- a/tools/designer/src/lib/shared/stylesheeteditor.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/designer/src/lib/shared/stylesheeteditor.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -79,6 +79,7 @@ : QTextEdit(parent) { setTabStopWidth(fontMetrics().width(QLatin1Char(' '))*4); + setAcceptRichText(false); new CssHighlighter(document()); } diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp --- a/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -66,12 +66,12 @@ QString SeekSliderPlugin::toolTip() const { - return QString(QLatin1String(toolTipC)); + return tr(toolTipC); } QString SeekSliderPlugin::whatsThis() const { - return QString(QLatin1String(toolTipC)); + return tr(toolTipC); } QString SeekSliderPlugin::includeFile() const diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp --- a/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -72,12 +72,12 @@ QString VideoPlayerPlugin::toolTip() const { - return QString(QLatin1String(toolTipC)); + return tr(toolTipC); } QString VideoPlayerPlugin::whatsThis() const { - return QString(QLatin1String(toolTipC)); + return tr(toolTipC); } QString VideoPlayerPlugin::includeFile() const diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp --- a/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -66,12 +66,12 @@ QString VolumeSliderPlugin::toolTip() const { - return QString(QLatin1String(toolTipC)); + return tr(toolTipC); } QString VolumeSliderPlugin::whatsThis() const { - return QString(QLatin1String(toolTipC)); + return tr(toolTipC); } QString VolumeSliderPlugin::includeFile() const diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -69,12 +69,12 @@ QString QDeclarativeViewPlugin::toolTip() const { - return QString(QLatin1String(toolTipC)); + return tr(toolTipC); } QString QDeclarativeViewPlugin::whatsThis() const { - return QString(QLatin1String(toolTipC)); + return tr(toolTipC); } QString QDeclarativeViewPlugin::includeFile() const diff -r ef0373b55136 -r 758a864f9613 tools/designer/src/plugins/qwebview/qwebview_plugin.cpp --- a/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -69,12 +69,12 @@ QString QWebViewPlugin::toolTip() const { - return QString(QLatin1String(toolTipC)); + return tr(toolTipC); } QString QWebViewPlugin::whatsThis() const { - return QString(QLatin1String(toolTipC)); + return tr(toolTipC); } QString QWebViewPlugin::includeFile() const diff -r ef0373b55136 -r 758a864f9613 tools/linguist/lconvert/main.cpp --- a/tools/linguist/lconvert/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/lconvert/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -45,11 +45,17 @@ #include #include #include +#include +#include #include QT_USE_NAMESPACE +class LC { + Q_DECLARE_TR_FUNCTIONS(LConvert) +}; + static int usage(const QStringList &args) { Q_UNUSED(args); @@ -59,7 +65,7 @@ foreach (Translator::FileFormat format, Translator::registeredFileFormats()) loaders += line.arg(format.extension, -5).arg(format.description); - std::cerr << qPrintable(QString(QLatin1String("\nUsage:\n" + std::cerr << qPrintable(LC::tr("\nUsage:\n" " lconvert [options] [...]\n\n" "lconvert is part of Qt's Linguist tool chain. It can be used as a\n" "stand-alone tool to convert and filter translation data files.\n" @@ -121,7 +127,7 @@ " 0 on success\n" " 1 on command line parse failures\n" " 2 on read failures\n" - " 3 on write failures\n")).arg(loaders)); + " 3 on write failures\n").arg(loaders)); return 1; } @@ -134,8 +140,17 @@ int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); + QTranslator translator; + QTranslator qtTranslator; + QString sysLocale = QLocale::system().name(); + QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + if (translator.load(QLatin1String("linguist_") + sysLocale, resourceDir) + && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir)) { + app.installTranslator(&translator); + app.installTranslator(&qtTranslator); + } + QStringList args = app.arguments(); - QList inFiles; QString inFormat(QLatin1String("auto")); QString outFileName; diff -r ef0373b55136 -r 758a864f9613 tools/linguist/linguist/mainwindow.cpp --- a/tools/linguist/linguist/mainwindow.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/linguist/mainwindow.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -142,10 +142,13 @@ case 0x2048: // question exclamation mark case 0x2049: // exclamation question mark case 0x2762: // heavy exclamation mark ornament + case 0xff01: // full width exclamation mark + case 0xff1f: // full width question mark return End_Interrobang; case 0x003b: // greek 'compatibility' questionmark return lang == QLocale::Greek ? End_Interrobang : End_None; case 0x003a: // colon + case 0xff1a: // full width colon return End_Colon; case 0x2026: // horizontal ellipsis return End_Ellipsis; @@ -1027,6 +1030,8 @@ break; if (searchItem(m->extraComment())) break; + if (searchItem(m->translatorComment())) + break; m_foundWhere = DataModel::NoLocation; // did not find the search string in this message } @@ -1347,7 +1352,7 @@ << (QT_VERSION >> 16) << ((QT_VERSION >> 8) & 0xFF) << (QT_VERSION & 0xFF) << QLatin1String("/qdoc/linguist-manual.html") - << QLatin1Char('\0') << endl; + << QLatin1Char('\n') << endl; } void MainWindow::about() diff -r ef0373b55136 -r 758a864f9613 tools/linguist/linguist/phrase.cpp --- a/tools/linguist/linguist/phrase.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/linguist/phrase.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -188,10 +188,9 @@ bool QphHandler::fatalError(const QXmlParseException &exception) { if (ferrorCount++ == 0) { - QString msg; - msg.sprintf("Parse error at line %d, column %d (%s).", - exception.lineNumber(), exception.columnNumber(), - exception.message().toLatin1().constData()); + QString msg = PhraseBook::tr("Parse error at line %1, column %2 (%3).") + .arg(exception.lineNumber()).arg(exception.columnNumber()) + .arg(exception.message()); QMessageBox::information(0, QObject::tr("Qt Linguist"), msg); } diff -r ef0373b55136 -r 758a864f9613 tools/linguist/lrelease/main.cpp --- a/tools/linguist/lrelease/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/lrelease/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -65,6 +65,17 @@ const char *argv0 #endif ); + +struct LR { + static inline QString tr(const char *sourceText, const char *comment = 0) + { + return QCoreApplication::translate("LRelease", sourceText, comment); + } +}; +#else +class LR { + Q_DECLARE_TR_FUNCTIONS(LRelease) +}; #endif static void printOut(const QString & out) @@ -75,7 +86,7 @@ static void printUsage() { - printOut(QCoreApplication::tr( + printOut(LR::tr( "Usage:\n" " lrelease [options] project-file\n" " lrelease [options] ts-files [-qm qm-file]\n\n" @@ -108,7 +119,7 @@ ConversionData cd; bool ok = tor.load(tsFileName, cd, QLatin1String("auto")); if (!ok) { - std::cerr << "lrelease error: " << qPrintable(cd.error()); + std::cerr << qPrintable(LR::tr("lrelease error: %1").arg(cd.error())); } else { if (!cd.errors().isEmpty()) printOut(cd.error()); @@ -123,17 +134,17 @@ tor.reportDuplicates(tor.resolveDuplicates(), qmFileName, cd.isVerbose()); if (cd.isVerbose()) - printOut(QCoreApplication::tr( "Updating '%1'...\n").arg(qmFileName)); + printOut(LR::tr("Updating '%1'...\n").arg(qmFileName)); if (removeIdentical) { if (cd.isVerbose()) - printOut(QCoreApplication::tr( "Removing translations equal to source text in '%1'...\n").arg(qmFileName)); + printOut(LR::tr("Removing translations equal to source text in '%1'...\n").arg(qmFileName)); tor.stripIdenticalSourceTranslations(); } QFile file(qmFileName); if (!file.open(QIODevice::WriteOnly)) { - std::cerr << "lrelease error: cannot create '" << qPrintable(qmFileName) - << "': " << qPrintable(file.errorString()) << std::endl; + std::cerr << qPrintable(LR::tr("lrelease error: cannot create '%1': %2\n") + .arg(qmFileName, file.errorString())); return false; } @@ -142,8 +153,8 @@ file.close(); if (!ok) { - std::cerr << "lrelease error: cannot save '" << qPrintable(qmFileName) - << "': " << qPrintable(cd.error()); + std::cerr << qPrintable(LR::tr("lrelease error: cannot save '%1': %2") + .arg(qmFileName, cd.error())); } else if (!cd.errors().isEmpty()) { printOut(cd.error()); } @@ -181,8 +192,14 @@ #else QCoreApplication app(argc, argv); QTranslator translator; - if (translator.load(QLatin1String("lrelease_") + QLocale::system().name())) + QTranslator qtTranslator; + QString sysLocale = QLocale::system().name(); + QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + if (translator.load(QLatin1String("linguist_") + sysLocale, resourceDir) + && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir)) { app.installTranslator(&translator); + app.installTranslator(&qtTranslator); + } #endif ConversionData cd; @@ -221,7 +238,7 @@ cd.m_verbose = true; continue; } else if (!strcmp(argv[i], "-version")) { - printOut(QCoreApplication::tr( "lrelease version %1\n").arg(QLatin1String(QT_VERSION_STR)) ); + printOut(LR::tr("lrelease version %1\n").arg(QLatin1String(QT_VERSION_STR))); return 0; } else if (!strcmp(argv[i], "-qm")) { if (i == argc - 1) { @@ -255,20 +272,23 @@ visitor.setVerbose(cd.isVerbose()); if (!visitor.queryProFile(&pro)) { - std::cerr << "lrelease error: cannot read project file '" - << qPrintable(inputFile) << "'.\n"; + std::cerr << qPrintable(LR::tr( + "lrelease error: cannot read project file '%1'.\n") + .arg(inputFile)); continue; } if (!visitor.accept(&pro)) { - std::cerr << "lrelease error: cannot process project file '" - << qPrintable(inputFile) << "'.\n"; + std::cerr << qPrintable(LR::tr( + "lrelease error: cannot process project file '%1'.\n") + .arg(inputFile)); continue; } QStringList translations = visitor.values(QLatin1String("TRANSLATIONS")); if (translations.isEmpty()) { - std::cerr << "lrelease warning: Met no 'TRANSLATIONS' entry in project file '" - << qPrintable(inputFile) << "'\n"; + std::cerr << qPrintable(LR::tr( + "lrelease warning: Met no 'TRANSLATIONS' entry in project file '%1'\n") + .arg(inputFile)); } else { QDir proDir(fi.absolutePath()); foreach (const QString &trans, translations) diff -r ef0373b55136 -r 758a864f9613 tools/linguist/lupdate/cpp.cpp --- a/tools/linguist/lupdate/cpp.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/lupdate/cpp.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -50,6 +50,7 @@ #include #include #include +#include #include @@ -57,6 +58,10 @@ QT_BEGIN_NAMESPACE +class LU { + Q_DECLARE_TR_FUNCTIONS(LUpdate) +}; + /* qmake ignore Q_OBJECT */ static QString MagicComment(QLatin1String("TRANSLATOR")); @@ -624,8 +629,8 @@ || yyBraceDepth != is.braceDepth1st || yyParenDepth != is.parenDepth1st) yyMsg(is.elseLine) - << "Parenthesis/bracket/brace mismatch between " - "#if and #else branches; using #if branch\n"; + << qPrintable(LU::tr("Parenthesis/bracket/brace mismatch between " + "#if and #else branches; using #if branch\n")); } else { is.bracketDepth1st = yyBracketDepth; is.braceDepth1st = yyBraceDepth; @@ -647,8 +652,8 @@ || yyBraceDepth != is.braceDepth1st || yyParenDepth != is.parenDepth1st) yyMsg(is.elseLine) - << "Parenthesis/brace mismatch between " - "#if and #else branches; using #if branch\n"; + << qPrintable(LU::tr("Parenthesis/brace mismatch between " + "#if and #else branches; using #if branch\n")); yyBracketDepth = is.bracketDepth1st; yyBraceDepth = is.braceDepth1st; yyParenDepth = is.parenDepth1st; @@ -674,7 +679,7 @@ forever { yyCh = getChar(); if (yyCh == EOF) { - yyMsg() << "Unterminated C++ comment\n"; + yyMsg() << qPrintable(LU::tr("Unterminated C++ comment\n")); break; } @@ -804,7 +809,7 @@ forever { yyCh = getChar(); if (yyCh == EOF) { - yyMsg() << "Unterminated C++ comment\n"; + yyMsg() << qPrintable(LU::tr("Unterminated C++ comment\n")); break; } *ptr++ = yyCh; @@ -837,7 +842,7 @@ yyWord.resize(ptr - (ushort *)yyWord.unicode()); if (yyCh != '"') - yyMsg() << "Unterminated C++ string\n"; + yyMsg() << qPrintable(LU::tr("Unterminated C++ string\n")); else yyCh = getChar(); return Tok_String; @@ -894,8 +899,8 @@ if (yyBraceDepth == yyMinBraceDepth) { if (!inDefine) yyMsg(yyCurLineNo) - << "Excess closing brace in C++ code" - " (or abuse of the C++ preprocessor)\n"; + << qPrintable(LU::tr("Excess closing brace in C++ code" + " (or abuse of the C++ preprocessor)\n")); // Avoid things getting messed up even more yyCh = getChar(); return Tok_Semicolon; @@ -912,8 +917,8 @@ case ')': if (yyParenDepth == 0) yyMsg(yyCurLineNo) - << "Excess closing parenthesis in C++ code" - " (or abuse of the C++ preprocessor)\n"; + << qPrintable(LU::tr("Excess closing parenthesis in C++ code" + " (or abuse of the C++ preprocessor)\n")); else yyParenDepth--; yyCh = getChar(); @@ -927,8 +932,8 @@ case ']': if (yyBracketDepth == 0) yyMsg(yyCurLineNo) - << "Excess closing bracket in C++ code" - " (or abuse of the C++ preprocessor)\n"; + << qPrintable(LU::tr("Excess closing bracket in C++ code" + " (or abuse of the C++ preprocessor)\n")); else yyBracketDepth--; yyCh = getChar(); @@ -1296,7 +1301,7 @@ QString cleanFile = QDir::cleanPath(file); if (inclusions.contains(cleanFile)) { - yyMsg() << "circular inclusion of " << qPrintable(cleanFile) << std::endl; + yyMsg() << qPrintable(LU::tr("circular inclusion of %1\n").arg(cleanFile)); return; } @@ -1320,9 +1325,7 @@ QFile f(cleanFile); if (!f.open(QIODevice::ReadOnly)) { - yyMsg() - << "Cannot open " << qPrintable(cleanFile) << ": " - << qPrintable(f.errorString()) << std::endl; + yyMsg() << qPrintable(LU::tr("Cannot open %1: %2\n").arg(cleanFile, f.errorString())); return; } @@ -1766,7 +1769,7 @@ if (!tor) goto case_default; if (!sourcetext.isEmpty()) - yyMsg() << "//% cannot be used with tr() / QT_TR_NOOP(). Ignoring\n"; + yyMsg() << qPrintable(LU::tr("//% cannot be used with tr() / QT_TR_NOOP(). Ignoring\n")); utf8 = (yyTok == Tok_trUtf8); line = yyLineNo; yyTok = getToken(); @@ -1787,9 +1790,8 @@ QStringList unresolved; if (!fullyQualify(namespaces, pendingContext, true, &functionContext, &unresolved)) { functionContextUnresolved = unresolved.join(strColons); - yyMsg() << "Qualifying with unknown namespace/class " - << qPrintable(stringifyNamespace(functionContext)) << "::" - << qPrintable(unresolved.first()) << std::endl; + yyMsg() << qPrintable(LU::tr("Qualifying with unknown namespace/class %1::%2\n") + .arg(stringifyNamespace(functionContext)).arg(unresolved.first())); } pendingContext.clear(); } @@ -1797,7 +1799,7 @@ if (functionContextUnresolved.isEmpty()) { int idx = functionContext.length(); if (idx < 2) { - yyMsg() << "tr() cannot be called without context\n"; + yyMsg() << qPrintable(LU::tr("tr() cannot be called without context\n")); break; } Namespace *fctx; @@ -1806,8 +1808,8 @@ context = stringifyNamespace(functionContext); fctx = findNamespace(functionContext)->classDef; if (!fctx->complained) { - yyMsg() << "Class '" << qPrintable(context) - << "' lacks Q_OBJECT macro\n"; + yyMsg() << qPrintable(LU::tr("Class '%1' lacks Q_OBJECT macro\n") + .arg(context)); fctx->complained = true; } goto gotctx; @@ -1835,8 +1837,8 @@ int last = prefix.lastIndexOf(strColons); QString className = prefix.mid(last == -1 ? 0 : last + 2); if (!className.isEmpty() && className == functionName) { - yyMsg() << "It is not recommended to call tr() from within a constructor '" - << qPrintable(className) << "::" << qPrintable(functionName) << "'\n"; + yyMsg() << qPrintable(LU::tr("It is not recommended to call tr() from within a constructor '%1::%2'\n") + .arg(className).arg(functionName)); } #endif prefix.chop(2); @@ -1851,7 +1853,7 @@ context = fctx->trQualification; } if (!fctx->hasTrFunctions && !fctx->complained) { - yyMsg() << "Class '" << qPrintable(context) << "' lacks Q_OBJECT macro\n"; + yyMsg() << qPrintable(LU::tr("Class '%1' lacks Q_OBJECT macro\n").arg(context)); fctx->complained = true; } } else { @@ -1873,7 +1875,7 @@ if (!tor) goto case_default; if (!sourcetext.isEmpty()) - yyMsg() << "//% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring\n"; + yyMsg() << qPrintable(LU::tr("//% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring\n")); utf8 = (yyTok == Tok_translateUtf8); line = yyLineNo; yyTok = getToken(); @@ -1928,7 +1930,7 @@ if (!tor) goto case_default; if (!msgid.isEmpty()) - yyMsg() << "//= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring\n"; + yyMsg() << qPrintable(LU::tr("//= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring\n")); //utf8 = false; // Maybe use //%% or something like that line = yyLineNo; yyTok = getToken(); @@ -1995,13 +1997,13 @@ if (isspace(c)) continue; if (c != '"') { - yyMsg() << "Unexpected character in meta string\n"; + yyMsg() << qPrintable(LU::tr("Unexpected character in meta string\n")); break; } forever { if (p >= yyWord.length()) { whoops: - yyMsg() << "Unterminated meta string\n"; + yyMsg() << qPrintable(LU::tr("Unterminated meta string\n")); break; } c = yyWord.unicode()[p++].unicode(); @@ -2054,7 +2056,7 @@ case Tok_Arrow: yyTok = getToken(); if (yyTok == Tok_tr || yyTok == Tok_trUtf8) - yyMsg() << "Cannot invoke tr() like this\n"; + yyMsg() << qPrintable(LU::tr("Cannot invoke tr() like this\n")); break; case Tok_ColonColon: if (yyBraceDepth == namespaceDepths.count() && yyParenDepth == 0 && !yyTokColonSeen) @@ -2087,7 +2089,7 @@ prospectiveContext.clear(); prefix.clear(); if (!sourcetext.isEmpty() || !extracomment.isEmpty() || !msgid.isEmpty() || !extra.isEmpty()) { - yyMsg() << "Discarding unconsumed meta data\n"; + yyMsg() << qPrintable(LU::tr("Discarding unconsumed meta data\n")); sourcetext.clear(); extracomment.clear(); msgid.clear(); @@ -2127,16 +2129,16 @@ if (yyBraceDepth != 0) yyMsg(yyBraceLineNo) - << "Unbalanced opening brace in C++ code" - " (or abuse of the C++ preprocessor)\n"; + << qPrintable(LU::tr("Unbalanced opening brace in C++ code" + " (or abuse of the C++ preprocessor)\n")); else if (yyParenDepth != 0) yyMsg(yyParenLineNo) - << "Unbalanced opening parenthesis in C++ code" - " (or abuse of the C++ preprocessor)\n"; + << qPrintable(LU::tr("Unbalanced opening parenthesis in C++ code" + " (or abuse of the C++ preprocessor)\n")); else if (yyBracketDepth != 0) yyMsg(yyBracketLineNo) - << "Unbalanced opening bracket in C++ code" - " (or abuse of the C++ preprocessor)\n"; + << qPrintable(LU::tr("Unbalanced opening bracket in C++ code" + " (or abuse of the C++ preprocessor)\n")); } const ParseResults *CppParser::recordResults(bool isHeader) @@ -2197,8 +2199,7 @@ QFile file(filename); if (!file.open(QIODevice::ReadOnly)) { - cd.appendError(QString::fromLatin1("Cannot open %1: %2") - .arg(filename, file.errorString())); + cd.appendError(LU::tr("Cannot open %1: %2").arg(filename, file.errorString())); continue; } diff -r ef0373b55136 -r 758a864f9613 tools/linguist/lupdate/java.cpp --- a/tools/linguist/lupdate/java.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/lupdate/java.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -50,6 +50,7 @@ #include #include #include +#include #include @@ -57,6 +58,10 @@ QT_BEGIN_NAMESPACE +class LU { + Q_DECLARE_TR_FUNCTIONS(LUpdate) +}; + enum { Tok_Eof, Tok_class, Tok_return, Tok_tr, Tok_translate, Tok_Ident, Tok_Package, Tok_Comment, Tok_String, Tok_Colon, Tok_Dot, @@ -196,7 +201,7 @@ while ( !metAsterSlash ) { yyCh = getChar(); if ( yyCh == EOF ) { - yyMsg() << "Unterminated Java comment.\n"; + yyMsg() << qPrintable(LU::tr("Unterminated Java comment.\n")); return Tok_Comment; } @@ -232,7 +237,7 @@ else { int sub(yyCh.toLower().toAscii() - 87); if( sub > 15 || sub < 10) { - yyMsg() << "Invalid Unicode value.\n"; + yyMsg() << qPrintable(LU::tr("Invalid Unicode value.\n")); break; } unicode += sub; @@ -255,7 +260,7 @@ } if ( yyCh != QLatin1Char('"') ) - yyMsg() << "Unterminated string.\n"; + yyMsg() << qPrintable(LU::tr("Unterminated string.\n")); yyCh = getChar(); @@ -368,8 +373,9 @@ if (yyTok == Tok_String) s += yyString; else { - yyMsg() << "String used in translation can contain only literals" - " concatenated with other literals, not expressions or numbers.\n"; + yyMsg() << qPrintable(LU::tr( + "String used in translation can contain only literals" + " concatenated with other literals, not expressions or numbers.\n")); return false; } yyTok = getToken(); @@ -477,7 +483,7 @@ yyScope.push(new Scope(yyIdent, Scope::Clazz, yyLineNo)); } else { - yyMsg() << "'class' must be followed by a class name.\n"; + yyMsg() << qPrintable(LU::tr("'class' must be followed by a class name.\n")); break; } while (!match(Tok_LeftBrace)) { @@ -549,7 +555,7 @@ case Tok_RightBrace: if ( yyScope.isEmpty() ) { - yyMsg() << "Excess closing brace.\n"; + yyMsg() << qPrintable(LU::tr("Excess closing brace.\n")); } else delete (yyScope.pop()); @@ -578,7 +584,7 @@ yyPackage.append(QLatin1String(".")); break; default: - yyMsg() << "'package' must be followed by package name.\n"; + yyMsg() << qPrintable(LU::tr("'package' must be followed by package name.\n")); break; } yyTok = getToken(); @@ -591,9 +597,9 @@ } if ( !yyScope.isEmpty() ) - yyMsg(yyScope.top()->line) << "Unbalanced opening brace.\n"; + yyMsg(yyScope.top()->line) << qPrintable(LU::tr("Unbalanced opening brace.\n")); else if ( yyParenDepth != 0 ) - yyMsg(yyParenLineNo) << "Unbalanced opening parenthesis.\n"; + yyMsg(yyParenLineNo) << qPrintable(LU::tr("Unbalanced opening parenthesis.\n")); } @@ -601,8 +607,7 @@ { QFile file(filename); if (!file.open(QIODevice::ReadOnly)) { - cd.appendError(QString::fromLatin1("Cannot open %1: %2") - .arg(filename, file.errorString())); + cd.appendError(LU::tr("Cannot open %1: %2").arg(filename, file.errorString())); return false; } diff -r ef0373b55136 -r 758a864f9613 tools/linguist/lupdate/main.cpp --- a/tools/linguist/lupdate/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/lupdate/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -52,6 +52,8 @@ #include #include #include +#include +#include #include @@ -79,7 +81,7 @@ static void printUsage() { - printOut(QObject::tr( + printOut(LU::tr( "Usage:\n" " lupdate [options] [project-file]...\n" " lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file\n\n" @@ -186,7 +188,7 @@ else if (options & AbsoluteLocations) tor.setLocationsType(Translator::AbsoluteLocations); if (options & Verbose) - printOut(QObject::tr("Updating '%1'...\n").arg(fn)); + printOut(LU::tr("Updating '%1'...\n").arg(fn)); UpdateOptions theseOptions = options; if (tor.locationsType() == Translator::NoLocations) // Could be set from file @@ -201,7 +203,7 @@ } if (options & PluralOnly) { if (options & Verbose) - printOut(QObject::tr("Stripping non plural forms in '%1'...\n").arg(fn)); + printOut(LU::tr("Stripping non plural forms in '%1'...\n").arg(fn)); out.stripNonPluralForms(); } if (options & NoObsolete) @@ -359,12 +361,12 @@ if (visitor.contains(QLatin1String("TRANSLATIONS"))) { if (parentTor) { if (topLevel) { - std::cerr << "lupdate warning: TS files from command line " - "will override TRANSLATIONS in " << qPrintable(proFile) << ".\n"; + std::cerr << qPrintable(LU::tr("lupdate warning: TS files from command line " + "will override TRANSLATIONS in %1.\n").arg(proFile)); goto noTrans; } else if (nestComplain) { - std::cerr << "lupdate warning: TS files from command line " - "prevent recursing into " << qPrintable(proFile) << ".\n"; + std::cerr << qPrintable(LU::tr("lupdate warning: TS files from command line " + "prevent recursing into %1.\n").arg(proFile)); continue; } } @@ -395,8 +397,8 @@ noTrans: if (!parentTor) { if (topLevel) - std::cerr << "lupdate warning: no TS files specified. Only diagnostics " - "will be produced for '" << qPrintable(proFile) << "'.\n"; + std::cerr << qPrintable(LU::tr("lupdate warning: no TS files specified. Only diagnostics " + "will be produced for '%1'.\n").arg(proFile)); Translator tor; processProject(nestComplain, pfi, visitor, options, codecForSource, targetLanguage, sourceLanguage, &tor, fail); @@ -410,6 +412,16 @@ int main(int argc, char **argv) { QCoreApplication app(argc, argv); + QTranslator translator; + QTranslator qtTranslator; + QString sysLocale = QLocale::system().name(); + QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + if (translator.load(QLatin1String("linguist_") + sysLocale, resourceDir) + && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir)) { + app.installTranslator(&translator); + app.installTranslator(&qtTranslator); + } + m_defaultExtensions = QLatin1String("java,jui,ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx,js,qs,qml"); QStringList args = app.arguments(); @@ -613,7 +625,7 @@ proFiles << file; } else if (fi.isDir()) { if (options & Verbose) - printOut(QObject::tr("Scanning directory '%1'...\n").arg(file)); + printOut(LU::tr("Scanning directory '%1'...\n").arg(file)); QDir dir = QDir(fi.filePath()); projectRoots.insert(dir.absolutePath() + QLatin1Char('/')); if (extensionsNameFilters.isEmpty()) { diff -r ef0373b55136 -r 758a864f9613 tools/linguist/lupdate/merge.cpp --- a/tools/linguist/lupdate/merge.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/lupdate/merge.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -44,14 +44,18 @@ #include "simtexth.h" #include "translator.h" +#include #include #include #include #include #include +QT_BEGIN_NAMESPACE -QT_BEGIN_NAMESPACE +class LU { + Q_DECLARE_TR_FUNCTIONS(LUpdate) +}; static bool isDigitFriendly(QChar c) { @@ -485,24 +489,24 @@ if (options & Verbose) { int totalFound = neww + known; - err += QObject::tr(" Found %n source text(s) (%1 new and %2 already existing)\n", 0, totalFound).arg(neww).arg(known); + err += LU::tr(" Found %n source text(s) (%1 new and %2 already existing)\n", 0, totalFound).arg(neww).arg(known); if (obsoleted) { if (options & NoObsolete) { - err += QObject::tr(" Removed %n obsolete entries\n", 0, obsoleted); + err += LU::tr(" Removed %n obsolete entries\n", 0, obsoleted); } else { - err += QObject::tr(" Kept %n obsolete entries\n", 0, obsoleted); + err += LU::tr(" Kept %n obsolete entries\n", 0, obsoleted); } } if (sameNumberHeuristicCount) - err += QObject::tr(" Number heuristic provided %n translation(s)\n", + err += LU::tr(" Number heuristic provided %n translation(s)\n", 0, sameNumberHeuristicCount); if (sameTextHeuristicCount) - err += QObject::tr(" Same-text heuristic provided %n translation(s)\n", + err += LU::tr(" Same-text heuristic provided %n translation(s)\n", 0, sameTextHeuristicCount); if (similarTextHeuristicCount) - err += QObject::tr(" Similar-text heuristic provided %n translation(s)\n", + err += LU::tr(" Similar-text heuristic provided %n translation(s)\n", 0, similarTextHeuristicCount); } return outTor; diff -r ef0373b55136 -r 758a864f9613 tools/linguist/lupdate/qdeclarative.cpp --- a/tools/linguist/lupdate/qdeclarative.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/lupdate/qdeclarative.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -65,8 +65,26 @@ QT_BEGIN_NAMESPACE +class LU { + Q_DECLARE_TR_FUNCTIONS(LUpdate) +}; + using namespace QDeclarativeJS; +class Comment +{ +public: + Comment() : lastLine(-1) {} + QString extracomment; + QString msgid; + TranslatorMessage::ExtraData extra; + QString sourcetext; + int lastLine; + + bool isValid() const + { return !extracomment.isEmpty() || !msgid.isEmpty() || !sourcetext.isEmpty() || !extra.isEmpty(); } +}; + class FindTrCalls: protected AST::Visitor { public: @@ -78,6 +96,8 @@ accept(node); } + QList comments; + protected: using AST::Visitor::visit; using AST::Visitor::endVisit; @@ -114,10 +134,23 @@ plural = true; } + QString id; + QString extracomment; + TranslatorMessage::ExtraData extra; + Comment scomment = findComment(node->firstSourceLocation().startLine); + if (scomment.isValid()) { + extracomment = scomment.extracomment; + extra = scomment.extra; + id = scomment.msgid; + } + TranslatorMessage msg(m_component, source, comment, QString(), m_fileName, node->firstSourceLocation().startLine, QStringList(), TranslatorMessage::Unfinished, plural); + msg.setExtraComment(extracomment.simplified()); + msg.setId(id); + msg.setExtras(extra); m_translator->extend(msg); } } else if (idExpr->name->asString() == QLatin1String("qsTranslate") || @@ -140,6 +173,17 @@ } if (!literal && m_bSource.isEmpty()) return; + + QString id; + QString extracomment; + TranslatorMessage::ExtraData extra; + Comment scomment = findComment(node->firstSourceLocation().startLine); + if (scomment.isValid()) { + extracomment = scomment.extracomment; + extra = scomment.extra; + id = scomment.msgid; + } + source = literal ? literal->value->asString() : m_bSource; AST::ArgumentList *commentNode = sourceNode->next; if (commentNode && AST::cast(commentNode->expression)) { @@ -155,15 +199,48 @@ comment, QString(), m_fileName, node->firstSourceLocation().startLine, QStringList(), TranslatorMessage::Unfinished, plural); + msg.setExtraComment(extracomment.simplified()); + msg.setId(id); + msg.setExtras(extra); m_translator->extend(msg); } + } else if (idExpr->name->asString() == QLatin1String("qsTrId") || + idExpr->name->asString() == QLatin1String("QT_TRID_NOOP")) { + if (!node->arguments) + return; + AST::StringLiteral *literal = AST::cast(node->arguments->expression); + if (literal) { + + QString extracomment; + QString sourcetext; + TranslatorMessage::ExtraData extra; + Comment comment = findComment(node->firstSourceLocation().startLine); + if (comment.isValid()) { + extracomment = comment.extracomment; + sourcetext = comment.sourcetext; + extra = comment.extra; + } + + const QString id = literal->value->asString(); + bool plural = node->arguments->next; + + TranslatorMessage msg(QString(), QString(), + QString(), QString(), m_fileName, + node->firstSourceLocation().startLine, QStringList(), + TranslatorMessage::Unfinished, plural); + msg.setExtraComment(extracomment.simplified()); + msg.setId(id); + msg.setExtras(extra); + m_translator->extend(msg); + } } } } private: - bool createString(AST::BinaryExpression *b) { + bool createString(AST::BinaryExpression *b) + { if (!b || b->op != 0) return false; AST::BinaryExpression *l = AST::cast(b->left); @@ -187,6 +264,23 @@ return true; } + Comment findComment(int loc) + { + if (comments.isEmpty()) + return Comment(); + + int i = 0; + int commentLoc = comments.at(i).lastLine; + while (commentLoc <= loc) { + if (commentLoc == loc) + return comments.at(i); + if (i == comments.count()-1) + break; + commentLoc = comments.at(++i).lastLine; + } + return Comment(); + } + Translator *m_translator; QString m_fileName; QString m_component; @@ -236,13 +330,60 @@ return errorString; } +bool processComment(const QChar *chars, int length, Comment &comment) +{ + // Try to match the logic of the QtScript parser. + if (!length) + return comment.isValid(); + if (*chars == QLatin1Char(':') && chars[1].isSpace()) { + comment.extracomment += QString(chars+1, length-1); + } else if (*chars == QLatin1Char('=') && chars[1].isSpace()) { + comment.msgid = QString(chars+2, length-2).simplified(); + } else if (*chars == QLatin1Char('~') && chars[1].isSpace()) { + QString text = QString(chars+2, length-2).trimmed(); + int k = text.indexOf(QLatin1Char(' ')); + if (k > -1) + comment.extra.insert(text.left(k), text.mid(k + 1).trimmed()); + } else if (*chars == QLatin1Char('%') && chars[1].isSpace()) { + comment.sourcetext.reserve(comment.sourcetext.length() + length-2); + ushort *ptr = (ushort *)comment.sourcetext.data() + comment.sourcetext.length(); + int p = 2, c; + forever { + if (p >= length) + break; + c = chars[p++].unicode(); + if (isspace(c)) + continue; + if (c != '"') + break; + forever { + if (p >= length) + break; + c = chars[p++].unicode(); + if (c == '"') + break; + if (c == '\\') { + if (p >= length) + break; + c = chars[p++].unicode(); + if (c == '\n') + break; + *ptr++ = '\\'; + } + *ptr++ = c; + } + } + comment.sourcetext.resize(ptr - (ushort *)comment.sourcetext.data()); + } + return comment.isValid(); +} + bool loadQml(Translator &translator, const QString &filename, ConversionData &cd) { cd.m_sourceFileName = filename; QFile file(filename); if (!file.open(QIODevice::ReadOnly)) { - cd.appendError(QString::fromLatin1("Cannot open %1: %2") - .arg(filename, file.errorString())); + cd.appendError(LU::tr("Cannot open %1: %2").arg(filename, file.errorString())); return false; } @@ -260,6 +401,25 @@ if (parser.parse()) { FindTrCalls trCalls; + + // build up a list of comments that contain translation information. + for (int i = 0; i < driver.comments().size(); ++i) { + AST::SourceLocation loc = driver.comments().at(i); + QString commentStr = code.mid(loc.offset, loc.length); + + if (trCalls.comments.isEmpty() || trCalls.comments.last().lastLine != int(loc.startLine)) { + Comment comment; + comment.lastLine = loc.startLine+1; + if (processComment(commentStr.constData(), commentStr.length(), comment)) + trCalls.comments.append(comment); + } else { + Comment &lastComment = trCalls.comments.last(); + lastComment.lastLine += 1; + processComment(commentStr.constData(), commentStr.length(), lastComment); + } + } + + //find all tr calls in the code trCalls(&translator, filename, parser.ast()); } else { QString error = createErrorString(filename, code, parser); diff -r ef0373b55136 -r 758a864f9613 tools/linguist/lupdate/qscript.cpp --- a/tools/linguist/lupdate/qscript.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/lupdate/qscript.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -47,6 +47,7 @@ #include +#include #include #include #include @@ -62,6 +63,10 @@ QT_BEGIN_NAMESPACE +class LU { + Q_DECLARE_TR_FUNCTIONS(LUpdate) +}; + class QScriptGrammar { public: @@ -770,13 +775,16 @@ static void recordMessage( Translator *tor, const QString &context, const QString &text, const QString &comment, - const QString &extracomment, bool plural, const QString &fileName, int lineNo) + const QString &extracomment, const QString &msgid, const TranslatorMessage::ExtraData &extra, + bool plural, const QString &fileName, int lineNo) { TranslatorMessage msg( context, text, comment, QString(), fileName, lineNo, QStringList(), TranslatorMessage::Unfinished, plural); msg.setExtraComment(extracomment.simplified()); + msg.setId(msgid); + msg.setExtras(extra); tor->extend(msg); } @@ -784,15 +792,23 @@ namespace QScript { +class CommentProcessor +{ +public: + virtual ~CommentProcessor() {} + virtual void processComment(const QChar *chars, int length) = 0; +}; + class Lexer { public: - Lexer(); + Lexer(CommentProcessor *); ~Lexer(); - void setCode(const QString &c, int lineno); + void setCode(const QString &c, const QString &fileName, int lineno); int lex(); + QString fileName() const { return yyfilename; } int currentLineNo() const { return yylineno; } int currentColumnNo() const { return yycolumn; } @@ -872,6 +888,7 @@ { err = NoError; } private: + QString yyfilename; int yylineno; bool done; char *buffer8; @@ -925,6 +942,8 @@ void syncProhibitAutomaticSemicolon(); + void processComment(const QChar *, int); + const QChar *code; uint length; int yycolumn; @@ -951,6 +970,8 @@ ParenthesesState parenthesesState; int parenthesesCount; bool prohibitAutomaticSemicolon; + + CommentProcessor *commentProcessor; }; } // namespace QScript @@ -1027,7 +1048,7 @@ } // namespace QScript -QScript::Lexer::Lexer() +QScript::Lexer::Lexer(QScript::CommentProcessor *proc) : yylineno(0), size8(128), size16(128), restrKeyword(false), @@ -1038,7 +1059,8 @@ err(NoError), check_reserved(true), parenthesesState(IgnoreParentheses), - prohibitAutomaticSemicolon(false) + prohibitAutomaticSemicolon(false), + commentProcessor(proc) { // allocate space for read buffers buffer8 = new char[size8]; @@ -1053,9 +1075,10 @@ delete [] buffer16; } -void QScript::Lexer::setCode(const QString &c, int lineno) +void QScript::Lexer::setCode(const QString &c, const QString &fileName, int lineno) { errmsg = QString(); + yyfilename = fileName; yylineno = lineno; yycolumn = 1; restrKeyword = false; @@ -1404,10 +1427,12 @@ } else if (current == '/' && next1 == '/') { recordStartPos(); shift(1); + Q_ASSERT(pos16 == 0); state = InSingleLineComment; } else if (current == '/' && next1 == '*') { recordStartPos(); shift(1); + Q_ASSERT(pos16 == 0); state = InMultiLineComment; } else if (current == 0) { syncProhibitAutomaticSemicolon(); @@ -1466,7 +1491,7 @@ else { setDone(Bad); err = IllegalCharacter; - errmsg = QLatin1String("Illegal character"); + errmsg = LU::tr("Illegal character"); } } break; @@ -1477,7 +1502,7 @@ } else if (current == 0 || isLineTerminator()) { setDone(Bad); err = UnclosedStringLiteral; - errmsg = QLatin1String("Unclosed string at end of line"); + errmsg = LU::tr("Unclosed string at end of line"); } else if (current == '\\') { state = InEscapeSequence; } else { @@ -1503,7 +1528,7 @@ } else { setDone(Bad); err = IllegalEscapeSequence; - errmsg = QLatin1String("Illegal escape squence"); + errmsg = LU::tr("Illegal escape squence"); } } else if (current == 'x') state = InHexEscape; @@ -1542,14 +1567,17 @@ } else { setDone(Bad); err = IllegalUnicodeEscapeSequence; - errmsg = QLatin1String("Illegal unicode escape sequence"); + errmsg = LU::tr("Illegal unicode escape sequence"); } break; case InSingleLineComment: if (isLineTerminator()) { + record16(current); // include newline + processComment(buffer16, pos16); shiftWindowsLineBreak(); yylineno++; yycolumn = 0; + pos16 = 0; terminator = true; bol = true; if (restrKeyword) { @@ -1559,19 +1587,25 @@ state = Start; } else if (current == 0) { setDone(Eof); + } else { + record16(current); } break; case InMultiLineComment: if (current == 0) { setDone(Bad); err = UnclosedComment; - errmsg = QLatin1String("Unclosed comment at end of file"); + errmsg = LU::tr("Unclosed comment at end of file"); } else if (isLineTerminator()) { shiftWindowsLineBreak(); yylineno++; } else if (current == '*' && next1 == '/') { + processComment(buffer16, pos16); + pos16 = 0; state = Start; shift(1); + } else { + record16(current); } break; case InIdentifier: @@ -1649,7 +1683,7 @@ } else { setDone(Bad); err = IllegalExponentIndicator; - errmsg = QLatin1String("Illegal syntax for exponential number"); + errmsg = LU::tr("Illegal syntax for exponential number"); } break; case InExponent: @@ -1675,7 +1709,7 @@ && isIdentLetter(current)) { state = Bad; err = IllegalIdentifier; - errmsg = QLatin1String("Identifier cannot start with numeric literal"); + errmsg = LU::tr("Identifier cannot start with numeric literal"); } // terminate string @@ -1994,7 +2028,7 @@ while (1) { if (isLineTerminator() || current == 0) { - errmsg = QLatin1String("Unterminated regular expression literal"); + errmsg = LU::tr("Unterminated regular expression literal"); return false; } else if (current != '/' || lastWasEscape == true) @@ -2033,10 +2067,15 @@ } } +void QScript::Lexer::processComment(const QChar *chars, int length) +{ + commentProcessor->processComment(chars, length); +} + class Translator; -class QScriptParser: protected QScriptGrammar +class QScriptParser: protected QScriptGrammar, public QScript::CommentProcessor { public: QVariant val; @@ -2052,10 +2091,12 @@ QScriptParser(); ~QScriptParser(); - bool parse(QScript::Lexer *lexer, - const QString &fileName, - Translator *translator); + void setLexer(QScript::Lexer *); + bool parse(Translator *translator); + + QString fileName() const + { return lexer->fileName(); } inline QString errorMessage() const { return error_message; } inline int errorLineNumber() const @@ -2072,6 +2113,10 @@ inline Location &loc(int index) { return location_stack [tos + index - 2]; } + std::ostream &yyMsg(int line = 0); + + virtual void processComment(const QChar *, int); + protected: int tos; int stack_size; @@ -2081,6 +2126,13 @@ QString error_message; int error_lineno; int error_column; + +private: + QScript::Lexer *lexer; + QString extracomment; + QString msgid; + QString sourcetext; + TranslatorMessage::ExtraData extra; }; inline void QScriptParser::reallocateStack() @@ -2107,7 +2159,8 @@ stack_size(0), sym_stack(0), state_stack(0), - location_stack(0) + location_stack(0), + lexer(0) { } @@ -2129,10 +2182,14 @@ return loc; } -bool QScriptParser::parse(QScript::Lexer *lexer, - const QString &fileName, - Translator *translator) +void QScriptParser::setLexer(QScript::Lexer *lex) { + lexer = lex; +} + +bool QScriptParser::parse(Translator *translator) +{ + Q_ASSERT(lexer != 0); const int INITIAL_STATE = 0; int yytoken = -1; @@ -2214,44 +2271,70 @@ case 66: { QString name = sym(1).toString(); if ((name == QLatin1String("qsTranslate")) || (name == QLatin1String("QT_TRANSLATE_NOOP"))) { + if (!sourcetext.isEmpty()) + yyMsg(identLineNo) << qPrintable(LU::tr("//% cannot be used with %1(). Ignoring\n").arg(name)); QVariantList args = sym(2).toList(); if (args.size() < 2) { - std::cerr << qPrintable(fileName) << ':' << identLineNo << ": " - << qPrintable(name) << "() requires at least two arguments.\n"; + yyMsg(identLineNo) << qPrintable(LU::tr("%1() requires at least two arguments.\n").arg(name)); } else { if ((args.at(0).type() != QVariant::String) || (args.at(1).type() != QVariant::String)) { - std::cerr << qPrintable(fileName) << ':' << identLineNo << ": " - << qPrintable(name) << "(): both arguments must be literal strings.\n"; + yyMsg(identLineNo) << qPrintable(LU::tr("%1(): both arguments must be literal strings.\n").arg(name)); } else { QString context = args.at(0).toString(); QString text = args.at(1).toString(); QString comment = args.value(2).toString(); - QString extracomment; bool plural = (args.size() > 4); recordMessage(translator, context, text, comment, extracomment, - plural, fileName, identLineNo); + msgid, extra, plural, fileName(), identLineNo); } } + sourcetext.clear(); + extracomment.clear(); + msgid.clear(); + extra.clear(); } else if ((name == QLatin1String("qsTr")) || (name == QLatin1String("QT_TR_NOOP"))) { + if (!sourcetext.isEmpty()) + yyMsg(identLineNo) << qPrintable(LU::tr("//% cannot be used with %1(). Ignoring\n").arg(name)); QVariantList args = sym(2).toList(); if (args.size() < 1) { - std::cerr << qPrintable(fileName) << ':' << identLineNo << ": " - << qPrintable(name) << "() requires at least one argument.\n"; + yyMsg(identLineNo) << qPrintable(LU::tr("%1() requires at least one argument.\n").arg(name)); } else { if (args.at(0).type() != QVariant::String) { - std::cerr << qPrintable(fileName) << ':' << identLineNo << ": " - << qPrintable(name) << "(): text to translate must be a literal string.\n"; + yyMsg(identLineNo) << qPrintable(LU::tr("%1(): text to translate must be a literal string.\n").arg(name)); } else { - QString context = QFileInfo(fileName).baseName(); + QString context = QFileInfo(fileName()).baseName(); QString text = args.at(0).toString(); QString comment = args.value(1).toString(); - QString extracomment; bool plural = (args.size() > 2); recordMessage(translator, context, text, comment, extracomment, - plural, fileName, identLineNo); + msgid, extra, plural, fileName(), identLineNo); } } + sourcetext.clear(); + extracomment.clear(); + msgid.clear(); + extra.clear(); + } else if ((name == QLatin1String("qsTrId")) || (name == QLatin1String("QT_TRID_NOOP"))) { + if (!msgid.isEmpty()) + yyMsg(identLineNo) << qPrintable(LU::tr("//= cannot be used with %1(). Ignoring\n").arg(name)); + QVariantList args = sym(2).toList(); + if (args.size() < 1) { + yyMsg(identLineNo) << qPrintable(LU::tr("%1() requires at least one argument.\n").arg(name)); + } else { + if (args.at(0).type() != QVariant::String) { + yyMsg(identLineNo) << qPrintable(LU::tr("%1(): identifier must be a literal string.\n").arg(name)); + } else { + msgid = args.at(0).toString(); + bool plural = (args.size() > 1); + recordMessage(translator, QString(), sourcetext, QString(), extracomment, + msgid, extra, plural, fileName(), identLineNo); + } + } + sourcetext.clear(); + extracomment.clear(); + msgid.clear(); + extra.clear(); } } break; @@ -2278,6 +2361,44 @@ sym(1) = QVariant(); } break; + case 171: + + case 172: + + case 173: + + case 174: + + case 175: + + case 176: + + case 177: + + case 178: + + case 179: + + case 180: + + case 181: + + case 182: + + case 183: + + case 184: + + case 185: + if (!sourcetext.isEmpty() || !extracomment.isEmpty() || !msgid.isEmpty() || !extra.isEmpty()) { + yyMsg() << qPrintable(LU::tr("Discarding unconsumed meta data\n")); + sourcetext.clear(); + extracomment.clear(); + msgid.clear(); + extra.clear(); + } + break; + } // switch state_stack [tos] = nt_action (act, lhs [r] - TERMINAL_COUNT); @@ -2332,7 +2453,9 @@ for (int s = 0; s < shifts; ++s) { if (first) - error_message += QLatin1String ("Expected "); + //: Beginning of the string that contains + //: comma-separated list of expected tokens + error_message += LU::tr("Expected "); else error_message += QLatin1String (", "); @@ -2356,13 +2479,69 @@ return false; } +std::ostream &QScriptParser::yyMsg(int line) +{ + return std::cerr << qPrintable(fileName()) << ':' << (line ? line : lexer->startLineNo()) << ": "; +} + +void QScriptParser::processComment(const QChar *chars, int length) +{ + if (!length) + return; + // Try to match the logic of the C++ parser. + if (*chars == QLatin1Char(':') && chars[1].isSpace()) { + extracomment += QString(chars+2, length-2); + } else if (*chars == QLatin1Char('=') && chars[1].isSpace()) { + msgid = QString(chars+2, length-2).simplified(); + } else if (*chars == QLatin1Char('~') && chars[1].isSpace()) { + QString text = QString(chars+2, length-2).trimmed(); + int k = text.indexOf(QLatin1Char(' ')); + if (k > -1) + extra.insert(text.left(k), text.mid(k + 1).trimmed()); + } else if (*chars == QLatin1Char('%') && chars[1].isSpace()) { + sourcetext.reserve(sourcetext.length() + length-2); + ushort *ptr = (ushort *)sourcetext.data() + sourcetext.length(); + int p = 2, c; + forever { + if (p >= length) + break; + c = chars[p++].unicode(); + if (isspace(c)) + continue; + if (c != '"') { + yyMsg() << qPrintable(LU::tr("Unexpected character in meta string\n")); + break; + } + forever { + if (p >= length) { + whoops: + yyMsg() << qPrintable(LU::tr("Unterminated meta string\n")); + break; + } + c = chars[p++].unicode(); + if (c == '"') + break; + if (c == '\\') { + if (p >= length) + goto whoops; + c = chars[p++].unicode(); + if (c == '\n') + goto whoops; + *ptr++ = '\\'; + } + *ptr++ = c; + } + } + sourcetext.resize(ptr - (ushort *)sourcetext.data()); + } +} + bool loadQScript(Translator &translator, const QString &filename, ConversionData &cd) { QFile file(filename); if (!file.open(QIODevice::ReadOnly)) { - cd.appendError(QString::fromLatin1("Cannot open %1: %2") - .arg(filename, file.errorString())); + cd.appendError(LU::tr("Cannot open %1: %2").arg(filename, file.errorString())); return false; } QTextStream ts(&file); @@ -2375,10 +2554,11 @@ ts.setAutoDetectUnicode(true); QString code = ts.readAll(); - QScript::Lexer lexer; - lexer.setCode(code, /*lineNumber=*/1); QScriptParser parser; - if (!parser.parse(&lexer, filename, &translator)) { + QScript::Lexer lexer(&parser); + lexer.setCode(code, filename, /*lineNumber=*/1); + parser.setLexer(&lexer); + if (!parser.parse(&translator)) { std::cerr << qPrintable(filename) << ':' << parser.errorLineNumber() << ": " << qPrintable(parser.errorMessage()) << std::endl; return false; diff -r ef0373b55136 -r 758a864f9613 tools/linguist/lupdate/qscript.g --- a/tools/linguist/lupdate/qscript.g Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/lupdate/qscript.g Mon Oct 04 01:19:32 2010 +0300 @@ -84,6 +84,7 @@ /. #include +#include #include #include #include @@ -99,15 +100,22 @@ QT_BEGIN_NAMESPACE +class LU { + Q_DECLARE_TR_FUNCTIONS(LUpdate) +}; + static void recordMessage( Translator *tor, const QString &context, const QString &text, const QString &comment, - const QString &extracomment, bool plural, const QString &fileName, int lineNo) + const QString &extracomment, const QString &msgid, const TranslatorMessage::ExtraData &extra, + bool plural, const QString &fileName, int lineNo) { TranslatorMessage msg( context, text, comment, QString(), fileName, lineNo, QStringList(), TranslatorMessage::Unfinished, plural); msg.setExtraComment(extracomment.simplified()); + msg.setId(msgid); + msg.setExtras(extra); tor->extend(msg); } @@ -115,15 +123,23 @@ namespace QScript { +class CommentProcessor +{ +public: + virtual ~CommentProcessor() {} + virtual void processComment(const QChar *chars, int length) = 0; +}; + class Lexer { public: - Lexer(); + Lexer(CommentProcessor *); ~Lexer(); - void setCode(const QString &c, int lineno); + void setCode(const QString &c, const QString &fileName, int lineno); int lex(); + QString fileName() const { return yyfilename; } int currentLineNo() const { return yylineno; } int currentColumnNo() const { return yycolumn; } @@ -203,6 +219,7 @@ { err = NoError; } private: + QString yyfilename; int yylineno; bool done; char *buffer8; @@ -256,6 +273,8 @@ void syncProhibitAutomaticSemicolon(); + void processComment(const QChar *, int); + const QChar *code; uint length; int yycolumn; @@ -282,6 +301,8 @@ ParenthesesState parenthesesState; int parenthesesCount; bool prohibitAutomaticSemicolon; + + CommentProcessor *commentProcessor; }; } // namespace QScript @@ -358,7 +379,7 @@ } // namespace QScript -QScript::Lexer::Lexer() +QScript::Lexer::Lexer(QScript::CommentProcessor *proc) : yylineno(0), size8(128), size16(128), restrKeyword(false), @@ -369,7 +390,8 @@ err(NoError), check_reserved(true), parenthesesState(IgnoreParentheses), - prohibitAutomaticSemicolon(false) + prohibitAutomaticSemicolon(false), + commentProcessor(proc) { // allocate space for read buffers buffer8 = new char[size8]; @@ -384,9 +406,10 @@ delete [] buffer16; } -void QScript::Lexer::setCode(const QString &c, int lineno) +void QScript::Lexer::setCode(const QString &c, const QString &fileName, int lineno) { errmsg = QString(); + yyfilename = fileName; yylineno = lineno; yycolumn = 1; restrKeyword = false; @@ -735,10 +758,12 @@ } else if (current == '/' && next1 == '/') { recordStartPos(); shift(1); + Q_ASSERT(pos16 == 0); state = InSingleLineComment; } else if (current == '/' && next1 == '*') { recordStartPos(); shift(1); + Q_ASSERT(pos16 == 0); state = InMultiLineComment; } else if (current == 0) { syncProhibitAutomaticSemicolon(); @@ -797,7 +822,7 @@ else { setDone(Bad); err = IllegalCharacter; - errmsg = QLatin1String("Illegal character"); + errmsg = LU::tr("Illegal character"); } } break; @@ -808,7 +833,7 @@ } else if (current == 0 || isLineTerminator()) { setDone(Bad); err = UnclosedStringLiteral; - errmsg = QLatin1String("Unclosed string at end of line"); + errmsg = LU::tr("Unclosed string at end of line"); } else if (current == '\\') { state = InEscapeSequence; } else { @@ -834,7 +859,7 @@ } else { setDone(Bad); err = IllegalEscapeSequence; - errmsg = QLatin1String("Illegal escape squence"); + errmsg = LU::tr("Illegal escape squence"); } } else if (current == 'x') state = InHexEscape; @@ -873,14 +898,17 @@ } else { setDone(Bad); err = IllegalUnicodeEscapeSequence; - errmsg = QLatin1String("Illegal unicode escape sequence"); + errmsg = LU::tr("Illegal unicode escape sequence"); } break; case InSingleLineComment: if (isLineTerminator()) { + record16(current); // include newline + processComment(buffer16, pos16); shiftWindowsLineBreak(); yylineno++; yycolumn = 0; + pos16 = 0; terminator = true; bol = true; if (restrKeyword) { @@ -890,19 +918,25 @@ state = Start; } else if (current == 0) { setDone(Eof); + } else { + record16(current); } break; case InMultiLineComment: if (current == 0) { setDone(Bad); err = UnclosedComment; - errmsg = QLatin1String("Unclosed comment at end of file"); + errmsg = LU::tr("Unclosed comment at end of file"); } else if (isLineTerminator()) { shiftWindowsLineBreak(); yylineno++; } else if (current == '*' && next1 == '/') { + processComment(buffer16, pos16); + pos16 = 0; state = Start; shift(1); + } else { + record16(current); } break; case InIdentifier: @@ -980,7 +1014,7 @@ } else { setDone(Bad); err = IllegalExponentIndicator; - errmsg = QLatin1String("Illegal syntax for exponential number"); + errmsg = LU::tr("Illegal syntax for exponential number"); } break; case InExponent: @@ -1006,7 +1040,7 @@ && isIdentLetter(current)) { state = Bad; err = IllegalIdentifier; - errmsg = QLatin1String("Identifier cannot start with numeric literal"); + errmsg = LU::tr("Identifier cannot start with numeric literal"); } // terminate string @@ -1325,7 +1359,7 @@ while (1) { if (isLineTerminator() || current == 0) { - errmsg = QLatin1String("Unterminated regular expression literal"); + errmsg = LU::tr("Unterminated regular expression literal"); return false; } else if (current != '/' || lastWasEscape == true) @@ -1364,10 +1398,15 @@ } } +void QScript::Lexer::processComment(const QChar *chars, int length) +{ + commentProcessor->processComment(chars, length); +} + class Translator; -class QScriptParser: protected $table +class QScriptParser: protected $table, public QScript::CommentProcessor { public: QVariant val; @@ -1383,10 +1422,12 @@ QScriptParser(); ~QScriptParser(); - bool parse(QScript::Lexer *lexer, - const QString &fileName, - Translator *translator); + void setLexer(QScript::Lexer *); + bool parse(Translator *translator); + + QString fileName() const + { return lexer->fileName(); } inline QString errorMessage() const { return error_message; } inline int errorLineNumber() const @@ -1403,6 +1444,10 @@ inline Location &loc(int index) { return location_stack [tos + index - 2]; } + std::ostream &yyMsg(int line = 0); + + virtual void processComment(const QChar *, int); + protected: int tos; int stack_size; @@ -1412,6 +1457,13 @@ QString error_message; int error_lineno; int error_column; + +private: + QScript::Lexer *lexer; + QString extracomment; + QString msgid; + QString sourcetext; + TranslatorMessage::ExtraData extra; }; inline void QScriptParser::reallocateStack() @@ -1438,7 +1490,8 @@ stack_size(0), sym_stack(0), state_stack(0), - location_stack(0) + location_stack(0), + lexer(0) { } @@ -1460,10 +1513,14 @@ return loc; } -bool QScriptParser::parse(QScript::Lexer *lexer, - const QString &fileName, - Translator *translator) +void QScriptParser::setLexer(QScript::Lexer *lex) { + lexer = lex; +} + +bool QScriptParser::parse(Translator *translator) +{ + Q_ASSERT(lexer != 0); const int INITIAL_STATE = 0; int yytoken = -1; @@ -1630,44 +1687,70 @@ case $rule_number: { QString name = sym(1).toString(); if ((name == QLatin1String("qsTranslate")) || (name == QLatin1String("QT_TRANSLATE_NOOP"))) { + if (!sourcetext.isEmpty()) + yyMsg(identLineNo) << qPrintable(LU::tr("//% cannot be used with %1(). Ignoring\n").arg(name)); QVariantList args = sym(2).toList(); if (args.size() < 2) { - std::cerr << qPrintable(fileName) << ':' << identLineNo << ": " - << qPrintable(name) << "() requires at least two arguments.\n"; + yyMsg(identLineNo) << qPrintable(LU::tr("%1() requires at least two arguments.\n").arg(name)); } else { if ((args.at(0).type() != QVariant::String) || (args.at(1).type() != QVariant::String)) { - std::cerr << qPrintable(fileName) << ':' << identLineNo << ": " - << qPrintable(name) << "(): both arguments must be literal strings.\n"; + yyMsg(identLineNo) << qPrintable(LU::tr("%1(): both arguments must be literal strings.\n").arg(name)); } else { QString context = args.at(0).toString(); QString text = args.at(1).toString(); QString comment = args.value(2).toString(); - QString extracomment; bool plural = (args.size() > 4); recordMessage(translator, context, text, comment, extracomment, - plural, fileName, identLineNo); + msgid, extra, plural, fileName(), identLineNo); } } + sourcetext.clear(); + extracomment.clear(); + msgid.clear(); + extra.clear(); } else if ((name == QLatin1String("qsTr")) || (name == QLatin1String("QT_TR_NOOP"))) { + if (!sourcetext.isEmpty()) + yyMsg(identLineNo) << qPrintable(LU::tr("//% cannot be used with %1(). Ignoring\n").arg(name)); QVariantList args = sym(2).toList(); if (args.size() < 1) { - std::cerr << qPrintable(fileName) << ':' << identLineNo << ": " - << qPrintable(name) << "() requires at least one argument.\n"; + yyMsg(identLineNo) << qPrintable(LU::tr("%1() requires at least one argument.\n").arg(name)); } else { if (args.at(0).type() != QVariant::String) { - std::cerr << qPrintable(fileName) << ':' << identLineNo << ": " - << qPrintable(name) << "(): text to translate must be a literal string.\n"; + yyMsg(identLineNo) << qPrintable(LU::tr("%1(): text to translate must be a literal string.\n").arg(name)); } else { - QString context = QFileInfo(fileName).baseName(); + QString context = QFileInfo(fileName()).baseName(); QString text = args.at(0).toString(); QString comment = args.value(1).toString(); - QString extracomment; bool plural = (args.size() > 2); recordMessage(translator, context, text, comment, extracomment, - plural, fileName, identLineNo); + msgid, extra, plural, fileName(), identLineNo); } } + sourcetext.clear(); + extracomment.clear(); + msgid.clear(); + extra.clear(); + } else if ((name == QLatin1String("qsTrId")) || (name == QLatin1String("QT_TRID_NOOP"))) { + if (!msgid.isEmpty()) + yyMsg(identLineNo) << qPrintable(LU::tr("//= cannot be used with %1(). Ignoring\n").arg(name)); + QVariantList args = sym(2).toList(); + if (args.size() < 1) { + yyMsg(identLineNo) << qPrintable(LU::tr("%1() requires at least one argument.\n").arg(name)); + } else { + if (args.at(0).type() != QVariant::String) { + yyMsg(identLineNo) << qPrintable(LU::tr("%1(): identifier must be a literal string.\n").arg(name)); + } else { + msgid = args.at(0).toString(); + bool plural = (args.size() > 1); + recordMessage(translator, QString(), sourcetext, QString(), extracomment, + msgid, extra, plural, fileName(), identLineNo); + } + } + sourcetext.clear(); + extracomment.clear(); + msgid.clear(); + extra.clear(); } } break; ./ @@ -1813,20 +1896,73 @@ ExpressionNotInOpt: ExpressionNotIn ; Statement: Block ; +/. + case $rule_number: +./ Statement: VariableStatement ; +/. + case $rule_number: +./ Statement: EmptyStatement ; +/. + case $rule_number: +./ Statement: ExpressionStatement ; +/. + case $rule_number: +./ Statement: IfStatement ; +/. + case $rule_number: +./ Statement: IterationStatement ; +/. + case $rule_number: +./ Statement: ContinueStatement ; +/. + case $rule_number: +./ Statement: BreakStatement ; +/. + case $rule_number: +./ Statement: ReturnStatement ; +/. + case $rule_number: +./ Statement: WithStatement ; +/. + case $rule_number: +./ Statement: LabelledStatement ; +/. + case $rule_number: +./ Statement: SwitchStatement ; +/. + case $rule_number: +./ Statement: ThrowStatement ; +/. + case $rule_number: +./ Statement: TryStatement ; +/. + case $rule_number: +./ Statement: DebuggerStatement ; +/. + case $rule_number: + if (!sourcetext.isEmpty() || !extracomment.isEmpty() || !msgid.isEmpty() || !extra.isEmpty()) { + yyMsg() << qPrintable(LU::tr("Discarding unconsumed meta data\n")); + sourcetext.clear(); + extracomment.clear(); + msgid.clear(); + extra.clear(); + } + break; +./ Block: T_LBRACE StatementListOpt T_RBRACE ; StatementList: Statement ; @@ -1965,6 +2101,9 @@ { if (first) error_message += QLatin1String ("Expected "); + //: Beginning of the string that contains + //: comma-separated list of expected tokens + error_message += LU::tr("Expected "); else error_message += QLatin1String (", "); @@ -1988,13 +2127,69 @@ return false; } +std::ostream &QScriptParser::yyMsg(int line) +{ + return std::cerr << qPrintable(fileName()) << ':' << (line ? line : lexer->startLineNo()) << ": "; +} + +void QScriptParser::processComment(const QChar *chars, int length) +{ + if (!length) + return; + // Try to match the logic of the C++ parser. + if (*chars == QLatin1Char(':') && chars[1].isSpace()) { + extracomment += QString(chars+2, length-2); + } else if (*chars == QLatin1Char('=') && chars[1].isSpace()) { + msgid = QString(chars+2, length-2).simplified(); + } else if (*chars == QLatin1Char('~') && chars[1].isSpace()) { + QString text = QString(chars+2, length-2).trimmed(); + int k = text.indexOf(QLatin1Char(' ')); + if (k > -1) + extra.insert(text.left(k), text.mid(k + 1).trimmed()); + } else if (*chars == QLatin1Char('%') && chars[1].isSpace()) { + sourcetext.reserve(sourcetext.length() + length-2); + ushort *ptr = (ushort *)sourcetext.data() + sourcetext.length(); + int p = 2, c; + forever { + if (p >= length) + break; + c = chars[p++].unicode(); + if (isspace(c)) + continue; + if (c != '"') { + yyMsg() << qPrintable(LU::tr("Unexpected character in meta string\n")); + break; + } + forever { + if (p >= length) { + whoops: + yyMsg() << qPrintable(LU::tr("Unterminated meta string\n")); + break; + } + c = chars[p++].unicode(); + if (c == '"') + break; + if (c == '\\') { + if (p >= length) + goto whoops; + c = chars[p++].unicode(); + if (c == '\n') + goto whoops; + *ptr++ = '\\'; + } + *ptr++ = c; + } + } + sourcetext.resize(ptr - (ushort *)sourcetext.data()); + } +} + bool loadQScript(Translator &translator, const QString &filename, ConversionData &cd) { QFile file(filename); if (!file.open(QIODevice::ReadOnly)) { - cd.appendError(QString::fromLatin1("Cannot open %1: %2") - .arg(filename, file.errorString())); + cd.appendError(LU::tr("Cannot open %1: %2").arg(filename, file.errorString())); return false; } QTextStream ts(&file); @@ -2007,10 +2202,11 @@ ts.setAutoDetectUnicode(true); QString code = ts.readAll(); - QScript::Lexer lexer; - lexer.setCode(code, /*lineNumber=*/1); QScriptParser parser; - if (!parser.parse(&lexer, filename, &translator)) { + QScript::Lexer lexer(&parser); + lexer.setCode(code, filename, /*lineNumber=*/1); + parser.setLexer(&lexer); + if (!parser.parse(&translator)) { std::cerr << qPrintable(filename) << ':' << parser.errorLineNumber() << ": " << qPrintable(parser.errorMessage()) << std::endl; return false; diff -r ef0373b55136 -r 758a864f9613 tools/linguist/lupdate/ui.cpp --- a/tools/linguist/lupdate/ui.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/lupdate/ui.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -43,6 +43,7 @@ #include +#include #include #include #include @@ -55,6 +56,10 @@ QT_BEGIN_NAMESPACE +class LU { + Q_DECLARE_TR_FUNCTIONS(LUpdate) +}; + class UiReader : public QXmlDefaultHandler { public: @@ -152,11 +157,10 @@ bool UiReader::fatalError(const QXmlParseException &exception) { - QString msg; - msg.sprintf("XML error: Parse error at line %d, column %d (%s).", - exception.lineNumber(), exception.columnNumber(), - exception.message().toLatin1().data()); - m_cd.appendError(msg); + QString msg = LU::tr("XML error: Parse error at line %1, column %2 (%3).") + .arg(exception.lineNumber()).arg(exception.columnNumber()) + .arg(exception.message()); + m_cd.appendError(msg); return false; } @@ -181,8 +185,7 @@ cd.m_sourceFileName = filename; QFile file(filename); if (!file.open(QIODevice::ReadOnly)) { - cd.appendError(QString::fromLatin1("Cannot open %1: %2") - .arg(filename, file.errorString())); + cd.appendError(LU::tr("Cannot open %1: %2").arg(filename, file.errorString())); return false; } QXmlInputSource in(&file); @@ -196,7 +199,7 @@ reader.setErrorHandler(&handler); bool result = reader.parse(in); if (!result) - cd.appendError(QLatin1String("Parse error in UI file")); + cd.appendError(LU::tr("Parse error in UI file")); reader.setContentHandler(0); reader.setErrorHandler(0); return result; diff -r ef0373b55136 -r 758a864f9613 tools/linguist/phrasebooks/french.qph --- a/tools/linguist/phrasebooks/french.qph Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/phrasebooks/french.qph Mon Oct 04 01:19:32 2010 +0300 @@ -801,7 +801,7 @@ Redo - Annuler Annuler + Rétablir region selection @@ -1111,10 +1111,6 @@ &Édition - &Redo - Re&faire - - debugger débogueur @@ -1438,4 +1434,60 @@ &Debug &Déboguer + + Slider + Barre de défilement + + + &Restore + &Restaurer + + + &Move + &Déplacer + + + New + Créer + + + Play + Lecture + + + Slider + Barre de défilement + + + &Restore + &Restaurer + + + &Move + &Déplacer + + + New + Créer + + + Play + Lecture + + + &Redo + &Refaire + + + Raised + Bombé + + + Sunken + Enfoncé + + + Run: + Exécution : + diff -r ef0373b55136 -r 758a864f9613 tools/linguist/phrasebooks/russian.qph --- a/tools/linguist/phrasebooks/russian.qph Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/phrasebooks/russian.qph Mon Oct 04 01:19:32 2010 +0300 @@ -498,7 +498,7 @@ Next - Следующий + Далее object @@ -1070,7 +1070,7 @@ Next - Далее + Следующий tree view @@ -1204,4 +1204,16 @@ Permission denied Доступ запрещён + + Previous + Предыдущий + + + Next + Следующее + + + Previous + Предыдущее + diff -r ef0373b55136 -r 758a864f9613 tools/linguist/shared/po.cpp --- a/tools/linguist/shared/po.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/shared/po.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -50,8 +50,6 @@ #include -#define MAGIC_OBSOLETE_REFERENCE "Obsolete_PO_entries" - // Uncomment if you wish to hard wrap long lines in .po files. Note that this // affects only msg strings, not comments. //#define HARD_WRAP_LONG_WORDS @@ -555,15 +553,26 @@ TranslatorMessage msg; msg.setContext(codec->toUnicode(item.context)); if (!item.references.isEmpty()) { + QString xrefs; foreach (const QString &ref, codec->toUnicode(item.references).split( QRegExp(QLatin1String("\\s")), QString::SkipEmptyParts)) { - int pos = ref.lastIndexOf(QLatin1Char(':')); - if (pos != -1) - msg.addReference(ref.left(pos), ref.mid(pos + 1).toInt()); + int pos = ref.indexOf(QLatin1Char(':')); + int lpos = ref.lastIndexOf(QLatin1Char(':')); + if (pos != -1 && pos == lpos) { + bool ok; + int lno = ref.mid(pos + 1).toInt(&ok); + if (ok) { + msg.addReference(ref.left(pos), lno); + continue; + } + } + if (!xrefs.isEmpty()) + xrefs += QLatin1Char(' '); + xrefs += ref; } - } else if (isObsolete) { - msg.setFileName(QLatin1String(MAGIC_OBSOLETE_REFERENCE)); + if (!xrefs.isEmpty()) + item.extra[QLatin1String("po-references")] = xrefs; } msg.setId(codec->toUnicode(item.id)); msg.setSourceText(codec->toUnicode(item.msgId)); @@ -660,6 +669,8 @@ item.isPlural = true; } else if (line.startsWith("#~ msgctxt ")) { item.tscomment = slurpEscapedString(lines, l, 11, "#~ ", cd); + if (qtContexts) + splitContext(&item.tscomment, &item.context); } else { cd.appendError(QString(QLatin1String("PO-format parse error in line %1: '%2'")) .arg(l + 1).arg(codec->toUnicode(lines[l]))); @@ -773,11 +784,14 @@ if (!msg.id().isEmpty()) out << QLatin1String("#. ts-id ") << msg.id() << '\n'; - if (!msg.fileName().isEmpty() && msg.fileName() != QLatin1String(MAGIC_OBSOLETE_REFERENCE)) { + QString xrefs = msg.extra(QLatin1String("po-references")); + if (!msg.fileName().isEmpty() || !xrefs.isEmpty()) { QStringList refs; foreach (const TranslatorMessage::Reference &ref, msg.allReferences()) refs.append(QString(QLatin1String("%2:%1")) .arg(ref.lineNumber()).arg(ref.fileName())); + if (!xrefs.isEmpty()) + refs << xrefs; out << poWrappedEscapedLines(QLatin1String("#:"), true, refs.join(QLatin1String(" "))); } diff -r ef0373b55136 -r 758a864f9613 tools/linguist/shared/xliff.cpp --- a/tools/linguist/shared/xliff.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/linguist/shared/xliff.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -53,6 +53,11 @@ #include +// The string value is historical and reflects the main purpose: Keeping +// obsolete entries separate from the magic file message (which both have +// no location information, but typically reside at opposite ends of the file). +#define MAGIC_OBSOLETE_REFERENCE "Obsolete_PO_entries" + QT_BEGIN_NAMESPACE /** @@ -692,6 +697,9 @@ m_cd.appendError(QLatin1String("XLIFF syntax error: Message without source string.")); return false; } + if (m_type == TranslatorMessage::Obsolete && m_refs.size() == 1 + && m_refs.at(0).fileName() == QLatin1String(MAGIC_OBSOLETE_REFERENCE)) + m_refs.clear(); TranslatorMessage msg(m_context, m_sources[0], m_comment, QString(), QString(), -1, m_translations, m_type, isPlural); @@ -761,12 +769,15 @@ QHash > contextOrder; QList fileOrder; foreach (const TranslatorMessage &msg, translator.messages()) { - QHash > &file = messageOrder[msg.fileName()]; + QString fn = msg.fileName(); + if (fn.isEmpty() && msg.type() == TranslatorMessage::Obsolete) + fn = QLatin1String(MAGIC_OBSOLETE_REFERENCE); + QHash > &file = messageOrder[fn]; if (file.isEmpty()) - fileOrder.append(msg.fileName()); + fileOrder.append(fn); QList &context = file[msg.context()]; if (context.isEmpty()) - contextOrder[msg.fileName()].append(msg.context()); + contextOrder[fn].append(msg.context()); context.append(msg); } diff -r ef0373b55136 -r 758a864f9613 tools/porting/src/errors.cpp --- a/tools/porting/src/errors.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/porting/src/errors.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -44,8 +44,8 @@ QT_BEGIN_NAMESPACE -QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, QLatin1String("Internal Error") ); -QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, QLatin1String("Syntax Error before '%1'") ); -QT_STATIC_CONST_IMPL Error& Errors::ParseError = Error( 3, -1, QLatin1String("Parse Error before '%1'") ); +QT_STATIC_CONST_IMPL Error Errors::InternalError = Error( 1, -1, QLatin1String("Internal Error") ); +QT_STATIC_CONST_IMPL Error Errors::SyntaxError = Error( 2, -1, QLatin1String("Syntax Error before '%1'") ); +QT_STATIC_CONST_IMPL Error Errors::ParseError = Error( 3, -1, QLatin1String("Parse Error before '%1'") ); QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 tools/porting/src/errors.h --- a/tools/porting/src/errors.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/porting/src/errors.h Mon Oct 04 01:19:32 2010 +0300 @@ -61,9 +61,9 @@ class Errors { public: - QT_STATIC_CONST Error& InternalError; - QT_STATIC_CONST Error& SyntaxError; - QT_STATIC_CONST Error& ParseError; + QT_STATIC_CONST Error InternalError; + QT_STATIC_CONST Error SyntaxError; + QT_STATIC_CONST Error ParseError; }; QT_END_NAMESPACE diff -r ef0373b55136 -r 758a864f9613 tools/porting/src/semantic.cpp --- a/tools/porting/src/semantic.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/porting/src/semantic.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -768,7 +768,7 @@ void Semantic::parseTypeSpecifier(TypeSpecifierAST *ast) { // If this is a classSpecifier or a EnumSpecifier we skip the name lookup, - // becuase looking up the name "E" in a class definition like + // because looking up the name "E" in a class definition like // "class E { ..." makes no sense. (There might be a variable named E // already declared, but that variable is now shadowed by the class type.) if( ast->nodeType() != NodeType_EnumSpecifier @@ -807,7 +807,7 @@ /* looks up name used in basescope. If name->isGlobal() is true or if classOrNamespaceList() - returns a non-emty list, the C++ qualified name lookup rules are used. Otherwise the + returns a non-empty list, the C++ qualified name lookup rules are used. Otherwise the unquialified name lookup rules are used. Returns the a list of members that was found, In most cases this list will contain zero or one element, exept in the case of overloaded functions. TODO: Argument-dependent name lookup @@ -975,7 +975,7 @@ */ FunctionMember *Semantic::selectFunction(QList candidatateList, const DeclaratorAST *functionDeclarator) { - // get arguments for funciton we are looking for + // get arguments for function we are looking for FunctionMember testFunction; parseFunctionArguments(functionDeclarator, &testFunction); const ArgumentCollection testArgumentCollection = testFunction.arguments(); diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/codemarker.cpp --- a/tools/qdoc3/codemarker.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/codemarker.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -624,7 +624,9 @@ Get the list of documentation sections for the children of the specified QmlClassNode. */ -QList
CodeMarker::qmlSections(const QmlClassNode* , SynopsisStyle ) +QList
CodeMarker::qmlSections(const QmlClassNode* , + SynopsisStyle , + const Tree* ) { return QList
(); } diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/codemarker.h --- a/tools/qdoc3/codemarker.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/codemarker.h Mon Oct 04 01:19:32 2010 +0300 @@ -153,7 +153,8 @@ Status status) = 0; #ifdef QDOC_QML virtual QList
qmlSections(const QmlClassNode* qmlClassNode, - SynopsisStyle style); + SynopsisStyle style, + const Tree* tree); #endif virtual const Node* resolveTarget(const QString& target, const Tree* tree, diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/config.h --- a/tools/qdoc3/config.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/config.h Mon Oct 04 01:19:32 2010 +0300 @@ -119,6 +119,7 @@ }; #define CONFIG_ALIAS "alias" +#define CONFIG_APPLICATION "application" #define CONFIG_BASE "base" // ### don't document for now #define CONFIG_CODEINDENT "codeindent" #define CONFIG_DEFINES "defines" @@ -142,8 +143,7 @@ #define CONFIG_MACRO "macro" #define CONFIG_NATURALLANGUAGE "naturallanguage" #define CONFIG_OBSOLETELINKS "obsoletelinks" -#define CONFIG_ONLINE "online" -#define CONFIG_CREATOR "creator" +#define CONFIG_APPLICATION "application" #define CONFIG_OUTPUTDIR "outputdir" #define CONFIG_OUTPUTENCODING "outputencoding" #define CONFIG_OUTPUTLANGUAGE "outputlanguage" diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/cppcodemarker.cpp --- a/tools/qdoc3/cppcodemarker.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/cppcodemarker.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1127,7 +1127,8 @@ Currently, it only handles QML property groups. */ QList
CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode, - SynopsisStyle style) + SynopsisStyle style, + const Tree* tree) { QList
sections; if (qmlClassNode) { @@ -1244,6 +1245,48 @@ append(sections,qmlmethods); append(sections,qmlattachedmethods); } + else { + FastSection all(qmlClassNode,"","","member","members"); + + QStack stack; + stack.push(qmlClassNode); + + while (!stack.isEmpty()) { + const QmlClassNode* ancestorClass = stack.pop(); + + NodeList::ConstIterator c = ancestorClass->childNodes().begin(); + while (c != ancestorClass->childNodes().end()) { + // if ((*c)->access() != Node::Private) + if ((*c)->subType() == Node::QmlPropertyGroup) { + const QmlPropGroupNode* qpgn = static_cast(*c); + NodeList::ConstIterator p = qpgn->childNodes().begin(); + while (p != qpgn->childNodes().end()) { + if ((*p)->type() == Node::QmlProperty) { + insert(all,*p,style,Okay); + } + ++p; + } + } + else + insert(all,*c,style,Okay); + ++c; + } + + if (!ancestorClass->links().empty()) { + if (ancestorClass->links().contains(Node::InheritsLink)) { + QPair linkPair; + linkPair = ancestorClass->links()[Node::InheritsLink]; + QStringList strList(linkPair.first); + const Node* n = tree->findNode(strList,Node::Fake); + if (n && n->subType() == Node::QmlClass) { + const QmlClassNode* qcn = static_cast(n); + stack.prepend(qcn); + } + } + } + } + append(sections, all); + } } return sections; diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/cppcodemarker.h --- a/tools/qdoc3/cppcodemarker.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/cppcodemarker.h Mon Oct 04 01:19:32 2010 +0300 @@ -80,7 +80,8 @@ SynopsisStyle style, Status status); QList
qmlSections(const QmlClassNode* qmlClassNode, - SynopsisStyle style); + SynopsisStyle style, + const Tree* tree); const Node* resolveTarget(const QString& target, const Tree* tree, const Node* relative, diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/ditaxmlgenerator.cpp --- a/tools/qdoc3/ditaxmlgenerator.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/ditaxmlgenerator.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -440,7 +440,6 @@ DITAXMLGENERATOR_GENERATEMACREFS); project = config.getString(CONFIG_PROJECT); - offlineDocs = !config.getBool(CONFIG_ONLINE); projectDescription = config.getString(CONFIG_DESCRIPTION); if (projectDescription.isEmpty() && !project.isEmpty()) projectDescription = project + " Reference Documentation"; @@ -545,6 +544,7 @@ funcIndex.clear(); legaleseTexts.clear(); serviceClasses.clear(); + qmlClasses.clear(); findAllClasses(tree->root()); findAllFunctions(tree->root()); findAllLegaleseTexts(tree->root()); @@ -752,6 +752,9 @@ else if (atom->string() == "classes") { generateCompactList(relative, marker, nonCompatClasses, true); } + else if (atom->string() == "qmlclasses") { + generateCompactList(relative, marker, qmlClasses, true); + } else if (atom->string().contains("classesbymodule")) { QString arg = atom->string().trimmed(); QString moduleName = atom->string().mid(atom->string().indexOf( @@ -1765,7 +1768,7 @@ generateQmlInstantiates(qml_cn, marker); generateBrief(qml_cn, marker); generateQmlInheritedBy(qml_cn, marker); - sections = marker->qmlSections(qml_cn,CodeMarker::Summary); + sections = marker->qmlSections(qml_cn,CodeMarker::Summary,0); s = sections.begin(); while (s != sections.end()) { out() << "\n"; @@ -1782,7 +1785,7 @@ generateAlsoList(fake, marker); out() << "
\n"; - sections = marker->qmlSections(qml_cn,CodeMarker::Detailed); + sections = marker->qmlSections(qml_cn,CodeMarker::Detailed,0); s = sections.begin(); while (s != sections.end()) { out() << "

" << protectEnc((*s).name) << "

\n"; @@ -3676,6 +3679,12 @@ if (!serviceName.isEmpty()) serviceClasses.insert(serviceName, *c); } + else if ((*c)->type() == Node::Fake && + (*c)->subType() == Node::QmlClass && + !(*c)->doc().isEmpty()) { + QString qmlClassName = (*c)->name(); + qmlClasses.insert(qmlClassName,*c); + } else if ((*c)->isInnerNode()) { findAllClasses(static_cast(*c)); } diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/generator.cpp --- a/tools/qdoc3/generator.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/generator.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1068,8 +1068,11 @@ Text text; text << Atom::ParaLeft << "This " - << typeString(node) - << " was introduced in "; + << typeString(node); + if (node->type() == Node::Enum) + text << " was introduced or modified in "; + else + text << " was introduced in "; if (project.isEmpty()) text << "version"; else diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/htmlgenerator.cpp --- a/tools/qdoc3/htmlgenerator.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/htmlgenerator.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -219,8 +219,7 @@ inTableHeader(false), numTableRows(0), threeColumnEnumValueTable(true), - offlineDocs(true), - creatorDocs(true), + application(Online), funcLeftParen("\\S(\\()"), myTree(0), slow(false), @@ -271,6 +270,12 @@ postPostHeader = config.getString(HtmlGenerator::format() + Config::dot + HTMLGENERATOR_POSTPOSTHEADER); + creatorPostHeader = config.getString(HtmlGenerator::format() + + Config::dot + + HTMLGENERATOR_CREATORPOSTHEADER); + creatorPostPostHeader = config.getString(HtmlGenerator::format() + + Config::dot + + HTMLGENERATOR_CREATORPOSTPOSTHEADER); footer = config.getString(HtmlGenerator::format() + Config::dot + HTMLGENERATOR_FOOTER); @@ -282,8 +287,15 @@ HTMLGENERATOR_GENERATEMACREFS); project = config.getString(CONFIG_PROJECT); - offlineDocs = !config.getBool(CONFIG_ONLINE); - creatorDocs = false; //!config.getBool(CONFIG_CREATOR); + + QString app = config.getString(CONFIG_APPLICATION); + if (app == "online") + application = Online; + else if (app == "creator") + application = Creator; + else + application = Creator; + projectDescription = config.getString(CONFIG_DESCRIPTION); if (projectDescription.isEmpty() && !project.isEmpty()) projectDescription = project + " Reference Documentation"; @@ -364,6 +376,7 @@ funcIndex.clear(); legaleseTexts.clear(); serviceClasses.clear(); + qmlClasses.clear(); findAllClasses(tree->root()); findAllFunctions(tree->root()); findAllLegaleseTexts(tree->root()); @@ -599,6 +612,9 @@ else if (atom->string() == "classes") { generateCompactList(relative, marker, nonCompatClasses, true); } + else if (atom->string() == "qmlclasses") { + generateCompactList(relative, marker, qmlClasses, true); + } else if (atom->string().contains("classesbymodule")) { QString arg = atom->string().trimmed(); QString moduleName = atom->string().mid(atom->string().indexOf( @@ -1477,7 +1493,7 @@ const QmlClassNode* qml_cn = 0; if (fake->subType() == Node::QmlClass) { qml_cn = static_cast(fake); - sections = marker->qmlSections(qml_cn,CodeMarker::Summary); + sections = marker->qmlSections(qml_cn,CodeMarker::Summary,0); generateTableOfContents(fake,marker,§ions); } else if (fake->name() != QString("index.html")) @@ -1559,6 +1575,13 @@ generateQmlInherits(qml_cn, marker); generateQmlInheritedBy(qml_cn, marker); generateQmlInstantiates(qml_cn, marker); + + QString allQmlMembersLink = generateAllQmlMembersFile(qml_cn, marker); + if (!allQmlMembersLink.isEmpty()) { + out() << "
  • " + << "List of all members, including inherited members
    • \n"; + } + s = sections.begin(); while (s != sections.end()) { out() << "\n"; - sections = marker->qmlSections(qml_cn,CodeMarker::Detailed); + sections = marker->qmlSections(qml_cn,CodeMarker::Detailed,0); s = sections.begin(); while (s != sections.end()) { out() << "

    " << protectEnc((*s).name) << "

    \n"; @@ -1615,7 +1638,7 @@ } else { generateExtractionMark(fake, DetailedDescriptionMark); - out() << "
    \n"; // QTBUG-9504 + out() << "
    \n"; // QTBUG-9504 } generateBody(fake, marker); @@ -1701,7 +1724,7 @@ out() << "\n"; } if (!cn->name().isEmpty()) - out() << "
  • " << cn->name() << "
    • \n"; + out() << "
  • " << protectEnc(cn->name()) << "
    • \n"; } else if (node->type() == Node::Fake) { const FakeNode* fn = static_cast(node); @@ -1709,52 +1732,50 @@ out() << "
  • Modules
    • "; QString name = node->name(); if (!name.isEmpty()) - out() << "
  • " << name << "
    • \n"; + out() << "
  • " << protectEnc(name) << "
    • \n"; } else if (node->subType() == Node::Group) { if (fn->name() == QString("modules")) out() << "
  • Modules
    • "; else { - out() << "
  • " << title << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } } else if (node->subType() == Node::Page) { if (fn->name() == QString("qdeclarativeexamples.html")) { out() << "
  • Examples
    • "; - out() << "
  • QML Examples & Demos
    • "; + out() << "
  • QML Examples & Demos
    • "; } else if (fn->name().startsWith("examples-")) { out() << "
  • Examples
    • "; - out() << "
  • " << title << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } else if (fn->name() == QString("namespaces.html")) { out() << "
  • Namespaces
    • "; } else { - out() << "
  • " << title << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } } else if (node->subType() == Node::QmlClass) { out() << "
  • QML Elements
    • "; - out() << "
  • " << title << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } else if (node->subType() == Node::Example) { out() << "
  • Examples
    • "; QStringList sl = fn->name().split('/'); if (sl.contains("declarative")) - out() << "
  • QML Examples & Demos
    • "; + out() << "
  • QML Examples & Demos
    • "; else { - QString name = "examples-" + sl.at(0) + ".html"; + QString name = protectEnc("examples-" + sl.at(0) + ".html"); // this generates an empty link QString t = CodeParser::titleFromName(name); - out() << "
  • " - << t << "
    • "; } - out() << "
  • " << title << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } } else if (node->type() == Node::Namespace) { out() << "
  • Namespaces
    • "; - out() << "
  • " << title << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } } @@ -1781,64 +1802,133 @@ else shortVersion = "Qt " + shortVersion + ": "; } - // Generating page title + + // Generating page title out() << " " << shortVersion << protectEnc(title) << "\n"; - // Adding style sheet - out() << " "; - // Adding jquery and functions - providing online tools and search features - out() << " \n"; - out() << " \n"; - // Adding style and js for small windows - out() << " \n"; - out() << " "; - out() << " \n"; - out() << " "; + // Adding style sheet + out() << " \n"; + // Adding jquery and functions - providing online tools and search features + out() << " \n"; + out() << " \n"; + - // Adding syntax highlighter // future release + // Adding syntax highlighter // future release - // Setting assistant configuration - if (offlineDocs) - { - out() << " "; // Only for Qt Creator - out() << "\n"; - out() << "\n"; // offline for Assistant - } - if (creatorDocs) - { - out() << " "; // Only for Qt Creator - out() << "\n"; - out() << "\n"; // offline for Creator - } - // Setting online doc configuration - else - { - // Browser spec styles - out() << " \n"; - out() << "\n"; - out() << "\n"; - out() << "\n"; + // Setting some additional style sheet related details depending on configuration (e.g. Online/Creator) + + switch (application) { + case Online: + // Adding style and js for small windows + out() << " \n"; + out() << " "; + out() << " \n"; + out() << " \n"; + // Browser spec styles + out() << " \n"; + out() << "\n"; + out() << "\n"; + out() << "\n"; - out() << "\n"; - // CheckEmptyAndLoadList activating search - out() << "\n"; - } + out() << "\n"; + // CheckEmptyAndLoadList activating search + out() << "\n"; + break; + case Creator: + out() << "\n"; + out() << "\n"; // offline narrow + break; + default: + out() << "\n"; + out() << "\n"; + break; + } #ifdef GENERATE_MAC_REFS if (mainPage) generateMacRef(node, marker); -#endif - out() << QString(postHeader).replace("\\" + COMMAND_VERSION, myTree->version()); - generateBreadCrumbs(title,node,marker); - out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); +#endif + + switch (application) { + case Online: + out() << QString(postHeader).replace("\\" + COMMAND_VERSION, myTree->version()); + generateBreadCrumbs(title,node,marker); + out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); + break; + case Creator: + out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); + generateBreadCrumbs(title,node,marker); + out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); + break; + default: // default -- not used except if one forgets to set any of the above settings to true + out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); + generateBreadCrumbs(title,node,marker); + out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); + break; + } + + navigationLinks.clear(); + + if (node && !node->links().empty()) { + QPair linkPair; + QPair anchorPair; + const Node *linkNode; + + if (node->links().contains(Node::PreviousLink)) { + linkPair = node->links()[Node::PreviousLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + + out() << " \n"; + + navigationLinks += "[Previous: "; + if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) + navigationLinks += protect(anchorPair.second); + else + navigationLinks += protect(linkPair.second); + navigationLinks += "]\n"; + } + if (node->links().contains(Node::NextLink)) { + linkPair = node->links()[Node::NextLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + + out() << " \n"; + + navigationLinks += "[Next: "; + if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) + navigationLinks += protect(anchorPair.second); + else + navigationLinks += protect(linkPair.second); + navigationLinks += "]\n"; + } + if (node->links().contains(Node::StartLink)) { + linkPair = node->links()[Node::StartLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + out() << " \n"; + } + } #if 0 // Removed for new doc format. MWS if (node && !node->links().empty()) @@ -1872,30 +1962,30 @@ out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version()) << QString(address).replace("\\" + COMMAND_VERSION, myTree->version()); - - if (offlineDocs) - { - out() << "\n"; - } - if (creatorDocs) - { - out() << "\n"; - } - else - { - out() << " \n"; - out() << " \n"; - out() << "\n"; - } + + switch (application) { + case Online: + out() << " \n"; + out() << " \n"; + out() << "\n"; + break; + case Creator: + out() << "\n"; + break; + default: + out() << "\n"; + } out() << "\n"; } @@ -1907,11 +1997,14 @@ generateExtractionMark(node, BriefMark); out() << "

    "; generateText(brief, node, marker); + if (!relative || node == relative) out() << " More...

    \n"; + + generateExtractionMark(node, EndMark); } } @@ -1928,7 +2021,7 @@ } /*! - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. */ void HtmlGenerator::generateTableOfContents(const Node *node, CodeMarker *marker, @@ -2014,7 +2107,7 @@ /*! Revised for the new doc format. - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. */ void HtmlGenerator::generateTableOfContents(const Node *node, CodeMarker *marker, @@ -2192,6 +2285,38 @@ return fileName; } +/*! + This function creates an html page on which are listed all + the members of QML class \a qml_cn, including the inherited + members. The \a marker is used for formatting stuff. + */ +QString HtmlGenerator::generateAllQmlMembersFile(const QmlClassNode* qml_cn, + CodeMarker* marker) +{ + QList
    sections; + QList
    ::ConstIterator s; + + sections = marker->qmlSections(qml_cn,CodeMarker::SeparateList,myTree); + if (sections.isEmpty()) + return QString(); + + QString fileName = fileBase(qml_cn) + "-members." + fileExtension(qml_cn); + beginSubPage(qml_cn->location(), fileName); + QString title = "List of All Members for " + qml_cn->name(); + generateHeader(title, qml_cn, marker); + generateTitle(title, Text(), SmallSubTitle, qml_cn, marker); + out() << "

    This is the complete list of members for "; + generateFullName(qml_cn, 0, marker); + out() << ", including inherited members.

    \n"; + + Section section = sections.first(); + generateSectionList(section, 0, marker, CodeMarker::SeparateList); + + generateFooter(); + endSubPage(); + return fileName; +} + QString HtmlGenerator::generateLowStatusMemberFile(const InnerNode *inner, CodeMarker *marker, CodeMarker::Status status) @@ -3052,7 +3177,14 @@ if (parseArg(src, typeTag, &i, srcSize, &arg, &par1)) { par1 = QStringRef(); const Node* n = marker->resolveTarget(arg.toString(), myTree, relative, self); - addLink(linkForNode(n,relative), arg, &html); + if (n && n->subType() == Node::QmlBasicType) { + if (relative && relative->subType() == Node::QmlClass) + addLink(linkForNode(n,relative), arg, &html); + else + html += arg.toString(); + } + else + addLink(linkForNode(n,relative), arg, &html); handled = true; } else if (parseArg(src, headerTag, &i, srcSize, &arg, &par1)) { @@ -3414,7 +3546,7 @@ return QString(); if (node->access() == Node::Private) return QString(); - + fn = fileName(node); /* if (!node->url().isEmpty()) return fn;*/ @@ -3587,6 +3719,12 @@ if (!serviceName.isEmpty()) serviceClasses.insert(serviceName, *c); } + else if ((*c)->type() == Node::Fake && + (*c)->subType() == Node::QmlClass && + !(*c)->doc().isEmpty()) { + QString qmlClassName = (*c)->name(); + qmlClasses.insert(qmlClassName,*c); + } else if ((*c)->isInnerNode()) { findAllClasses(static_cast(*c)); } @@ -4292,57 +4430,103 @@ return true; if (node->access() == Node::Private) return false; - if (!node->isInnerNode()) - return false; - + + QString guid = QUuid::createUuid().toString(); + QString url = PageGenerator::fileName(node); QString title; QString rawTitle; QString fullTitle; - const InnerNode* inner = static_cast(node); - - writer.writeStartElement("page"); + QStringList pageWords; QXmlStreamAttributes attributes; - QString t; - t.setNum(id++); - switch (node->type()) { - case Node::Fake: - { - const FakeNode* fake = static_cast(node); - title = fake->fullTitle(); - break; - } - case Node::Class: - { - title = node->name() + " Class Reference"; + + writer.writeStartElement("page"); + + if (node->isInnerNode()) { + const InnerNode* inner = static_cast(node); + if (!inner->pageKeywords().isEmpty()) + pageWords << inner->pageKeywords(); + + switch (node->type()) { + case Node::Fake: + { + const FakeNode* fake = static_cast(node); + title = fake->fullTitle(); + pageWords << title; + break; + } + case Node::Class: + { + title = node->name() + " Class Reference"; + pageWords << node->name() << "class" << "reference"; + break; + } + case Node::Namespace: + { + rawTitle = marker->plainName(inner); + fullTitle = marker->plainFullName(inner); + title = rawTitle + " Namespace Reference"; + pageWords << rawTitle << "namespace" << "reference"; + break; + } + default: + title = node->name(); + pageWords << title; break; } - case Node::Namespace: - { - rawTitle = marker->plainName(inner); - fullTitle = marker->plainFullName(inner); - title = rawTitle + " Namespace Reference"; + } + else { + switch (node->type()) { + case Node::Enum: + { + title = node->name() + " Enum Reference"; + pageWords << node->name() << "enum" << "type"; + url += "#" + node->name() + "-enum"; + break; + } + case Node::Function: + { + title = node->name() + " Function Reference"; + pageWords << node->name() << "function"; + url += "#" + node->name(); + break; + } + case Node::Property: + { + title = node->name() + " Property Reference"; + pageWords << node->name() << "property"; + url += "#" + node->name() + "-prop"; + break; + } + case Node::Typedef: + { + title = node->name() + " Type Reference"; + pageWords << node->name() << "typedef" << "type"; + url += "#" + node->name(); + break; + } + default: + title = node->name(); + pageWords << title; break; } - default: - title = node->name(); - break; - } - writer.writeAttribute("id",t); - writer.writeStartElement("pageWords"); - writer.writeCharacters(title); - if (!inner->pageKeywords().isEmpty()) { - const QStringList& w = inner->pageKeywords(); - for (int i = 0; i < w.size(); ++i) { - writer.writeCharacters(" "); - writer.writeCharacters(w.at(i).toLocal8Bit().constData()); + + Node* parent = node->parent(); + if (parent && ((parent->type() == Node::Class) || + (parent->type() == Node::Namespace))) { + pageWords << parent->name(); } } + + writer.writeAttribute("id",guid); + writer.writeStartElement("pageWords"); + writer.writeCharacters(pageWords.join(" ")); + writer.writeEndElement(); writer.writeStartElement("pageTitle"); writer.writeCharacters(title); writer.writeEndElement(); writer.writeStartElement("pageUrl"); - writer.writeCharacters(PageGenerator::fileName(node)); + writer.writeCharacters(url); writer.writeEndElement(); writer.writeStartElement("pageType"); switch (node->pageType()) { @@ -4360,6 +4544,35 @@ } writer.writeEndElement(); writer.writeEndElement(); + + if (node->type() == Node::Fake && node->doc().hasTableOfContents()) { + QList toc = node->doc().tableOfContents(); + if (!toc.isEmpty()) { + for (int i = 0; i < toc.size(); ++i) { + Text headingText = Text::sectionHeading(toc.at(i)); + QString s = headingText.toString(); + writer.writeStartElement("page"); + guid = QUuid::createUuid().toString(); + QString internalUrl = url + "#" + Doc::canonicalTitle(s); + writer.writeAttribute("id",guid); + writer.writeStartElement("pageWords"); + writer.writeCharacters(pageWords.join(" ")); + writer.writeCharacters(" "); + writer.writeCharacters(s); + writer.writeEndElement(); + writer.writeStartElement("pageTitle"); + writer.writeCharacters(s); + writer.writeEndElement(); + writer.writeStartElement("pageUrl"); + writer.writeCharacters(internalUrl); + writer.writeEndElement(); + writer.writeStartElement("pageType"); + writer.writeCharacters("Article"); + writer.writeEndElement(); + writer.writeEndElement(); + } + } + } return true; } diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/htmlgenerator.h --- a/tools/qdoc3/htmlgenerator.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/htmlgenerator.h Mon Oct 04 01:19:32 2010 +0300 @@ -95,6 +95,10 @@ LastSinceType }; + enum Application { + Online, + Creator}; + public: HtmlGenerator(); ~HtmlGenerator(); @@ -164,7 +168,10 @@ void generateTableOfContents(const Node *node, CodeMarker *marker, QList
    * sections = 0); - QString generateListOfAllMemberFile(const InnerNode *inner, CodeMarker *marker); + QString generateListOfAllMemberFile(const InnerNode *inner, + CodeMarker *marker); + QString generateAllQmlMembersFile(const QmlClassNode* qml_cn, + CodeMarker* marker); QString generateLowStatusMemberFile(const InnerNode *inner, CodeMarker *marker, CodeMarker::Status status); @@ -294,14 +301,15 @@ bool inTableHeader; int numTableRows; bool threeColumnEnumValueTable; - bool offlineDocs; - bool creatorDocs; + Application application; QString link; QStringList sectionNumber; QRegExp funcLeftParen; QString style; QString postHeader; QString postPostHeader; + QString creatorPostHeader; + QString creatorPostPostHeader; QString footer; QString address; bool pleaseGenerateMacRef; @@ -322,6 +330,7 @@ NodeMap obsoleteClasses; NodeMap namespaceIndex; NodeMap serviceClasses; + NodeMap qmlClasses; QMap funcIndex; QMap legaleseTexts; NewSinceMaps newSinceMaps; @@ -339,6 +348,8 @@ #define HTMLGENERATOR_GENERATEMACREFS "generatemacrefs" // ### document me #define HTMLGENERATOR_POSTHEADER "postheader" #define HTMLGENERATOR_POSTPOSTHEADER "postpostheader" +#define HTMLGENERATOR_CREATORPOSTHEADER "postheader" +#define HTMLGENERATOR_CREATORPOSTPOSTHEADER "postpostheader" #define HTMLGENERATOR_STYLE "style" #define HTMLGENERATOR_STYLESHEETS "stylesheets" #define HTMLGENERATOR_CUSTOMHEADELEMENTS "customheadelements" diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/main.cpp --- a/tools/qdoc3/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -105,6 +105,7 @@ static bool obsoleteLinks = false; static QStringList defines; static QHash trees; +static QString appArg; // application /*! Find the Tree for language \a lang and return a pointer to it. @@ -147,7 +148,7 @@ */ static void printVersion() { - QString s = QString(tr("qdoc version ")) + QString(QT_VERSION_STR); + QString s = tr("qdoc version %1").arg(QT_VERSION_STR); Location::information(s); } @@ -192,6 +193,24 @@ config.load(fileName); /* + Set the application to which qdoc will create the output. + The two applications are: + + creator: additional formatting for viewing in + the Creator application. + + online: full-featured online version with search and + links to Qt topics + */ + if (appArg.isEmpty()) { + qDebug() << "Warning: Application flag not specified on" + << "command line. Options are -creator (default)" + << "and -online."; + appArg = "creator"; + } + config.setStringList(CONFIG_APPLICATION, QStringList(appArg)); + + /* Add the defines to the configuration variables. */ QStringList defs = defines + config.getStringList(CONFIG_DEFINES); @@ -462,12 +481,16 @@ else if (opt == "-obsoletelinks") { obsoleteLinks = true; } + else if (opt == "-creator") + appArg = "creator"; + else if (opt == "-online") + appArg = "online"; else { qdocFiles.append(opt); } } - if (qdocFiles.isEmpty()) { + if (qdocFiles.isEmpty()) { printHelp(); return EXIT_FAILURE; } @@ -475,8 +498,10 @@ /* Main loop. */ - foreach (QString qf, qdocFiles) + foreach (QString qf, qdocFiles) { + //qDebug() << "PROCESSING:" << qf; processQdocconfFile(qf); + } qDeleteAll(trees); return EXIT_SUCCESS; diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/node.cpp --- a/tools/qdoc3/node.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/node.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -652,8 +652,14 @@ InnerNode::InnerNode(Type type, InnerNode *parent, const QString& name) : Node(type, parent, name) { - if (type == Class) + switch (type) { + case Class: + case Namespace: setPageType(ApiPage); + break; + default: + break; + } } /*! @@ -845,6 +851,19 @@ LeafNode::LeafNode(Type type, InnerNode *parent, const QString& name) : Node(type, parent, name) { + switch (type) { + case Enum: + case Function: + case Typedef: + case Variable: + case QmlProperty: + case QmlSignal: + case QmlMethod: + setPageType(ApiPage); + break; + default: + break; + } } /*! @@ -1600,7 +1619,7 @@ des(Trool_Default), att(attached) { - // nothing. + setPageType(ApiPage); } /*! diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/qdoc3.pro --- a/tools/qdoc3/qdoc3.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/qdoc3.pro Mon Oct 04 01:19:32 2010 +0300 @@ -6,6 +6,7 @@ qdoc_bootstrapped { include(../../src/tools/bootstrap/bootstrap.pri) + SOURCES += ../../src/corelib/plugin/quuid.cpp DEFINES -= QT_NO_CAST_FROM_ASCII DEFINES += QT_NO_TRANSLATION } else { diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/test/assistant.qdocconf --- a/tools/qdoc3/test/assistant.qdocconf Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/test/assistant.qdocconf Mon Oct 04 01:19:32 2010 +0300 @@ -16,39 +16,39 @@ qhp.Assistant.namespace = com.trolltech.assistant.470 qhp.Assistant.virtualFolder = qdoc qhp.Assistant.indexTitle = Qt Assistant Manual -qhp.Assistant.extraFiles = images/bg_l.png \ - images/bg_l_blank.png \ - images/bg_ll_blank.png \ - images/bg_ul_blank.png \ - images/header_bg.png \ +qhp.Assistant.extraFiles = images/bg_l.png \ + images/bg_l_blank.png \ + images/bg_ll_blank.png \ + images/bg_ul_blank.png \ + images/header_bg.png \ images/bg_r.png \ - images/box_bg.png \ - images/breadcrumb.png \ - images/bullet_gt.png \ + images/box_bg.png \ + images/breadcrumb.png \ + images/bullet_gt.png \ images/bullet_dn.png \ - images/bullet_sq.png \ + images/bullet_sq.png \ images/bullet_up.png \ - images/arrow_down.png \ + images/arrow_down.png \ images/feedbackground.png \ images/horBar.png \ - images/page.png \ - images/page_bg.png \ - images/sprites-combined.png \ - images/spinner.gif \ + images/page.png \ + images/page_bg.png \ + images/sprites-combined.png \ + images/spinner.gif \ images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ - images/coloreditorfactoryimage.png \ - images/dynamiclayouts-example.png \ - scripts/functions.js \ - scripts/jquery.js \ - scripts/narrow.js \ - scripts/superfish.js \ - style/narrow.css \ - style/superfish.css \ - style/style_ie6.css \ - style/style_ie7.css \ - style/style_ie8.css \ - style/style.css + images/coloreditorfactoryimage.png \ + images/dynamiclayouts-example.png \ + scripts/functions.js \ + scripts/jquery.js \ + scripts/narrow.js \ + scripts/superfish.js \ + style/narrow.css \ + style/superfish.css \ + style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ + style/style.css qhp.Assistant.filterAttributes = qt 4.7.0 tools assistant qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/test/qdeclarative.qdocconf --- a/tools/qdoc3/test/qdeclarative.qdocconf Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/test/qdeclarative.qdocconf Mon Oct 04 01:19:32 2010 +0300 @@ -28,32 +28,32 @@ # Files not referenced in any qdoc file # See also extraimages.HTML qhp.Qml.extraFiles = images/bg_l.png \ - images/bg_l_blank.png \ - images/bg_r.png \ - images/box_bg.png \ - images/breadcrumb.png \ - images/bullet_gt.png \ - images/bullet_dn.png \ - images/bullet_sq.png \ - images/bullet_up.png \ - images/feedbackground.png \ - images/horBar.png \ - images/page.png \ - images/page_bg.png \ - images/sprites-combined.png \ - images/arrow-down.png \ - images/spinner.png \ - images/stylesheet-coffee-plastique.png \ - images/taskmenuextension-example.png \ - images/coloreditorfactoryimage.png \ - images/dynamiclayouts-example.png \ - scripts/functions.js \ - scripts/jquery.js \ - style/OfflineStyle.css \ - style/style_ie6.css \ - style/style_ie7.css \ - style/style_ie8.css \ - style/style.css + images/bg_l_blank.png \ + images/bg_r.png \ + images/box_bg.png \ + images/breadcrumb.png \ + images/bullet_gt.png \ + images/bullet_dn.png \ + images/bullet_sq.png \ + images/bullet_up.png \ + images/feedbackground.png \ + images/horBar.png \ + images/page.png \ + images/page_bg.png \ + images/sprites-combined.png \ + images/arrow-down.png \ + images/spinner.png \ + images/stylesheet-coffee-plastique.png \ + images/taskmenuextension-example.png \ + images/coloreditorfactoryimage.png \ + images/dynamiclayouts-example.png \ + scripts/functions.js \ + scripts/jquery.js \ + style/OfflineStyle.css \ + style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ + style/style.css qhp.Qml.filterAttributes = qt 4.7.0 qtrefdoc qhp.Qml.customFilters.Qt.name = Qt 4.7.0 diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/test/qt-api-only.qdocconf --- a/tools/qdoc3/test/qt-api-only.qdocconf Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/test/qt-api-only.qdocconf Mon Oct 04 01:19:32 2010 +0300 @@ -27,10 +27,7 @@ # Remove the QML documentation from the Qt-only documentation. -excludedirs += $QT_SOURCE_TREE/src/declarative \ - $QT_SOURCE_TREE/src/imports \ - $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/declarative \ - $QT_SOURCE_TREE/doc/src/declarative +excludedirs += $QT_SOURCE_TREE/src/imports outputdir = $QT_BUILD_TREE/doc-build/html-qt tagfile = $QT_BUILD_TREE/doc-build/html-qt/qt.tags diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/test/qt-build-docs.qdocconf --- a/tools/qdoc3/test/qt-build-docs.qdocconf Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/test/qt-build-docs.qdocconf Mon Oct 04 01:19:32 2010 +0300 @@ -18,6 +18,7 @@ qhp.Qt.namespace = com.trolltech.qt.470 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation +qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/test/qt-cpp-ignore.qdocconf --- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf Mon Oct 04 01:19:32 2010 +0300 @@ -64,6 +64,7 @@ Q_XMLSTREAM_EXPORT \ Q_XMLPATTERNS_EXPORT \ QDBUS_EXPORT \ + Q_DBUS_EXPORT \ QT_BEGIN_NAMESPACE \ QT_BEGIN_INCLUDE_NAMESPACE \ QT_END_NAMESPACE \ diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/test/qt-defines.qdocconf --- a/tools/qdoc3/test/qt-defines.qdocconf Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/test/qt-defines.qdocconf Mon Oct 04 01:19:32 2010 +0300 @@ -20,29 +20,29 @@ # See also qhp.Qt.extraFiles extraimages.HTML = qt-logo \ trolltech-logo \ - bg_l.png \ - bg_l_blank.png \ - bg_ll_blank.png \ - bg_ul_blank.png \ - header_bg.png \ - bg_r.png \ - box_bg.png \ - breadcrumb.png \ - bullet_gt.png \ - bullet_dn.png \ - bullet_sq.png \ - bullet_up.png \ - arrow_down.png \ - feedbackground.png \ - horBar.png \ - page.png \ - page_bg.png \ - sprites-combined.png \ - spinner.gif \ - stylesheet-coffee-plastique.png \ - taskmenuextension-example.png \ - coloreditorfactoryimage.png \ - dynamiclayouts-example.png \ + bg_l.png \ + bg_l_blank.png \ + bg_ll_blank.png \ + bg_ul_blank.png \ + header_bg.png \ + bg_r.png \ + box_bg.png \ + breadcrumb.png \ + bullet_gt.png \ + bullet_dn.png \ + bullet_sq.png \ + bullet_up.png \ + arrow_down.png \ + feedbackground.png \ + horBar.png \ + page.png \ + page_bg.png \ + sprites-combined.png \ + spinner.gif \ + stylesheet-coffee-plastique.png \ + taskmenuextension-example.png \ + coloreditorfactoryimage.png \ + dynamiclayouts-example.png # This stuff is used by the new doc format. scriptdirs = $QT_SOURCE_TREE/doc/src/template/scripts diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/test/qt-html-templates.qdocconf --- a/tools/qdoc3/test/qt-html-templates.qdocconf Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/test/qt-html-templates.qdocconf Mon Oct 04 01:19:32 2010 +0300 @@ -3,13 +3,13 @@ style/style_ie7.css \ style/style_ie8.css \ style/style_ie6.css - + HTML.postheader = "
    \n" \ "
    \n" \ "
    \n" \ " Home
    \n" \ " Qt Reference Documentation\n" \ - "
    \n" \ + "
    \n" \ "
    \n" \ " \n" \ "
    \n" \ @@ -27,7 +27,7 @@ "
    \n" \ " \n" \ "
    \n" \ @@ -38,16 +38,18 @@ "
  • Function index
    • \n" \ "
  • Modules
    • \n" \ "
  • Namespaces
    • \n" \ - "
  • Global stuff
    • \n" \ - "
  • QML elements
    • \n" \ + "
  • Global Declarations
    • \n" \ + "
  • Licenses and Credits
    • \n" \ " \n" \ " \n" \ "
  • Qt Topics \n" \ " \n" \ "
    • \n" \ @@ -86,7 +88,7 @@ "
  • Function index
    • \n" \ "
  • Modules
    • \n" \ "
  • Namespaces
    • \n" \ - "
  • Global stuff
    • \n" \ + "
  • Global Declarations
    • \n" \ "
  • QML elements
    • \n" \ " \n" \ "
    \n" \ @@ -96,10 +98,13 @@ " Qt Topics\n" \ " \n" \ "
    \n" \ @@ -146,6 +151,7 @@ " \n" \ "
    \n" \ "
    \n" \ + "
    \n" \ "
    \n" \ "

    \n" \ " © 2008-2010 Nokia Corporation and/or its\n" \ @@ -158,11 +164,12 @@ "

    \n" \ "
    X
    \n" \ " \n" \ - "

    Thank you for giving your feedback.

    Make sure it is related to this specific page. For more general bugs and \n" \ - " requests, please use the Qt Bug Tracker.

    \n" \ + "

    Thank you for giving your feedback.

    Make sure it is related to this specific page. For more general bugs and \n" \ + " requests, please use the Qt Bug Tracker.

    \n" \ "

    \n" \ "

    \n" \ " \n" \ "
    \n" \ "
    \n" \ - "
    \n" + " \n" \ + "
    \n" diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf --- a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf Mon Oct 04 01:19:32 2010 +0300 @@ -160,19 +160,9 @@ "
    \n" \ "
    X
    \n" \ "
    \n" \ - "

    \n" \ + "

    \n" \ "

    \n" \ "
    \n" \ "
    \n" \ "
    \n" \ - "
    \n" \ - "\n" + "
    \n" diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf --- a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf Mon Oct 04 01:19:32 2010 +0300 @@ -1,25 +1,168 @@ -HTML.stylesheets = classic.css -HTML.postheader = "\n" \ - "\n" \ - "\n" \ - "" \ - "" \ - "
    " \ - "" \ - "  " \ - "" \ - "主页 ·" \ - " " \ - "所有类 ·" \ - " " \ - "所有函数 ·" \ - " " \ - "简介" \ - "
    " +HTML.stylesheets = style/style.css \ + style/OfflineStyle.css \ + style/style_ie7.css \ + style/style_ie8.css \ + style/style_ie6.css -HTML.footer = "

    \n" \ - "\n" \ - "\n" \ - "\n" \ - "\n" \ - "
    版权所有 © 2010 诺基亚公司和/或其子公司商标
    Qt \\version
    " +HTML.postheader = "
    \n" \ + "
    \n" \ + "
    \n" \ + " Home
    \n" \ + " Qt Reference Documentation\n" \ + "
    \n" \ + "
    \n" \ + " \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + " \n" \ + "
    \n" \ + "
    \n" \ + " \n" \ + "
    \n" \ + " \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + " \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + " Search index:
    \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + " \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "

    \n" \ + " API Lookup

    \n" \ + "
    \n" \ + " \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "

    \n" \ + " Qt Topics

    \n" \ + "
    \n" \ + " \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "

    \n" \ + " Examples

    \n" \ + "
    \n" \ + " \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "
      \n" \ + "
    • Home
      • \n" \ + " \n" + +HTML.postpostheader = "
    \n" \ + "
    \n" \ + "
    \n" \ + " \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" + +HTML.footer = " \n" \ + "
    \n" \ + " [+] Documentation Feedback
    \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + " \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "

    \n" \ + " © 2008-2010 Nokia Corporation and/or its\n" \ + " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ + " in Finland and/or other countries worldwide.

    \n" \ + "

    \n" \ + " All other trademarks are property of their respective owners. Privacy Policy

    \n" \ + "
    \n" \ + "
    \n" \ + "
    X
    \n" \ + "
    \n" \ + "

    \n" \ + "

    \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" \ + "
    \n" diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/test/qt.qdocconf --- a/tools/qdoc3/test/qt.qdocconf Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/test/qt.qdocconf Mon Oct 04 01:19:32 2010 +0300 @@ -9,7 +9,6 @@ version = %VERSION% description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.7 -online = true sourceencoding = UTF-8 outputencoding = UTF-8 diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/tree.cpp --- a/tools/qdoc3/tree.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qdoc3/tree.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -1963,8 +1963,8 @@ if ((node->subType() == Node::QmlClass) || (node->subType() == Node::QmlBasicType)) { QString fb = node->fileBase(); - if (fb.startsWith(QLatin1String("QML:"))) - return node->fileBase() + ".html"; + if (fb.startsWith(QLatin1String("qml-"))) + return fb + ".html"; else return "qml-" + node->fileBase() + ".html"; } else @@ -1981,7 +1981,7 @@ else if ((parentNode = node->parent())) { if (parentNode->subType() == Node::QmlPropertyGroup) { parentNode = parentNode->parent(); - parentName = "qml-" + parentNode->fileBase() + ".html"; + parentName = fullDocumentLocation(parentNode); } else parentName = fullDocumentLocation(node->parent()); diff -r ef0373b55136 -r 758a864f9613 tools/qml/Info_mac.plist --- a/tools/qml/Info_mac.plist Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qml/Info_mac.plist Mon Oct 04 01:19:32 2010 +0300 @@ -14,5 +14,36 @@ @TYPEINFO@ CFBundleExecutable @EXECUTABLE@ + UTExportedTypeDeclarations + + + UTTypeIdentifier + com.nokia.qt.qml + UTTypeDescription + Qt Markup Language + UTTypeConformsTo + + public.plain-text + + UTTypeTagSpecification + + public.filename-extension + + qml + + + + + CFBundleDocumentTypes + + + LSItemContentTypes + + com.nokia.qt.qml + + CFBundleTypeRole + Viewer + + diff -r ef0373b55136 -r 758a864f9613 tools/qml/browser/Browser.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/qml/browser/Browser.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,284 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 +import Qt.labs.folderlistmodel 1.0 + +Rectangle { + id: root + property bool keyPressed: false + property variant folders: folders1 + property variant view: view1 + width: 320 + height: 480 + color: palette.window + + FolderListModel { + id: folders1 + nameFilters: [ "*.qml" ] + folder: qmlViewerFolder + } + FolderListModel { + id: folders2 + nameFilters: [ "*.qml" ] + folder: qmlViewerFolder + } + + SystemPalette { id: palette } + + function down(path) { + if (folders == folders1) { + view = view2 + folders = folders2; + view1.state = "exitLeft"; + } else { + view = view1 + folders = folders1; + view2.state = "exitLeft"; + } + view.x = root.width; + view.state = "current"; + view.focus = true; + folders.folder = path; + } + function up() { + var path = folders.parentFolder; + if (folders == folders1) { + view = view2 + folders = folders2; + view1.state = "exitRight"; + } else { + view = view1 + folders = folders1; + view2.state = "exitRight"; + } + view.x = -root.width; + view.state = "current"; + view.focus = true; + folders.folder = path; + } + + Component { + id: folderDelegate + Rectangle { + id: wrapper + function launch() { + if (folders.isFolder(index)) { + down(filePath); + } else { + qmlViewer.launch(filePath); + } + } + width: root.width + height: 52 + color: "transparent" + Rectangle { + id: highlight; visible: false + anchors.fill: parent + gradient: Gradient { + GradientStop { id: t1; position: 0.0; color: palette.highlight } + GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) } + } + } + Item { + width: 48; height: 48 + Image { source: "images/folder.png"; anchors.centerIn: parent; visible: folders.isFolder(index)} + } + Text { + id: nameText + anchors.fill: parent; verticalAlignment: Text.AlignVCenter + text: fileName + anchors.leftMargin: 54 + font.pixelSize: 32 + color: (wrapper.ListView.isCurrentItem && root.keyPressed) ? palette.highlightedText : palette.windowText + elide: Text.ElideRight + } + MouseArea { + id: mouseRegion + anchors.fill: parent + onClicked: { if (folders == wrapper.ListView.view.model) launch() } + } + states: [ + State { + name: "pressed" + when: mouseRegion.pressed + PropertyChanges { target: highlight; visible: true } + PropertyChanges { target: nameText; color: palette.highlightedText } + } + ] + } + } + + ListView { + id: view1 + anchors.top: titleBar.bottom + anchors.bottom: parent.bottom + x: 0 + width: parent.width + model: folders1 + delegate: folderDelegate + highlight: Rectangle { color: palette.highlight; visible: root.keyPressed && view1.count != 0 } + highlightMoveSpeed: 1000 + pressDelay: 100 + focus: true + state: "current" + states: [ + State { + name: "current" + PropertyChanges { target: view1; x: 0 } + }, + State { + name: "exitLeft" + PropertyChanges { target: view1; x: -root.width } + }, + State { + name: "exitRight" + PropertyChanges { target: view1; x: root.width } + } + ] + transitions: [ + Transition { + to: "current" + SequentialAnimation { + NumberAnimation { properties: "x"; duration: 250 } + } + }, + Transition { + NumberAnimation { properties: "x"; duration: 250 } + NumberAnimation { properties: "x"; duration: 250 } + } + ] + Keys.onPressed: { root.keyPressed = true; } + } + + ListView { + id: view2 + anchors.top: titleBar.bottom + anchors.bottom: parent.bottom + x: parent.width + width: parent.width + model: folders2 + delegate: folderDelegate + highlight: Rectangle { color: palette.highlight; visible: root.keyPressed && view2.count != 0 } + highlightMoveSpeed: 1000 + pressDelay: 100 + states: [ + State { + name: "current" + PropertyChanges { target: view2; x: 0 } + }, + State { + name: "exitLeft" + PropertyChanges { target: view2; x: -root.width } + }, + State { + name: "exitRight" + PropertyChanges { target: view2; x: root.width } + } + ] + transitions: [ + Transition { + to: "current" + SequentialAnimation { + NumberAnimation { properties: "x"; duration: 250 } + } + }, + Transition { + NumberAnimation { properties: "x"; duration: 250 } + } + ] + Keys.onPressed: { root.keyPressed = true; } + } + + Keys.onPressed: { + root.keyPressed = true; + if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) { + view.currentItem.launch(); + event.accepted = true; + } else if (event.key == Qt.Key_Left) { + up(); + } + } + + BorderImage { + source: "images/titlebar.sci"; + width: parent.width; + height: 52 + y: -7 + id: titleBar + + Rectangle { + id: upButton + width: 48 + height: titleBar.height - 7 + color: "transparent" + + Image { anchors.centerIn: parent; source: "images/up.png" } + MouseArea { id: upRegion; anchors.centerIn: parent + width: 56 + height: 56 + onClicked: if (folders.parentFolder != "") up() + } + states: [ + State { + name: "pressed" + when: upRegion.pressed + PropertyChanges { target: upButton; color: palette.highlight } + } + ] + } + Rectangle { + color: "gray" + x: 48 + width: 1 + height: 44 + } + + Text { + anchors.left: upButton.right; anchors.right: parent.right; height: parent.height + anchors.leftMargin: 4; anchors.rightMargin: 4 + text: folders.folder + color: "white" + elide: Text.ElideLeft; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignVCenter + font.pixelSize: 32 + } + } +} diff -r ef0373b55136 -r 758a864f9613 tools/qml/browser/browser.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/qml/browser/browser.qrc Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,9 @@ + + + Browser.qml + images/up.png + images/folder.png + images/titlebar.sci + images/titlebar.png + + diff -r ef0373b55136 -r 758a864f9613 tools/qml/browser/images/folder.png Binary file tools/qml/browser/images/folder.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/browser/images/titlebar.png Binary file tools/qml/browser/images/titlebar.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/browser/images/titlebar.sci --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/qml/browser/images/titlebar.sci Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,5 @@ +border.left: 10 +border.top: 12 +border.bottom: 12 +border.right: 10 +source: titlebar.png diff -r ef0373b55136 -r 758a864f9613 tools/qml/browser/images/up.png Binary file tools/qml/browser/images/up.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/content/Browser.qml --- a/tools/qml/content/Browser.qml Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,284 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt 4.7 -import Qt.labs.folderlistmodel 1.0 - -Rectangle { - id: root - property bool keyPressed: false - property variant folders: folders1 - property variant view: view1 - width: 320 - height: 480 - color: palette.window - - FolderListModel { - id: folders1 - nameFilters: [ "*.qml" ] - folder: qmlViewerFolder - } - FolderListModel { - id: folders2 - nameFilters: [ "*.qml" ] - folder: qmlViewerFolder - } - - SystemPalette { id: palette } - - function down(path) { - if (folders == folders1) { - view = view2 - folders = folders2; - view1.state = "exitLeft"; - } else { - view = view1 - folders = folders1; - view2.state = "exitLeft"; - } - view.x = root.width; - view.state = "current"; - view.focus = true; - folders.folder = path; - } - function up() { - var path = folders.parentFolder; - if (folders == folders1) { - view = view2 - folders = folders2; - view1.state = "exitRight"; - } else { - view = view1 - folders = folders1; - view2.state = "exitRight"; - } - view.x = -root.width; - view.state = "current"; - view.focus = true; - folders.folder = path; - } - - Component { - id: folderDelegate - Rectangle { - id: wrapper - function launch() { - if (folders.isFolder(index)) { - down(filePath); - } else { - qmlViewer.launch(filePath); - } - } - width: root.width - height: 52 - color: "transparent" - Rectangle { - id: highlight; visible: false - anchors.fill: parent - gradient: Gradient { - GradientStop { id: t1; position: 0.0; color: palette.highlight } - GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) } - } - } - Item { - width: 48; height: 48 - Image { source: "images/folder.png"; anchors.centerIn: parent; visible: folders.isFolder(index)} - } - Text { - id: nameText - anchors.fill: parent; verticalAlignment: Text.AlignVCenter - text: fileName - anchors.leftMargin: 54 - font.pixelSize: 32 - color: (wrapper.ListView.isCurrentItem && root.keyPressed) ? palette.highlightedText : palette.windowText - elide: Text.ElideRight - } - MouseArea { - id: mouseRegion - anchors.fill: parent - onClicked: { if (folders == wrapper.ListView.view.model) launch() } - } - states: [ - State { - name: "pressed" - when: mouseRegion.pressed - PropertyChanges { target: highlight; visible: true } - PropertyChanges { target: nameText; color: palette.highlightedText } - } - ] - } - } - - ListView { - id: view1 - anchors.top: titleBar.bottom - anchors.bottom: parent.bottom - x: 0 - width: parent.width - model: folders1 - delegate: folderDelegate - highlight: Rectangle { color: palette.highlight; visible: root.keyPressed && view1.count != 0 } - highlightMoveSpeed: 1000 - pressDelay: 100 - focus: true - state: "current" - states: [ - State { - name: "current" - PropertyChanges { target: view1; x: 0 } - }, - State { - name: "exitLeft" - PropertyChanges { target: view1; x: -root.width } - }, - State { - name: "exitRight" - PropertyChanges { target: view1; x: root.width } - } - ] - transitions: [ - Transition { - to: "current" - SequentialAnimation { - NumberAnimation { properties: "x"; duration: 250 } - } - }, - Transition { - NumberAnimation { properties: "x"; duration: 250 } - NumberAnimation { properties: "x"; duration: 250 } - } - ] - Keys.onPressed: { root.keyPressed = true; } - } - - ListView { - id: view2 - anchors.top: titleBar.bottom - anchors.bottom: parent.bottom - x: parent.width - width: parent.width - model: folders2 - delegate: folderDelegate - highlight: Rectangle { color: palette.highlight; visible: root.keyPressed && view2.count != 0 } - highlightMoveSpeed: 1000 - pressDelay: 100 - states: [ - State { - name: "current" - PropertyChanges { target: view2; x: 0 } - }, - State { - name: "exitLeft" - PropertyChanges { target: view2; x: -root.width } - }, - State { - name: "exitRight" - PropertyChanges { target: view2; x: root.width } - } - ] - transitions: [ - Transition { - to: "current" - SequentialAnimation { - NumberAnimation { properties: "x"; duration: 250 } - } - }, - Transition { - NumberAnimation { properties: "x"; duration: 250 } - } - ] - Keys.onPressed: { root.keyPressed = true; } - } - - Keys.onPressed: { - root.keyPressed = true; - if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) { - view.currentItem.launch(); - event.accepted = true; - } else if (event.key == Qt.Key_Left) { - up(); - } - } - - BorderImage { - source: "images/titlebar.sci"; - width: parent.width; - height: 52 - y: -7 - id: titleBar - - Rectangle { - id: upButton - width: 48 - height: titleBar.height - 7 - color: "transparent" - - Image { anchors.centerIn: parent; source: "images/up.png" } - MouseArea { id: upRegion; anchors.centerIn: parent - width: 56 - height: 56 - onClicked: if (folders.parentFolder != "") up() - } - states: [ - State { - name: "pressed" - when: upRegion.pressed - PropertyChanges { target: upButton; color: palette.highlight } - } - ] - } - Rectangle { - color: "gray" - x: 48 - width: 1 - height: 44 - } - - Text { - anchors.left: upButton.right; anchors.right: parent.right; height: parent.height - anchors.leftMargin: 4; anchors.rightMargin: 4 - text: folders.folder - color: "white" - elide: Text.ElideLeft; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignVCenter - font.pixelSize: 32 - } - } -} diff -r ef0373b55136 -r 758a864f9613 tools/qml/content/images/folder.png Binary file tools/qml/content/images/folder.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/content/images/titlebar.png Binary file tools/qml/content/images/titlebar.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/content/images/titlebar.sci --- a/tools/qml/content/images/titlebar.sci Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -border.left: 10 -border.top: 12 -border.bottom: 12 -border.right: 10 -source: titlebar.png diff -r ef0373b55136 -r 758a864f9613 tools/qml/content/images/up.png Binary file tools/qml/content/images/up.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/deviceorientation.cpp --- a/tools/qml/deviceorientation.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qml/deviceorientation.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -53,6 +53,11 @@ return m_orientation; } + void pauseListening() { + } + void resumeListening() { + } + void setOrientation(Orientation o) { if (o != m_orientation) { m_orientation = o; diff -r ef0373b55136 -r 758a864f9613 tools/qml/deviceorientation.h --- a/tools/qml/deviceorientation.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qml/deviceorientation.h Mon Oct 04 01:19:32 2010 +0300 @@ -63,6 +63,9 @@ virtual Orientation orientation() const = 0; virtual void setOrientation(Orientation) = 0; + virtual void pauseListening() = 0; + virtual void resumeListening() = 0; + static DeviceOrientation *instance(); signals: diff -r ef0373b55136 -r 758a864f9613 tools/qml/deviceorientation_maemo5.cpp --- a/tools/qml/deviceorientation_maemo5.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qml/deviceorientation_maemo5.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -50,23 +50,9 @@ Q_OBJECT public: MaemoOrientation() - : o(UnknownOrientation) + : o(UnknownOrientation), sensorEnabled(false) { - // enable the orientation sensor - QDBusConnection::systemBus().call( - QDBusMessage::createMethodCall(MCE_SERVICE, MCE_REQUEST_PATH, - MCE_REQUEST_IF, MCE_ACCELEROMETER_ENABLE_REQ)); - - // query the initial orientation - QDBusMessage reply = QDBusConnection::systemBus().call( - QDBusMessage::createMethodCall(MCE_SERVICE, MCE_REQUEST_PATH, - MCE_REQUEST_IF, MCE_DEVICE_ORIENTATION_GET)); - if (reply.type() == QDBusMessage::ErrorMessage) { - qWarning("Unable to retrieve device orientation: %s", qPrintable(reply.errorMessage())); - } else { - o = toOrientation(reply.arguments().value(0).toString()); - } - + resumeListening(); // connect to the orientation change signal QDBusConnection::systemBus().connect(QString(), MCE_SIGNAL_PATH, MCE_SIGNAL_IF, MCE_DEVICE_ORIENTATION_SIG, @@ -91,6 +77,40 @@ { } + void pauseListening() { + if (sensorEnabled) { + // disable the orientation sensor + QDBusConnection::systemBus().call( + QDBusMessage::createMethodCall(MCE_SERVICE, MCE_REQUEST_PATH, + MCE_REQUEST_IF, MCE_ACCELEROMETER_DISABLE_REQ)); + sensorEnabled = false; + } + } + + void resumeListening() { + if (!sensorEnabled) { + // enable the orientation sensor + QDBusConnection::systemBus().call( + QDBusMessage::createMethodCall(MCE_SERVICE, MCE_REQUEST_PATH, + MCE_REQUEST_IF, MCE_ACCELEROMETER_ENABLE_REQ)); + + QDBusMessage reply = QDBusConnection::systemBus().call( + QDBusMessage::createMethodCall(MCE_SERVICE, MCE_REQUEST_PATH, + MCE_REQUEST_IF, MCE_DEVICE_ORIENTATION_GET)); + + if (reply.type() == QDBusMessage::ErrorMessage) { + qWarning("Unable to retrieve device orientation: %s", qPrintable(reply.errorMessage())); + } else { + Orientation orientation = toOrientation(reply.arguments().value(0).toString()); + if (o != orientation) { + o = orientation; + emit orientationChanged(); + } + sensorEnabled = true; + } + } + } + private Q_SLOTS: void deviceOrientationChanged(const QString &newOrientation) { @@ -116,6 +136,7 @@ private: Orientation o; + bool sensorEnabled; }; DeviceOrientation* DeviceOrientation::instance() diff -r ef0373b55136 -r 758a864f9613 tools/qml/deviceorientation_symbian.cpp --- a/tools/qml/deviceorientation_symbian.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qml/deviceorientation_symbian.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -52,7 +52,7 @@ Q_OBJECT public: SymbianOrientation() - : DeviceOrientation(), m_current(UnknownOrientation), m_sensorChannel(0) + : DeviceOrientation(), m_current(UnknownOrientation), m_sensorChannel(0), m_channelOpen(false) { TRAP_IGNORE(initL()); if (!m_sensorChannel) @@ -84,6 +84,7 @@ TRAP(error, m_sensorChannel->OpenChannelL()); if (!error) { TRAP(error, m_sensorChannel->StartDataListeningL(this, 1, 1, 0)); + m_channelOpen = true; break; } if (error) { @@ -107,25 +108,54 @@ private: DeviceOrientation::Orientation m_current; CSensrvChannel *m_sensorChannel; + bool m_channelOpen; + void pauseListening() { + if (m_sensorChannel && m_channelOpen) { + m_sensorChannel->StopDataListening(); + m_sensorChannel->CloseChannel(); + m_channelOpen = false; + } + } + + void resumeListening() { + if (m_sensorChannel && !m_channelOpen) { + TRAPD(error, m_sensorChannel->OpenChannelL()); + if (!error) { + TRAP(error, m_sensorChannel->StartDataListeningL(this, 1, 1, 0)); + if (!error) { + m_channelOpen = true; + } + } + if (error) { + delete m_sensorChannel; + m_sensorChannel = 0; + } + } + } void DataReceived(CSensrvChannel &channel, TInt count, TInt dataLost) { + Q_UNUSED(dataLost) if (channel.GetChannelInfo().iChannelType == KSensrvChannelTypeIdOrientationData) { TSensrvOrientationData data; for (int i = 0; i < count; ++i) { TPckgBuf dataBuf; channel.GetData(dataBuf); data = dataBuf(); - Orientation o = UnknownOrientation; + Orientation orientation = UnknownOrientation; switch (data.iDeviceOrientation) { case TSensrvOrientationData::EOrientationDisplayUp: - o = Portrait; + orientation = Portrait; break; case TSensrvOrientationData::EOrientationDisplayRightUp: - o = Landscape; + orientation = Landscape; break; case TSensrvOrientationData::EOrientationDisplayLeftUp: + orientation = LandscapeInverted; + break; case TSensrvOrientationData::EOrientationDisplayDown: + orientation = PortraitInverted; + break; case TSensrvOrientationData::EOrientationUndefined: case TSensrvOrientationData::EOrientationDisplayUpwards: case TSensrvOrientationData::EOrientationDisplayDownwards: @@ -133,8 +163,8 @@ break; } - if (m_current != o && o != UnknownOrientation) { - m_current = o; + if (m_current != orientation && orientation != UnknownOrientation) { + m_current = orientation; emit orientationChanged(); } } diff -r ef0373b55136 -r 758a864f9613 tools/qml/main.cpp --- a/tools/qml/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qml/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -56,7 +56,8 @@ QtMsgHandler systemMsgOutput = 0; - +static QDeclarativeViewer *openFile(const QString &fileName); +static void showViewer(QDeclarativeViewer *viewer); #if defined (Q_OS_SYMBIAN) #include @@ -117,6 +118,11 @@ #endif +static QDeclarativeViewer* globalViewer = 0; + +// The qml file that is shown if the user didn't specify a QML file +QString initialFile = "qrc:/startup/startup.qml"; + void usage() { qWarning("Usage: qmlviewer [options] "); @@ -175,6 +181,331 @@ enum WarningsConfig { ShowWarnings, HideWarnings, DefaultWarnings }; +struct ViewerOptions +{ + ViewerOptions() + : frameless(false), + fps(0.0), + autorecord_from(0), + autorecord_to(0), + dither("none"), + runScript(false), + devkeys(false), + cache(0), + useGL(false), + fullScreen(false), + stayOnTop(false), + maximized(false), + useNativeFileBrowser(true), + experimentalGestures(false), + warningsConfig(DefaultWarnings), + sizeToView(true) + { +#if defined(Q_OS_SYMBIAN) + maximized = true; + useNativeFileBrowser = false; +#endif + +#if defined(Q_WS_MAC) + useGL = true; +#endif + } + + bool frameless; + double fps; + int autorecord_from; + int autorecord_to; + QString dither; + QString recordfile; + QStringList recordargs; + QStringList imports; + QStringList plugins; + QString script; + QString scriptopts; + bool runScript; + bool devkeys; + int cache; + QString translationFile; + bool useGL; + bool fullScreen; + bool stayOnTop; + bool maximized; + bool useNativeFileBrowser; + bool experimentalGestures; + + WarningsConfig warningsConfig; + bool sizeToView; + + QDeclarativeViewer::ScriptOptions scriptOptions; +}; + +static ViewerOptions opts; +static QStringList fileNames; + +class Application : public QApplication +{ + Q_OBJECT +public: + Application(int &argc, char **&argv) + : QApplication(argc, argv) + {} + +protected: + bool event(QEvent *ev) + { + if (ev->type() != QEvent::FileOpen) + return QApplication::event(ev); + + QFileOpenEvent *fev = static_cast(ev); + + globalViewer->open(fev->file()); + if (!globalViewer->isVisible()) + showViewer(globalViewer); + + return true; + } + +private Q_SLOTS: + void showInitialViewer() + { + QApplication::processEvents(); + + QDeclarativeViewer *viewer = globalViewer; + if (!viewer) + return; + if (viewer->currentFile().isEmpty()) { + if(opts.useNativeFileBrowser) + viewer->open(initialFile); + else + viewer->openFile(); + } + if (!viewer->isVisible()) + showViewer(viewer); + } +}; + +static void parseScriptOptions() +{ + QStringList options = + opts.scriptopts.split(QLatin1Char(','), QString::SkipEmptyParts); + + QDeclarativeViewer::ScriptOptions scriptOptions = 0; + for (int i = 0; i < options.count(); ++i) { + const QString &option = options.at(i); + if (option == QLatin1String("help")) { + scriptOptsUsage(); + } else if (option == QLatin1String("play")) { + scriptOptions |= QDeclarativeViewer::Play; + } else if (option == QLatin1String("record")) { + scriptOptions |= QDeclarativeViewer::Record; + } else if (option == QLatin1String("testimages")) { + scriptOptions |= QDeclarativeViewer::TestImages; + } else if (option == QLatin1String("testerror")) { + scriptOptions |= QDeclarativeViewer::TestErrorProperty; + } else if (option == QLatin1String("exitoncomplete")) { + scriptOptions |= QDeclarativeViewer::ExitOnComplete; + } else if (option == QLatin1String("exitonfailure")) { + scriptOptions |= QDeclarativeViewer::ExitOnFailure; + } else if (option == QLatin1String("saveonexit")) { + scriptOptions |= QDeclarativeViewer::SaveOnExit; + } else if (option == QLatin1String("snapshot")) { + scriptOptions |= QDeclarativeViewer::Snapshot; + } else { + scriptOptsUsage(); + } + } + + opts.scriptOptions = scriptOptions; +} + +static void parseCommandLineOptions(const QStringList &arguments) +{ + for (int i = 1; i < arguments.count(); ++i) { + bool lastArg = (i == arguments.count() - 1); + QString arg = arguments.at(i); + if (arg == "-frameless") { + opts.frameless = true; + } else if (arg == "-maximized") { + opts.maximized = true; + } else if (arg == "-fullscreen") { + opts.fullScreen = true; + } else if (arg == "-stayontop") { + opts.stayOnTop = true; + } else if (arg == "-netcache") { + if (lastArg) usage(); + opts.cache = arguments.at(++i).toInt(); + } else if (arg == "-recordrate") { + if (lastArg) usage(); + opts.fps = arguments.at(++i).toDouble(); + } else if (arg == "-recordfile") { + if (lastArg) usage(); + opts.recordfile = arguments.at(++i); + } else if (arg == "-record") { + if (lastArg) usage(); + opts.recordargs << arguments.at(++i); + } else if (arg == "-recorddither") { + if (lastArg) usage(); + opts.dither = arguments.at(++i); + } else if (arg == "-autorecord") { + if (lastArg) usage(); + QString range = arguments.at(++i); + int dash = range.indexOf('-'); + if (dash > 0) + opts.autorecord_from = range.left(dash).toInt(); + opts.autorecord_to = range.mid(dash+1).toInt(); + } else if (arg == "-devicekeys") { + opts.devkeys = true; + } else if (arg == "-dragthreshold") { + if (lastArg) usage(); + qApp->setStartDragDistance(arguments.at(++i).toInt()); + } else if (arg == QLatin1String("-v") || arg == QLatin1String("-version")) { + qWarning("Qt QML Viewer version %s", QT_VERSION_STR); + exit(0); + } else if (arg == "-translation") { + if (lastArg) usage(); + opts.translationFile = arguments.at(++i); + } else if (arg == "-opengl") { + opts.useGL = true; + } else if (arg == "-qmlbrowser") { + opts.useNativeFileBrowser = false; + } else if (arg == "-warnings") { + if (lastArg) usage(); + QString warningsStr = arguments.at(++i); + if (warningsStr == QLatin1String("show")) { + opts.warningsConfig = ShowWarnings; + } else if (warningsStr == QLatin1String("hide")) { + opts.warningsConfig = HideWarnings; + } else { + usage(); + } + } else if (arg == "-I" || arg == "-L") { + if (arg == "-L") + qWarning("-L option provided for compatibility only, use -I instead"); + if (lastArg) { + QDeclarativeEngine tmpEngine; + QString paths = tmpEngine.importPathList().join(QLatin1String(":")); + qWarning("Current search path: %s", paths.toLocal8Bit().constData()); + exit(0); + } + opts.imports << arguments.at(++i); + } else if (arg == "-P") { + if (lastArg) usage(); + opts.plugins << arguments.at(++i); + } else if (arg == "-script") { + if (lastArg) usage(); + opts.script = arguments.at(++i); + } else if (arg == "-scriptopts") { + if (lastArg) usage(); + opts.scriptopts = arguments.at(++i); + } else if (arg == "-savescript") { + if (lastArg) usage(); + opts.script = arguments.at(++i); + opts.runScript = false; + } else if (arg == "-playscript") { + if (lastArg) usage(); + opts.script = arguments.at(++i); + opts.runScript = true; + } else if (arg == "-sizeviewtorootobject") { + opts.sizeToView = false; + } else if (arg == "-sizerootobjecttoview") { + opts.sizeToView = true; + } else if (arg == "-experimentalgestures") { + opts.experimentalGestures = true; + } else if (!arg.startsWith('-')) { + fileNames.append(arg); + } else if (true || arg == "-help") { + usage(); + } + } + + if (!opts.scriptopts.isEmpty()) { + + parseScriptOptions(); + + if (opts.script.isEmpty()) + usage(); + + if (!(opts.scriptOptions & QDeclarativeViewer::Record) && !(opts.scriptOptions & QDeclarativeViewer::Play)) + scriptOptsUsage(); + } else if (!opts.script.isEmpty()) { + usage(); + } + +} + +static QDeclarativeViewer *createViewer() +{ + Qt::WFlags wflags = (opts.frameless ? Qt::FramelessWindowHint : Qt::Widget); + if (opts.stayOnTop) + wflags |= Qt::WindowStaysOnTopHint; + + QDeclarativeViewer *viewer = new QDeclarativeViewer(0, wflags); + viewer->setAttribute(Qt::WA_DeleteOnClose, true); + viewer->setUseGL(opts.useGL); + + if (!opts.scriptopts.isEmpty()) { + viewer->setScriptOptions(opts.scriptOptions); + viewer->setScript(opts.script); + } + +#if !defined(Q_OS_SYMBIAN) + logger = viewer->warningsWidget(); + if (opts.warningsConfig == ShowWarnings) { + logger.data()->setDefaultVisibility(LoggerWidget::ShowWarnings); + logger.data()->show(); + } else if (opts.warningsConfig == HideWarnings){ + logger.data()->setDefaultVisibility(LoggerWidget::HideWarnings); + } +#endif + + if (opts.experimentalGestures) + viewer->enableExperimentalGestures(); + + foreach (QString lib, opts.imports) + viewer->addLibraryPath(lib); + + foreach (QString plugin, opts.plugins) + viewer->addPluginPath(plugin); + + viewer->setNetworkCacheSize(opts.cache); + viewer->setRecordFile(opts.recordfile); + viewer->setSizeToView(opts.sizeToView); + if (opts.fps > 0) + viewer->setRecordRate(opts.fps); + if (opts.autorecord_to) + viewer->setAutoRecord(opts.autorecord_from, opts.autorecord_to); + if (opts.devkeys) + viewer->setDeviceKeys(true); + viewer->setRecordDither(opts.dither); + if (opts.recordargs.count()) + viewer->setRecordArgs(opts.recordargs); + + viewer->setUseNativeFileBrowser(opts.useNativeFileBrowser); + + return viewer; +} + +void showViewer(QDeclarativeViewer *viewer) +{ + if (opts.fullScreen) + viewer->showFullScreen(); + else if (opts.maximized) + viewer->showMaximized(); + else + viewer->show(); + viewer->raise(); +} + +QDeclarativeViewer *openFile(const QString &fileName) +{ + QDeclarativeViewer *viewer = globalViewer; + + viewer->open(fileName); + showViewer(viewer); + + return viewer; +} + int main(int argc, char ** argv) { #if defined (Q_OS_SYMBIAN) @@ -204,264 +535,54 @@ QApplication::setGraphicsSystem("raster"); #endif - QApplication app(argc, argv); + Application app(argc, argv); app.setApplicationName("QtQmlViewer"); app.setOrganizationName("Nokia"); app.setOrganizationDomain("nokia.com"); - - QDeclarativeViewer::registerTypes(); QDeclarativeTester::registerTypes(); - bool frameless = false; - QString fileName; - double fps = 0; - int autorecord_from = 0; - int autorecord_to = 0; - QString dither = "none"; - QString recordfile; - QStringList recordargs; - QStringList imports; - QStringList plugins; - QString script; - QString scriptopts; - bool runScript = false; - bool devkeys = false; - int cache = 0; - QString translationFile; - bool useGL = false; - bool fullScreen = false; - bool stayOnTop = false; - bool maximized = false; - bool useNativeFileBrowser = true; - bool experimentalGestures = false; + parseCommandLineOptions(app.arguments()); - WarningsConfig warningsConfig = DefaultWarnings; - bool sizeToView = true; + QTranslator qmlTranslator; + if (!opts.translationFile.isEmpty()) { + qmlTranslator.load(opts.translationFile); + app.installTranslator(&qmlTranslator); + } -#if defined(Q_OS_SYMBIAN) - maximized = true; - useNativeFileBrowser = false; -#endif - -#if defined(Q_WS_MAC) - useGL = true; -#endif + if (opts.fullScreen && opts.maximized) + qWarning() << "Both -fullscreen and -maximized specified. Using -fullscreen."; - for (int i = 1; i < argc; ++i) { - bool lastArg = (i == argc - 1); - QString arg = argv[i]; - if (arg == "-frameless") { - frameless = true; - } else if (arg == "-maximized") { - maximized = true; - } else if (arg == "-fullscreen") { - fullScreen = true; - } else if (arg == "-stayontop") { - stayOnTop = true; - } else if (arg == "-netcache") { - if (lastArg) usage(); - cache = QString(argv[++i]).toInt(); - } else if (arg == "-recordrate") { - if (lastArg) usage(); - fps = QString(argv[++i]).toDouble(); - } else if (arg == "-recordfile") { - if (lastArg) usage(); - recordfile = QString(argv[++i]); - } else if (arg == "-record") { - if (lastArg) usage(); - recordargs << QString(argv[++i]); - } else if (arg == "-recorddither") { - if (lastArg) usage(); - dither = QString(argv[++i]); - } else if (arg == "-autorecord") { - if (lastArg) usage(); - QString range = QString(argv[++i]); - int dash = range.indexOf('-'); - if (dash > 0) - autorecord_from = range.left(dash).toInt(); - autorecord_to = range.mid(dash+1).toInt(); - } else if (arg == "-devicekeys") { - devkeys = true; - } else if (arg == "-dragthreshold") { - if (lastArg) usage(); - app.setStartDragDistance(QString(argv[++i]).toInt()); - } else if (arg == QLatin1String("-v") || arg == QLatin1String("-version")) { - qWarning("Qt QML Viewer version %s", QT_VERSION_STR); - exit(0); - } else if (arg == "-translation") { - if (lastArg) usage(); - translationFile = argv[++i]; - } else if (arg == "-opengl") { - useGL = true; - } else if (arg == "-qmlbrowser") { - useNativeFileBrowser = false; - } else if (arg == "-warnings") { - if (lastArg) usage(); - QString warningsStr = QString(argv[++i]); - if (warningsStr == QLatin1String("show")) { - warningsConfig = ShowWarnings; - } else if (warningsStr == QLatin1String("hide")) { - warningsConfig = HideWarnings; - } else { - usage(); - } - } else if (arg == "-I" || arg == "-L") { - if (arg == "-L") - qWarning("-L option provided for compatibility only, use -I instead"); - if (lastArg) { - QDeclarativeEngine tmpEngine; - QString paths = tmpEngine.importPathList().join(QLatin1String(":")); - qWarning("Current search path: %s", paths.toLocal8Bit().constData()); - exit(0); - } - imports << QString(argv[++i]); - } else if (arg == "-P") { - if (lastArg) usage(); - plugins << QString(argv[++i]); - } else if (arg == "-script") { - if (lastArg) usage(); - script = QString(argv[++i]); - } else if (arg == "-scriptopts") { - if (lastArg) usage(); - scriptopts = QString(argv[++i]); - } else if (arg == "-savescript") { - if (lastArg) usage(); - script = QString(argv[++i]); - runScript = false; - } else if (arg == "-playscript") { - if (lastArg) usage(); - script = QString(argv[++i]); - runScript = true; - } else if (arg == "-sizeviewtorootobject") { - sizeToView = false; - } else if (arg == "-sizerootobjecttoview") { - sizeToView = true; - } else if (arg == "-experimentalgestures") { - experimentalGestures = true; - } else if (arg[0] != '-') { - fileName = arg; - } else if (1 || arg == "-help") { - usage(); + if (fileNames.isEmpty()) { + QFile qmlapp(QLatin1String("qmlapp")); + if (qmlapp.exists() && qmlapp.open(QFile::ReadOnly)) { + QString content = QString::fromUtf8(qmlapp.readAll()); + qmlapp.close(); + + int newline = content.indexOf(QLatin1Char('\n')); + if (newline >= 0) + fileNames += content.left(newline); + else + fileNames += content; } } - QTranslator qmlTranslator; - if (!translationFile.isEmpty()) { - qmlTranslator.load(translationFile); - app.installTranslator(&qmlTranslator); - } - - Qt::WFlags wflags = (frameless ? Qt::FramelessWindowHint : Qt::Widget); - if (stayOnTop) - wflags |= Qt::WindowStaysOnTopHint; - - QDeclarativeViewer *viewer = new QDeclarativeViewer(0, wflags); - viewer->setAttribute(Qt::WA_DeleteOnClose, true); - if (!scriptopts.isEmpty()) { - QStringList options = - scriptopts.split(QLatin1Char(','), QString::SkipEmptyParts); + globalViewer = createViewer(); - QDeclarativeViewer::ScriptOptions scriptOptions = 0; - for (int i = 0; i < options.count(); ++i) { - const QString &option = options.at(i); - if (option == QLatin1String("help")) { - scriptOptsUsage(); - } else if (option == QLatin1String("play")) { - scriptOptions |= QDeclarativeViewer::Play; - } else if (option == QLatin1String("record")) { - scriptOptions |= QDeclarativeViewer::Record; - } else if (option == QLatin1String("testimages")) { - scriptOptions |= QDeclarativeViewer::TestImages; - } else if (option == QLatin1String("testerror")) { - scriptOptions |= QDeclarativeViewer::TestErrorProperty; - } else if (option == QLatin1String("exitoncomplete")) { - scriptOptions |= QDeclarativeViewer::ExitOnComplete; - } else if (option == QLatin1String("exitonfailure")) { - scriptOptions |= QDeclarativeViewer::ExitOnFailure; - } else if (option == QLatin1String("saveonexit")) { - scriptOptions |= QDeclarativeViewer::SaveOnExit; - } else if (option == QLatin1String("snapshot")) { - scriptOptions |= QDeclarativeViewer::Snapshot; - } else { - scriptOptsUsage(); - } - } - - if (script.isEmpty()) - usage(); - - if (!(scriptOptions & QDeclarativeViewer::Record) && !(scriptOptions & QDeclarativeViewer::Play)) - scriptOptsUsage(); - viewer->setScriptOptions(scriptOptions); - viewer->setScript(script); - } else if (!script.isEmpty()) { - usage(); + if (fileNames.isEmpty()) { + // show the initial viewer delayed. + // This prevents an initial viewer popping up while there + // are FileOpen events coming through the event queue + QTimer::singleShot(1, &app, SLOT(showInitialViewer())); + } else { + foreach (const QString &fileName, fileNames) + openFile(fileName); } -#if !defined(Q_OS_SYMBIAN) - logger = viewer->warningsWidget(); - if (warningsConfig == ShowWarnings) { - logger.data()->setDefaultVisibility(LoggerWidget::ShowWarnings); - logger.data()->show(); - } else if (warningsConfig == HideWarnings){ - logger.data()->setDefaultVisibility(LoggerWidget::HideWarnings); - } -#endif - - if (experimentalGestures) - viewer->enableExperimentalGestures(); - - foreach (QString lib, imports) - viewer->addLibraryPath(lib); - - foreach (QString plugin, plugins) - viewer->addPluginPath(plugin); - - viewer->setNetworkCacheSize(cache); - viewer->setRecordFile(recordfile); - viewer->setSizeToView(sizeToView); - if (fps>0) - viewer->setRecordRate(fps); - if (autorecord_to) - viewer->setAutoRecord(autorecord_from,autorecord_to); - if (devkeys) - viewer->setDeviceKeys(true); - viewer->setRecordDither(dither); - if (recordargs.count()) - viewer->setRecordArgs(recordargs); - - viewer->setUseNativeFileBrowser(useNativeFileBrowser); - if (fullScreen && maximized) - qWarning() << "Both -fullscreen and -maximized specified. Using -fullscreen."; - - if (fileName.isEmpty()) { - QFile qmlapp(QLatin1String("qmlapp")); - if (qmlapp.exists() && qmlapp.open(QFile::ReadOnly)) { - QString content = QString::fromUtf8(qmlapp.readAll()); - qmlapp.close(); - - int newline = content.indexOf(QLatin1Char('\n')); - if (newline >= 0) - fileName = content.left(newline); - else - fileName = content; - } - } - - if (!fileName.isEmpty()) { - viewer->open(fileName); - fullScreen ? viewer->showFullScreen() : maximized ? viewer->showMaximized() : viewer->show(); - } else { - if (!useNativeFileBrowser) - viewer->openFile(); - fullScreen ? viewer->showFullScreen() : maximized ? viewer->showMaximized() : viewer->show(); - if (useNativeFileBrowser) - viewer->openFile(); - } - viewer->setUseGL(useGL); - viewer->raise(); + QObject::connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit())); return app.exec(); } + +#include "main.moc" diff -r ef0373b55136 -r 758a864f9613 tools/qml/qml.pri --- a/tools/qml/qml.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qml/qml.pri Mon Oct 04 01:19:32 2010 +0300 @@ -16,7 +16,9 @@ $$PWD/qdeclarativetester.cpp \ $$PWD/loggerwidget.cpp -RESOURCES = $$PWD/qmlruntime.qrc +RESOURCES = $$PWD/browser/browser.qrc \ + $$PWD/startup/startup.qrc + symbian:!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { SOURCES += $$PWD/deviceorientation_symbian.cpp FORMS = $$PWD/recopts.ui \ diff -r ef0373b55136 -r 758a864f9613 tools/qml/qml.pro --- a/tools/qml/qml.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qml/qml.pro Mon Oct 04 01:19:32 2010 +0300 @@ -34,12 +34,15 @@ } symbian { TARGET.UID3 = 0x20021317 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + TARGET.EPOCHEAPSIZE = 0x20000 0x4000000 TARGET.CAPABILITY = NetworkServices ReadUserData !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { LIBS += -lsensrvclient -lsensrvutil } + contains(QT_CONFIG, s60): { + LIBS += -lavkon -lcone + } } mac { QMAKE_INFO_PLIST=Info_mac.plist diff -r ef0373b55136 -r 758a864f9613 tools/qml/qmlruntime.cpp --- a/tools/qml/qmlruntime.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qml/qmlruntime.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -85,6 +85,7 @@ #include #include #include +#include #include #include #include @@ -98,10 +99,57 @@ #include #endif +#if defined(Q_WS_S60) +#include // For locking app orientation +#endif + #include QT_BEGIN_NAMESPACE +class DragAndDropView : public QDeclarativeView +{ + Q_OBJECT +public: + DragAndDropView(QDeclarativeViewer *parent = 0) + : QDeclarativeView(parent) + { + setAcceptDrops(true); + } + + void dragEnterEvent(QDragEnterEvent *event) + { + const QMimeData *mimeData = event->mimeData(); + if (mimeData->hasUrls()) + event->acceptProposedAction(); + } + + void dragMoveEvent(QDragMoveEvent *event) + { + event->acceptProposedAction(); + } + + void dragLeaveEvent(QDragLeaveEvent *event) + { + event->accept(); + } + + void dropEvent(QDropEvent *event) + { + const QMimeData *mimeData = event->mimeData(); + if (!mimeData->hasUrls()) + return; + const QList urlList = mimeData->urls(); + foreach (const QUrl &url, urlList) { + if (url.scheme() == QLatin1String("file")) { + static_cast(parent())->open(url.toLocalFile()); + event->accept(); + return; + } + } + } +}; + class Runtime : public QObject { Q_OBJECT @@ -557,6 +605,7 @@ : QMainWindow(parent, flags) , loggerWindow(new LoggerWidget(this)) , frame_stream(0) + , rotateAction(0) , orientation(0) , showWarningsWindow(0) , m_scriptOptions(0) @@ -596,7 +645,7 @@ recdlg->warning->hide(); } - canvas = new QDeclarativeView(this); + canvas = new DragAndDropView(this); canvas->setAttribute(Qt::WA_OpaquePaintEvent); canvas->setAttribute(Qt::WA_NoSystemBackground); @@ -605,7 +654,7 @@ QObject::connect(canvas, SIGNAL(sceneResized(QSize)), this, SLOT(sceneResized(QSize))); QObject::connect(canvas, SIGNAL(statusChanged(QDeclarativeView::Status)), this, SLOT(statusChanged())); - QObject::connect(canvas->engine(), SIGNAL(quit()), QCoreApplication::instance (), SLOT(quit())); + QObject::connect(canvas->engine(), SIGNAL(quit()), this, SLOT(close())); QObject::connect(warningsWidget(), SIGNAL(opened()), this, SLOT(warningsWidgetOpened())); QObject::connect(warningsWidget(), SIGNAL(closed()), this, SLOT(warningsWidgetClosed())); @@ -664,11 +713,14 @@ void QDeclarativeViewer::createMenu() { QAction *openAction = new QAction(tr("&Open..."), this); - openAction->setShortcut(QKeySequence("Ctrl+O")); + openAction->setShortcuts(QKeySequence::Open); connect(openAction, SIGNAL(triggered()), this, SLOT(openFile())); + QAction *openUrlAction = new QAction(tr("Open &URL..."), this); + connect(openUrlAction, SIGNAL(triggered()), this, SLOT(openUrl())); + QAction *reloadAction = new QAction(tr("&Reload"), this); - reloadAction->setShortcut(QKeySequence("Ctrl+R")); + reloadAction->setShortcuts(QKeySequence::Refresh); connect(reloadAction, SIGNAL(triggered()), this, SLOT(reload())); QAction *snapshotAction = new QAction(tr("&Take Snapshot"), this); @@ -699,28 +751,40 @@ fullscreenAction->setCheckable(true); connect(fullscreenAction, SIGNAL(triggered()), this, SLOT(toggleFullScreen())); - QAction *rotateOrientation = new QAction(tr("Rotate orientation"), this); - rotateOrientation->setShortcut(QKeySequence("Ctrl+T")); - connect(rotateOrientation, SIGNAL(triggered()), this, SLOT(rotateOrientation())); + rotateAction = new QAction(tr("Rotate orientation"), this); + rotateAction->setShortcut(QKeySequence("Ctrl+T")); + connect(rotateAction, SIGNAL(triggered()), this, SLOT(rotateOrientation())); orientation = new QActionGroup(this); orientation->setExclusive(true); connect(orientation, SIGNAL(triggered(QAction*)), this, SLOT(changeOrientation(QAction*))); +#if defined(Q_OS_SYMBIAN) + QAction *autoOrientationAction = new QAction(tr("Auto-orientation"), this); + autoOrientationAction->setCheckable(true); +#endif QAction *portraitAction = new QAction(tr("Portrait"), this); portraitAction->setCheckable(true); QAction *landscapeAction = new QAction(tr("Landscape"), this); landscapeAction->setCheckable(true); +#if !defined(Q_OS_SYMBIAN) QAction *portraitInvAction = new QAction(tr("Portrait (inverted)"), this); portraitInvAction->setCheckable(true); QAction *landscapeInvAction = new QAction(tr("Landscape (inverted)"), this); landscapeInvAction->setCheckable(true); +#endif QAction *aboutAction = new QAction(tr("&About Qt..."), this); + aboutAction->setMenuRole(QAction::AboutQtRole); connect(aboutAction, SIGNAL(triggered()), qApp, SLOT(aboutQt())); + QAction *closeAction = new QAction(tr("&Close"), this); + closeAction->setShortcuts(QKeySequence::Close); + connect(closeAction, SIGNAL(triggered()), this, SLOT(close())); + QAction *quitAction = new QAction(tr("&Quit"), this); - quitAction->setShortcut(QKeySequence("Ctrl+Q")); + quitAction->setMenuRole(QAction::QuitRole); + quitAction->setShortcuts(QKeySequence::Quit); connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); QMenuBar *menu = menuBar(); @@ -729,6 +793,7 @@ #if defined(Q_WS_MAEMO_5) menu->addAction(openAction); + menu->addAction(openUrlAction); menu->addAction(reloadAction); menu->addAction(snapshotAction); @@ -749,11 +814,13 @@ QMenu *fileMenu = menu->addMenu(tr("&File")); fileMenu->addAction(openAction); + fileMenu->addAction(openUrlAction); fileMenu->addAction(reloadAction); fileMenu->addSeparator(); + fileMenu->addAction(closeAction); +#if !defined(Q_OS_SYMBIAN) fileMenu->addAction(quitAction); -#if !defined(Q_OS_SYMBIAN) QMenu *recordMenu = menu->addMenu(tr("&Recording")); recordMenu->addAction(snapshotAction); recordMenu->addAction(recordAction); @@ -763,22 +830,27 @@ debugMenu->addAction(showWarningsWindow); #endif // ! Q_OS_SYMBIAN - QMenu *settingsMenu = menu->addMenu(tr("S&ettings")); + QMenu *settingsMenu = menu->addMenu(tr("&Settings")); settingsMenu->addAction(proxyAction); -#if !defined(Q_OS_SYMBIAN) +#if defined(Q_OS_SYMBIAN) + settingsMenu->addAction(fullscreenAction); +#else settingsMenu->addAction(recordOptions); settingsMenu->addMenu(loggerWindow->preferencesMenu()); -#else // ! Q_OS_SYMBIAN - settingsMenu->addAction(fullscreenAction); -#endif // Q_OS_SYMBIAN - settingsMenu->addAction(rotateOrientation); +#endif // !Q_OS_SYMBIAN + settingsMenu->addAction(rotateAction); QMenu *propertiesMenu = settingsMenu->addMenu(tr("Properties")); +#if defined(Q_OS_SYMBIAN) + orientation->addAction(autoOrientationAction); +#endif orientation->addAction(portraitAction); orientation->addAction(landscapeAction); +#if !defined(Q_OS_SYMBIAN) orientation->addAction(portraitInvAction); orientation->addAction(landscapeInvAction); +#endif propertiesMenu->addActions(orientation->actions()); QMenu *helpMenu = menu->addMenu(tr("&Help")); @@ -802,6 +874,23 @@ void QDeclarativeViewer::rotateOrientation() { +#if defined(Q_WS_S60) + CAknAppUi *appUi = static_cast(CEikonEnv::Static()->AppUi()); + if (appUi) { + CAknAppUi::TAppUiOrientation oldOrientation = appUi->Orientation(); + QString newOrientation; + if (oldOrientation == CAknAppUi::EAppUiOrientationPortrait) { + newOrientation = QLatin1String("Landscape"); + } else { + newOrientation = QLatin1String("Portrait"); + } + foreach (QAction *action, orientation->actions()) { + if (action->text() == newOrientation) { + changeOrientation(action); + } + } + } +#else QAction *current = orientation->checkedAction(); QList actions = orientation->actions(); int index = actions.indexOf(current); @@ -810,6 +899,7 @@ QAction *newOrientation = actions[(index + 1) % actions.count()]; changeOrientation(newOrientation); +#endif } void QDeclarativeViewer::toggleFullScreen() @@ -927,7 +1017,7 @@ { QString cur = canvas->source().toLocalFile(); if (useQmlFileBrowser) { - open("qrc:/content/Browser.qml"); + open("qrc:/browser/Browser.qml"); } else { QString fileName = QFileDialog::getOpenFileName(this, tr("Open QML file"), cur, tr("QML Files (*.qml)")); if (!fileName.isEmpty()) { @@ -937,6 +1027,14 @@ } } +void QDeclarativeViewer::openUrl() +{ + QString cur = canvas->source().toLocalFile(); + QString url= QInputDialog::getText(this, tr("Open QML file"), tr("URL of main QML file:"), QLineEdit::Normal, cur); + if (!url.isEmpty()) + open(url); +} + void QDeclarativeViewer::statusChanged() { if (canvas->status() == QDeclarativeView::Error && tester) @@ -1110,8 +1208,10 @@ { if (event->type() == QEvent::WindowActivate) { Runtime::instance()->setActiveWindow(true); + DeviceOrientation::instance()->resumeListening(); } else if (event->type() == QEvent::WindowDeactivate) { Runtime::instance()->setActiveWindow(false); + DeviceOrientation::instance()->pauseListening(); } return QWidget::event(event); } @@ -1319,9 +1419,24 @@ { if (!action) return; + QString o = action->text(); action->setChecked(true); - - QString o = action->text(); +#if defined(Q_WS_S60) + CAknAppUi *appUi = static_cast(CEikonEnv::Static()->AppUi()); + if (appUi) { + CAknAppUi::TAppUiOrientation orientation = appUi->Orientation(); + if (o == QLatin1String("Auto-orientation")) { + appUi->SetOrientationL(CAknAppUi::EAppUiOrientationAutomatic); + rotateAction->setVisible(false); + } else if (o == QLatin1String("Portrait")) { + appUi->SetOrientationL(CAknAppUi::EAppUiOrientationPortrait); + rotateAction->setVisible(true); + } else if (o == QLatin1String("Landscape")) { + appUi->SetOrientationL(CAknAppUi::EAppUiOrientationLandscape); + rotateAction->setVisible(true); + } + } +#else if (o == QLatin1String("Portrait")) DeviceOrientation::instance()->setOrientation(DeviceOrientation::Portrait); else if (o == QLatin1String("Landscape")) @@ -1330,6 +1445,7 @@ DeviceOrientation::instance()->setOrientation(DeviceOrientation::PortraitInverted); else if (o == QLatin1String("Landscape (inverted)")) DeviceOrientation::instance()->setOrientation(DeviceOrientation::LandscapeInverted); +#endif } void QDeclarativeViewer::orientationChanged() diff -r ef0373b55136 -r 758a864f9613 tools/qml/qmlruntime.h --- a/tools/qml/qmlruntime.h Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qml/qmlruntime.h Mon Oct 04 01:19:32 2010 +0300 @@ -105,6 +105,7 @@ QDeclarativeView *view() const; LoggerWidget *warningsWidget() const; + QString currentFile() const { return currentFileOrUrl; } void enableExperimentalGestures(); @@ -112,6 +113,7 @@ void sceneResized(QSize size); bool open(const QString&); void openFile(); + void openUrl(); void reload(); void takeSnapShot(); void toggleRecording(); @@ -169,8 +171,6 @@ int record_autotime; bool devicemode; QAction *recordAction; - QString currentSkin; - bool scaleSkin; RecordingDialog *recdlg; void senseImageMagick(); @@ -179,6 +179,7 @@ bool ffmpegAvailable; bool convertAvailable; + QAction *rotateAction; QActionGroup *orientation; QAction *showWarningsWindow; diff -r ef0373b55136 -r 758a864f9613 tools/qml/qmlruntime.qrc --- a/tools/qml/qmlruntime.qrc Fri Sep 17 08:34:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ - - - content/Browser.qml - content/images/up.png - content/images/folder.png - content/images/titlebar.sci - content/images/titlebar.png - - diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/Logo.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/qml/startup/Logo.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,179 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id: myApp + width: 411 + height: 411 + color: "transparent" + property alias logoState : myApp.state + signal animationFinished + + Item { + id: sketchBlueHolder + width: sketchLogo.width + height: sketchLogo.height + Image { + id: image1 + x: -44 + y: -45 + smooth: true + source: "shadow.png" + } + Item { + clip: true + width: sketchLogo.width + height: sketchLogo.height + Image { + id: sketchLogo + smooth: true + source: "qt-sketch.jpg" + } + Image { + id: blueLogo + y: -420 + smooth: true + source: "qt-blue.jpg" + } + } + } + + states: [ + State { + name: "showBlueprint" + PropertyChanges { + target: blueLogo + y: 0 + } + PropertyChanges { + target: sketchLogo + opacity: 0 + } + }, + State { + extend: "showBlueprint" + name: "finale" + PropertyChanges { + target: fullLogo + opacity: 1 + } + PropertyChanges { + target: backLogo + opacity: 1 + scale: 1 + } + PropertyChanges { + target: frontLogo + opacity: 1 + scale: 1 + } + PropertyChanges { + target: qtText + opacity: 1 + scale: 1 + } + PropertyChanges { + target: sketchBlueHolder + opacity: 0 + scale: 1.4 + } + } + ] + + transitions: [ + Transition { + to: "showBlueprint" + SequentialAnimation { + NumberAnimation { property: "y"; duration: 600; easing.type: "OutBounce" } + PropertyAction { target: sketchLogo; property: "opacity" } + } + }, + Transition { + to: "finale" + PropertyAction { target: fullLogo; property: "opacity" } + SequentialAnimation { + NumberAnimation { target: backLogo; properties: "scale, opacity"; duration: 300 } + NumberAnimation { target: frontLogo; properties: "scale, opacity"; duration: 300 } + ParallelAnimation { + NumberAnimation { target: qtText; properties: "opacity, scale"; duration: 400; easing.type: "OutQuad" } + NumberAnimation { target: sketchBlueHolder; property: "opacity"; duration: 300; easing.type: "OutQuad" } + NumberAnimation { target: sketchBlueHolder; property: "scale"; duration: 320; easing.type: "OutQuad" } + } + PauseAnimation { duration: 1000 } + ScriptAction { script: myApp.animationFinished() } + } + } + ] + + Item { + id: fullLogo + opacity: 0 + Image { + id: backLogo + x: -16 + y: -41 + opacity: 0 + scale: 0.7 + smooth: true + source: "qt-back.png" + } + Image { + id: frontLogo + x: -17 + y: -41 + opacity: 0 + scale: 1.2 + smooth: true + source: "qt-front.png" + } + Image { + id: qtText + x: -10 + y: -41 + opacity: 0 + scale: 1.2 + smooth: true + source: "qt-text.png" + } + } +} diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/qt-back.png Binary file tools/qml/startup/qt-back.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/qt-blue.jpg Binary file tools/qml/startup/qt-blue.jpg has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/qt-front.png Binary file tools/qml/startup/qt-front.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/qt-sketch.jpg Binary file tools/qml/startup/qt-sketch.jpg has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/qt-text.png Binary file tools/qml/startup/qt-text.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/quick-blur.png Binary file tools/qml/startup/quick-blur.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/quick-regular.png Binary file tools/qml/startup/quick-regular.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/shadow.png Binary file tools/qml/startup/shadow.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/startup.qml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/qml/startup/startup.qml Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,173 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt 4.7 + +Rectangle { + id: treatsApp + width: 800 + height: 480 + color: "darkgrey" + Component.onCompleted: treatsApp.state = "part1" + signal animationFinished + + Item { + width: 800 + height: 480 + anchors.centerIn: parent + clip: true + + Logo { + id: logo + x: 165 + y: 35 + rotation: -15 + scale: 0.6 + opacity: 0 + onAnimationFinished: treatsApp.animationFinished(); + } + + Item { + id: quickblur + x: 800//325 + y: 344 + Image { + id: blurText + source: "quick-blur.png" + } + Image { + id: quickregular + x: -1 + y: 0 + opacity: 0 + source: "quick-regular.png" + } + Image { + id: star + x: -1 + y: 0 + opacity: 0 + source: "white-star.png" + smooth: true + NumberAnimation on rotation { + from: 0 + to: 360 + loops: NumberAnimation.Infinite + running: true + duration: 2000 + } + } + } + } + + states: [ + State { + name: "part1" + PropertyChanges { + target: logo + scale: 0.8 + opacity: 1 + rotation: 0 + } + PropertyChanges { + target: treatsApp + color: "black" + } + PropertyChanges { + target: logo + y: 10 + } + PropertyChanges { + target: quickblur + x: logo.x + 145 + } + PropertyChanges { + target: blurText + opacity: 0 + } + PropertyChanges { + target: quickregular + opacity: 1 + } + PropertyChanges { + target: star + x: -7 + y: -37 + } + } + ] + + transitions: [ + Transition { + ParallelAnimation { + NumberAnimation { target: logo; property: "opacity"; duration: 500 } + NumberAnimation { target: logo; property: "scale"; duration: 4000; } + NumberAnimation { target: logo; property: "rotation"; duration: 2000; easing.type: "OutBack"} + ColorAnimation { duration: 3000} + SequentialAnimation { + PauseAnimation { duration: 1000 } + ScriptAction { script: logo.logoState = "showBlueprint" } + PauseAnimation { duration: 800 } + ScriptAction { script: logo.logoState = "finale" } + PauseAnimation { duration: 800 } + ParallelAnimation { + NumberAnimation { target: quickblur; property: "x"; duration: 200;} + SequentialAnimation { + PauseAnimation { duration: 200} + ParallelAnimation { + NumberAnimation { target: blurText; property: "opacity"; duration: 300;} + NumberAnimation { target: quickregular; property: "opacity"; duration: 300;} + } + NumberAnimation { target: star; property: "opacity"; from: 0; to: 1; duration: 500 } + PauseAnimation { duration: 200 } + NumberAnimation { target: star; property: "opacity"; from: 1; to: 0; duration: 500 } + } + SequentialAnimation { + PauseAnimation { duration: 150} + NumberAnimation { target: logo; property: "y"; duration: 300; easing.type: "OutBounce" } + } + } + } + } + } + ] + +} // treatsApp diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/startup.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/qml/startup/startup.qrc Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,16 @@ + + + Logo.qml + qt-back.png + qt-blue.jpg + qt-front.png + qt-sketch.jpg + qt-text.png + quick-blur.png + quick-regular.png + shadow.png + startup.qml + startup.qrc + white-star.png + + diff -r ef0373b55136 -r 758a864f9613 tools/qml/startup/white-star.png Binary file tools/qml/startup/white-star.png has changed diff -r ef0373b55136 -r 758a864f9613 tools/qtconfig/main.cpp --- a/tools/qtconfig/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qtconfig/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -42,6 +42,9 @@ #include "ui_previewwidgetbase.h" #include "mainwindow.h" #include +#include +#include +#include QT_USE_NAMESPACE @@ -50,6 +53,17 @@ Q_INIT_RESOURCE(qtconfig); QApplication app(argc, argv); + + QTranslator translator; + QTranslator qtTranslator; + QString sysLocale = QLocale::system().name(); + QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + if (translator.load(QLatin1String("qtconfig_") + sysLocale, resourceDir) + && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir)) { + app.installTranslator(&translator); + app.installTranslator(&qtTranslator); + } + MainWindow mw; mw.show(); return app.exec(); diff -r ef0373b55136 -r 758a864f9613 tools/qvfb/main.cpp --- a/tools/qvfb/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qvfb/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -43,6 +43,9 @@ #include #include +#include +#include +#include #include #include #include @@ -73,6 +76,16 @@ QApplication app( argc, argv ); + QTranslator translator; + QTranslator qtTranslator; + QString sysLocale = QLocale::system().name(); + QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + if (translator.load(QLatin1String("qvfb_") + sysLocale, resourceDir) + && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir)) { + app.installTranslator(&translator); + app.installTranslator(&qtTranslator); + } + int width = 0; int height = 0; int depth = -32; // default, but overridable by skin diff -r ef0373b55136 -r 758a864f9613 tools/qvfb/qvfb.cpp --- a/tools/qvfb/qvfb.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qvfb/qvfb.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -398,47 +398,47 @@ QMenu* QVFb::createFileMenu() { - QMenu *file = new QMenu( "File", this ); - file->addAction( "Configure...", this, SLOT(configure()), 0 ); + QMenu *file = new QMenu( tr("&File"), this ); + file->addAction( tr("&Configure..."), this, SLOT(configure()), QKeySequence::Preferences ); file->addSeparator(); - file->addAction( "&Save image...", this, SLOT(saveImage()), 0 ); - file->addAction( "&Animation...", this, SLOT(toggleAnimation()), 0 ); + file->addAction( tr("&Save image..."), this, SLOT(saveImage()), QKeySequence::Save ); + file->addAction( tr("&Animation..."), this, SLOT(toggleAnimation()), 0 ); file->addSeparator(); - file->addAction( "&Quit", qApp, SLOT(quit()) ); + file->addAction( tr("&Quit"), qApp, SLOT(quit()), QKeySequence::Quit ); return file; } QMenu* QVFb::createViewMenu() { - viewMenu = new QMenu( "View", this ); - cursorAction = viewMenu->addAction( "Show &Cursor", this, + viewMenu = new QMenu( tr("&View"), this ); + cursorAction = viewMenu->addAction( tr("Show &Cursor"), this, SLOT(toggleCursor()) ); cursorAction->setCheckable(true); if ( view ) enableCursor(true); - viewMenu->addAction( "&Refresh Rate...", this, SLOT(changeRate()) ); + viewMenu->addAction( tr("&Refresh Rate..."), this, SLOT(changeRate()) ); viewMenu->addSeparator(); - viewMenu->addAction( "No rotation", this, SLOT(setRot0()) ); - viewMenu->addAction( "90\260 rotation", this, SLOT(setRot90()) ); - viewMenu->addAction( "180\260 rotation", this, SLOT(setRot180()) ); - viewMenu->addAction( "270\260 rotation", this, SLOT(setRot270()) ); + viewMenu->addAction( tr("&No rotation"), this, SLOT(setRot0()) ); + viewMenu->addAction( tr("&90\260 rotation"), this, SLOT(setRot90()) ); + viewMenu->addAction( tr("1&80\260 rotation"), this, SLOT(setRot180()) ); + viewMenu->addAction( tr("2&70\260 rotation"), this, SLOT(setRot270()) ); viewMenu->addSeparator(); - viewMenu->addAction( "Zoom scale &0.5", this, SLOT(setZoomHalf()) ); - viewMenu->addAction( "Zoom scale 0.75", this, SLOT(setZoom075()) ); - viewMenu->addAction( "Zoom scale &1", this, SLOT(setZoom1()) ); - viewMenu->addAction( "Zoom scale &2", this, SLOT(setZoom2()) ); - viewMenu->addAction( "Zoom scale &3", this, SLOT(setZoom3()) ); - viewMenu->addAction( "Zoom scale &4", this, SLOT(setZoom4()) ); + viewMenu->addAction( tr("Zoom scale &0.5"), this, SLOT(setZoomHalf()) ); + viewMenu->addAction( tr("Zoom scale 0.7&5"), this, SLOT(setZoom075()) ); + viewMenu->addAction( tr("Zoom scale &1"), this, SLOT(setZoom1()) ); + viewMenu->addAction( tr("Zoom scale &2"), this, SLOT(setZoom2()) ); + viewMenu->addAction( tr("Zoom scale &3"), this, SLOT(setZoom3()) ); + viewMenu->addAction( tr("Zoom scale &4"), this, SLOT(setZoom4()) ); viewMenu->addSeparator(); - viewMenu->addAction( "Zoom scale...", this, SLOT(setZoom()) ); + viewMenu->addAction( tr("Zoom &scale..."), this, SLOT(setZoom()) ); return viewMenu; } QMenu* QVFb::createHelpMenu() { - QMenu *help = new QMenu( "Help", this ); - help->addAction("About...", this, SLOT(about())); + QMenu *help = new QMenu( tr("&Help"), this ); + help->addAction(tr("&About..."), this, SLOT(about())); return help; } @@ -525,17 +525,17 @@ void QVFb::saveImage() { QImage img = view->image(); - QString filename = QFileDialog::getSaveFileName(this, "Save Main Screen image", "snapshot.png", "Portable Network Graphics (*.png)"); + QString filename = QFileDialog::getSaveFileName(this, tr("Save Main Screen image"), tr("snapshot.png"), tr("Portable Network Graphics (*.png)")); if (!filename.isEmpty()){ if(!img.save(filename,"PNG")) - QMessageBox::critical(this, "Save Main Screen Image", "Save failed. Check that you have permission to write to the target directory."); + QMessageBox::critical(this, tr("Save Main Screen Image"), tr("Save failed. Check that you have permission to write to the target directory.")); } if (secondaryView) { QImage img = view->image(); - QString filename = QFileDialog::getSaveFileName(this, "Save Second Screen image", "snapshot.png", "Portable Network Graphics (*.png)"); + QString filename = QFileDialog::getSaveFileName(this, tr("Save Second Screen image"), tr("snapshot.png"), tr("Portable Network Graphics (*.png)")); if (!filename.isEmpty()) { if(!img.save(filename,"PNG")) - QMessageBox::critical(this, "Save Second Screen Image", "Save failed. Check that you have permission to write to the target directory."); + QMessageBox::critical(this, tr("Save Second Screen Image"), tr("Save failed. Check that you have permission to write to the target directory.")); } } } @@ -577,7 +577,7 @@ void QVFb::about() { - QMessageBox::about(this, "About QVFB", + QMessageBox::about(this, tr("About QVFB"), tr( "

    The Qt for Embedded Linux Virtual X11 Framebuffer

    " "

    This application runs under Qt for X11, emulating a simple framebuffer, " "which the Qt for Embedded Linux server and clients can attach to just as if " @@ -586,7 +586,7 @@ "Linux applications under X11 without having to switch to a virtual console. " "This means you can comfortably use your other development tools such " "as GUI profilers and debuggers." - ); + )); } void QVFb::findSkins(const QString ¤tSkin) diff -r ef0373b55136 -r 758a864f9613 tools/qvfb/qvfbratedlg.cpp --- a/tools/qvfb/qvfbratedlg.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/qvfb/qvfbratedlg.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -55,7 +55,7 @@ QVBoxLayout *tl = new QVBoxLayout(this); tl->setMargin(5); - QLabel *label = new QLabel("Target frame rate:", this); + QLabel *label = new QLabel(tr("Target frame rate:"), this); tl->addWidget(label); QHBoxLayout *hl = new QHBoxLayout(); @@ -67,15 +67,15 @@ rateSlider->setValue(rate); hl->addWidget(rateSlider); connect(rateSlider, SIGNAL(valueChanged(int)), this, SLOT(rateChanged(int))); - rateLabel = new QLabel(QString("%1fps").arg(rate), this); + rateLabel = new QLabel(tr("%1fps").arg(rate), this); hl->addWidget(rateLabel); hl = new QHBoxLayout(); tl->addItem(hl); - QPushButton *pb = new QPushButton("OK", this); + QPushButton *pb = new QPushButton(tr("OK"), this); connect(pb, SIGNAL(clicked()), this, SLOT(ok())); hl->addWidget(pb); - pb = new QPushButton("Cancel", this); + pb = new QPushButton(tr("Cancel"), this); connect(pb, SIGNAL(clicked()), this, SLOT(cancel())); hl->addWidget(pb); } @@ -84,7 +84,7 @@ { if (rateSlider->value() != r) rateSlider->setValue(r); - rateLabel->setText(QString("%1fps").arg(r)); + rateLabel->setText(tr("%1fps").arg(r)); emit updateRate(r); } diff -r ef0373b55136 -r 758a864f9613 tools/runonphone/main.cpp --- a/tools/runonphone/main.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/runonphone/main.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -51,6 +51,7 @@ #include "trksignalhandler.h" #include "serenum.h" +#include "ossignalconverter.h" void printUsage(QTextStream& outstream, QString exeName) { @@ -235,6 +236,8 @@ QObject::connect(&handler, SIGNAL(getRegistersAndCallStack(uint,uint)), launcher.data(), SLOT(getRegistersAndCallStack(uint,uint))); QObject::connect(launcher.data(), SIGNAL(finished()), &handler, SLOT(finished())); + QObject::connect(OsSignalConverter::instance(), SIGNAL(terminate()), launcher.data(), SLOT(terminate()), Qt::QueuedConnection); + QTimer timer; timer.setSingleShot(true); QObject::connect(&timer, SIGNAL(timeout()), &handler, SLOT(timeout())); diff -r ef0373b55136 -r 758a864f9613 tools/runonphone/ossignalconverter.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/runonphone/ossignalconverter.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,120 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the tools applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "ossignalconverter_p.h" +#include +#include + +Q_GLOBAL_STATIC(OsSignalConverter, osSignalConverter); + +OsSignalConverter* OsSignalConverter::instance() +{ + return osSignalConverter(); +} + +OsSignalConverter::OsSignalConverter() +: d(new OsSignalConverterPrivate(this)) +{ +}; + +OsSignalConverter::~OsSignalConverter() +{ +} + +OsSignalConverterPrivate::OsSignalConverterPrivate(OsSignalConverter* owner) +: QObject(owner), q(owner), poller(new QTimer(this)) +{ + trap(); + connect(poller, SIGNAL(timeout()), this, SLOT(poll())); + poller->start(1000); +} + +OsSignalConverterPrivate::~OsSignalConverterPrivate() +{ + untrap(); +} + +void OsSignalConverterPrivate::trap() +{ + signal(SIGINT, handler); + signal(SIGTERM, handler); +#ifdef SIGBREAK + signal(SIGBREAK, handler); +#endif +#ifdef SIGHUP + signal(SIGHUP, handler); +#endif +#ifdef SIGQUIT + signal(SIGQUIT, handler); +#endif +} + +void OsSignalConverterPrivate::untrap() +{ + signal(SIGINT, SIG_DFL); + signal(SIGTERM, SIG_DFL); +#ifdef SIGBREAK + signal(SIGBREAK, SIG_DFL); +#endif +#ifdef SIGHUP + signal(SIGHUP, SIG_DFL); +#endif +#ifdef SIGQUIT + signal(SIGQUIT, SIG_DFL); +#endif +} + +void OsSignalConverterPrivate::handler(int sig) +{ + untrap(); //allow 2nd ctrl-c to really kill us + terminateRequest = sig; +} + +void OsSignalConverterPrivate::poll() +{ + if (terminateRequest) { + fprintf(stderr, "\n*** caught signal %d, terminating ***\n", terminateRequest); + poller->stop(); + emit q->terminate(); + } +} + +sig_atomic_t OsSignalConverterPrivate::terminateRequest; diff -r ef0373b55136 -r 758a864f9613 tools/runonphone/ossignalconverter.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/runonphone/ossignalconverter.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the tools applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef OSSIGNALCONVERTER_H +#define OSSIGNALCONVERTER_H +#include + +class OsSignalConverterPrivate; + +class OsSignalConverter : public QObject +{ + friend class OsSignalConverterPrivate; + Q_OBJECT +public: + static OsSignalConverter* instance(); + OsSignalConverter(); + ~OsSignalConverter(); +signals: + //emitted when this process is asked to quit, e.g. by SIGINT + void terminate(); +private: + OsSignalConverterPrivate *d; +}; + +#endif // OSSIGNALCONVERTER_H diff -r ef0373b55136 -r 758a864f9613 tools/runonphone/ossignalconverter_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/runonphone/ossignalconverter_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the tools applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef OSSIGNALCONVERTER_P_H +#define OSSIGNALCONVERTER_P_H +#include "ossignalconverter.h" +#include + +class QTimer; +class OsSignalConverterPrivate : public QObject +{ + Q_OBJECT +public: + OsSignalConverterPrivate(OsSignalConverter* owner); + ~OsSignalConverterPrivate(); +private: + + static void trap(); + static void untrap(); + static void handler(int signal); + +private slots: + + void poll(); + +private: + + OsSignalConverter* q; + static sig_atomic_t terminateRequest; + QTimer *poller; +}; + +#endif // OSSIGNALCONVERTER_P_H diff -r ef0373b55136 -r 758a864f9613 tools/runonphone/runonphone.pro --- a/tools/runonphone/runonphone.pro Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/runonphone/runonphone.pro Mon Oct 04 01:19:32 2010 +0300 @@ -7,10 +7,13 @@ include(symbianutils/symbianutils.pri) SOURCES += main.cpp \ - trksignalhandler.cpp + trksignalhandler.cpp \ + ossignalconverter.cpp HEADERS += trksignalhandler.h \ - serenum.h + serenum.h \ + ossignalconverter.h \ + ossignalconverter_p.h DEFINES += SYMBIANUTILS_INCLUDE_PRI @@ -28,4 +31,5 @@ SOURCES += serenum_stub.cpp } - +target.path=$$[QT_INSTALL_BINS] +INSTALLS += target diff -r ef0373b55136 -r 758a864f9613 tools/shared/qtpropertybrowser/qtpropertymanager.cpp --- a/tools/shared/qtpropertybrowser/qtpropertymanager.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/tools/shared/qtpropertybrowser/qtpropertymanager.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -2399,15 +2399,23 @@ if (it == d_ptr->m_values.constEnd()) return QString(); - QLocale loc = it.value(); + const QLocale loc = it.value(); int langIdx = 0; int countryIdx = 0; - metaEnumProvider()->localeToIndex(loc.language(), loc.country(), &langIdx, &countryIdx); - QString str = tr("%1, %2") - .arg(metaEnumProvider()->languageEnumNames().at(langIdx)) - .arg(metaEnumProvider()->countryEnumNames(loc.language()).at(countryIdx)); - return str; + const QtMetaEnumProvider *me = metaEnumProvider(); + me->localeToIndex(loc.language(), loc.country(), &langIdx, &countryIdx); + if (langIdx < 0) { + qWarning("QtLocalePropertyManager::valueText: Unknown language %d", loc.language()); + return tr(""); + } + const QString languageName = me->languageEnumNames().at(langIdx); + if (countryIdx < 0) { + qWarning("QtLocalePropertyManager::valueText: Unknown country %d for %s", loc.country(), qPrintable(languageName)); + return languageName; + } + const QString countryName = me->countryEnumNames(loc.language()).at(countryIdx); + return tr("%1, %2").arg(languageName, countryName); } /*! @@ -2635,8 +2643,8 @@ if (it == d_ptr->m_values.constEnd()) return QString(); const QPoint v = it.value(); - return QString(tr("(%1, %2)").arg(QString::number(v.x())) - .arg(QString::number(v.y()))); + return tr("(%1, %2)").arg(QString::number(v.x())) + .arg(QString::number(v.y())); } /*! @@ -2876,8 +2884,8 @@ return QString(); const QPointF v = it.value().val; const int dec = it.value().decimals; - return QString(tr("(%1, %2)").arg(QString::number(v.x(), 'f', dec)) - .arg(QString::number(v.y(), 'f', dec))); + return tr("(%1, %2)").arg(QString::number(v.x(), 'f', dec)) + .arg(QString::number(v.y(), 'f', dec)); } /*! @@ -3196,8 +3204,8 @@ if (it == d_ptr->m_values.constEnd()) return QString(); const QSize v = it.value().val; - return QString(tr("%1 x %2").arg(QString::number(v.width())) - .arg(QString::number(v.height()))); + return tr("%1 x %2").arg(QString::number(v.width())) + .arg(QString::number(v.height())); } /*! @@ -3561,8 +3569,8 @@ return QString(); const QSizeF v = it.value().val; const int dec = it.value().decimals; - return QString(tr("%1 x %2").arg(QString::number(v.width(), 'f', dec)) - .arg(QString::number(v.height(), 'f', dec))); + return tr("%1 x %2").arg(QString::number(v.width(), 'f', dec)) + .arg(QString::number(v.height(), 'f', dec)); } /*! @@ -3954,10 +3962,10 @@ if (it == d_ptr->m_values.constEnd()) return QString(); const QRect v = it.value().val; - return QString(tr("[(%1, %2), %3 x %4]").arg(QString::number(v.x())) - .arg(QString::number(v.y())) - .arg(QString::number(v.width())) - .arg(QString::number(v.height()))); + return tr("[(%1, %2), %3 x %4]").arg(QString::number(v.x())) + .arg(QString::number(v.y())) + .arg(QString::number(v.width())) + .arg(QString::number(v.height())); } /*! diff -r ef0373b55136 -r 758a864f9613 translations/assistant_de.ts --- a/translations/assistant_de.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/assistant_de.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,7 +4,6 @@ AboutDialog - &Close &Schließen @@ -12,19 +11,16 @@ AboutLabel - Warning Achtung - Unable to launch external application. Fehler beim Starten der externen Anwendung. - OK OK @@ -32,17 +28,14 @@ Assistant - Error registering documentation file '%1': %2 Beim Registrieren der Dokumentationsdatei '%1' trat ein Fehler auf: %2 - Error: %1 Fehler: %1 - Could not register documentation file %1 @@ -54,12 +47,10 @@ %2 - Documentation successfully registered. Dokumentation erfolgreich registriert. - Could not unregister documentation file %1 @@ -71,27 +62,22 @@ %2 - Documentation successfully unregistered. Dokumentation erfolgreich entfernt. - Error reading collection file '%1': %2. Fehler beim Lesen der Katalogdatei '%1': %2 - Error creating collection file '%1': %2. Fehler beim Erstellen der Katalogdatei '%1': %2. - Error reading collection file '%1': %2 Fehler beim Lesen der Katalogdatei '%1': %2 - Cannot load sqlite database driver! Der Datenbanktreiber für SQLite kann nicht geladen werden. @@ -99,139 +85,229 @@ BookmarkDialog - Add Bookmark Lesezeichen hinzufügen - Bookmark: Lesezeichen: - Add in Folder: Erstellen in: - New Folder Neuer Ordner - + + + + Rename Folder + Ordner umbenennen + BookmarkManager - Untitled Ohne Titel - Remove Entfernen - You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? Wenn Sie diesen Ordner löschen, wird auch<br>dessen kompletter Inhalt gelöscht. Möchten Sie wirklich fortfahren? - Manage Bookmarks... Lesezeichen verwalten... - Add Bookmark... Lesezeichen hinzufügen ... - Ctrl+D Ctrl+D - Delete Folder Ordner löschen - Rename Folder Ordner umbenennen - Show Bookmark Lesezeichen öffnen - Show Bookmark in New Tab Lesezeichen in neuem Reiter öffnen - Delete Bookmark Lesezeichen löschen - Rename Bookmark Lesezeichen umbenennen + BookmarkManagerWidget + + Manage Bookmarks + Lesezeichen verwalten + + + Search: + Suche: + + + Remove + Entfernen + + + Import and Backup + Importieren und Sichern + + + OK + OK + + + Import... + Importieren... + + + Export... + Exportieren... + + + Open File + Datei öffnen + + + Files (*.xbel) + Dateien (*.xbel) + + + Save File + Datei speichern + + + Qt Assistant + Qt Assistant + + + Unable to save bookmarks. + Die Lesezeichen konnten nicht gespeichert werden. + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + Beim Löschen des Ordners wird auch dessen Inhalt entfernt.<br>Möchten Sie fortsetzen? + + + Delete Folder + Ordner löschen + + + Rename Folder + Ordner umbenennen + + + Show Bookmark + Lesezeichen anzeigen + + + Show Bookmark in New Tab + Lesezeichen in neuem Reiter öffnen + + + Delete Bookmark + Lesezeichen löschen + + + Rename Bookmark + Lesezeichen umbenennen + + + + BookmarkModel + + Name + Name + + + Address + Adresse + + + Bookmarks Menu + Lesezeichen-Menü + + + + BookmarkWidget + + Bookmarks + Lesezeichen + + + Filter: + Filter: + + + Add + Hinzufügen + + + Remove + Entfernen + + + CentralWidget - Add new page Neue Seite hinzufügen - Close current page Aktuelle Seite schließen - Print Document Drucken - - unknown unbekannt - Add New Page Neue Seite hinzufügen - Close This Page Aktuelle Seite schließen - Close Other Pages Andere Seiten schließen - Add Bookmark for this Page... Lesezeichen für diese Seite hinzufügen ... - Search Suchen @@ -239,62 +315,50 @@ CmdLineParser - Unknown option: %1 Unbekannte Option: %1 - Unknown widget: %1 Unbekanntes Widget-Objekt: %1 - The collection file '%1' does not exist. Die Katalogdatei '%1' existiert nicht. - Missing collection file. Fehlende Katalogdatei. - Invalid URL '%1'. Ungültige URL '%1'. - Missing URL. Fehlende URL. - Missing widget. Fehlendes Widget-Objekt. - The Qt help file '%1' does not exist. Die Hilfedatei '%1' existiert nicht. - Missing help file. Fehlende Hilfedatei. - Missing filter argument. Das Filter-Argument fehlt. - Error Fehler - Notice Hinweis @@ -302,12 +366,10 @@ ContentWindow - Open Link Link öffnen - Open Link in New Tab Link in neuem Reiter öffnen @@ -315,40 +377,52 @@ FilterNameDialogClass - Add Filter Name Filternamen hinzufügen - Filter Name: Filtername: + FindWidget + + Previous + Voriges + + + Next + Nächstes + + + Case Sensitive + Groß/Kleinschreibung beachten + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Seitenende erreicht + + + FontPanel - Font Schriftart - &Writing system S&kript - &Family &Schriftart - &Style S&chriftschnitt - &Point size &Schriftgrad @@ -356,30 +430,37 @@ HelpViewer - <title>about:blank</title> <title>about:blank</title> - <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Fehler 404 ...</title><div align="center"><br><br><h1>Die Seite kann nicht gefunden werden.</h1><br><h3>'%1'</h3></div> + + Copy &Link Location + &Link-Adresse kopieren + + + Open Link in New Tab Ctrl+LMB + Link in neuem Reiter öffnen (Strg + linke Maustaste) + + + Open Link in New Tab + Link in neuem Reiter öffnen + IndexWindow - &Look for: Suchen &nach: - Open Link Link öffnen - Open Link in New Tab Link in neuem Reiter öffnen @@ -387,99 +468,76 @@ InstallDialog - - Install Documentation Dokumentation installieren - Downloading documentation info... Dokumentationsinformation herunterladen ... - Download canceled. Herunterladen abgebrochen. - - - Done. Fertig. - The file %1 already exists. Do you want to overwrite it? Die Datei %1 existiert bereits. Möchten Sie sie überschreiben? - Unable to save the file %1: %2. Die Datei %1 kann nicht gespeichert werden: %2. - Downloading %1... Herunterladen der Datei %1 ... - - - Download failed: %1. Herunterladen fehlgeschlagen: %1. - Documentation info file is corrupt! Die Dokumentationsdatei ist beschädigt. - Download failed: Downloaded file is corrupted. Herunterladen fehlgeschlagen: Die Datei ist wahrscheinlich beschädigt. - Installing documentation %1... Dokumentation %1 installieren ... - Error while installing documentation: %1 Fehler bei der Installation von: %1 - Available Documentation: Verfügbare Dokumentation: - Install Installieren - Cancel Abbrechen - Close Schließen - Installation Path: Installationsordner: - ... ... @@ -487,297 +545,234 @@ MainWindow - - Index Index - - Contents Inhalt - - Bookmarks Lesezeichen - Search Suchen - - - Qt Assistant Qt Assistant - Page Set&up... S&eite einrichten ... - Print Preview... Druckvorschau ... - &Print... &Drucken ... - New &Tab Neuer &Reiter - &Close Tab Reiter &schließen - &Quit &Beenden - CTRL+Q CTRL+Q - &Copy selected Text Ausgewählten Text &kopieren - &Find in Text... &Textsuche ... - &Find &Suchen - Find &Next &Weitersuchen - Find &Previous &Vorheriges suchen - Preferences... Einstellungen ... - Zoom &in &Vergrößern - Zoom &out Ver&kleinern - Normal &Size Standard&größe - Ctrl+0 Ctrl+0 - ALT+C ALT+C - ALT+I ALT+I - ALT+S ALT+S - &Home &Startseite - &Back &Rückwärts - &Forward &Vorwärts - Sync with Table of Contents Seite mit Inhaltsangabe abgleichen - Sync Synchronisieren - Next Page Nächste Seite - Ctrl+Alt+Right Ctrl+Alt+Right - Previous Page Vorherige Seite - Ctrl+Alt+Left Ctrl+Alt+Left - Could not register file '%1': %2 Die Datei '%1' konnte nicht registriert werden: %2 - About... Über ... - Navigation Toolbar Navigationsleiste - Toolbars Werkzeugleisten - Filter Toolbar Filterleiste - Filtered by: Filter: - Address Toolbar Adressleiste - Address: Adresse: - Could not find the associated content item. Der zugehörige Inhaltseintrag konnte nicht gefunden werden. - About %1 Über %1 - Updating search index Suchindex wird aufgebaut - Looking for Qt Documentation... Suche nach Qt-Dokumentation ... - &Window &Fenster - Minimize Minimieren - Ctrl+M Ctrl+M - Zoom Zoom - &File &Datei - &Edit &Bearbeiten - &View &Ansicht - &Go &Gehe zu - ALT+Home ALT+Home - &Bookmarks &Lesezeichen - &Help &Hilfe - ALT+O ALT+O @@ -785,48 +780,38 @@ PreferencesDialog - - Add Documentation Dokumentation hinzufügen - Qt Compressed Help Files (*.qch) Komprimierte Hilfedateien (*.qch) - The specified file is not a valid Qt Help File! Die angegebene Datei ist keine Qt-Hilfedatei. - The namespace %1 is already registered! Der Namespace %1 ist bereits registriert. - Remove Documentation Dokumentation entfernen - Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. Einige der derzeit geöffneten Dokumente stammen aus der Dokumentation, die Sie gerade zu löschen versuchen. Sie werden beim Löschen geschlossen. - Cancel Abbrechen - OK OK - Use custom settings Benutzerdefinierte Einstellungen verwenden @@ -834,117 +819,94 @@ PreferencesDialogClass - Preferences Einstellungen - Fonts Schriftart - Font settings: Schriftart: - Browser Browser - Application Anwendung - Filters Filter - Filter: Filter: - Attributes: Attribute: - 1 1 - Add Hinzufügen - Remove Entfernen - Documentation Dokumentation - Registered Documentation: Registrierte Dokumentation: - Add... Hinzufügen ... - Options Einstellungen - Current Page Aktuelle Seite - Restore to default Voreinstellung wiederherstellen - Homepage Startseite - On help start: Zu Beginn: - Show my home page Startseite zeigen - Show a blank page Leere Seite zeigen - Show my tabs from last session Reiter aus letzter Sitzung zeigen - Blank Page Leere Seite @@ -952,12 +914,10 @@ RemoteControl - Debugging Remote Control Debugging Remote Control - Received Command: %1 %2 Empfangenes Kommando: %1 : %2 @@ -965,22 +925,18 @@ SearchWidget - &Copy &Kopieren - Copy &Link Location &Link-Adresse kopieren - Open Link in New Tab Link in neuem Reiter öffnen - Select All Alles markieren @@ -988,27 +944,22 @@ TopicChooser - Choose a topic for <b>%1</b>: Wählen Sie ein Thema für <b>%1</b>: - Choose Topic Thema wählen - &Topics &Themen - &Display &Anzeigen - &Close &Schließen diff -r ef0373b55136 -r 758a864f9613 translations/assistant_fr.ts --- a/translations/assistant_fr.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/assistant_fr.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,7 +4,7 @@ AboutDialog - + &Close &Fermer @@ -12,7 +12,7 @@ AboutLabel - + Warning Avertissement @@ -24,12 +24,81 @@ - + OK OK + Assistant + + + Error registering documentation file '%1': %2 + Erreur lors de l'enregistrement du fichier de documentation '%1' : %2 + + + + Error: %1 + Erreur : %1 + + + + Could not register documentation file +%1 + +Reason: +%2 + Impossible d'enregistrer le fichier de documentation +%1 + +Raison : +%2 + + + + Documentation successfully registered. + Documentation enregistrée avec succès. + + + + Could not unregister documentation file +%1 + +Reason: +%2 + Impossible de retirer le fichier de documentation +%1 + +Raison : +%2 + + + + Documentation successfully unregistered. + Documentation retirée avec succès. + + + + Error reading collection file '%1': %2. + Erreur lors de la lecture du fichier de collection '%1' : %2. + + + + Error creating collection file '%1': %2. + Erreur lors de la création du fichier de collection '%1' : %2. + + + + Error reading collection file '%1': %2 + Erreur lors de la lecture du fichier de collection '%1' : %2 + + + + Cannot load sqlite database driver! + Impossible de charger le driver de la base de données sqlite ! + + + BookmarkDialog @@ -57,21 +126,15 @@ Nouveau dossier - - - - - Bookmarks - Signets + Signets - Delete Folder - Supprimer le dossier + Supprimer le dossier - + Rename Folder Renommer le dossier @@ -79,12 +142,16 @@ BookmarkManager - Bookmarks - Signets + Signets - + + Untitled + Sans titre + + + Remove Suppression @@ -94,16 +161,127 @@ Vous allez supprimer un dossier, ceci va aussi<br>supprimer son contenu. Voulez-vous continuer ? - - + + Manage Bookmarks... + Gestion des signets... + + + + Add Bookmark... + Ajouter un signet... + + + + Ctrl+D + Ctrl+D + + + + Delete Folder + Supprimer le dossier + + + + Rename Folder + Renommer le dossier + + + + Show Bookmark + Afficher le signet + + + + Show Bookmark in New Tab + Afficher le signet dans un nouvel onglet + + + + Delete Bookmark + Supprimer le signet + + + + Rename Bookmark + Renommer le signet + + New Folder - Nouveau dossier + Nouveau dossier - BookmarkWidget + BookmarkManagerWidget + + + Manage Bookmarks + Gestion des signets + + + + Search: + Recherche : + + + + + Remove + Supprimer + + + + Import and Backup + Importation et sauvegarde + + + + + OK + OK + + + + Import... + Importer... + - + + Export... + Exporter... + + + + Open File + Ouvrir un fichier + + + + + Files (*.xbel) + Fichiers (*.xbel) + + + + Save File + Enregistrer le fichier + + + + Qt Assistant + Qt Assistant + + + + Unable to save bookmarks. + Impossible de sauvegarder les signets. + + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + Vous êtes sur le point de supprimer un dossier, ceci supprimera<br> également son contenu. Voulez-vous continuer ? + + + Delete Folder Supprimer le dossier @@ -123,7 +301,7 @@ Afficher le signet dans un nouvel onglet - + Delete Bookmark Supprimer le signet @@ -132,26 +310,76 @@ Rename Bookmark Renommer le signet + + + BookmarkModel - + + Name + Nom + + + + Address + Adresse + + + + Bookmarks Menu + Menu signets + + + + BookmarkWidget + + Delete Folder + Supprimer le dossier + + + Rename Folder + Renommer le dossier + + + Show Bookmark + Afficher le signet + + + Show Bookmark in New Tab + Afficher le signet dans un nouvel onglet + + + Delete Bookmark + Supprimer le signet + + + Rename Bookmark + Renommer le signet + + + Filter: Filtre : - + Add Ajouter - + Remove Retirer + + + Bookmarks + Signets + CentralWidget - + Add new page Créer une nouvelle page @@ -161,18 +389,18 @@ Fermer la page courante - + Print Document Imprimer le document - + unknown inconnu - + Add New Page Créer une nouvelle page @@ -192,15 +420,78 @@ Ajouter un signet pour cette page... - + Search Recherche + CmdLineParser + + + Unknown option: %1 + Option inconnue : %1 + + + + The collection file '%1' does not exist. + Le fichier de collection '%1' n'existe pas. + + + + Missing collection file. + Fichier de collection manquant. + + + + Invalid URL '%1'. + URL invalide '%1'. + + + + Missing URL. + URL manquante. + + + + Unknown widget: %1 + Widget inconnu : %1 + + + + Missing widget. + Widget manquant. + + + + The Qt help file '%1' does not exist. + Le fichier d'aide Qt '%1' n'existe pas. + + + + Missing help file. + Fichier d'aide manquant. + + + + Missing filter argument. + Argument de filtre manquant. + + + + Error + Erreur + + + + Notice + Avertissement + + + ContentWindow - + Open Link Ouvrir le lien @@ -226,27 +517,26 @@ FindWidget - + Previous Précédent - + Next Suivant - + Case Sensitive Sensible à la casse - Whole words - Mots complets + Mots complets - + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Recherche à partir du début @@ -282,34 +572,37 @@ HelpViewer - + Open Link in New Tab Ouvrir le lien dans un nouvel onglet - + + <title>about:blank</title> + y'a t'il une autre traduction dans Firefox & cie ? + <title>about:blank</title> + + + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Erreur 404...</title><div align="center"><br><br><h1>La page n'a pas pu être trouvée</h1><br><h3>'%1'</h3></div> - Help - Aide + Aide - Unable to launch external application. - Impossible de lancer l'application externe. + Impossible de lancer l'application externe. - OK - OK + OK - + Copy &Link Location Copier l'&adresse cible @@ -323,12 +616,12 @@ IndexWindow - + &Look for: &Rechercher : - + Open Link Ouvrir le lien @@ -342,7 +635,7 @@ InstallDialog - + Install Documentation Installer la documentation @@ -374,27 +667,27 @@ ... - … + ... - + Downloading documentation info... - Téléchargement des informations de la documentation… + Téléchargement des informations de la documentation... - + Download canceled. Téléchargement annulé. - - + + Done. Terminé. - + The file %1 already exists. Do you want to overwrite it? Le fichier %1 existe déjà. Voulez-vous l'écraser ? @@ -406,17 +699,17 @@ Downloading %1... - Téléchargement de %1 en cours… + Téléchargement de %1 en cours... - + - + Download failed: %1. Échec du téléchargement : %1. - + Documentation info file is corrupt! Le fichier d'information de documentation est corrompu ! @@ -428,10 +721,10 @@ Installing documentation %1... - Installation de la documentation %1… + Installation de la documentation %1... - + Error while installing documentation: %1 Erreur durant l'installation de la documentation : @@ -441,78 +734,81 @@ MainWindow - - + + Index Index - - + + Contents Sommaire - - + + Bookmarks Signets - - - + + + Qt Assistant Qt Assistant - - Unfiltered - Non-filtré + Non-filtré - + Looking for Qt Documentation... - Recherche la documentation de Qt… + Recherche la documentation de Qt... - + &File &Fichier - + Page Set&up... - &Mise en page… + &Mise en page... Print Preview... - Aperçu avant impression… + Aperçu avant impression... &Print... - &Imprimer… + &Imprimer... - + New &Tab Nouvel ongle&t - + &Close Tab &Fermer l'onglet - + &Quit &Quitter - + + CTRL+Q + CTRL+Q + + + &Edit &Édition @@ -524,7 +820,7 @@ &Find in Text... - &Rechercher dans le texte… + &Rechercher dans le texte... @@ -544,7 +840,7 @@ Preferences... - Préférences… + Préférences... @@ -652,32 +948,35 @@ Ctrl+Alt+Left - + &Bookmarks Si&gnets - - Add Bookmark... - Ajouter un signet… + + Could not register file '%1': %2 + Impossible d'enregistrer le fichier '%1' : %2 - - CTRL+D - CTRL+D + Add Bookmark... + Ajouter un signet... - + CTRL+D + CTRL+D + + + &Help Ai&de About... - À propos… + À propos... - + Navigation Toolbar Barre d'outils de navigation @@ -702,12 +1001,12 @@ Ctrl+M - + Toolbars Barres d'outils - + Filter Toolbar Barre d'outils de filtrage @@ -717,7 +1016,7 @@ Filtre : - + Address Toolbar Barre d'outils d'adresse @@ -727,18 +1026,18 @@ Adresse : - + Could not find the associated content item. what is item in this context? ← same question here Impossible de trouver l'élément de contenu associé. - + About %1 À propos de %1 - + Updating search index Mise à jour de l'index de recherche @@ -746,18 +1045,18 @@ PreferencesDialog - - + + Add Documentation Ajouter de la documentation - + Qt Compressed Help Files (*.qch) Fichiers d'aide Qt compressés (*.qch) - + The namespace %1 is already registered! L'espace de nom %1 existe déjà ! @@ -767,7 +1066,7 @@ Le fichier spécifié n'est pas un fichier d'aide Qt valide ! - + Remove Documentation Supprimer la documentation @@ -787,7 +1086,7 @@ OK - + Use custom settings Utiliser des paramètres personnalisés @@ -863,7 +1162,7 @@ Add... - Ajouter… + Ajouter... @@ -914,118 +1213,94 @@ QObject - The specified collection file does not exist! - Le fichier de collection spécifié n'existe pas ! + Le fichier de collection spécifié n'existe pas ! - Missing collection file! - Fichier de collection manquant ! + Fichier de collection manquant ! - Invalid URL! - URL invalide ! + URL invalide ! - Missing URL! - URL manquante ! + URL manquante ! - - - Unknown widget: %1 - Widget inconnu : %1 + Widget inconnu : %1 - - - Missing widget! - Widget manquant ! + Widget manquant ! - - The specified Qt help file does not exist! - Le fichier d'aide Qt spécifié n'existe pas ! + Le fichier d'aide Qt spécifié n'existe pas ! + + + Missing help file! + Fichier d'aide manquant ! - - - Missing help file! - Fichier d'aide manquant ! - - - Missing filter argument! - Argument de filtre manquant ! + Argument de filtre manquant ! - Unknown option: %1 - Option inconnue : %1 + Option inconnue : %1 - - Qt Assistant - Qt Assistant + Qt Assistant - Could not register documentation file %1 Reason: %2 - Impossible d'enregistrer le fichier de documentation + Impossible d'enregistrer le fichier de documentation %1 Raison : %2 - Documentation successfully registered. - Documentation enregistrée avec succès. + Documentation enregistrée avec succès. - Documentation successfully unregistered. - Documentation retirée avec succès. + Documentation retirée avec succès. - Could not unregister documentation file %1 Reason: %2 - Impossible d'enregistrer le fichier de documentation + Impossible d'enregistrer le fichier de documentation %1 Raison : %2 - Cannot load sqlite database driver! - Impossible de charger le driver de la base de données sqlite ! + Impossible de charger le driver de la base de données sqlite ! - The specified collection file could not be read! - Le fichier de collection spécifié ne peut pas être lu ! + Le fichier de collection spécifié ne peut pas être lu ! RemoteControl - + Debugging Remote Control Débogage du contrôle à distance @@ -1038,7 +1313,7 @@ SearchWidget - + &Copy &Copier @@ -1081,7 +1356,7 @@ &Fermer - + Choose a topic for <b>%1</b>: Choisir le domaine pour <b>%1</b> : diff -r ef0373b55136 -r 758a864f9613 translations/assistant_ja.ts --- a/translations/assistant_ja.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/assistant_ja.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,7 +4,6 @@ AboutDialog - &Close 閉じる(&C) @@ -12,940 +11,31 @@ AboutLabel - Warning 警告 - Unable to launch external application. 外部アプリケーションを起動できません。 - OK OK - BookmarkDialog - - - - - - - Bookmarks - ブックマーク - - - - Add Bookmark - ブックマークの追加 - - - - Bookmark: - ブックマーク: - - - - Add in Folder: - 追加先フォルダ: - - - - + - + - - - - New Folder - 新しいフォルダ - - - - Delete Folder - フォルダを削除 - - - - Rename Folder - フォルダの名前変更 - - - - BookmarkManager - - - Bookmarks - ブックマーク - - - - Remove - 削除 - - - - You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? - フォルダを削除すると中身も削除されますが、続けてよろしいですか? - - - - - New Folder - 新しいフォルダ - - - - BookmarkWidget - - - Filter: - フィルタ: - - - - Remove - 削除 - - - - Delete Folder - フォルダを削除 - - - - Rename Folder - フォルダの名前変更 - - - - Show Bookmark - ブックマークを開く - - - - Show Bookmark in New Tab - ブックマークを新しいタブで開く - - - - Delete Bookmark - ブックマークを削除 - - - - Rename Bookmark - ブックマークの名前変更 - - - - Add - 追加 - - - - CentralWidget - - - Add new page - 新しいページの追加 - - - - Close current page - 現在のページを閉じる - - - - Print Document - ドキュメントを印刷 - - - - - unknown - 不明 - - - - Add New Page - 新しいページの追加 - - - - Close This Page - このページを閉じる - - - - Close Other Pages - 他のページを閉じる - - - - Add Bookmark for this Page... - このページをブックマークに追加... - - - - Search - 検索 - - - - ContentWindow - - - Open Link - リンクを開く - - - - Open Link in New Tab - リンクを新しいタブで開く - - - - FilterNameDialogClass - - - Add Filter Name - フィルタ名を追加 - - - - Filter Name: - フィルタ名: - - - - FindWidget - - - Previous - 戻る - - - - Next - 進む - - - - Case Sensitive - 大文字/小文字を区別する - - - - Whole words - 単語単位で検索する - - - - <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped - <img src=":/trolltech/assistant/images/wrap.png">&nbsp;見つからなければ先頭から検索する - - - - FontPanel + Assistant - - Font - フォント - - - - &Writing system - 文字セット(&W) - - - - &Family - フォント名(&F) - - - - &Style - スタイル(&S) - - - - &Point size - サイズ(&P) - - - - HelpViewer - - - Help - ヘルプ - - - - OK - OK - - - - <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> - <title>Error 404...</title><div align="center"><br><br><h1>ページが見つかりませんでした</h1><br><h3>'%1'</h3></div> - - - - Copy &Link Location - リンクのURLをコピー(&L) - - - - Open Link in New Tab Ctrl+LMB - リンクを新しいタブで開く Ctrl+LMB - - - - Open Link in New Tab - リンクを新しいタブで開く - - - - Unable to launch external application. - - 外部アプリケーションを起動できません。 - - - - - IndexWindow - - - &Look for: - 検索文字列(&L): - - - - Open Link - リンクを開く - - - - Open Link in New Tab - リンクを新しいタブで開く - - - - InstallDialog - - - - Install Documentation - ドキュメントのインストール - - - - Downloading documentation info... - ドキュメント情報をダウンロード中... - - - - Download canceled. - ダウンロードを中止しました。 - - - - - - Done. - 完了. - - - - The file %1 already exists. Do you want to overwrite it? - %1 は既に存在します。上書きしますか? - - - - Unable to save the file %1: %2. - ファイルを保存できません。%1: %2. - - - - Downloading %1... - %1 をダウンロード中... - - - - - - Download failed: %1. - ダウンロード失敗: %1. - - - - Documentation info file is corrupt! - ドキュメント情報ファイルが不正です! - - - - Download failed: Downloaded file is corrupted. - ダウンロード失敗: ダウンロードしたファイルが不正です。 - - - - Installing documentation %1... - %1 のドキュメントをインストール中... - - - - Error while installing documentation: -%1 - ドキュメントのインストール中にエラーが発生しました: -%1 - - - - Available Documentation: - 使用可能なドキュメント: - - - - Install - インストール - - - - Cancel - キャンセル - - - - Close - 閉じる - - - - Installation Path: - インストール先のパス: - - - - ... - ... - - - - MainWindow - - - - Index - インデックス - - - - - Contents - コンテンツ - - - - - Bookmarks - ブックマーク - - - - - Search - 検索 - - - - - - Qt Assistant - Qt Assistant - - - - - Unfiltered - フィルタなし - - - - Page Set&up... - ページ設定(&U)... - - - - Print Preview... - 印刷プレビュー... + Error registering documentation file '%1': %2 + ドキュメントファイル '%1' の登録中にエラーが発生しました: %2 - - &Print... - 印刷(&P)... - - - - New &Tab - 新しいタブ(&T) - - - - &Close Tab - タブを閉じる(&C) - - - - &Quit - 終了(&Q) - - - - CTRL+Q - CTRL+Q - - - - &Copy selected Text - 選択中の文字をコピー(&C) - - - - &Find in Text... - 検索(&F)... - - - - Find &Next - 次を検索(&N) - - - - Find &Previous - 前を検索(&P) - - - - Preferences... - 設定... - - - - Zoom &in - 拡大(&I) - - - - Zoom &out - 縮小(&O) - - - - Normal &Size - 普通の大きさ(&S) - - - - Ctrl+0 - Ctrl+0 - - - - ALT+C - ALT+C - - - - ALT+I - ALT+I - - - - ALT+S - ALT+S - - - - &Home - ホーム(&H) - - - - Ctrl+Home - Ctrl+Home - - - - &Back - 戻る(&B) - - - - &Forward - 進む(&F) - - - - Sync with Table of Contents - 内容と目次を同期する - - - - Next Page - 次のページ - - - - Ctrl+Alt+Right - Ctrl+Alt+Right - - - - Previous Page - 前のページ - - - - Ctrl+Alt+Left - Ctrl+Alt+Left - - - - Add Bookmark... - ブックマークの追加... - - - - About... - Qt Assistant について... - - - - Navigation Toolbar - ナビゲーション ツールバー - - - - Toolbars - ツールバー - - - - Filter Toolbar - フィルター ツールバー - - - - Filtered by: - フィルタ条件: - - - - Address Toolbar - アドレス ツールバー - - - - Address: - アドレス: - - - - Could not find the associated content item. - 関連付いた内容が見つかりません。 - - - - About %1 - %1 について - - - - Updating search index - 検索インデックスを更新中 - - - - Looking for Qt Documentation... - Qt ドキュメントを探しています... - - - - &Window - ウィンドウ(&W) - - - - Minimize - 最小化 - - - - Ctrl+M - Ctrl+M - - - - Zoom - ズーム - - - - &File - ファイル(&F) - - - - &Edit - 編集(&E) - - - - &View - 表示(&V) - - - - &Go - ジャンプ(&G) + Error: %1 + エラー: %1 - - &Bookmarks - ブックマーク(&B) - - - - &Help - ヘルプ(&H) - - - - ALT+O - ALT+O - - - - CTRL+D - CTRL+D - - - - PreferencesDialog - - - - - Add Documentation - ドキュメントの追加 - - - - Qt Compressed Help Files (*.qch) - 圧縮済み Qt ヘルプファイル (*.qch) - - - - The specified file is not a valid Qt Help File! - 指定されたファイルは有効な Qt ヘルプ ファイルではありません! - - - - The namespace %1 is already registered! - ネームスペース %1 は既に登録済みです! - - - - Remove Documentation - ドキュメントの除去 - - - - Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. - 除去しようとしているいくつかのドキュメントは Assistant 上で参照されています。除去すると、これらのドキュメントは閉じられます。 - - - - Cancel - キャンセル - - - - OK - OK - - - - Use custom settings - 独自設定を使用する - - - - PreferencesDialogClass - - - Preferences - 設定 - - - - Fonts - フォント - - - - Font settings: - フォント設定: - - - - Browser - ブラウザー - - - - Application - アプリケーション - - - - Filters - フィルタ - - - - Filter: - フィルタ: - - - - Attributes: - 属性: - - - - 1 - 1 - - - - Add - 追加 - - - - Remove - 削除 - - - - Documentation - ドキュメント - - - - Registered Documentation: - 登録済みドキュメント: - - - - Add... - 追加... - - - - Options - オプション - - - - Current Page - 現在のページ - - - - Restore to default - デフォルト設定に戻す - - - - Homepage - ホームページ - - - - QObject - - - The specified collection file does not exist! - 指定されたコレクションファイルは存在しません! - - - - Missing collection file! - コレクションファイルが見つかりません! - - - - Invalid URL! - 不正なURLです! - - - - Missing URL! - URLが見つかりません! - - - - - - Unknown widget: %1 - 不明なウィジェット: %1 - - - - - - Missing widget! - ウィジェットが見つかりません! - - - - - The specified Qt help file does not exist! - 指定された Qt ヘルプ ファイルが存在しません! - - - - - Missing help file! - ヘルプファイルが見つかりません! - - - - Missing filter argument! - フィルタ引数が不足しています! - - - - Unknown option: %1 - 不明なオプション: %1 - - - - - Qt Assistant - Qt Assistant - - - Could not register documentation file %1 @@ -958,54 +48,1043 @@ %2 - Documentation successfully registered. ドキュメントの登録に成功しました。 - Could not unregister documentation file %1 Reason: %2 - ドキュメントファイルを解除できませんでした。 + ドキュメントファイルの登録を解除できませんでした。 %1 原因: %2 - Documentation successfully unregistered. - ドキュメントの解放に成功しました。 + ドキュメントの登録解除に成功しました。 + + + Error reading collection file '%1': %2. + コレクションファイル '%1' の読み込み中にエラーが発生しました: %2 - + Error creating collection file '%1': %2. + コレクションファイル '%1' の作成中にエラーが発生しました: %2 + + + Error reading collection file '%1': %2 + コレクションファイル '%1' の読み込み中にエラーが発生しました: %2 + + Cannot load sqlite database driver! SQLite データベース ドライバーをロードできません! + + + BookmarkDialog - - The specified collection file could not be read! - 指定されたコレクションファイルは読み込めません! + Bookmarks + ブックマーク + + + Add Bookmark + ブックマークの追加 + + + Bookmark: + ブックマーク: + + + Add in Folder: + 追加先フォルダ: + + + + + + + + + New Folder + 新しいフォルダ + + + Delete Folder + フォルダを削除 + + + Rename Folder + フォルダの名前変更 + + + + BookmarkManager + + Bookmarks + ブックマーク + + + Untitled + タイトルなし + + + Remove + 削除 + + + You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? + フォルダを削除すると中身も削除されますが、続けてよろしいですか? + + + Manage Bookmarks... + ブックマークを管理... + + + Add Bookmark... + ブックマークの追加... + + + Ctrl+D + Ctrl+D + + + Delete Folder + フォルダを削除 + + + Rename Folder + フォルダの名前変更 + + + Show Bookmark + ブックマークを開く + + + Show Bookmark in New Tab + ブックマークを新しいタブで開く + + + Delete Bookmark + ブックマークを削除 + + + Rename Bookmark + ブックマークの名前変更 + + + New Folder + 新しいフォルダ + + + + BookmarkManagerWidget + + Manage Bookmarks + ブックマークを管理 + + + Search: + 検索: + + + Remove + 削除 + + + Import and Backup + インポートとバックアップ + + + OK + OK + + + Import... + インポート... + + + Export... + エクスポート... + + + Open File + ファイルを開く + + + Files (*.xbel) + ファイル (*.xbel) + + + Save File + ファイルを保存 + + + Qt Assistant + Qt Assistant + + + Unable to save bookmarks. + ブックマークを保存できません。 + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + フォルダを削除するとその中身も削除されますが、続けてよろしいですか? + + + Delete Folder + フォルダを削除 + + + Rename Folder + フォルダの名前変更 + + + Show Bookmark + ブックマークを開く + + + Show Bookmark in New Tab + ブックマークを新しいタブで開く + + + Delete Bookmark + ブックマークを削除 + + + Rename Bookmark + ブックマークの名前変更 + + + + BookmarkModel + + Name + 名前 + + + Address + アドレス + + + Bookmarks Menu + ブックマークメニュー + + + + BookmarkWidget + + Filter: + フィルタ: + + + Remove + 削除 + + + Delete Folder + フォルダを削除 + + + Rename Folder + フォルダの名前変更 + + + Show Bookmark + ブックマークを開く + + + Show Bookmark in New Tab + ブックマークを新しいタブで開く + + + Delete Bookmark + ブックマークを削除 + + + Rename Bookmark + ブックマークの名前変更 + + + Add + 追加 + + + Bookmarks + ブックマーク + + + + CentralWidget + + Add new page + 新しいページの追加 + + + Close current page + 現在のページを閉じる + + + Print Document + ドキュメントを印刷 + + + unknown + 不明 + + + Add New Page + 新しいページの追加 + + + Close This Page + このページを閉じる + + + Close Other Pages + 他のページを閉じる + + + Add Bookmark for this Page... + このページをブックマークに追加... + + + Search + 検索 + + + + CmdLineParser + + Unknown option: %1 + 不明なオプション: %1 + + + The collection file '%1' does not exist. + コレクションファイル '%1' が存在しません。 + + + Missing collection file. + コレクションファイルが見つかりません。 + + + Invalid URL '%1'. + 不正なURL '%1' です。 + + + Missing URL. + URLが見つかりません。 + + + Unknown widget: %1 + 不明なウィジェット: %1 + + + Missing widget. + ウィジェットが見つかりません。 + + + The Qt help file '%1' does not exist. + Qt のヘルプファイル '%1' が存在しません。 + + + Missing help file. + ヘルプファイルが見つかりません。 + + + Missing filter argument. + フィルタ引数が不足しています。 + + + Error + エラー + + + Notice + 注意 + + + + ContentWindow + + Open Link + リンクを開く + + + Open Link in New Tab + リンクを新しいタブで開く + + + + FilterNameDialogClass + + Add Filter Name + フィルタ名を追加 + + + Filter Name: + フィルタ名: + + + + FindWidget + + Previous + 戻る + + + Next + 進む + + + Case Sensitive + 大文字/小文字を区別する + + + Whole words + 単語単位で検索する + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;見つからなければ先頭から検索する + + + + FontPanel + + Font + フォント + + + &Writing system + 文字セット(&W) + + + &Family + フォント名(&F) + + + &Style + スタイル(&S) + + + &Point size + サイズ(&P) + + + + HelpViewer + + Help + ヘルプ + + + OK + OK + + + <title>about:blank</title> + + + + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> + <title>Error 404...</title><div align="center"><br><br><h1>ページが見つかりませんでした</h1><br><h3>'%1'</h3></div> + + + Copy &Link Location + リンクのURLをコピー(&L) + + + Open Link in New Tab Ctrl+LMB + リンクを新しいタブで開く Ctrl+LMB + + + Open Link in New Tab + リンクを新しいタブで開く + + + Unable to launch external application. + + 外部アプリケーションを起動できません。 + + + + + IndexWindow + + &Look for: + 検索文字列(&L): + + + Open Link + リンクを開く + + + Open Link in New Tab + リンクを新しいタブで開く + + + + InstallDialog + + Install Documentation + ドキュメントのインストール + + + Downloading documentation info... + ドキュメント情報をダウンロード中... + + + Download canceled. + ダウンロードを中止しました。 + + + Done. + 完了. + + + The file %1 already exists. Do you want to overwrite it? + %1 は既に存在します。上書きしますか? + + + Unable to save the file %1: %2. + ファイルを保存できません。%1: %2. + + + Downloading %1... + %1 をダウンロード中... + + + Download failed: %1. + ダウンロード失敗: %1. + + + Documentation info file is corrupt! + ドキュメント情報ファイルが不正です! + + + Download failed: Downloaded file is corrupted. + ダウンロード失敗: ダウンロードしたファイルが不正です。 + + + Installing documentation %1... + %1 のドキュメントをインストール中... + + + Error while installing documentation: +%1 + ドキュメントのインストール中にエラーが発生しました: +%1 - - + Available Documentation: + 使用可能なドキュメント: + + + Install + インストール + + + Cancel + キャンセル + + + Close + 閉じる + + + Installation Path: + インストール先のパス: + + + ... + ... + + + + MainWindow + + Index + インデックス + + + Contents + コンテンツ + + + Bookmarks + ブックマーク + + + Search + 検索 + + + Qt Assistant + Qt Assistant + + + Unfiltered + フィルタなし + + + Page Set&up... + ページ設定(&U)... + + + Print Preview... + 印刷プレビュー... + + + &Print... + 印刷(&P)... + + + New &Tab + 新しいタブ(&T) + + + &Close Tab + タブを閉じる(&C) + + + &Quit + 終了(&Q) + + + CTRL+Q + CTRL+Q + + + &Copy selected Text + 選択中の文字をコピー(&C) + + + &Find in Text... + 検索(&F)... + + + &Find + 検索(&F) + + + Find &Next + 次を検索(&N) + + + Find &Previous + 前を検索(&P) + + + Preferences... + 設定... + + + Zoom &in + 拡大(&I) + + + Zoom &out + 縮小(&O) + + + Normal &Size + 普通の大きさ(&S) + + + Ctrl+0 + Ctrl+0 + + + ALT+C + ALT+C + + + ALT+I + ALT+I + + + ALT+S + ALT+S + + + &Home + ホーム(&H) + + + Could not register file '%1': %2 + ファイル '%1' を登録できませんでした: %2 + + + Ctrl+Home + Ctrl+Home + + + &Back + 戻る(&B) + + + &Forward + 進む(&F) + + + Sync with Table of Contents + 内容と目次を同期する + + + Next Page + 次のページ + + + Ctrl+Alt+Right + Ctrl+Alt+Right + + + Previous Page + 前のページ + + + Ctrl+Alt+Left + Ctrl+Alt+Left + + + Add Bookmark... + ブックマークの追加... + + + About... + Qt Assistant について... + + + Navigation Toolbar + ナビゲーション ツールバー + + + Toolbars + ツールバー + + + Filter Toolbar + フィルター ツールバー + + + Filtered by: + フィルタ条件: + + + Address Toolbar + アドレス ツールバー + + + Address: + アドレス: + + + Could not find the associated content item. + 関連付いた内容が見つかりません。 + + + About %1 + %1 について + + + Updating search index + 検索インデックスを更新中 + + + Looking for Qt Documentation... + Qt ドキュメントを探しています... + + + &Window + ウィンドウ(&W) + + + Minimize + 最小化 + + + Ctrl+M + Ctrl+M + + + Zoom + ズーム + + + &File + ファイル(&F) + + + &Edit + 編集(&E) + + + &View + 表示(&V) + + + &Go + ジャンプ(&G) + + + ALT+Home + ALT+Home + + + Sync + 同期 + + + &Bookmarks + ブックマーク(&B) + + + &Help + ヘルプ(&H) + + + ALT+O + ALT+O + + + CTRL+D + CTRL+D + + + + PreferencesDialog + + Add Documentation + ドキュメントの追加 + + + Qt Compressed Help Files (*.qch) + 圧縮済み Qt ヘルプファイル (*.qch) + + + The specified file is not a valid Qt Help File! + 指定されたファイルは有効な Qt ヘルプ ファイルではありません! + + + The namespace %1 is already registered! + ネームスペース %1 は既に登録済みです! + + + Remove Documentation + ドキュメントの除去 + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + 除去しようとしているいくつかのドキュメントは Assistant 上で参照されています。除去すると、これらのドキュメントは閉じられます。 + + + Cancel + キャンセル + + + OK + OK + + + Use custom settings + 独自設定を使用する + + + + PreferencesDialogClass + + Preferences + 設定 + + + Fonts + フォント + + + Font settings: + フォント設定: + + + Browser + ブラウザー + + + Application + アプリケーション + + + Filters + フィルタ + + + Filter: + フィルタ: + + + Attributes: + 属性: + + + 1 + 1 + + + Add + 追加 + + + Remove + 削除 + + + Documentation + ドキュメント + + + Registered Documentation: + 登録済みドキュメント: + + + Add... + 追加... + + + Options + オプション + + + Current Page + 現在のページ + + + Restore to default + デフォルト設定に戻す + + + Homepage + ホームページ + + + On help start: + ヘルプの起動時: + + + Show my home page + ホームページを表示する + + + Show a blank page + 空白ページを表示する + + + Show my tabs from last session + 前回のセッションのタブを表示する + + + Blank Page + 空白ページ + + + + QObject + + The specified collection file does not exist! + 指定されたコレクションファイルは存在しません! + + + Missing collection file! + コレクションファイルが見つかりません! + + + Invalid URL! + 不正なURLです! + + + Missing URL! + URLが見つかりません! + + + Unknown widget: %1 + 不明なウィジェット: %1 + + + Missing widget! + ウィジェットが見つかりません! + + + The specified Qt help file does not exist! + 指定された Qt ヘルプ ファイルが存在しません! + + + Missing help file! + ヘルプファイルが見つかりません! + + + Missing filter argument! + フィルタ引数が不足しています! + + + Unknown option: %1 + 不明なオプション: %1 + + + Qt Assistant + Qt Assistant + + + Could not register documentation file +%1 + +Reason: +%2 + ドキュメントファイルを登録できませんでした。 +%1 + +原因: +%2 + + + Documentation successfully registered. + ドキュメントの登録に成功しました。 + + + Could not unregister documentation file +%1 + +Reason: +%2 + ドキュメントファイルを解除できませんでした。 +%1 + +原因: +%2 + + + Documentation successfully unregistered. + ドキュメントの解放に成功しました。 + + + Cannot load sqlite database driver! + SQLite データベース ドライバーをロードできません! + + + The specified collection file could not be read! + 指定されたコレクションファイルは読み込めません! + + Bookmark - ブックマーク + ブックマーク RemoteControl - Debugging Remote Control リモート コントロールをデバッグ中 - Received Command: %1 %2 受信したコマンド: %1 %2 @@ -1013,56 +1092,45 @@ SearchWidget - &Copy コピー(&C) - Copy &Link Location リンクのURLをコピー(&L) - - Open Link in New Tab リンクを新しいタブで開く - Select All すべてを選択 - Open Link - リンクを開く + リンクを開く TopicChooser - Choose a topic for <b>%1</b>: <b>%1</b> の検索先トピックを選択してください: - Choose Topic トピックを選択 - &Topics トピック(&T) - &Display 表示(&D) - &Close 閉じる(&C) diff -r ef0373b55136 -r 758a864f9613 translations/assistant_ru.ts --- a/translations/assistant_ru.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/assistant_ru.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,7 +4,6 @@ AboutDialog - &Close &Закрыть @@ -12,19 +11,16 @@ AboutLabel - Warning Предупреждение - Unable to launch external application. Невозможно запустить внешнее приложение. - OK Закрыть @@ -32,17 +28,14 @@ Assistant - Error registering documentation file '%1': %2 Ошибка регистрации файла документации '%1': %2 - Error: %1 Ошибка: %1 - Could not register documentation file %1 @@ -55,12 +48,10 @@ %2 - Documentation successfully registered. Документация успешно зарегистрирована. - Could not unregister documentation file %1 @@ -73,27 +64,22 @@ %2 - Documentation successfully unregistered. Документация успешно дерегистрирована. - Error reading collection file '%1': %2. - Ошибка чтения файла коллекции справки '%1': %2. + Ошибка чтения файла коллекции справки '%1': %2. - Error creating collection file '%1': %2. - Ошибка создания файла коллекции справки '%1': %2. + Ошибка создания файла коллекции справки '%1': %2. - Error reading collection file '%1': %2 - Ошибка чтения файла коллекции справки '%1': %2 + Ошибка чтения файла коллекции справки '%1': %2 - Cannot load sqlite database driver! Не удалось загрузить драйвер баз данных sqlite! @@ -101,139 +87,229 @@ BookmarkDialog - Add Bookmark Добавление закладки - Bookmark: Закладка: - Add in Folder: Добавить в папку: - + + - New Folder Новая папка + + Rename Folder + Переименовать папку + BookmarkManager - Remove Удалить - You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? Удаление папки приведёт к удалению её содержимого.<br>Желаете продолжить? - Add Bookmark... Добавить закладку... - Ctrl+D - Untitled Неозаглавлено - Manage Bookmarks... Управление закладками... - Delete Folder Удалить папку - Rename Folder Переименовать папку - Show Bookmark Открыть закладку - Show Bookmark in New Tab Открыть закладку в новой вкладке - Delete Bookmark Удалить закладку - Rename Bookmark Переименовать закладку + BookmarkManagerWidget + + Manage Bookmarks + Управление закладками + + + Search: + Поиск: + + + Remove + Удалить + + + Import and Backup + Резервное копирование + + + OK + ОК + + + Import... + Импорт... + + + Export... + Экспорт... + + + Open File + Открыть файл + + + Files (*.xbel) + Файлы (*.xbel) + + + Save File + Сохранить файл + + + Qt Assistant + Qt Assistant + + + Unable to save bookmarks. + Невозможно сохранитьзакладки. + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + Удаление папки приведёт к удалению её содержимого.<br>Желаете продолжить? + + + Delete Folder + Удалить папку + + + Rename Folder + Переименовать папку + + + Show Bookmark + Открыть закладку + + + Show Bookmark in New Tab + Открыть закладку в новой вкладке + + + Delete Bookmark + Удалить закладку + + + Rename Bookmark + Переименовать закладку + + + + BookmarkModel + + Name + Название + + + Address + Адрес + + + Bookmarks Menu + Меню закладок + + + + BookmarkWidget + + Bookmarks + Закладки + + + Filter: + Фильтр: + + + Add + Добавить + + + Remove + Удалить + + + CentralWidget - Add new page Открыть новую страницу - Close current page Закрыть текущую страницу - Print Document Печать документа - - unknown безымянная вкладка - Add New Page Открыть новую страницу - Close This Page Закрыть данную страницу - Close Other Pages Закрыть остальные страницы - Add Bookmark for this Page... Добавить закладку для этой страницы... - Search Поиск @@ -241,62 +317,50 @@ CmdLineParser - Unknown option: %1 Неизвестный параметр: %1 - Unknown widget: %1 Неизвестный виджет: %1 - The collection file '%1' does not exist. - Файл коллекции справки '%1' не существует. + Файл коллекции справки '%1' не существует. - Missing collection file. - Отсутствует файл коллекции справки. + Отсутствует файл коллекции справки. - Invalid URL '%1'. Некорректный URL '%1'. - Missing URL. Отсутствует URL. - Missing widget. Отсутствует виджет. - The Qt help file '%1' does not exist. Файл справки Qt '%1' не существует. - Missing help file. Отсутствует файл справки. - Missing filter argument. Отсутствует параметр фильтра. - Error Ошибка - Notice Замечание @@ -304,12 +368,10 @@ ContentWindow - Open Link Открыть ссылку - Open Link in New Tab Открыть ссылку в новой вкладке @@ -317,40 +379,52 @@ FilterNameDialogClass - Add Filter Name Добавление фильтра - Filter Name: Название фильтра: + FindWidget + + Previous + Предыдущее + + + Next + Следующее + + + Case Sensitive + Учитывать регистр символов + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Поиск с начала + + + FontPanel - Font Шрифт - &Writing system Система &письма - &Family &Шрифт - &Style &Начертание - &Point size &Размер @@ -358,30 +432,37 @@ HelpViewer - <title>about:blank</title> - <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Ошибка 404...</title><div align="center"><br><br><h1>Страница не найдена</h1><br><h3>'%1'</h3></div> + + Copy &Link Location + Копировать &адрес ссылки + + + Open Link in New Tab Ctrl+LMB + Открыть ссылку в новой вкладке Ctrl+LMB + + + Open Link in New Tab + Открыть ссылку в новой вкладке + IndexWindow - &Look for: &Искать: - Open Link Открыть ссылку - Open Link in New Tab Открыть ссылку в новой вкладке @@ -389,99 +470,76 @@ InstallDialog - - Install Documentation Установка документации - Downloading documentation info... Загрузка информации о документации... - Download canceled. Загрузка отменена. - - - Done. Готово. - The file %1 already exists. Do you want to overwrite it? Файл %1 уже существует. Желаете перезаписать его? - Unable to save the file %1: %2. Невозможно сохранить файл %1: %2. - Downloading %1... Загрузка %1... - - - Download failed: %1. Загрузка не удалась: %1. - Documentation info file is corrupt! Файл информации о документации повреждён! - Download failed: Downloaded file is corrupted. Загрузка не удалась: загруженный файл повреждён. - Installing documentation %1... Установка документации %1... - Error while installing documentation: %1 При установке документации возникла ошибка: %1 - Available Documentation: Доступная документация: - Install Установить - Cancel Отмена - Close Закрыть - Installation Path: Путь установки: - ... ... @@ -489,297 +547,234 @@ MainWindow - - Index Указатель - - Contents Содержание - - Bookmarks Закладки - - - Qt Assistant Qt Assistant - Looking for Qt Documentation... Поиск документации Qt... - &File &Файл - Page Set&up... Параметры &страницы... - Print Preview... Предпросмотр печати... - &Print... &Печать... - New &Tab Новая &вкладка - &Close Tab &Закрыть вкладку - &Quit В&ыход - CTRL+Q - &Edit &Правка - &Copy selected Text &Копировать выделенный текст - &Find in Text... П&оиск в тексте... - &Find &Поиск - Find &Next Найти &следующее - Find &Previous Найти &предыдущее - Preferences... Настройки... - &View &Вид - Zoom &in У&величить - Zoom &out У&меньшить - Normal &Size Нормальный р&азмер - Ctrl+0 - ALT+C - ALT+I - ALT+O - Search Поиск - ALT+S - &Go &Перейти - &Home &Домой - ALT+Home - &Back &Назад - &Forward &Вперёд - Sync with Table of Contents Синхронизировать с оглавлением - Sync Синхронизировать - Next Page Следующая страница - Ctrl+Alt+Right - Previous Page Предыдущая страница - Ctrl+Alt+Left - &Bookmarks &Закладки - Could not register file '%1': %2 Не удалось зарегистрировать файл '%1': %2 - &Help &Справка - About... О программе... - Navigation Toolbar Панель навигации - &Window &Окно - Zoom Масштаб - Minimize Свернуть - Ctrl+M - Toolbars Панели инструментов - Filter Toolbar Панель фильтров - Filtered by: Отфильтровано по: - Address Toolbar Панель адреса - Address: Адрес: - Could not find the associated content item. Не удалось найти элемент, связанный с содержанием. - About %1 О %1 - Updating search index Обновление поискового индекса @@ -787,48 +782,38 @@ PreferencesDialog - - Add Documentation Добавить документацию - Qt Compressed Help Files (*.qch) Сжатые файлы справки Qt (*.qch) - The namespace %1 is already registered! Пространство имён %1 уже зарегистрировано! - The specified file is not a valid Qt Help File! Указанный файл не является корректным файлом справки Qt! - Remove Documentation Удалить документацию - Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. Некоторые открытые в Qt Assistant документы ссылаются на документацию, которую вы пытаетесь удалить. Её удаление приведёт к закрытию этих документов. - Cancel Отмена - OK Удалить - Use custom settings Использовать индивидуальные настройки @@ -836,117 +821,94 @@ PreferencesDialogClass - Preferences Настройки - Fonts Шрифты - Font settings: Настройки шрифта: - Browser Обозреватель - Application Приложение - Filters Фильтры - Filter: Фильтр: - Attributes: Атрибуты: - 1 1 - Add Добавить - Remove Удалить - Documentation Документация - Registered Documentation: Зарегистрированная документация: - Add... Добавить... - Options Параметры - Homepage Стартовая страница - Current Page Текущая страница - Restore to default Страница по умолчанию - On help start: При запуске: - Show my home page Отобразить стартовую страницу - Show a blank page Отобразить пустую страницу - Show my tabs from last session Восстановить предыдущую сессиию - Blank Page Пустая страница @@ -954,12 +916,10 @@ RemoteControl - Debugging Remote Control Отладочное удалённое управление - Received Command: %1 %2 Получена команда: %1 %2 @@ -967,22 +927,18 @@ SearchWidget - &Copy &Копировать - Copy &Link Location Копировать &адрес ссылки - Open Link in New Tab Открыть ссылку в новой вкладке - Select All Выделить всё @@ -990,27 +946,22 @@ TopicChooser - Choose a topic for <b>%1</b>: Выберите раздел для <b>%1</b>: - Choose Topic Выбор раздела - &Topics &Разделы - &Display &Показать - &Close &Закрыть diff -r ef0373b55136 -r 758a864f9613 translations/assistant_sl.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/assistant_sl.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,972 @@ + + + + 2010-08-28 14:36+0200 + MIME-Version,Content-Type,Content-Transfer-Encoding,Plural-Forms,X-Language,X-Qt-Contexts,Last-Translator,PO-Revision-Date,Project-Id-Version,Language-Team,X-Generator + Lokalize 1.1 + Slovenian <lugos-slo@lugos.si> + + # Jure Repinc <jlp@holodeck1.com>, 2010. + Jure Repinc <jlp@holodeck1.com> + + AboutDialog + + &Close + &Zapri + + + + AboutLabel + + Warning + Opozorilo + + + Unable to launch external application. + + Zunanjega programa ni moč zagnati. + + + + OK + V redu + + + + Assistant + + Error registering documentation file '%1': %2 + Napaka pri registraciji datoteke z dokumentacijo »%1«: %2 + + + Error: %1 + Napaka: %1 + + + Could not register documentation file +%1 + +Reason: +%2 + Ni bilo moč registrirati datoteke z dokumentacijo +%1 + +Razlog: +%2 + + + Documentation successfully registered. + Dokumentacija je bila uspešno registrirana. + + + Could not unregister documentation file +%1 + +Reason: +%2 + Ni bilo moč od-registrirati datoteke z dokumentacijo +%1 + +Razlog: +%2 + + + Documentation successfully unregistered. + Dokumentacija je bila uspešno odstranjena iz registrira. + + + Error reading collection file '%1': %2. + Napaka pri branju datoteke zbirke »%1«: %2. + + + Error creating collection file '%1': %2. + Napaka pri ustvarjanju datoteke zbirke »%1«: %2. + + + Cannot load sqlite database driver! + Ni moč naložiti gonilnika za podatkovno zbirko SQLite. + + + + BookmarkDialog + + Add Bookmark + Dodaj zaznamek + + + Bookmark: + Zaznamek: + + + Add in Folder: + Dodaj v mapo: + + + + + + + + + New Folder + Nova mapa + + + Rename Folder + Preimenuj mapo + + + + BookmarkManager + + Untitled + Brez naslova + + + Remove + Odstrani + + + You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? + Nameravate zbrisati mapo, pri čemer bo zbrisana<br>tudi njena vsebina. Ali res želite nadaljevati? + + + Manage Bookmarks... + Upravljanje zaznamkov ... + + + Add Bookmark... + Dodaj zaznamek ... + + + Ctrl+D + Ctrl+D + + + Delete Folder + Izbriši mapo + + + Rename Folder + Preimenuj mapo + + + Show Bookmark + Prikaži zaznamek + + + Show Bookmark in New Tab + Prikaži zaznamek v novem zavihku + + + Delete Bookmark + Izbriši zaznamek + + + Rename Bookmark + Preimenuj zaznamek + + + + BookmarkManagerWidget + + Manage Bookmarks + Upravljanje zaznamkov + + + Search: + Išči: + + + Remove + Odstrani + + + Import and Backup + Uvozi in ustvari varnostno kopijo + + + OK + V redu + + + Import... + Uvozi ... + + + Export... + Izvozi ... + + + Open File + Odpri datoteko + + + Files (*.xbel) + Datoteke (*.xbel) + + + Save File + Shrani datoteko + + + Qt Assistant + Qt Assistant + + + Unable to save bookmarks. + Zaznamkov ni moč shraniti. + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + Nameravate zbrisati mapo, pri čemer bo zbrisana<br>tudi njena vsebina. Ali res želite nadaljevati? + + + Delete Folder + Izbriši mapo + + + Rename Folder + Preimenuj mapo + + + Show Bookmark + Prikaži zaznamek + + + Show Bookmark in New Tab + Prikaži zaznamek v novem zavihku + + + Delete Bookmark + Izbriši zaznamek + + + Rename Bookmark + Preimenuj zaznamek + + + + BookmarkModel + + Name + Ime + + + Address + Naslov + + + Bookmarks Menu + Meni z zaznamki + + + + BookmarkWidget + + Bookmarks + Zaznamki + + + Filter: + Filter: + + + Add + Dodaj + + + Remove + Odstrani + + + + CentralWidget + + Add new page + Dodaj novo stran + + + Close current page + Zapri trenutno stran + + + Print Document + Natisni dokument + + + unknown + neznano + + + Add New Page + Dodaj novo stran + + + Close This Page + Zapri to stran + + + Close Other Pages + Zapri druge strani + + + Add Bookmark for this Page... + Dodaj zaznamek za to stran ... + + + Search + Iskanje + + + + CmdLineParser + + Unknown option: %1 + Neznana možnost: %1 + + + The collection file '%1' does not exist. + Datoteka zbirke »%1« ne obstaja. + + + Missing collection file. + Manjkajoča datoteka zbirke. + + + Invalid URL '%1'. + Neveljaven URL »%1«. + + + Missing URL. + Manjkajoč URL. + + + Unknown widget: %1 + Neznan gradnik: %1 + + + Missing widget. + Manjkajoč gradnik. + + + The Qt help file '%1' does not exist. + Datoteka s pomočjo za Qt »%1« ne obstaja. + + + Missing help file. + Manjkajoča datoteka s pomočjo. + + + Missing filter argument. + Manjkajoč argument filtra. + + + Error + Napaka + + + Notice + Opomba + + + + ContentWindow + + Open Link + Odpri povezavo + + + Open Link in New Tab + Odpri povezavo v novem zavihku + + + + FilterNameDialogClass + + Add Filter Name + Dodaj ime filtra + + + Filter Name: + Ime filtra: + + + + FindWidget + + Previous + Predhodno + + + Next + Naslednje + + + Case Sensitive + Loči velike in male črke + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Iskanje se nadaljuje na drugem koncu + + + + FontPanel + + Font + Pisava + + + &Writing system + S&istem pisanja + + + &Family + &Družina + + + &Style + &Slog + + + &Point size + &Velikost v točkah + + + + HelpViewer + + <title>about:blank</title> + <title>about:blank</title> + + + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> + <title>Napaka 404</title><div align="center"><br><br><h1>Strani ni bilo moč najti</h1><br><h3>»%1«</h3></div> + + + Copy &Link Location + Skopiraj &povezavo do lokacije + + + Open Link in New Tab Ctrl+LMB + Odpri povezavo v novem zavihku Ctrl+LGM + + + Open Link in New Tab + Odpri povezavo v novem zavihku + + + + IndexWindow + + &Look for: + &Išči: + + + Open Link + Odpri povezavo + + + Open Link in New Tab + Odpri povezavo v novem zavihku + + + + InstallDialog + + Install Documentation + Namesti dokumentacijo + + + Available Documentation: + Razpoložljiva dokumentacija: + + + Install + Namesti + + + Cancel + Prekliči + + + Close + Zapri + + + Installation Path: + Namestitvena pot: + + + ... + ... + + + Downloading documentation info... + Prejemanje podatkov o dokumentaciji ... + + + Download canceled. + Prejemanje preklicano. + + + Done. + Opravljeno. + + + The file %1 already exists. Do you want to overwrite it? + Datoteka %1 že obstaja. Ali jo želite nadomestiti? + + + Unable to save the file %1: %2. + Datoteke %1 ni moč shraniti: %2. + + + Downloading %1... + Prejemanje %1 ... + + + Download failed: %1. + Prejemanje ni uspelo: %1. + + + Documentation info file is corrupt! + Datoteka s podatki o dokumentaciji je poškodovana. + + + Download failed: Downloaded file is corrupted. + Prejemanje ni uspelo. Prejeta datoteka je poškodovana. + + + Installing documentation %1... + Nameščanje dokumentacije %1 ... + + + Error while installing documentation: +%1 + Napaka pri nameščanju dokumentacije: +%1 + + + + MainWindow + + Index + Kazalo + + + Contents + Vsebina + + + Bookmarks + Zaznamki + + + Qt Assistant + Qt Assistant + + + Looking for Qt Documentation... + iskanje dokumentacije za Qt ... + + + &File + &Datoteka + + + New &Tab + Nov zavi&hek + + + Page Set&up... + Nastavitve stra&ni ... + + + Print Preview... + Ogled tiskanja ... + + + &Print... + Na&tisni ... + + + &Close Tab + &Zapri zavihek + + + &Quit + Konča&j + + + CTRL+Q + Ctrl+Q + + + &Edit + &Urejanje + + + &Copy selected Text + S&kopiraj izbrano besedilo + + + &Find in Text... + &Najdi v besedilu ... + + + &Find + &Najdi + + + Find &Next + Najdi na&slednje + + + Find &Previous + Najdi p&rejšnje + + + Preferences... + Nastavitve ... + + + &View + &Videz + + + Zoom &in + Po&večaj + + + Zoom &out + Z&manjšaj + + + Normal &Size + &Običajna velikost + + + Ctrl+0 + Ctrl+0 + + + ALT+C + Alt+V + + + ALT+I + Alt+K + + + ALT+O + Alt+Z + + + Search + Iskanje + + + ALT+S + Alt+I + + + &Go + &Pojdi + + + &Home + &Domov + + + ALT+Home + Alt+Domov + + + &Back + Na&zaj + + + &Forward + &Naprej + + + Sync with Table of Contents + Uskladi s seznamom vsebine + + + Sync + Uskladi + + + Next Page + Naslednja stran + + + Ctrl+Alt+Right + Ctrl+Alt+Desno + + + Previous Page + Predhodna stran + + + Ctrl+Alt+Left + Ctrl+Alt+Levo + + + &Bookmarks + &Zaznamki + + + &Help + &Pomoč + + + About... + O ... + + + Navigation Toolbar + Orodjarna za krmarjenje + + + &Window + &Okno + + + Zoom + Povečava + + + Minimize + Pomanjšaj + + + Ctrl+M + Ctrl+M + + + Toolbars + Orodjarne + + + Filter Toolbar + Orodjarna filtra + + + Filtered by: + Filtrirano po: + + + Address Toolbar + Naslovna vrstica + + + Address: + Naslov: + + + Could not find the associated content item. + Povezane postavke vsebine ni bilo moč najti. + + + About %1 + O %1 + + + Updating search index + Posodabljanje kazala za iskanje + + + Could not register file '%1': %2 + Datoteke »%1« ni bilo moč registrirati: %2 + + + + PreferencesDialog + + Add Documentation + Dodaj dokumentacijo + + + Qt Compressed Help Files (*.qch) + Stisnjene datoteke s pomočjo za Qt (*.qch) + + + The namespace %1 is already registered! + Imenski prostor %1 je že registriran. + + + The specified file is not a valid Qt Help File! + Navedena datoteka ni veljavna datoteka s pomočjo za Qt. + + + Remove Documentation + Odstrani dokumentacijo + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + Nekateri odprti dokumenti se sklicujejo na dokumentacijo, ki jo poskušate odstraniti. Odstranitev dokumentacije bo povzročila zaprtje teh dokumentov. + + + Cancel + Prekliči + + + OK + V redu + + + Use custom settings + Uporabi nastavitve po meri + + + + PreferencesDialogClass + + Preferences + Nastavitve + + + Fonts + Pisave + + + Font settings: + Nastavitve pisav + + + Browser + Brskalnik + + + Application + Program + + + Filters + Filtri + + + Filter: + Filter: + + + Attributes: + Lastnosti: + + + 1 + 1 + + + Add + Dodaj + + + Remove + Odstrani + + + Documentation + Dokumentacija + + + Registered Documentation: + Registrirana dokumentacija + + + Add... + Dodaj ... + + + Options + Možnosti + + + On help start: + Ob zagonu pomoči: + + + Show my home page + Prikaži mojo domačo stran + + + Show a blank page + Prikaži prazno stran + + + Show my tabs from last session + Prikaži moje zavihke iz zadnje seje + + + Homepage + Domača stran + + + Current Page + Trenutna stran + + + Blank Page + Prazna stran + + + Restore to default + Ponastavi na privzeto + + + + RemoteControl + + Debugging Remote Control + Razhroščevanje oddaljenega nadzora + + + Received Command: %1 %2 + Prejet ukaz: %1 %2 + + + + SearchWidget + + &Copy + S&kopiraj + + + Copy &Link Location + Skopiraj &povezavo do lokacije + + + Open Link in New Tab + Odpri povezavo v novem &zavihku + + + Select All + Izberi vse + + + + TopicChooser + + Choose Topic + Izberite temo + + + &Topics + &Teme + + + &Display + &Prikaži + + + &Close + &Zapri + + + Choose a topic for <b>%1</b>: + Izberite temo za <b>%1</b>: + + + diff -r ef0373b55136 -r 758a864f9613 translations/assistant_uk.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/assistant_uk.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1537 @@ + + + + + AboutDialog + + &Close + &Закрити + + + + AboutLabel + + Warning + Попередження + + + Unable to launch external application. + + Неможливо запустити зовнішню програму. + + + + OK + OK + + + + Assistant + + Error registering documentation file '%1': %2 + Помилка реєстрації файлу документації '%1': %2 + + + Error: %1 + Помилка: %1 + + + Could not register documentation file +%1 + +Reason: +%2 + Не вдалось зареєструвати файл документації +%1 + +Причина: +%2 + + + Documentation successfully registered. + Документацію успішно зареєстровано. + + + Could not unregister documentation file +%1 + +Reason: +%2 + Не вдалось скасувати реєстрацію файлу документації +%1 + +Причина: +%2 + + + Documentation successfully unregistered. + Реєстрацію документації успішно скасовано. + + + Error reading collection file '%1': %2. + Помилка читання файлу колекції '%1': %2. + + + Error creating collection file '%1': %2. + Помилка створення файлу колекції '%1': %2. + + + Cannot load sqlite database driver! + Неможливо завантажити драйвер бази даних SQLite! + + + + BookmarkDialog + + Add Bookmark + Додати закладку + + + Bookmark: + Закладка: + + + Add in Folder: + Додати в теку: + + + + + + + + + New Folder + Нова тека + + + Rename Folder + Перейменувати теку + + + + BookmarkItem + + New Folder + Нова тека + + + Untitled + Без назви + + + + BookmarkManager + + Untitled + Без назви + + + Remove + Видалити + + + You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? + Ви збираєтесь видалити теку, що призведе до видалення її вмісту.<br>Ви впевнені, що хочете продовжити? + + + Manage Bookmarks... + Керування закладками... + + + Add Bookmark... + Додати закладку... + + + Ctrl+D + + + + Delete Folder + Видалити теку + + + Rename Folder + Перейменувати теку + + + Show Bookmark + Показати закладку + + + Show Bookmark in New Tab + Показати закладку в новій вкладці + + + Delete Bookmark + Видалити закладку + + + Rename Bookmark + Перейменувати закладку + + + + BookmarkManagerWidget + + Manage Bookmarks + Керування закладками + + + Search: + Пошук: + + + Remove + Видалити + + + Import and Backup + Імпорт та резервування + + + OK + OK + + + Import... + Імпортувати... + + + Export... + Експортувати... + + + Open File + Відкрити файл + + + Files (*.xbel) + Файли (*.xbel) + + + Save File + Зберегти файл + + + Qt Assistant + Qt Assistant + + + Unable to save bookmarks. + Не можу зберегти закладки. + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + Ви збираєтесь видалити теку, що призведе до видалення її вмісту.<br>Ви впевнені, що хочете продовжити? + + + Delete Folder + Видалити теку + + + Rename Folder + Перейменувати теку + + + Show Bookmark + Показати закладку + + + Show Bookmark in New Tab + Показати закладку в новій вкладці + + + Delete Bookmark + Видалити закладку + + + Rename Bookmark + Перейменувати закладку + + + + BookmarkModel + + Name + Ім'я + + + Address + Адреса + + + Bookmarks Menu + Меню закладок + + + + BookmarkWidget + + Bookmarks + Закладки + + + Filter: + Фільтр: + + + Add + Додати + + + Remove + Видалити + + + + CentralWidget + + Add new page + Додати нову сторінку + + + Close current page + Закрити поточну сторінку + + + Print Document + Друкувати документ + + + unknown + невідомо + + + Add New Page + Додати нову сторінку + + + Close This Page + Закрити цю сторінку + + + Close Other Pages + Закрити інші сторінки + + + Add Bookmark for this Page... + Додати закладку для цієї сторінки... + + + Search + Пошук + + + + CmdLineParser + + Usage: assistant [Options] + +-collectionFile file Uses the specified collection + file instead of the default one +-showUrl url Shows the document with the + url. +-enableRemoteControl Enables Assistant to be + remotely controlled. +-show widget Shows the specified dockwidget + which can be "contents", "index", + "bookmarks" or "search". +-activate widget Activates the specified dockwidget + which can be "contents", "index", + "bookmarks" or "search". +-hide widget Hides the specified dockwidget + which can be "contents", "index" + "bookmarks" or "search". +-register helpFile Registers the specified help file + (.qch) in the given collection + file. +-unregister helpFile Unregisters the specified help file + (.qch) from the give collection + file. +-setCurrentFilter filter Set the filter as the active filter. +-remove-search-index Removes the full text search index. +-rebuild-search-index Re-builds the full text search index (potentially slow). +-quiet Does not display any error or + status message. +-help Displays this help. + + Використання: assistant [Опції] + +-collectionFile файл Використати вказаний файл колекції + замість типового +-showUrl URL Показати документ з URL. +-enableRemoteControl Увімкнути віддалене керування Assistant. +-show віджет Показати вказаний віджет (може бути: + "contents", "index", "bookmarks" чи "search"). +-activate віджет Активувати вказаний віджет (може бути: + "contents", "index", "bookmarks" чи "search"). +-hide віджет Сховати вказаний віджет (може бути: + "contents", "index", "bookmarks" чи "search"). +-register файлДовідки Зареєструвати вказаний файл довідки + (.qch) в даному файлі колекції. +-unregister файлДовідки Скасувати реєстрацію вказаного файлу довідки + (.qch) в даному файлі колекції. +-setCurrentFilter фільтр Встановити фільтр в якості активного. +-remove-search-index Видалити повнотекстовий пошуковий індекс. +-rebuild-search-index Перебудувати повнотекстовий пошуковий індекс (можливо довго). +-quiet Не показувати жодних помилок чи статусних повідомлень. +-help Показати цю довідку. + + + + Unknown option: %1 + Невідома опція: %1 + + + The collection file '%1' does not exist. + Файл колекції '%1' не існує. + + + Missing collection file. + Відсутній файл колекції. + + + Invalid URL '%1'. + Неправильний URL '%1'. + + + Missing URL. + URL відсутній. + + + Unknown widget: %1 + Невідомий віджет: %1 + + + Missing widget. + Відсутній віджет. + + + The Qt help file '%1' does not exist. + Файл довідки Qt '%1' не існує. + + + Missing help file. + Відсутній файл довідки. + + + Missing filter argument. + Відсутній аргумент фільтра. + + + Error + Помилка + + + Notice + Примітка + + + + ContentWindow + + Open Link + Відкрити посилання + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + + ConversionWizard + + Help Conversion Wizard + Майстер конвертування довідки + + + Converting %1... + Конвертую %1... + + + Writing help collection file... + Записую файл колекції довідки... + + + Done. + Виконано. + + + + FilesPage + + Form + Форма + + + Files: + Файли: + + + Remove + Видалити + + + Remove All + Видалити все + + + Unreferenced Files + Файли,на які немає посилань + + + Remove files which are neither referenced by a keyword nor by the TOC. + Видаліть файли, на які немає посилань ні за ключовим словом, ні зі змісту. + + + <p><b>Warning:</b> Be aware when removing images or stylesheets since those files are not directly referenced by the .adp or .dcf file.</p> + <p><b>Попередження:</b> Будьте уважними, при видаленні зображень чи таблиць стилів, оскільки на ці файли не має прямих посилань файла .adp чи .dcf.</p> + + + + FilterNameDialogClass + + Add Filter Name + Додати назву фільтра + + + Filter Name: + Назва фільтра: + + + + FilterPage + + Form + Форма + + + Filter attributes for current documentation (comma separated list): + Атрибути фільтра для поточної документації (список, розділений комою): + + + Custom Filters + Користувацькі фільтри + + + 1 + 1 + + + 2 + 2 + + + Add + Додати + + + Remove + Видалити + + + Filter Settings + Налаштування фільтрів + + + Specify the filter attributes for the documentation. If filter attributes are used, also define a custom filter for it. Both, the filter attributes and the custom filters are optional. + Вкажіть атрибути фільтра для документації. Якщо використовуються атрибути фільтра, то, також, визначіть користувацький фільтр для нього. Як атрибути фільтра, так і користувацькі фільтри, є необов'язковими. + + + Filter Name + Назва фільтра + + + Filter Attributes + Атрибути фільтра + + + The custom filter '%1' is defined multiple times. + Користувацький фільтр '%1' визначено декілька раз. + + + The attributes for custom filter '%1' are defined multiple times. + Атрибути для користувацького фільтра '%1' визначено декілька раз. + + + unfiltered + list of available documentation + без фільтра + + + + FindWidget + + Previous + Попередній + + + Next + Наступний + + + Case Sensitive + Враховувати регістр + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Пошук з початку + + + + FinishPage + + Converting File + Конвертування файлу + + + Creating the new Qt help files from the old ADP file. + Створення нових файлів довідки Qt зі старого файлу ADP. + + + + FontPanel + + Font + Шрифт + + + &Writing system + Система &писемності + + + &Family + &Шрифт + + + &Style + &Стиль + + + &Point size + &Розмір + + + + GeneralPage + + Form + Форма + + + Namespace: + Простір імен: + + + Virtual Folder: + Віртуальна тека: + + + General Settings + Загальні налаштування + + + Specify the namespace and the virtual folder for the documentation. + Вкажіть простір імен та віртуальну теку для документації. + + + Namespace Error + Помилка простору імен + + + The namespace contains some invalid characters. + Простір імен містить деякі неприпустимі символи. + + + Virtual Folder Error + Помилка віртуальної теки + + + The virtual folder contains some invalid characters. + Віртуальна тека містить деякі неприпустимі символи. + + + + HelpGenerator + + Warning: %1 + Попередження: %1 + + + + HelpViewer + + <title>about:blank</title> + <title>about:blank</title> + + + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> + <title>Помилка 404...</title><div align="center"><br><br><h1>Не вдалось знайти сторінку</h1><br><h3>'%1'</h3></div> + + + Copy &Link Location + Копіювати &адресу посилання + + + Open Link in New Tab Ctrl+LMB + Відкрити посилання в новій вкладці Ctrl+LMB + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + + HelpWindow + + <center><b>Wizard Assistant</b></center> + <center><b>Майстер Assistant</b></center> + + + + IdentifierPage + + Form + Форма + + + Create identifiers + Створювати ідентифікатори + + + Global prefix: + Глобальний префікс: + + + Inherit prefix from file names + Успадковувати префікс з імен файлів + + + Identifiers + Ідентифікатори + + + This page allows you to create identifiers from the keywords found in the .adp or .dcf file. + Ця сторінка дозволяє вам створювати ідентифікатори з ключових слів, знайдених в файлі .adp чи .dcf. + + + + IndexWindow + + &Look for: + &Шукати: + + + Open Link + Відкрити посилання + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + + InputPage + + Form + Форма + + + File name: + Ім'я файлу: + + + ... + ... + + + Input File + Вхідний файл + + + Specify the .adp or .dcf file you want to convert to the new Qt help project format and/or collection format. + Вкажіть файл .adp чи .dcf, який ви бажаєте сконвертувати до нового формату проекту довідки Qt та/або формату колекції. + + + Open file + Відкрити файл + + + Qt Help Files (*.adp *.dcf) + Файли довідки Qt (*.adp *.dcf) + + + File Open Error + Помилка відкриття файлу + + + The specified file could not be opened! + Не вдалось відкрити вказаний файл! + + + File Parsing Error + Помилка розбору файлу + + + Parsing error in line %1! + Помилка розбору в рядку %1! + + + + InstallDialog + + Install Documentation + Встановити документацію + + + Available Documentation: + Доступна документація: + + + Install + Встановити + + + Cancel + Скасувати + + + Close + Закрити + + + Installation Path: + Шлях встановлення: + + + ... + ... + + + Downloading documentation info... + Звантажую інформацію про документацію... + + + Download canceled. + Звантаження скасоване. + + + Done. + Виконано. + + + The file %1 already exists. Do you want to overwrite it? + Файл %1 вже існує. Бажаєте перезаписати? + + + Unable to save the file %1: %2. + Неможливо зберегти файл %1: %2. + + + Downloading %1... + Звантажую %1... + + + Download failed: %1. + Звантаження провалилось: %1. + + + Documentation info file is corrupt! + Файл інформації про документацію пошкоджений! + + + Download failed: Downloaded file is corrupted. + Звантаження провалилось: Звантажений файл пошкоджений. + + + Installing documentation %1... + Встановлюю документацію %1... + + + Error while installing documentation: +%1 + Помилка під час встановлення документації: +%1 + + + + MainWindow + + Index + Покажчик + + + Contents + Зміст + + + Bookmarks + Закладки + + + Qt Assistant + Qt Assistant + + + Looking for Qt Documentation... + Пошук документації Qt... + + + &File + &Файл + + + New &Tab + &Нова вкладка + + + Page Set&up... + Параметри &сторінки... + + + Print Preview... + Попередній перегляд... + + + &Print... + &Друк... + + + &Close Tab + &Закрити вкладку + + + &Quit + Ви&йти + + + CTRL+Q + + + + &Edit + &Правка + + + &Copy selected Text + &Копіювати виділений текст + + + &Find in Text... + Пошук в &тексті... + + + &Find + По&шук + + + Find &Next + Знайти &наступне + + + Find &Previous + Знайти &попереднє + + + Preferences... + Налаштування... + + + &View + &Вид + + + Zoom &in + З&більшити + + + Zoom &out + З&меншити + + + Normal &Size + &Нормальний розмір + + + Ctrl+0 + + + + ALT+C + + + + ALT+I + + + + ALT+O + + + + Search + Пошук + + + ALT+S + + + + &Go + П&ерейти + + + &Home + &Домівка + + + ALT+Home + + + + &Back + &Назад + + + &Forward + &Вперед + + + Sync with Table of Contents + Синхронізувати зі змістом + + + Sync + Синхронізувати + + + Next Page + Наступна сторінка + + + Ctrl+Alt+Right + + + + Previous Page + Попередня сторінка + + + Ctrl+Alt+Left + + + + &Bookmarks + &Закладки + + + &Help + &Довідка + + + About... + Про... + + + Navigation Toolbar + Панель навігації + + + &Window + В&ікно + + + Zoom + Масштабувати + + + Minimize + Мінімізувати + + + Ctrl+M + + + + Toolbars + Панелі + + + Filter Toolbar + Панель фільтрування + + + Filtered by: + Фільтрувати по: + + + Address Toolbar + Панель адреси + + + Address: + Адреса: + + + Could not find the associated content item. + Не вдалось знайти елемент, пов'язаний зі змістом. + + + <center><h3>%1</h3><p>Version %2</p></center><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p> + <center><h3>%1</h3><p>Версія %2</p></center><p>Copyright (C) 2010 Корпорація Nokia та/або її дочірні компанії.</p> + + + About %1 + Про %1 + + + Updating search index + Оновлюється покажчик пошуку + + + Could not register file '%1': %2 + Не вдалось зареєструвати файл '%1': %2 + + + + OutputPage + + Form + Форма + + + Project file name: + Ім'я файлу проекту: + + + Collection file name: + Ім'я файлу колекції: + + + Output File Names + Імена вихідний файлів + + + Specify the file names for the output files. + Вкажіть імена вихідних файлів. + + + Convert... + Конвертувати... + + + Qt Help Project File + Файл проекту довідки Qt + + + Qt Help Collection Project File + Файл проекту колекції довідки Qt + + + The specified file %1 already exist. + +Do you want to remove it? + Вказаний файл %1 вже існує + +Бажаєте видалити його? + + + Remove + Видалити + + + Cancel + Скасувати + + + + PathPage + + Form + Форма + + + File filters: + Фільтри файлів: + + + Documentation source file paths: + Шляхи вхідних файлів документації: + + + Add + Додати + + + Remove + Видалити + + + Source File Paths + Шляхи вхідних файлів + + + Specify the paths where the sources files are located. By default, all files in those directories matched by the file filter will be included. + Вкажіть шляхи, де розташовані вхідні файли. Зазвичай, усі файли в цих теках, що відповідають фільтру файлів, будуть включені. + + + Source File Path + Шлях вхідного файлу + + + + PreferencesDialog + + Add Documentation + Додати документацію + + + Qt Compressed Help Files (*.qch) + Стиснені файли довідки Qt (*.qch) + + + The namespace %1 is already registered! + Простір імен %1 вже зареєстровано! + + + The specified file is not a valid Qt Help File! + Вказаний файл не є коректним файлом довідки Qt! + + + Remove Documentation + Видалити документацію + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + Деякі документи, що зараз відкриті в Assistant, пов'язані з документацією, яку ви намагаєтесь видалити. Видалення документації призведе до закриття цих документів. + + + Cancel + Скасувати + + + OK + OK + + + Use custom settings + Використовувати налаштування користувача + + + + PreferencesDialogClass + + Preferences + Налаштування + + + Fonts + Шрифти + + + Font settings: + Параметри шрифту: + + + Browser + Навігатор + + + Application + Програма + + + Filters + Фільтри + + + Filter: + Фільтр: + + + Attributes: + Атрибути: + + + 1 + 1 + + + Add + Додати + + + Remove + Видалити + + + Documentation + Документація + + + Registered Documentation: + Зареєстрована документація: + + + Add... + Додати... + + + Options + Опції + + + On help start: + При запуску довідки: + + + Show my home page + Показувати мою домашню сторінку + + + Show a blank page + Показувати порожню сторінку + + + Show my tabs from last session + Показувати вкладку з минулого сеансу + + + Homepage + Домашня сторінка + + + Current Page + Поточна сторінка + + + Blank Page + Порожня сторінка + + + Restore to default + Відновити типово + + + + QCollectionGenerator + + Unknown token at line %1. + Невідомий токен в рядку %1. + + + Missing end tags. + Відсутні кінцеві теги. + + + Qt Collection Generator version 1.0 (Qt %1) + + Qt Collection Generator версії 1.0 (Qt %1) + + + + +Usage: + +qcollectiongenerator <collection-config-file> [options] + + -o <collection-file> Generates a collection file + called <collection-file>. If + this option is not specified + a default name will be used. + -v Displays the version of + qcollectiongenerator. + + + +Використання: + +qcollectiongenerator <файл-налаштувань-колекції> [опції] + + -o <файл-колекції> Згенерувати файл колекції з іменем + <файл-колекції>. Якщо цю опцію не + вказано, то використовуватиметься + типове ім'я + -v Показати версію qcollectiongenerator. + + + + + Unknown token at line %1. Expected "QtHelpCollectionProject". + Невідомий токен в рядку %1. Очікувався "QtHelpCollectionProject". + + + Missing input or output file for help file generation. + Відсутній вхідний чи вихідний файл для генерації файлу довідки. + + + Missing output file name. + Відсутнє ім'я вихідного файлу. + + + Missing collection config file. + Відсутній файл налаштувань колекції. + + + Could not open %1. + + Не вдалось відкрити %1. + + + + Reading collection config file... + + Читання файлу налаштувань колекції... + + + + Collection config file error: %1 + + Помилка файлу налаштувань колекції: %1 + + + + Generating help for %1... + + Генерування довідки для %1... + + + + Creating collection file... + + Створення файлу колекції... + + + + The file %1 cannot be overwritten. + + Неможливо перезаписати файл %1. + + + + Cannot open %1. + + Неможливо відкрити %1. + + + + Cannot open referenced image file %1. + + Неможливо відкрити файл зображення %1, на який є посилання. + + + + + QHelpGenerator + + Missing output file name. + Відсутнє ім'я вихідного файлу. + + + Qt Help Generator version 1.0 (Qt %1) + + Qt Help Generator версії 1.0 (Qt %1) + + + + Missing Qt help project file. + Відсутній файл проекту колекції довідки Qt. + + + Could not open %1. + + Не вдалось відкрити %1. + + + + +Usage: + +qhelpgenerator <help-project-file> [options] + + -o <compressed-file> Generates a Qt compressed help + file called <compressed-file>. + If this option is not specified + a default name will be used. + -c Checks whether all links in HTML files + point to files in this help project. + -v Displays the version of + qhelpgenerator. + + + +Використання: + +qhelpgenerator <файл-проекту-довідки> [опції] + + -o <стиснений-файл> Згенерувати стиснений файл довідки + з іменем <стиснений-файл>. Якщо цю + опцію не вказано, то буде використане + типове ім'я. + -c Перевірити, що усі посилання в файлах + HTML files вказують на файли в цьому + проекті довідки. + -v Показати версію qhelpgenerator. + + + + + Could not create output directory: %1 + + Не вдалось створити вихідну теку: %1 + + + + + RemoteControl + + Debugging Remote Control + Зневадження віддаленого управління + + + Received Command: %1 %2 + Отримано команду: %1 %2 + + + + SearchWidget + + &Copy + &Копіювати + + + Copy &Link Location + Копіювати &адресу посилання + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + Select All + Виділити все + + + + TopicChooser + + Choose Topic + Оберіть тему + + + &Topics + &Теми + + + &Display + &Показати + + + &Close + &Закрити + + + Choose a topic for <b>%1</b>: + Оберіть тему для <b>%1</b>: + + + diff -r ef0373b55136 -r 758a864f9613 translations/check-ts.xq --- a/translations/check-ts.xq Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/check-ts.xq Mon Oct 04 01:19:32 2010 +0300 @@ -1,3 +1,3 @@ for $file in tokenize($files, codepoints-to-string(10)) - let $fresh := doc($file)/TS/context/message[not (translation/@type = 'obsolete')] + let $fresh := doc($file)/TS/context[not (name = 'QtXmlPatterns')]/message[not (translation/@type = 'obsolete')] return concat($file, ":", count($fresh/translation[not (@type = 'unfinished')]) * 100 idiv count($fresh)) diff -r ef0373b55136 -r 758a864f9613 translations/designer_de.ts --- a/translations/designer_de.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/designer_de.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,27 +4,22 @@ AbstractFindWidget - &Previous &Vorige - &Next &Nächste - &Case sensitive &Groß/Kleinschreibung - Whole &words Nur ganze &Worte - <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;Die Suche hat das Ende erreicht @@ -32,17 +27,14 @@ AddLinkDialog - Insert Link Link einfügen - Title: Titel: - URL: URL: @@ -50,7 +42,6 @@ AppFontDialog - Additional Fonts Zusätzliche Schriftarten @@ -58,37 +49,30 @@ AppFontManager - '%1' is not a file. '%1' ist keine Datei. - The font file '%1' does not have read permissions. Die Fontdatei '%1' hat keinen Lesezugriff. - The font file '%1' is already loaded. Die Fontdatei ist bereits geladen. - The font file '%1' could not be loaded. Die Fontdatei '%1' konnte nicht geladen werden. - '%1' is not a valid font id. '%1' ist keine gültige Id einer Schriftart. - There is no loaded font matching the id '%1'. Es ist keine Schriftart mit der Id '%1' geladen. - The font '%1' (%2) could not be unloaded. Die Schriftart '%1' (%2) konnte nicht entladen werden. @@ -96,52 +80,42 @@ AppFontWidget - Fonts Schriftarten - Add font files Schriftarten hinzufügen - Remove current font file Schriftart entfernen - Remove all font files Alle Schriftarten entfernen - Add Font Files Schriftarten hinzufügen - Font files (*.ttf) Schriftarten (*.ttf) - Error Adding Fonts Fehler beim Hinzufügen einer Schriftart - Error Removing Fonts Fehler beim Entfernen von Schriftarten - Remove Fonts Schriftarten entfernen - Would you like to remove all fonts? Möchten Sie alle Schriftarten entfernen? @@ -149,12 +123,10 @@ AppearanceOptionsWidget - Form Formular - User Interface Mode Fenstermodus @@ -162,17 +134,14 @@ AssistantClient - Unable to send request: Assistant is not responding. Fehler beim Senden einer Anforderung: Das Programm Assistant antwortet nicht. - The binary '%1' does not exist. Die ausführbare Datei '%1' existiert nicht. - Unable to launch assistant (%1). Das Programm Assistant kann nicht gestartet werden (%1). @@ -180,92 +149,74 @@ BrushPropertyManager - Style Stil - No brush Kein Muster - Solid Voll - Dense 1 Dichte 1 - Dense 2 Dichte 2 - Dense 3 Dichte 3 - Dense 4 Dichte 4 - Dense 5 Dichte 5 - Dense 6 Dichte 6 - Dense 7 Dichte 7 - Horizontal Horizontal - Vertical Vertikal - Cross Kreuzende Linien - Backward diagonal Rückwärtslehnende Diagonalen - Forward diagonal Vorwärtslehnende Diagonalen - Crossing diagonal Kreuzende Diagonalen - Color Farbe - [%1, %2] [%1, %2] @@ -273,360 +224,277 @@ Command - - Change signal Signal ändern - - Change slot Slot ändern - Change signal-slot connection Signale-Slotverbindung ändern - Change sender Sender ändern - Change receiver Empfänger ändern - Add connection Verbindung hinzufügen - Adjust connection Verbindung anpassen - Delete connections Verbindungen löschen - Change source Startpunkt ändern - Change target Endpunkt ändern - Insert '%1' '%1' einfügen - Raise '%1' '%1' nach vorn - Lower '%1' '%1' nach hinten - Delete '%1' '%1' löschen - Reparent '%1' '%1' einem anderen Widget zuordnen - Promote to custom widget Platzhalter für benutzerdefinierte Klasse erzeugen - Demote from custom widget Platzhalter für benutzerdefinierte Klasse entfernen - Lay out using grid Objekte tabellarisch anordnen - Lay out vertically Objekte senkrecht anordnen - Lay out horizontally Objekte waagrecht anordnen - Break layout Layout auflösen - - - Move Page Seite verschieben - - - - Delete Page Seite löschen - - Page Seite - page Seite - - - - Insert Page Seite einfügen - Change Tab order Seite ändern - Create Menu Bar Menü erzeugen - Delete Menu Bar Menüleiste löschen - Create Status Bar Statuszeile erzeugen - Delete Status Bar Statuszeile löschen - Add Tool Bar Werkzeugleiste hinzufügen - Add Dock Window Dockfenster hinzufügen - Adjust Size of '%1' Größe von '%1' anpassen - Change Form Layout Item Geometry Ändern des Formularlayout-Elements - Change Layout Item Geometry Geometrie des Layoutelements ändern - Change Table Contents Tabelleninhalt ändern - Change Tree Contents Bauminhalt ändern - - Add action Aktion hinzufügen - - Remove action Aktion löschen - Add menu Menü hinzufügen - Remove menu Menü löschen - Create submenu Untermenü erzeugen - Delete Tool Bar Werkzeugleiste löschen - Set action text Text der Aktion setzen - Insert action Aktion einfügen - - Move action Aktion verschieben - Change Title Titel ändern - Insert Menu Menü einfügen - Change signals/slots Signale/Slots ändern - Delete Subwindow Subfenster löschen - Insert Subwindow Subfenster einfügen - subwindow subwindow - Subwindow Subwindow - Change Z-order of '%1' Z-Reihenfolge von '%1' ändern - Simplify Grid Layout Tabellarisches Layout vereinfachen - Create button group Buttons gruppieren - Break button group Button-Gruppierung aufheben - Break button group '%1' Gruppierung '%1' aufheben - Add buttons to group Buttons zur Gruppierung hinzufügen - Remove buttons from group Buttons aus Gruppierung entfernen - Morph %1/'%2' into %3 MorphWidgetCommand description %1/'%2' in %3 umwandeln - Change layout of '%1' from %2 to %3 Layout von '%1' von %2 in %3 umwandeln - - Add '%1' to '%2' Command description for adding buttons to a QButtonGroup '%1' zu '%2' hinzufügen - Remove '%1' from '%2' Command description for removing buttons from a QButtonGroup '%1' aus '%2' entfernen - Change script Skript ändern - Changed '%1' of '%2' '%1' von '%2' geändert - Changed '%1' of %n objects Singular will never be shown @@ -635,12 +503,10 @@ - Reset '%1' of '%2' '%1' von '%2' zurücksetzen - Reset '%1' of %n objects Singular will never be shown @@ -649,12 +515,10 @@ - Add dynamic property '%1' to '%2' Dynamische Eigenschaft '%1' zu '%2' hinzufügen - Add dynamic property '%1' to %n objects Singular will never be shown @@ -663,12 +527,10 @@ - Remove dynamic property '%1' from '%2' Dynamische Eigenschaft '%1' von '%2' entfernen - Remove dynamic property '%1' from %n objects Dynamische Eigenschaft '%1' des Objektes entfernen @@ -679,22 +541,18 @@ ConnectDialog - Configure Connection Verbindung bearbeiten - GroupBox GroupBox - Edit... Ändern... - Show signals and slots inherited from QWidget Signale und Slots von QWidget anzeigen @@ -702,17 +560,14 @@ ConnectionDelegate - <object> <Objekt> - <signal> <Signal> - <slot> <Slot> @@ -720,19 +575,16 @@ DPI_Chooser - Standard (96 x 96) Embedded device standard screen resolution Standardauflösung (96 x 96) - Greenphone (179 x 185) Embedded device screen resolution Greenphone (179 x 185) - High (192 x 192) Embedded device high definition screen resolution Hohe Auflösung (192 x 192) @@ -741,89 +593,72 @@ Designer - Qt Designer Qt Designer - Unable to launch %1. %1 konnte nicht gestartet werden. - %1 timed out. Zeitüberschreitung bei der Ausführung von %1. - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. Das Formular enthält freistehende Layoutelemente, die <b>nicht</b> gespeichert wurden. - Perhaps you forgot to create a layout? Haben Sie ein Layout eingefügt? - This file cannot be read because it was created using %1. Die Datei kann nicht gelesen werden, da sie mit %1 erzeugt wurde. - This file was created using Designer from Qt-%1 and cannot be read. Die Datei kann nicht gelesen werden, da sie mit dem Designer der Version %1 erzeugt wurde. - This file cannot be read because the extra info extension failed to load. Die Datei kann nicht gelesen werden (Fehler beim Laden der Daten der ExtraInfoExtension). - The converted file could not be read. Die konvertierte Datei konnte nicht gelesen werden. - Invalid UI file: The root element <ui> is missing. Fehler beim Lesen der ui-Datei: Das Wurzelelement <ui> fehlt. - An error has occurred while reading the UI file at line %1, column %2: %3 Fehler beim Lesen der ui-Datei bei Zeile %1, Spalte %2: %3 - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. Die Datei wurde mit dem Designer der Version %1 erzeugt und wird zu einem neuen Formular konvertiert. - The old form has not been touched, but you will have to save the form under a new name. Sie bleibt unverändert.Das neue Formular muss unter einem neuen Namen abgespeichert werden. - This file was created using Designer from Qt-%1 and could not be read: %2 Das Lesen der von Designer %1 erzeugten Datei schlug fehl: %2 - Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. Bitte wandeln Sie sie mit dem Befehl <b>uic3&nbsp;-convert</b> zum Format von Qt 4. - Custom Widgets Benutzerdefinierte Widgets - Promoted Widgets Platzhalter für benutzerdefinierte Klassen @@ -831,12 +666,10 @@ DesignerMetaEnum - %1 is not a valid enumeration value of '%2'. %1 ist kein gültiger Wert der Aufzählung '%2'. - '%1' could not be converted to an enumeration value of type '%2'. '%1' konnte nicht in einen Wert der Aufzählung '%2' konvertiert werden. @@ -844,7 +677,6 @@ DesignerMetaFlags - '%1' could not be converted to a flag value of type '%2'. '%1' konnte nicht in einen Wert des Maskentyps '%2' konvertiert werden. @@ -852,13 +684,11 @@ DeviceProfile - '%1' is not a number. Reading a number for an embedded device profile '%1' ist keine gültige Zahl. - An invalid tag <%1> was encountered. Ein ungültiges Element '%1' wurde festgestellt. @@ -866,27 +696,22 @@ DeviceProfileDialog - &Family Schrift&familie - &Point Size Punktgröße - Style Stil - Device DPI Bildschirmauflösung - Name Name @@ -894,57 +719,46 @@ DeviceSkin - The image file '%1' could not be loaded. Die Pixmap-Datei '%1' konnte nicht geladen werden. - The skin directory '%1' does not contain a configuration file. Das Skin-Verzeichnis '%1' enthält keine Konfigurationsdatei. - The skin configuration file '%1' could not be opened. Die Skin-Konfigurationsdatei '%1' konnte nicht geöffnet werden. - Syntax error: %1 Syntaxfehler: %1 - The skin cursor image file '%1' does not exist. Die Skin-Bilddatei '%1' für den Cursor existiert nicht. - Syntax error in area definition: %1 Die Bereichsdefinition enthält einen Syntaxfehler: %1 - Mismatch in number of areas, expected %1, got %2. Die angegebene Anzahl der Bereiche (%1) stimmt nicht; es wurden %2 Bereiche gefunden. - The skin configuration file '%1' could not be read: %2 Die Skin-Konfigurationsdatei '%1' konnte nicht gelesen werden: %2 - The skin "up" image file '%1' does not exist. Die Skin-Konfigurationsdatei '%1' (oben) existiert nicht. - The skin "down" image file '%1' does not exist. Die Skin-Konfigurationsdatei '%1' (unten) existiert nicht. - The skin "closed" image file '%1' does not exist. Die Skin-Konfigurationsdatei '%1' (geschlossen) existiert nicht. @@ -952,7 +766,6 @@ EmbeddedOptionsControl - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Stil</b></td><td>%3</td></tr><tr><td><b>Auflösung</b></td><td>%4 x %5</td></tr></table></html> @@ -961,13 +774,11 @@ EmbeddedOptionsPage - Embedded Design Tab in preferences dialog Embedded-Entwurf - Device Profiles EmbeddedOptionsControl group box" Profile @@ -976,27 +787,22 @@ FontPanel - Font Schriftart - &Writing system Schrifts&ystem - &Family Schrift&familie - &Style &Stil - &Point size &Punktgröße @@ -1004,22 +810,18 @@ FontPropertyManager - PreferDefault Voreinstellung bevorzugt - NoAntialias Keine Kantenglättung - PreferAntialias Kantenglättung bevorzugen - Antialiasing Kantenglättung @@ -1027,43 +829,44 @@ FormBuilder - Invalid stretch value for '%1': '%2' - Parsing layout stretch values + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values Ungültiger Stretch-Wert für '%1': '%2' - Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values FormEditorOptionsPage - %1 % %1 % - Preview Zoom Vergrößerungsfaktor für Vorschau - Default Zoom Vorgabe für Vergrößerungsfaktor - Forms Tab in preferences dialog Formulare - Default Grid Raster für neue Formulare @@ -1071,37 +874,30 @@ FormLayoutRowDialog - Add Form Layout Row Formularlayoutzeile hinzufügen - &Label text: Be&schriftung: - Field &type: &Datentyp: - &Field name: &Feldname: - &Buddy: &Buddy: - &Row: &Zeile: - Label &name: &Label-Name: @@ -1109,12 +905,10 @@ FormWindow - Unexpected element <%1> Ungültiges Element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Fehler beim Einfügen der Zwischenablage, Zeile %1, Spalte %2: %3 @@ -1122,62 +916,50 @@ FormWindowSettings - Form Settings Formulareinstellungen - Layout &Default &Layout-Standardwerte - &Spacing: A&bstand: - &Margin: &Rand: - &Layout Function Layout&funktion - Ma&rgin: Ra&nd: - Spa&cing: Abstan&d: - Embedded Design Embedded-Entwurf - &Author &Autor - &Include Hints &Include-Dateien - &Pixmap Function &Pixmapfunktion - Grid Raster @@ -1185,7 +967,6 @@ IconSelector - All Pixmaps ( Alle Pixmap-Dateien ( @@ -1193,7 +974,6 @@ ItemPropertyBrowser - XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser Ausgewähltes Icon, aus @@ -1202,33 +982,27 @@ MainWindowBase - Main Not currently used (main tool bar) Haupt-Werkzeugleiste - File Datei - Edit Bearbeiten - Tools Werkzeuge - Form Formular - Qt Designer Qt Designer @@ -1236,52 +1010,42 @@ NewForm - C&reate &Neu von Vorlage - Recent Zuletzt bearbeitet - &Close &Schließen - &Open... &Öffnen... - &Recent Forms &Zuletzt bearbeitete Formulare - Read error Lesefehler - New Form Neues Formular - Show this Dialog on Startup Diesen Dialog zu Beginn anzeigen - A temporary form file could not be created in %1. In dem Verzeichnis %1 konnte keine temporäre Formulardatei angelegt werden. - The temporary form file %1 could not be written. Die temporäre Formulardatei %1 konnte nicht geschrieben werden. @@ -1289,22 +1053,18 @@ ObjectInspectorModel - Object Objekt - Class Klasse - separator Trenner - <noname> <unbenannt> @@ -1312,12 +1072,10 @@ ObjectNameDialog - Change Object Name Objektnamen bearbeiten - Object Name Objektname @@ -1325,12 +1083,10 @@ PluginDialog - Plugin Information Plugins - 1 1 @@ -1338,7 +1094,6 @@ PreferencesDialog - Preferences Einstellungen @@ -1346,32 +1101,26 @@ PreviewConfigurationWidget - Form Formular - Print/Preview Configuration Druck/Vorschau - Style Stil - Style sheet Style sheet - ... ... - Device skin Geräte-Skin @@ -1379,7 +1128,6 @@ PromotionModel - Not used Usage of promoted widgets Nicht verwendet @@ -1388,8 +1136,6 @@ Q3WizardContainer - - Page Seite @@ -1397,58 +1143,47 @@ QAbstractFormBuilder - Unexpected element <%1> Ungültiges Element <%1> - An error has occurred while reading the UI file at line %1, column %2: %3 Fehler beim Lesen der ui-Datei bei Zeile %1, Spalte %2: %3 - Invalid UI file: The root element <ui> is missing. Fehler beim Lesen der ui-Datei: Das Wurzelelement <ui> fehlt. - The creation of a widget of the class '%1' failed. Es konnte kein Widget der Klasse '%1' erzeugt werden. - Attempt to add child that is not of class QWizardPage to QWizard. Es wurde versucht, einem Objekt der Klasse QWizard eine Seite hinzuzufügen, die nicht vom Typ QWizardPage ist. - Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. Es wurde versucht, ein Layout auf das Widget '%1' (%2) zu setzen, welches bereits ein Layout vom Typ %3 hat. Das deutet auf eine Inkonsistenz in der ui-Datei hin. - Empty widget item in %1 '%2'. Leeres Widget-Item in %1 '%2'. - Flags property are not supported yet. Eigenschaften des Typs "Flag" werden nicht unterstützt. - While applying tab stops: The widget '%1' could not be found. Fehler beim Setzen der Tabulatorreihenfolge: Es konnte kein Widget mit dem Namen '%1' gefunden werden. - Invalid QButtonGroup reference '%1' referenced by '%2'. Ungültige Referenz der Buttongruppe '%1', referenziert von '%2'. - This version of the uitools library is linked without script support. Dies Version der uitools-Bibliothek unterstützt keine Skripte. @@ -1456,12 +1191,10 @@ QAxWidgetPlugin - ActiveX control ActiveX-Steuerelement - ActiveX control widget ActiveX-Widget @@ -1469,22 +1202,18 @@ QAxWidgetTaskMenu - Set Control Steuerelement setzen - Reset Control Steuerelement zurücksetzen - Licensed Control Lizensiertes Steuerelement - The control requires a design-time license Das Steuerelement erfordert eine Lizenz zur Entwurfszeit @@ -1492,67 +1221,54 @@ QCoreApplication - %1 is not a promoted class. %1 ist kein Platzhalter für eine benutzerdefinierte Klasse. - The base class %1 is invalid. %1 ist keine gültige Basisklasse. - The class %1 already exists. Es existiert bereits eine Klasse namens %1. - Promoted Widgets Platzhalter für benutzerdefinierte Klassen - The class %1 cannot be removed Die Klasse %1 kann nicht gelöscht werden - The class %1 cannot be removed because it is still referenced. Die Klasse %1 kann nicht gelöscht werden, da sie gegenwärtig verwendet wird. - The class %1 cannot be renamed Die Klasse %1 kann nicht umbenannt werden - The class %1 cannot be renamed to an empty name. Der Klassennamen darf nicht leer sein (%1). - There is already a class named %1. Es existiert bereits eine Klasse namens %1. - Cannot set an empty include file. Der Name der Include-Datei darf nicht leer sein. - Exception at line %1: %2 Ausnahmefehler bei Zeile %1: %2 - Unknown error Unbekannter Fehler - An error occurred while running the script for %1: %2 Script: %3 Bei der Ausführung des Skripts für %1 trat ein Fehler auf: %2Skript: %3 @@ -1561,17 +1277,14 @@ QDesigner - %1 - warning %1 - Warnung - Qt Designer Qt Designer - This application cannot be used for the Console edition of Qt Diese Anwendung kann in der Qt-Konsolen-Edition nicht benutzt werden @@ -1579,207 +1292,162 @@ QDesignerActions - Edit Widgets Widgets bearbeiten - &Quit &Beenden - &Minimize &Minimieren - Bring All to Front Alle Formulare anzeigen - Preferences... Einstellungen... - Clear &Menu Menü &löschen - CTRL+SHIFT+S CTRL+SHIFT+S - CTRL+R CTRL+R - CTRL+M CTRL+M - Qt Designer &Help &Hilfe zum Qt Designer - Current Widget Help Hilfe zum ausgewählten Widget - What's New in Qt Designer? Was gibt es Neues beim Qt Designer? - About Plugins Plugins - - About Qt Designer Über Qt Designer - About Qt Über Qt - - Open Form Formular öffnen - - - Designer UI files (*.%1);;All Files (*) Designer-UI-Dateien (*.%1);;Alle Dateien (*) - %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. Möchten Sie sie überschreiben? - Saved %1. Das Formular %1 wurde gespeichert... - &Recent Forms &Zuletzt bearbeitete Formulare - Designer Designer - Feature not implemented yet! Diese Funktionalität ist noch nicht implementiert. - Read error Lesefehler - %1 Do you want to update the file location or generate a new form? %1 Möchten Sie einen anderen Namen eingeben oder ein neues Formular erzeugen? - &Update &Anderer Name - &New Form &Neues Formular - - Save Form? Formular speichern? - Could not open file Die Datei konnte nicht geöffnet werden - - The backup file %1 could not be written. Hintergrundsicherung: Die Datei %1 konnte nicht geschrieben werden. - The backup directory %1 could not be created. Hintergrundsicherung: Das Verzeichnis %1 konnte nicht angelegt werden. - The temporary backup directory %1 could not be created. Hintergrundsicherung: Das temporäre Verzeichnis %1 konnte nicht angelegt werden. - Please close all forms to enable the loading of additional fonts. Bitte schließen Sie alle Formulare, um zusätzliche Schriftarten zu laden. - Select New File Andere Datei - Could not write file Die Datei konnte nicht geschrieben werden - &Close Preview Vorschau &schließen - Save &Image... &Vorschaubild speichern... - &Print... &Drucken... - Additional Fonts... &Zusätzliche Schriftarten... - The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -1788,7 +1456,6 @@ Möchten Sie es noch einmal versuchen oder eine andere Datei auswählen? - It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -1797,96 +1464,74 @@ Möchten Sie es noch einmal versuchen? - Image files (*.%1) Bilddateien (*.%1) - - Save Image Bild speichern - The file %1 could not be written. Die Datei %1 konnte nicht geschrieben werden. - &New... &Neu... - &Open... &Öffnen... - &Save &Speichern - Save &As... Speichern &unter... - Save A&ll &Alles speichern - Save As &Template... Als Vor&lage abspeichern... - - &Close &Schließen - View &Code... &Code anzeigen... - - Save Form As Formular unter einem anderen Namen speichern - Preview failed Es konnte keine Vorschau erzeugt werden - Code generation failed Es konnte kein Code generiert werden - - Assistant Assistant - Saved image %1. Das Vorschaubild wurde unter %1 gespeichert. - Printed %1. %1 wurde gedruckt. - ALT+CTRL+S ALT+CTRL+S @@ -1894,7 +1539,6 @@ QDesignerAppearanceOptionsPage - Appearance Tab in preferences dialog Ansicht @@ -1903,17 +1547,14 @@ QDesignerAppearanceOptionsWidget - Docked Window Dockfenster-Modus - Multiple Top-Level Windows Multifenster-Modus - Toolwindow Font Font für Dockfenster @@ -1921,22 +1562,18 @@ QDesignerAxWidget - Reset control Steuerelement zurücksetzen - Set control Steuerelement setzen - Control loaded Steuerelement geladen - A COM exception occurred when executing a meta call of type %1, index %2 of "%3". Beim Methodenaufruf des Typs %1, index %2 von "%3" trat eine COM-Ausnahme auf. @@ -1944,17 +1581,14 @@ QDesignerFormBuilder - Script errors occurred: Es sind Skriptfehler aufgetreten: - The preview failed to build. Es konnte keine Vorschau erzeugt werden. - Designer Designer @@ -1962,22 +1596,18 @@ QDesignerFormWindow - %1 - %2[*] %1 - %2[*] - Save Form? Formular speichern? - Do you want to save the changes to this document before closing? Möchten Sie die Änderungen an diesem Formular speichern? - If you don't save, your changes will be lost. Die Änderungen gehen verloren, wenn Sie nicht speichern. @@ -1985,38 +1615,30 @@ QDesignerMenu - Type Here Geben Sie Text ein - Add Separator Trenner hinzufügen - Insert separator Trenner einfügen - Remove action '%1' Aktion '%1' löschen - Remove separator Trenner löschen - - Add separator Trenner hinzufügen - Insert action Aktion einfügen @@ -2024,22 +1646,18 @@ QDesignerMenuBar - Type Here Geben Sie Text ein - Remove Menu '%1' Menü '%1' öschen - Remove Menu Bar Menüleiste löschen - Menu Menü @@ -2047,37 +1665,30 @@ QDesignerPluginManager - An XML error was encountered when parsing the XML of the custom widget %1: %2 Fehler beim Auswerten des XML des benutzerdefinierten Widgets %1: %2 - A required attribute ('%1') is missing. Bei dem Element fehlt ein erforderliches Attribut ('%1'). - An invalid property specification ('%1') was encountered. Supported types: %2 '%1' ist keine gültige Spezifikation einer Eigenschaft. Die folgenden Typen werden unterstützt: %2 - '%1' is not a valid string property specification. '%1' ist keine gültige Spezifikation einer Zeichenketten-Eigenschaft. - The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. Der XML-Code für das Widget %1 enthält kein gültiges Wurzelelement (<widget>, <ui>). - The class attribute for the class %1 is missing. Das Klassenattribut der Klasse %1 fehlt. - The class attribute for the class %1 does not match the class name %2. Das Klassenattribut der Klasse %1 entspricht nicht dem Klassennamen (%2). @@ -2085,7 +1696,6 @@ QDesignerPropertySheet - Dynamic Properties Dynamische Eigenschaften @@ -2093,31 +1703,26 @@ QDesignerResource - The layout type '%1' is not supported, defaulting to grid. Der Layout-Typ '%1' wird nicht unterstützt; es wurde ein Grid-Layout erzeugt. - The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. Die Container-Extension des Widgets '%1' (%2) gab für Seite %5 ein Widget '%3' (%4) zurück, was nicht von Designer verwaltet wird. Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifiziert werden. - Unexpected element <%1> Parsing clipboard contents Ungültiges Element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Parsing clipboard contents Fehler beim Einfügen der Zwischenablage, Zeile %1, Spalte %2: %3 - Error while pasting clipboard contents: The root element <ui> is missing. Parsing clipboard contents Fehler beim Einfügen der Zwischenablage: Das Wurzelelement <ui> fehlt. @@ -2126,12 +1731,10 @@ QDesignerSharedSettings - The template path %1 could not be created. Das Vorlagenverzeichnis %1 konnte nicht angelegt werden. - An error has been encountered while parsing device profile XML: %1 Beim Lesen des Profils trat ein Fehler auf: %1 @@ -2139,32 +1742,26 @@ QDesignerToolWindow - Property Editor Eigenschaften - Action Editor Aktionseditor - Object Inspector Objektanzeige - Resource Browser Ressourcen - Signal/Slot Editor Signale und Slots - Widget Box Widget-Box @@ -2172,97 +1769,78 @@ QDesignerWorkbench - &File &Datei - F&orm F&ormular - Preview in Vorschau im - &Window &Fenster - &Help &Hilfe - Edit Bearbeiten - Toolbars Werkzeugleisten - Save Forms? Formulare speichern? - &View &Ansicht - &Settings &Einstellungen - Widget Box Widgetbox - If you do not review your documents, all your changes will be lost. Die Änderungen gehen verloren, wenn Sie sich die Formulare nicht noch einmal ansehen. - Discard Changes Änderungen verwerfen - Review Changes Änderungen ansehen - Backup Information Information zur Hintergrundsicherung - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? Designer wurde offenbar nicht ordnungsgemäß beendet; es existieren noch Dateien von der Hintergrundsicherung. Möchten Sie sie laden? - The file <b>%1</b> could not be opened. Die Datei <b>%1</b> konnte nicht geöffnet werden. - The file <b>%1</b> is not a valid Designer UI file. Die Datei <b>%1</b> ist keine gültige Designer-Datei. - There are %n forms with unsaved changes. Do you want to review these changes before quitting? Das Formular wurde geändert. Möchten Sie sich die Änderungen ansehen, bevor Sie das Programm beenden? @@ -2273,53 +1851,47 @@ QFormBuilder - An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method Der Methode %1 wurde ein leerer Klassennamen übergeben (Name '%2'). - QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder konnte kein benutzerdefiniertes Widget der Klasse '%1' erzeugen; es wurde ein Widget der Basisklasse '%2' erzeugt. - QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder konnte kein Objekt der Klasse '%1' erzeugen. - The layout type `%1' is not supported. Layouts des Typs `%1' werden nicht unterstützt. - The set-type property %1 could not be read. Die Eigenschaft %1 konnte nicht gelesen werden (Typ: Menge). - The enumeration-type property %1 could not be read. Die Eigenschaft %1 konnte nicht gelesen werden (Typ: Aufzählung). - Reading properties of the type %1 is not supported yet. Das Lesen von Eigenschaften des Typs %1 wird nicht unterstützt. - The property %1 could not be written. The type %2 is not supported yet. Die Eigenschaft %1 konnte nicht geschrieben werden, da der Typ %2 nicht unterstützt wird. - The enumeration-value '%1' is invalid. The default value '%2' will be used instead. Der Aufzählungswert '%1' ist ungültig. Es wird der Vorgabewert '%2' verwendet. - The flag-value '%1' is invalid. Zero will be used instead. Der Flag-Wert '%1' ist ungültig. Es wird der Wert 0 verwendet. @@ -2327,48 +1899,38 @@ QStackedWidgetEventFilter - Previous Page Vorige Seite - Next Page Nächste Seite - Delete Löschen - Before Current Page Davor - After Current Page Danach - Change Page Order... Seiten umordnen.... - Change Page Order Seiten umordnen - Page %1 of %2 Seite %1 von %2 - - Insert Page Seite einfügen @@ -2376,12 +1938,10 @@ QStackedWidgetPreviewEventFilter - Go to previous page of %1 '%2' (%3/%4). Gehe zur vorigen Seite von %1 '%2' (%3/%4). - Go to next page of %1 '%2' (%3/%4). Gehe zur nächste Seite von %1 '%2' (%3/%4). @@ -2389,28 +1949,22 @@ QTabWidgetEventFilter - Delete Löschen - Before Current Page Davor - After Current Page Danach - Page %1 of %2 Seite %1 von %2 - - Insert Page Seite einfügen @@ -2418,37 +1972,30 @@ QToolBoxHelper - Delete Page Seite löschen - Before Current Page Davor - After Current Page Danach - Change Page Order... Seiten umordnen.... - Change Page Order Seiten umordnen - Page %1 of %2 Seite %1 von %2 - Insert Page Seite einfügen @@ -2456,15 +2003,10 @@ QtBoolEdit - - - True Wahr - - False Falsch @@ -2472,12 +2014,10 @@ QtBoolPropertyManager - True Wahr - False Falsch @@ -2485,7 +2025,6 @@ QtCharEdit - Clear Char Zeichen löschen @@ -2493,7 +2032,6 @@ QtColorEditWidget - ... ... @@ -2501,22 +2039,18 @@ QtColorPropertyManager - Red Rot - Green Grün - Blue Blau - Alpha Alpha @@ -2524,97 +2058,78 @@ QtCursorDatabase - Arrow Pfeil - Up Arrow Pfeil hoch - Cross Kreuzende Linien - Wait Sanduhr - IBeam IBeam - Size Vertical Vertikal vergrößern - Size Horizontal Horizontal vergrößern - Size Backslash Vergrößern/Backslash - Size Slash Vergrößern/Slash - Size All Alles vergrößern - Blank Leer - Split Vertical Vertikal aufteilen - Split Horizontal Horizontal aufteilen - Pointing Hand Hand - Forbidden Verboten - Open Hand Geöffnete Hand - Closed Hand Geschlossene Hand - What's This What's This - Busy Beschäftigt @@ -2622,12 +2137,10 @@ QtFontEditWidget - ... ... - Select Font Schriftart auswählen @@ -2635,37 +2148,30 @@ QtFontPropertyManager - Family Familie - Point Size Punktgröße - Bold Fett - Italic Kursiv - Underline Unterstreichen - Strikeout Durchgestrichen - Kerning Kerning @@ -2673,7 +2179,6 @@ QtGradientDialog - Edit Gradient Gradienten bearbeiten @@ -2681,304 +2186,242 @@ QtGradientEditor - Start X Anfangswert X - Start Y Anfangswert Y - Final X Endwert X - Final Y Endwert Y - - Central X Mittelpunkt X - - Central Y Mittelpunkt Y - Focal X Fokus X - Focal Y Fokus Y - Radius Radius - Angle Winkel - Linear Linear - Radial Radial - Conical Konisch - Pad Auffüllen - Repeat Wiederholen - Reflect Spiegeln - Form Form - Gradient Editor Gradienten bearbeiten - 1 1 - 2 2 - 3 3 - 4 4 - 5 5 - Gradient Stops Editor Bezugspunkte - This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. Diese Fläche dient zum Bearbeiten der Bezugspunkte. Doppelklicken Sie auf einen Bezugspunkt, um ihn zu duplizieren. Doppelklicken Sie auf die Fläche, um einen neuen Bezugspunkt zu erzeugen. Benutzen Sie Drag & Drop um einen Punkt zu verschieben. Die rechte Maustaste aktiviert ein Menü mit weiteren Optionen. - Zoom Vergrößern - Position Position - Hue Farbton - H H - Saturation Sättigung - S S - Sat Sättigung - Value Wert - V V - Val Wert - Alpha Alpha - A A - Type Typ - Spread Ausbreitung - Color Farbe - Current stop's color Farbe des Bezugspunkts - HSV HSV - RGB RGB - Current stop's position Position des Bezugspunkts - % % - Zoom In Vergrößern - Zoom Out Verkleinern - Toggle details extension Weiter Optionen einblenden - > > - Linear Type Typ linear - ... ... - Radial Type Typ radial - Conical Type Typ konisch - Pad Spread Auffüllen - Repeat Spread Wiederholen - Reflect Spread Spiegeln - This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. Dieser Bereich zeigt eine Vorschau des in Bearbeitung befindlichen Gradienten. Hier können Gradienttyp-spezifische Parameter, wie Start- und Endpunkt, Radius etc. per Drag & Drop bearbeitet werden. - Show HSV specification HSV-Spezifikation anzeigen - Show RGB specification RGB-Spezifikation anzeigen - Reset Zoom Vergrößerung zurücksetzen @@ -2986,37 +2429,30 @@ QtGradientStopsWidget - New Stop Neuer Bezugspunkt - Delete Löschen - Flip All Alles umkehren - Select All Alles auswählen - Zoom In Vergrößern - Zoom Out Verkleinern - Reset Zoom Vergrößerung zurücksetzen @@ -3024,46 +2460,34 @@ QtGradientView - Grad Grad - Remove Gradient Gradient löschen - Are you sure you want to remove the selected gradient? Möchten Sie den ausgewählten Gradienten löschen? - - New... Neu... - - Edit... Ändern... - - Rename Umbenennen - - Remove Löschen - Gradient View Gradientenanzeige @@ -3071,8 +2495,6 @@ QtGradientViewDialog - - Select Gradient Gradienten auswählen @@ -3080,7 +2502,6 @@ QtKeySequenceEdit - Clear Shortcut Tastenkürzel löschen @@ -3088,17 +2509,14 @@ QtLocalePropertyManager - %1, %2 %1, %2 - Language Sprache - Country Land @@ -3106,17 +2524,14 @@ QtPointFPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3124,17 +2539,14 @@ QtPointPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3142,12 +2554,10 @@ QtPropertyBrowserUtils - [%1, %2, %3] (%4) [%1, %2, %3] (%4) - [%1, %2] [%1, %2] @@ -3155,27 +2565,22 @@ QtRectFPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Breite - Height Höhe @@ -3183,27 +2588,22 @@ QtRectPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Breite - Height Höhe @@ -3211,33 +2611,26 @@ QtResourceEditorDialog - Edit Resources Ressourcen bearbeiten - New... Neu... - - New Resource File Neue Ressourcendatei - <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>Hinweis:</b><p>Die gewählte Datei: </p><p>%1</p><p>befindet sich außerhalb des Verzeichnisses der Ressourcendatei:</p> - <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>Bitte wählen Sie:</p><table><tr><th align="left">Kopieren</th><td>um die Datei in das Verzeichnis der Ressourcendatei zu kopieren.</td></tr><tr><th align="left">Kopieren nach...</th><td>um die Datei in ein Unterverzeichnis der Ressourcendatei zu kopieren.</td></tr><tr><th align="left">Beibehalten</th><td>um die Datei in ihrem gegenwärtigen Verzeichnis zu verwenden.</td></tr></table> - Could not copy %1 to @@ -3248,248 +2641,192 @@ %2 - A parse error occurred at line %1, column %2 of %3: %4 In der Datei %3 wurde bei Zeile %1, Spalte %2 ein Fehler gefunden: %4 - Open... Öffnen... - - Remove Löschen - - Move Up Nach oben - - Move Down Nach unten - - Add Prefix Präfix hinzufügen - Add Files... Dateien hinzufügen... - Change Prefix Präfix ändern - Change Language Sprache ändern - Change Alias Alias ändern - Clone Prefix... Präfix doppeln... - Prefix / Path Präfix / Pfad - Language / Alias Sprache / Alias - <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>Warnung:</b> Beim Neuladen der Ressourcen traten Fehler auf:</p><pre>%1</pre></html> - Resource Warning Ressourcen - Warnung - Dialog Dialog - New File Neue Datei - N N - Remove File Datei löschen - R L - I I - New Resource Neue Ressource - A A - Remove Resource or File Datei oder Ressource löschen - %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. Wollen Sie sie überschreiben? - The file does not appear to be a resource file; element '%1' was found where '%2' was expected. Die Datei ist offenbar keine Ressourcendatei; an Stelle des erwarteten Elements '%2' wurde das Element '%1' gefunden. - %1 [read-only] %1 [schreibgeschützt] - - %1 [missing] %1 [fehlt] - <no prefix> <kein Präfix> - - Resource files (*.qrc) Ressourcendateien (*.qrc) - Import Resource File Ressourcendatei importieren - newPrefix newPrefix - Add Files Dateien hinzufügen - Incorrect Path Fehlerhafte Pfadangabe - - - - Copy Kopieren - Copy As... Kopieren nach... - Keep Beibehalten - Skip Überspringen - Clone Prefix Präfix doppeln - Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". Bitte geben Sie den Suffix ein, der an den Namen der gedoppelten Dateien angehängt werden soll. Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. - - Copy As Kopieren nach - <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>Die gewählte Datei: </p><p>%1</p><p>befindet sich außerhalb des Verzeichnisses der Ressourcendatei:</p><p>%2</p><p>Bitte wählen Sie einen anderen Pfad, der im Verzeichnis der Ressourcendatei enthalten ist.</p> - Could not overwrite %1. %1 konnte nicht überschrieben werden. - Save Resource File Ressourcendatei speichern - Could not write %1: %2 Die Datei %1konnte nicht geschrieben werden: %2 - Open Resource File Ressourcendatei öffnen @@ -3497,24 +2834,20 @@ QtResourceView - Size: %1 x %2 %3 Größe: %1 x %2 %3 - Edit Resources... Ressourcen bearbeiten... - Reload Neu laden - Copy Path Pfad kopieren @@ -3522,7 +2855,6 @@ QtResourceViewDialog - Select Resource Ressource auswählen @@ -3530,17 +2862,14 @@ QtSizeFPropertyManager - %1 x %2 %1 x %2 - Width Breite - Height Höhe @@ -3548,33 +2877,26 @@ QtSizePolicyPropertyManager - - <Invalid> <Ungültig> - [%1, %2, %3, %4] [%1, %2, %3, %4] - Horizontal Policy Horizontale Einstellung - Vertical Policy Vertikale Einstellung - Horizontal Stretch Horizontaler Dehnungsfaktor - Vertical Stretch Vertikaler Dehnungsfaktor @@ -3582,17 +2904,14 @@ QtSizePropertyManager - %1 x %2 %1 x %2 - Width Breite - Height Höhe @@ -3600,107 +2919,86 @@ QtToolBarDialog - < S E P A R A T O R > < T R E N N E R > - Customize Toolbars Werkzeugleisten anpassen - 1 1 - Actions Aktionen - Toolbars Werkzeugleisten - New Neu - Remove Löschen - Rename Umbenennen - Up Nach oben - <- <- - -> -> - Down Nach unten - Current Toolbar Actions Aktionen - Custom Toolbar Benutzerdefinierte Werkzeugleiste - Add new toolbar Neue Werkzeugleiste hinzufügen - Remove selected toolbar Ausgewählte Werkzeugleiste '%1' löschen - Rename toolbar Werkzeugleiste umbenennen - Move action up Aktion eins nach oben - Remove action from toolbar Aktion aus Werkzeugleiste entfernen - Add action to toolbar Aktion zu Werkzeugleiste hinzufügen - Move action down Aktion eins nach unten @@ -3708,12 +3006,10 @@ QtTreePropertyBrowser - Property Eigenschaft - Value Wert @@ -3721,64 +3017,52 @@ SaveFormAsTemplate - Add path... Verzeichnis anlegen... - Template Exists Die Vorlage existiert bereits - A template with the name %1 already exists. Do you want overwrite the template? Es existiert bereits eine Vorlage mit dem Namen %1. Möchten Sie sie überschreiben? - Overwrite Template Vorlage überschreiben - Open Error Fehler beim Öffnen - There was an error opening template %1 for writing. Reason: %2 Die Vorlage %1 konnte nicht in eine Datei geschrieben werden: %2 - Write Error Schreibfehler - There was an error writing the template %1 to disk. Reason: %2 Die Vorlage %1 konnte nicht in eine Datei geschrieben werden: %2 - Pick a directory to save templates in Wählen Sie ein Verzeichnis zum Abspeichern der Vorlagen aus - Save Form As Template Formular als Vorlage abspeichern - &Category: &Kategorie: - &Name: &Name: @@ -3786,7 +3070,6 @@ ScriptErrorDialog - An error occurred while running the scripts for "%1": Bei der Ausführung der Skripte für "%1" sind Fehler aufgetreten: @@ -3796,22 +3079,18 @@ SelectSignalDialog - Go to slot - Select signal - signal Signal - class Klasse @@ -3819,7 +3098,6 @@ SignalSlotConnection - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) SENDER(%1), SIGNAL(%2), EMPFÄNGER(%3), SLOT(%4) @@ -3827,32 +3105,26 @@ SignalSlotDialogClass - Signals and slots Signale und Slots - Slots Slots - ... ... - Signals Signale - Add Hinzufügen - Delete Löschen @@ -3860,12 +3132,10 @@ Spacer - Horizontal Spacer '%1', %2 x %3 Horizontales Füllelement '%1', %2 x %3 - Vertical Spacer '%1', %2 x %3 Vertikales Füllelement '%1', %2 x %3 @@ -3873,7 +3143,6 @@ TemplateOptionsPage - Template Paths Tab in preferences dialog Verzeichnisse für Vorlagen @@ -3882,52 +3151,42 @@ ToolBarManager - Configure Toolbars... Werkzeugleiste konfigurieren... - Window Fenster - Help Hilfe - Style Stil - Dock views Dockfenster - File Datei - Edit Bearbeiten - Tools Werkzeuge - Form Formular - Toolbars Werkzeugleisten @@ -3935,30 +3194,64 @@ VersionDialog - <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Version %2 - Qt Designer Qt Designer - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> - %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + VideoPlayerTaskMenu + + Available Mime Types + Verfügbare Mime-Typen + + + Display supported mime types... + Verfügbare Mime-Typen anzeigen... + + + Load... + Laden... + + + Play + Wiedergabe + + + Pause + Pause + + + Stop + Stop + + + Choose Video Player Media Source + Medienquelle wählen + + + An error has occurred in '%1': %2 + In '%1' ist ein Fehler aufgetreten: %2 + + + Video Player Error + Video Player Fehler + + + WidgetDataBase - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Die Datei enthält ein benutzerdefiniertes Widget '%1' dessen Basisklasse (%2) nicht mit dem Eintrag in der Widget-Datenbank übereinstimmt. Die Widget-Datenbank wird nicht geändert. @@ -3966,87 +3259,70 @@ qdesigner_internal::ActionEditor - Actions Aktionen - New... Neu... - Delete Löschen - New action Neue Aktion - Edit action Aktion ändern - Edit... Ändern... - Go to slot... Slot anzeigen... - Copy Kopieren - Cut Ausschneiden - Paste Einfügen - Select all Alles auswählen - Icon View Icon-Ansicht - Detailed View Detaillierte Ansicht - Remove actions Aktionen löschen - Remove action '%1' Aktion '%1' löschen - Used In Verwendet in - Configure Action Editor Aktionseditor konfigurieren @@ -4054,32 +3330,26 @@ qdesigner_internal::ActionModel - Name Name - Used Verwendet - Text Text - Shortcut Tastenkürzel - Checkable Ankreuzbar - ToolTip ToolTip @@ -4087,27 +3357,22 @@ qdesigner_internal::BrushManagerProxy - The element '%1' is missing the required attribute '%2'. Bei dem Element fehlt das erforderliche Attribut '%2'. - Empty brush name encountered. Fehlender Name bei der Brush-Definition. - An unexpected element '%1' was encountered. Ein ungültiges Element '%1' wurde festgestellt. - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 Fehler beim Lesen der Brush-Datei '%1' bei Zeile %2, Spalte %3: %4 - An error occurred when reading the resource file '%1' at line %2, column %3: %4 Fehler beim Lesen der Ressourcen-Datei '%1' bei Zeile %2, Spalte %3: %4 @@ -4115,17 +3380,14 @@ qdesigner_internal::BuddyEditor - Add buddy Buddy hinzufügen - Remove buddies Buddies löschen - Remove %n buddies Buddy löschen @@ -4133,7 +3395,6 @@ - Add %n buddies Buddy hinzufügen @@ -4141,7 +3402,6 @@ - Set automatically Automatisch setzen @@ -4149,7 +3409,6 @@ qdesigner_internal::BuddyEditorPlugin - Edit Buddies Buddies bearbeiten @@ -4157,7 +3416,6 @@ qdesigner_internal::BuddyEditorTool - Edit Buddies Buddies bearbeiten @@ -4165,12 +3423,10 @@ qdesigner_internal::ButtonGroupMenu - Select members Mitglieder auswählen - Break Aufheben @@ -4178,32 +3434,26 @@ qdesigner_internal::ButtonTaskMenu - Assign to button group Gruppierung - Button group Gruppierung - New button group Neue Gruppierung - Change text... Text ändern... - None Keine - Button group '%1' Gruppierung '%1' @@ -4211,57 +3461,46 @@ qdesigner_internal::CodeDialog - Save... Speichern... - Copy All Alles kopieren - &Find in Text... &Suchen... - A temporary form file could not be created in %1. In dem Verzeichnis %1 konnte keine temporäre Formulardatei angelegt werden. - The temporary form file %1 could not be written. Die temporäre Formulardatei %1 konnte nicht geschrieben werden. - %1 - [Code] %1 - [Code] - Save Code Code speichern - Header Files (*.%1) Include-Dateien (*.%1) - The file %1 could not be opened: %2 Die Datei %1 konnte nicht geöffnet werden: %2 - The file %1 could not be written: %2 Die Datei %1 konnte nicht geschrieben werden: %2 - %1 - Error %1 - Fehler @@ -4269,7 +3508,6 @@ qdesigner_internal::ColorAction - Text Color Schriftfarbe @@ -4277,12 +3515,10 @@ qdesigner_internal::ComboBoxTaskMenu - Edit Items... Einträge ändern... - Change Combobox Contents Inhalt der Combobox ändern @@ -4290,7 +3526,6 @@ qdesigner_internal::CommandLinkButtonTaskMenu - Change description... Beschreibung ändern... @@ -4298,17 +3533,14 @@ qdesigner_internal::ConnectionEdit - Select All Alles auswählen - Delete Löschen - Deselect All Auswahl rücksetzen @@ -4316,52 +3548,42 @@ qdesigner_internal::ConnectionModel - Sender Sender - Signal - Receiver Empfänger - Slot Slot - <sender> <Sender> - <signal> <Signal> - <receiver> <Receiver> - <slot> <Slot> - Signal and Slot Editor Signal/Slot editor - The connection already exists!<br>%1 Diese Verbindung existiert bereits!<br>%1</br> @@ -4369,42 +3591,34 @@ qdesigner_internal::ContainerWidgetTaskMenu - Insert Page Before Current Page Seite davor einfügen - Insert Page After Current Page Seite danach einfügen - Add Subwindow Subfenster hinzufügen - Delete Löschen - Insert Einfügen - Subwindow Subwindow - Page Seite - Page %1 of %2 Seite %1 von %2 @@ -4412,19 +3626,16 @@ qdesigner_internal::DPI_Chooser - x DPI X/Y separator x - System (%1 x %2) System resolution System (%1 x %2) - User defined Benutzerdefiniert @@ -4432,49 +3643,38 @@ qdesigner_internal::DesignerPropertyManager - - AlignLeft Linksbündig ausrichten - AlignHCenter Horizontal zentrieren - AlignRight Rechtsbündig ausrichten - AlignJustify Blocksatz - AlignTop Am oberen Rand ausrichten - - AlignVCenter Vertikal zentrieren - AlignBottom Am unteren Rand zentrieren - %1, %2 %1, %2 - Customized (%n roles) Angepasst (eine Rolle) @@ -4482,75 +3682,58 @@ - Inherited Geerbt - Horizontal Horizontal - Vertical Vertikal - Normal Off Normal, aus - Normal On Normal, ein - Disabled Off Nicht verfügbar, aus - Disabled On Verfügbar, ein - Active Off Aktiv, aus - Active On Aktiv, ein - Selected Off Ausgewählt, aus - Selected On Ausgewählt, ein - - translatable Übersetzung - - disambiguation Kennung - - comment Kommentar @@ -4558,48 +3741,38 @@ qdesigner_internal::DeviceProfileDialog - Device Profiles (*.%1) Profile - Default Vorgabe - Save Profile Profil speichern - Save Profile - Error Fehler beim Speichern des Profils - Unable to open the file '%1' for writing: %2 Die Datei '%1' konnte nicht zum Schreiben geöffnet werden: %2 - Unable to open the file '%1' for reading: %2 Die Datei '%1' konnte nicht zum Lesen geöffnet werden: %2 - '%1' is not a valid profile: %2 '%1' ist kein gültiges Profil: %2 - Open profile Profil öffnen - - Open Profile - Error Fehler beim Öffnen des Profils @@ -4607,57 +3780,46 @@ qdesigner_internal::Dialog - Dialog Dialog - StringList Liste von Zeichenketten - New String Neue Zeichenkette - &New &Neu - Delete String Zeichenkette löschen - &Delete &Löschen - &Value: &Wert: - Move String Up Zeichenkette eins nach oben - Up Hoch - Move String Down Zeichenkette eins nach unten - Down Runter @@ -4665,52 +3827,42 @@ qdesigner_internal::EmbeddedOptionsControl - None Vorgabe - Add a profile Profil hinzufügen - Edit the selected profile Ausgewähltes Profil modifizieren - Delete the selected profile Ausgewähltes Profil löschen - Add Profile Profil hinzufügen - New profile Neues Profil - Edit Profile Profil ändern - Delete Profile Profil löschen - Would you like to delete the profile '%1'? Möchten Sie das Profil '%1' löschen? - Default Vorgabe @@ -4718,12 +3870,10 @@ qdesigner_internal::FilterWidget - Filter Filter - Clear text Text löschen @@ -4731,12 +3881,10 @@ qdesigner_internal::FormEditor - Resource File Changed Änderung einer Ressourcendatei - The file "%1" has changed outside Designer. Do you want to reload it? Die Ressourcendatei "%1" wurde außerhalb Designer geändert. Möchten Sie sie neu laden? @@ -4744,7 +3892,6 @@ qdesigner_internal::FormLayoutMenu - Add form layout row... Zeile hinzufügen... @@ -4752,43 +3899,34 @@ qdesigner_internal::FormWindow - Edit contents Ändern - F2 F2 - Resize Größe ändern - Key Move Verschieben mittels Tastatur - Paste error Fehler beim Einfügen - Lay out Layout - - Drop widget Widget einfügen - Paste %n action(s) Eine Aktion einfügen @@ -4796,17 +3934,14 @@ - Insert widget '%1' Widget '%1' einfügen - Key Resize Größe ändern mittels Tastatur - Paste %n widget(s) Widget einfügen @@ -4814,37 +3949,30 @@ - Paste (%1 widgets, %2 actions) Einfügen (%1 Widgets, %2 Aktionen) - Cannot paste widgets. Designer could not find a container without a layout to paste into. Die Widgets konnten nicht eingefügt werden, da kein Container gefunden werden konnte, der nicht bereits ein Layout hat. - Break the layout of the container you want to paste into, select this container and then paste again. Bitte lösen Sie das Layout des gewünschten Containers auf und wählen Sie ihn erneut aus, um die Widgets einzufügen. - Select Ancestor Übergeordnetes Widget auswählen - A QMainWindow-based form does not contain a central widget. Ein auf QMainWindow basierendes Formular enthält kein zentrales Widget. - Raise widgets Widgets nach vorn bringen - Lower widgets Widgets nach hinten setzen @@ -4852,12 +3980,10 @@ qdesigner_internal::FormWindowBase - Delete Löschen - Delete '%1' '%1' löschen @@ -4865,200 +3991,159 @@ qdesigner_internal::FormWindowManager - Cu&t &Ausschneiden - Cuts the selected widgets and puts them on the clipboard Schneidet die ausgewählten Widgets aus und legt sie in der Zwischenablage ab - &Copy &Kopieren - Copies the selected widgets to the clipboard Kopiert die ausgewählten Widgets in die Zwischenablage - &Paste &Einfügen - Pastes the clipboard's contents Fügt den Inhalt der Zwischenablage ein - &Delete &Löschen - Deletes the selected widgets Löscht die ausgewählten Widgets - Select &All &Alles auswählen - Selects all widgets Wählt alle Widget aus - Bring to &Front Nach &vorn - - Raises the selected widgets Bringt das ausgewählte Widget nach vorn - Send to &Back Nach &hinten - - Lowers the selected widgets Stellt das ausgewählte Widget nach hinten - Adjust &Size &Größe anpassen - Adjusts the size of the selected widget Berechnet die Größe des ausgewählten Widgets aus dem Layout und passt das Widget an - Lay Out &Horizontally Objekte &waagrecht anordnen - Lays out the selected widgets horizontally Ordnet die ausgewähltenObjekte waagrecht an - Lay Out &Vertically Objekte &senkrecht anordnen - Lays out the selected widgets vertically Ordnet die ausgewählten Objekte senkrecht an - Lay Out in a &Grid Objekte &tabellarisch anordnen - Lays out the selected widgets in a grid Ordnet die ausgewählten Objekte tabellarisch an - Lay Out Horizontally in S&plitter Objekte waagrecht um Spl&itter anordnen - Lays out the selected widgets horizontally in a splitter Ordnet die ausgewählten Objekte um einen Splitter waagrecht an - Lay Out Vertically in Sp&litter Objekte senkrecht um Spl&itter anordnen - Lays out the selected widgets vertically in a splitter Ordnet die ausgewählten Objekte um einen Splitter senkecht an - &Break Layout La&yout auflösen - Breaks the selected layout Löst das ausgewählte Layout auf - &Preview... &Vorschau... - Preview current form Vorschau des Formulars - Form &Settings... Formular&einstellungen... - Break Layout Layout auflösen - Adjust Size Größe anpassen - Could not create form preview Title of warning message box Es konnte keine Vorschau erzeugt werden - Form Settings - %1 Formulareinstellungen - %1 - Removes empty columns and rows Entfernt unbesetzte Zeilen und Spalten - Lay Out in a &Form Layout Objekte in &Formularlayout anordnen - Lays out the selected widgets in a form layout Ordnet die ausgewählten Objekte in einem zweispaltigen Formularlayout an - Si&mplify Grid Layout Tabellarisches Layout &vereinfachen @@ -5066,12 +4151,10 @@ qdesigner_internal::FormWindowSettings - None Kein - Device Profile: %1 Profil: %1 @@ -5079,37 +4162,30 @@ qdesigner_internal::GridPanel - Visible Sichtbar - Snap Einschnappen - Reset Rücksetzen - Form Formular - Grid Raster - Grid &X Raster &X - Grid &Y Raster &Y @@ -5117,7 +4193,6 @@ qdesigner_internal::GroupBoxTaskMenu - Change title... Titel ändern... @@ -5125,7 +4200,6 @@ qdesigner_internal::HtmlTextEdit - Insert HTML entity HTML-Sonderzeichen einfügen @@ -5133,92 +4207,74 @@ qdesigner_internal::IconSelector - The pixmap file '%1' cannot be read. Die Pixmap-Datei '%1' kann nicht gelesen werden. - The file '%1' does not appear to be a valid pixmap file: %2 Die Datei '%1' ist keine gültige Pixmap-Datei: %2 - The file '%1' could not be read: %2 Die Datei '%1' konnte nicht gelesen werden: %2 - Pixmap Read Error Fehler beim Lesen der Pixmap - ... ... - Normal Off Normal, aus - Normal On Normal, ein - Disabled Off Nicht verfügbar, aus - Disabled On Verfügbar, ein - Active Off Aktiv, aus - Active On Aktiv, ein - Selected Off Ausgewählt, aus - Selected On Ausgewählt, ein - Choose Resource... Ressource auswählen... - Choose File... Datei auswählen... - Reset Rücksetzen - Reset All Alle rücksetzen - Choose a Pixmap Pixmap-Datei auswählen @@ -5226,58 +4282,46 @@ qdesigner_internal::ItemListEditor - Properties &<< Eigenschaften &<< - - Properties &>> Eigenschaften &>> - Items List Liste der Elemente - New Item Neues Element - &New &Neu - Delete Item Element löschen - &Delete &Löschen - Move Item Up Element eins nach oben - U U - Move Item Down Element eins nach unten - D D @@ -5285,12 +4329,10 @@ qdesigner_internal::LabelTaskMenu - Change rich text... Formatierbaren Text ändern... - Change plain text... Text ändern... @@ -5298,7 +4340,6 @@ qdesigner_internal::LanguageResourceDialog - Choose Resource Ressource auswählen @@ -5306,7 +4347,6 @@ qdesigner_internal::LineEditTaskMenu - Change text... Text ändern... @@ -5314,17 +4354,14 @@ qdesigner_internal::ListWidgetEditor - Edit List Widget List-Widget ändern - Edit Combobox Combobox ändern - New Item Neues Element @@ -5332,12 +4369,10 @@ qdesigner_internal::ListWidgetTaskMenu - Edit Items... Elemente ändern... - Change List Contents Inhalt der Liste ändern @@ -5345,22 +4380,18 @@ qdesigner_internal::MdiContainerWidgetTaskMenu - Next Subwindow Nächste Unterfenster - Previous Subwindow Voriges Unterfenster - Tile Nebeneinander anordnen - Cascade Stapeln @@ -5368,7 +4399,6 @@ qdesigner_internal::MenuTaskMenu - Remove Löschen @@ -5376,7 +4406,6 @@ qdesigner_internal::MorphMenu - Morph into Widget umwandeln in @@ -5384,42 +4413,34 @@ qdesigner_internal::NewActionDialog - New Action... Neue Aktion... - &Text: &Text: - Shortcut: Tastenkürzel - Checkable: Ankreuzbar: - ToolTip: ToolTip: - ... ... - &Icon: &Icon: - Object &name: Objekt&name: @@ -5427,40 +4448,33 @@ qdesigner_internal::NewDynamicPropertyDialog - Set Property Name Namen der Eigenschaft setzen - The current object already has a property named '%1'. Please select another, unique one. Das Objekt besitzt eine bereits eine Eigenschaft namens '%1'. Bitte wählen Sie einen anderen, eindeutigen Namen. - Create Dynamic Property Dynamische Eigenschaft erzeugen - Property Name Name der Eigenschaft - Property Type Typ der Eigenschaft - The '_q_' prefix is reserved for the Qt library. Please select another name. Der Präfix '_q_' wird von der Qt-Bibliothek für interne Zwecke verwendet.Bitte wählen Sie einen anderen Namen. - horizontalSpacer @@ -5468,83 +4482,67 @@ qdesigner_internal::NewFormWidget - Default size Vorgabe - QVGA portrait (240x320) QVGA Hochformat (240x320) - QVGA landscape (320x240) QVGA Querformat (320x240) - VGA portrait (480x640) VGA Hochformat (480x640) - VGA landscape (640x480) VGA Querformat (640x480) - Widgets New Form Dialog Categories Widgets - Custom Widgets Benutzerdefinierte Widgets - None Kein - Error loading form Das Formular konnte nicht geladen werden - Unable to open the form template file '%1': %2 Die Formularvorlage '%1' konnte nicht geöffnet werden: %2 - Internal error: No template selected. Interner Fehler: Es ist keine Vorlage selektiert. - 0 0 - Choose a template for a preview Wählen Sie eine Vorlage für die Vorschau - Embedded Design Embedded-Entwurf - Device: Geräteprofil: - Screen Size: Bildschirmgröße: @@ -5552,37 +4550,30 @@ qdesigner_internal::NewPromotedClassPanel - Add Hinzufügen - New Promoted Class Neue Klasse - Base class name: Basisklasse: - Promoted class name: Klassenname: - Header file: Include-Datei: - Global include Globale Include-Datei - Reset Rücksetzen @@ -5590,12 +4581,10 @@ qdesigner_internal::ObjectInspector - Change Current Page Seite wechseln - &Find in Text... &Suchen... @@ -5603,32 +4592,26 @@ qdesigner_internal::OrderDialog - Index %1 (%2) Position %1 (%2) - Change Page Order Seiten umordnen - Page Order Reihenfolge - Move page up Seite eins nach oben - Move page down Seite eins nach unten - %1 %2 %1 %2 @@ -5636,47 +4619,38 @@ qdesigner_internal::PaletteEditor - Edit Palette Palette ändern - Tune Palette Palette - Show Details Details einblenden - Compute Details Details berechnen - Quick Einfach - Preview Vorschau - Disabled Ausgegraut - Inactive Inaktiv - Active Aktiv @@ -5684,7 +4658,6 @@ qdesigner_internal::PaletteEditorButton - Change Palette Palette ändern @@ -5692,22 +4665,18 @@ qdesigner_internal::PaletteModel - Color Role Farbrolle - Active Aktiv - Inactive Inaktiv - Disabled Ausgegraut @@ -5715,28 +4684,22 @@ qdesigner_internal::PixmapEditor - Copy Path Pfad kopieren - Paste Path Pfad einfügen - Choose Resource... Ressource auswählen... - Choose File... Datei auswählen... - - ... ... @@ -5744,7 +4707,6 @@ qdesigner_internal::PlainTextEditorDialog - Edit text Text bearbeiten @@ -5752,37 +4714,30 @@ qdesigner_internal::PluginDialog - Components Komponenten - Plugin Information Plugins - Refresh Neu laden - Scan for newly installed custom widget plugins. Nach neu installierten Plugins mit benutzerdefinierten Widgets suchen. - Qt Designer couldn't find any plugins Qt Designer kann keine Plugins finden - Qt Designer found the following plugins Qt Designer hat die folgenden Plugins gefunden - New custom widget plugins have been found. Es wurden neu installierte Plugins mit benutzerdefinierten Widgets gefunden. @@ -5790,7 +4745,6 @@ qdesigner_internal::PreviewActionGroup - %1 Style %1-Stil @@ -5798,47 +4752,38 @@ qdesigner_internal::PreviewConfigurationWidget - Default Vorgabe - None Kein - Browse... Durchsuchen... - Load Custom Device Skin Benutzerdefinierten Geräte-Skin laden - All QVFB Skins (*.%1) Alle QVFB-Skins (*.%1) - %1 - Duplicate Skin %1 - Skin bereits vorhanden - The skin '%1' already exists. Der Skin '%1' ist bereits vorhanden. - %1 - Error %1 - Fehler - %1 is not a valid skin directory: %2 %1 ist kein gültiges Verzeichnis eines Skins: @@ -5848,24 +4793,20 @@ qdesigner_internal::PreviewDeviceSkin - &Portrait &Hochformat - Landscape (&CCW) Rotate form preview counter-clockwise Querformat (&entgegen Uhrzeigersinn) - &Landscape (CW) Rotate form preview clockwise Querformat (im &Uhrzeigersinn) - &Close &Schließen @@ -5873,7 +4814,6 @@ qdesigner_internal::PreviewManager - %1 - [Preview] %1 - [Vorschau] @@ -5881,7 +4821,6 @@ qdesigner_internal::PreviewMdiArea - The moose in the noose ate the goose who was loose. Palette editor background @@ -5891,57 +4830,46 @@ qdesigner_internal::PreviewWidget - Preview Window Vorschaufenster - LineEdit - ComboBox - PushButton - ButtonGroup2 - CheckBox1 - CheckBox2 - ButtonGroup - RadioButton1 - RadioButton2 - RadioButton3 @@ -5949,22 +4877,18 @@ qdesigner_internal::PromotionModel - Name Name - Header file Include-Datei - Global include Globale Include-Datei - Usage Verwendet @@ -5972,27 +4896,22 @@ qdesigner_internal::PromotionTaskMenu - Promoted widgets... Benutzerdefinierte Klassen... - Promote to ... Als Platzhalter für benutzerdefinierte Klasse festlegen... - Promote to Als Platzhalter für benutzerdefinierte Klasse festlegen - Demote to %1 Platzhalter für benutzerdefinierte Klasse entfernen und in %1 wandeln - Change signals/slots... Signale/Slots ändern... @@ -6000,59 +4919,48 @@ qdesigner_internal::PropertyEditor - Add Dynamic Property... Dynamische Eigenschaft hinzufügen... - Remove Dynamic Property Dynamische Eigenschaft löschen - Tree View Baumansicht - Drop Down Button View Detailansicht - Object: %1 Class: %2 Objekt: %1 Klasse: %2 - Sorting Sortiert - Color Groups Farbige Hervorhebung - Configure Property Editor Anzeige der Eigenschaften konfigurieren - String... Zeichenkette... - Bool... Boolescher Wert... - Other... Anderer Typ... @@ -6060,7 +4968,6 @@ qdesigner_internal::PropertyLineEdit - Insert line break Zeilenumbruch einfügen @@ -6068,27 +4975,22 @@ qdesigner_internal::QDesignerPromotionDialog - Promoted Widgets Platzhalter für benutzerdefinierte Widgets - Promoted Classes Platzhalter für benutzerdefinierte Klassen - Promote Anwenden - %1 - Error %1 - Fehler - Change signals/slots... Signale/Slots ändern... @@ -6096,22 +4998,18 @@ qdesigner_internal::QDesignerResource - Loading qrc file Laden der Ressourcendatei - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> Die Ressourcendatei <p><b>%1</b></p><p> konnte nicht gefunden werden. Möchten Sie einen neuen Pfad eingeben?</p> - New location for %1 Neuer Pfad für %1 - Resource files (*.qrc) Ressourcendateien (*.qrc) @@ -6119,67 +5017,54 @@ qdesigner_internal::QDesignerTaskMenu - Change objectName... Objektnamen ändern... - Change toolTip... ToolTip ändern... - Change whatsThis... WhatsThis ändern... - Change styleSheet... Stylesheet ändern... - Create Menu Bar Menüleiste erzeugen - Add Tool Bar Werkzeugleiste hinzufügen - Create Status Bar Statuszeile hinzufügen - Remove Status Bar Statuszeile löschen - Change script... Skript ändern... - Change signals/slots... Signale/Slots ändern... - Go to slot... Slot anzeigen... - no signals available Es sind keine Signale vorhanden - Set size constraint on %n widget(s) Größenbeschränkung eines Widgets festlegen @@ -6187,47 +5072,38 @@ - Size Constraints Größe - Set Minimum Width Minimalbreite festlegen - Set Minimum Height Minimalhöhe festlegen - Set Minimum Size Minimalgröße festlegen - Set Maximum Width Maximalbreite festlegen - Set Maximum Height Maximalhöhe festlegen - Set Maximum Size Maximalgröße festlegen - Edit ToolTip ToolTip bearbeiten - Edit WhatsThis What'sThis bearbeiten @@ -6235,41 +5111,33 @@ qdesigner_internal::QDesignerWidgetBox - - Unexpected element <%1> Ungültiges Element <%1> - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 Der XML-Code für das Widget %3 enthält einen Fehler bei Zeile %1, Spalte %2:%4: %5 - The XML code specified for the widget %1 does not contain any widget elements. %2 Der XML-Code für das Widget %1 enthält keine Widgets.%2 - An error has been encountered at line %1 of %2: %3 Fehler bei Zeile %1 von %2: %3 - Unexpected element <%1> encountered when parsing for <widget> or <ui> An Stelle des erwarteten <widget>- oder <ui>-Elementes wurde <%1> gefunden - Unexpected end of file encountered when parsing widgets. Vorzeitiges Dateiende beim Lesen der Widget-Box-Konfiguration. - A widget element could not be found. Es fehlt das Widget-Element. @@ -6277,73 +5145,58 @@ qdesigner_internal::QtGradientStopsController - H H - S S - V V - - Hue Farbton - Sat Sättigung - Val Wert - Saturation Sättigung - Value Wert - R R - G G - B B - Red Rot - Green Grün - Blue Blau @@ -6351,27 +5204,22 @@ qdesigner_internal::RichTextEditorDialog - Edit text Text bearbeiten - &OK &OK - &Cancel &Abbrechen - Rich Text Text - Source Quelltext @@ -6379,72 +5227,58 @@ qdesigner_internal::RichTextEditorToolBar - Bold Fett - CTRL+B CTRL+F - Italic Kursiv - CTRL+I CTRL+K - Underline Unterstreichen - CTRL+U CTRL+U - Left Align Linksbündig ausrichten - Center Zentrieren - Right Align Rechtsbündig ausrichten - Justify Blocksatz - Superscript Hochstellung - Subscript Tiefstellung - Insert &Link &Link einfügen - Insert &Image &Bild einfügen @@ -6452,17 +5286,14 @@ qdesigner_internal::ScriptDialog - Edit script Skript bearbeiten - Syntax error Syntaxfehler - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>Geben Sie ein Qt-Skript zur Ausführung während des Formularaufbaus ein.<br>Auf das Widget und seine untergeordneten Widgets kann durch die Variablen <i>widget</i> und <i>childWidgets</i> zugegriffen werden. @@ -6470,7 +5301,6 @@ qdesigner_internal::ScriptErrorDialog - Script errors Skriptfehler @@ -6478,23 +5308,18 @@ qdesigner_internal::SignalSlotDialog - There is already a slot with the signature '%1'. Es existiert bereits ein Slot mit der Signatur '%1'. - There is already a signal with the signature '%1'. Es existiert bereits ein Signal mit der Signatur '%1'. - %1 - Duplicate Signature %1 - Doppelte Signatur - - Signals/Slots of %1 Signale/Slots von %1 @@ -6502,12 +5327,10 @@ qdesigner_internal::SignalSlotEditorPlugin - Edit Signals/Slots Signale und Slots bearbeiten - F4 F4 @@ -6515,7 +5338,6 @@ qdesigner_internal::SignalSlotEditorTool - Edit Signals/Slots Signale und Slots bearbeiten @@ -6523,7 +5345,6 @@ qdesigner_internal::StatusBarTaskMenu - Remove Löschen @@ -6531,7 +5352,6 @@ qdesigner_internal::StringListEditorButton - Change String List Zeichenkettenliste ändern @@ -6539,38 +5359,30 @@ qdesigner_internal::StyleSheetEditorDialog - Edit Style Sheet Stylesheet bearbeiten - - Valid Style Sheet Stylesheet gültig - Invalid Style Sheet Stylesheet ungültig - Add Resource... Ressource hinzufügen... - Add Gradient... Gradient hinzufügen... - Add Color... Farbe hinzufügen... - Add Font... Font hinzufügen... @@ -6578,27 +5390,22 @@ qdesigner_internal::TabOrderEditor - Start from Here Hier neu beginnen - Restart Neu beginnen - Tab Order List... Tabulatorreihenfolge... - Tab Order List Tabulatorreihenfolge - Tab Order Tabulatorreihenfolge @@ -6606,7 +5413,6 @@ qdesigner_internal::TabOrderEditorPlugin - Edit Tab Order Tabulatorreihenfolge bearbeiten @@ -6614,7 +5420,6 @@ qdesigner_internal::TabOrderEditorTool - Edit Tab Order Tabulatorreihenfolge bearbeiten @@ -6622,48 +5427,38 @@ qdesigner_internal::TableWidgetEditor - New Column Neue Spalte - New Row Neue Zeile - &Columns &Spalten - &Rows &Zeilen - Properties &<< Eigenschaften &<< - - Properties &>> Eigenschaften &>> - Edit Table Widget Table Widget ändern - &Items &Inhalt - Table Items Tabellenelemente @@ -6671,7 +5466,6 @@ qdesigner_internal::TableWidgetTaskMenu - Edit Items... Elemente ändern... @@ -6679,22 +5473,18 @@ qdesigner_internal::TemplateOptionsWidget - Pick a directory to save templates in Wählen Sie ein Verzeichnis zum Abspeichern der Vorlagen aus - Form - Additional Template Paths Zusätzliche Verzeichnisse für Vorlagen - ... ... @@ -6702,22 +5492,18 @@ qdesigner_internal::TextEditTaskMenu - Change HTML... HTML ändern... - Edit HTML HTML bearbeiten - Edit Text Text bearbeiten - Change Plain Text... Text ändern... @@ -6725,22 +5511,18 @@ qdesigner_internal::TextEditor - Choose Resource... Ressource auswählen... - Choose File... Datei auswählen... - Choose a File - ... ... @@ -6748,27 +5530,22 @@ qdesigner_internal::ToolBarEventFilter - Insert Separator Trenner einfügen - Remove action '%1' Aktion '%1' löschen - Remove Toolbar '%1' Werkzeugleiste '%1' löschen - Insert Separator before '%1' Trenner vor '%1' einfügen - Append Separator Trenner hinzufügen @@ -6776,125 +5553,98 @@ qdesigner_internal::TreeWidgetEditor - &Columns &Spalten - Per column properties Spalteneigenschaften - Common properties Gemeinsame Eigenschaften - - New Item Neues Element - Properties &<< Eigenschaften &<< - - Properties &>> Eigenschaften &>> - New Column Neue Spalte - Edit Tree Widget Tree Widget ändern - &Items &Inhalt - Tree Items Elemente - - New Subitem - New &Subitem Neues &untergeordnetes Element - Delete Item Element löschen - Move Item Left (before Parent Item) Element nach links (vor übergeordnetes Element) - L L - Move Item Right (as a First Subitem of the Next Sibling Item) Element nach rechts (als untergeordnetes Element des nächsten gleichrangigen Elements) - R R - Move Item Up Element eins nach oben - U U - Move Item Down Element eins nach unten - D D - 1 1 - &New &Neu - &Delete &Löschen @@ -6902,7 +5652,6 @@ qdesigner_internal::TreeWidgetTaskMenu - Edit Items... Elemente ändern... @@ -6910,7 +5659,6 @@ qdesigner_internal::WidgetBox - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Warnung: Die Erzeugung des Widgets in der Widget-Box schlug fehl. Das könnte durch fehlerhaften XML-Code benutzerdefinierter Widgets verursacht worden sein. @@ -6918,42 +5666,34 @@ qdesigner_internal::WidgetBoxTreeWidget - Scratchpad Ablage - Custom Widgets Benutzerdefinierte Widgets - Expand all Alles aufklappen - Collapse all Alles zuklappen - List View Listenansicht - Icon View Icon-Ansicht - Remove Löschen - Edit name Namen ändern @@ -6961,7 +5701,6 @@ qdesigner_internal::WidgetDataBase - A custom widget plugin whose class name (%1) matches that of an existing class has been found. Es wurde ein Plugin gefunden, das ein benutzerdefiniertes Widget enthält, dessen Klassenname (%1) einer existierenden Klasse entspricht. @@ -6969,7 +5708,6 @@ qdesigner_internal::WidgetEditorTool - Edit Widgets Widgets bearbeiten @@ -6977,33 +5715,27 @@ qdesigner_internal::WidgetFactory - The custom widget factory registered for widgets of class %1 returned 0. Die Factory für benutzerdefinierte Widgets der Klasse %1 gab einen 0-Zeiger zurück. - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Bei der Erzeugung von Widgets wurden widersprüchliche Klassennamen festgestellt: Die Factory für benutzerdefinierte Widgets der Klasse %1 gab ein Widget der Klasse %2 zurück. - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. Der Container '%1' (%2) hat keine Seite, auf der ein Layout angelegt werden könnte. Das deutet auf eine inkonsistente ui-Datei hin; wahrscheinlich wurde ein Layout direkt auf dem Container spezifiziert. - Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. Es wurde versucht, ein Layout auf das Widget '%1' (%2) zu setzen, welches bereits ein Layout vom Typ %3 hat. Das deutet auf eine Inkonsistenz in der ui-Datei hin. - Cannot create style '%1'. Der Stil '%1' konnte nicht erzeugt werden. - %1 Widget %1 Widget @@ -7011,12 +5743,10 @@ qdesigner_internal::WizardContainerWidgetTaskMenu - Next Nächste - Back Vorige @@ -7024,7 +5754,6 @@ qdesigner_internal::ZoomMenu - %1 % Zoom factor %1 % @@ -7033,7 +5762,6 @@ qdesigner_internal::ZoomablePreviewDeviceSkin - &Zoom &Vergrößern diff -r ef0373b55136 -r 758a864f9613 translations/designer_fr.ts --- a/translations/designer_fr.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/designer_fr.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,27 +4,27 @@ AbstractFindWidget - + &Previous &Précédent - + &Next &Suivant - + &Case sensitive &Sensible à la casse - + Whole &words M&ots complets - + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;Recherche à partir du début @@ -32,17 +32,17 @@ AddLinkDialog - + Insert Link Insérer lien - + Title: Titre : - + URL: URL : @@ -50,7 +50,7 @@ AppFontDialog - + Additional Fonts Polices additionnelles @@ -58,38 +58,38 @@ AppFontManager - + '%1' is not a file. '%1' n'est pas un fichier. - + The font file '%1' does not have read permissions. Le fichier de la police '%1' n'a pas les permissions de lecture. - + The font file '%1' is already loaded. Le fichier de la police '%1' est déjà chargé. - + The font file '%1' could not be loaded. passé composé plutôt Le fichier de la police '%1' n'a pas pu chargé. - + '%1' is not a valid font id. '%1' n'est pas un identifiant de police valide. - + There is no loaded font matching the id '%1'. Il n'y a pas de police chargée correspondant à l'identifiant '%1'. - + The font '%1' (%2) could not be unloaded. La police '%1' (%2) ne peut pas être déchargée. @@ -97,53 +97,53 @@ AppFontWidget - + Fonts Polices - + Add font files Ajouter des fichiers de polices - + Remove current font file Retirer le fichier de police courant - + Remove all font files Retirer tous les fichiers de polices - + Add Font Files Ajouter des fichiers de polices - + Font files (*.ttf) Fichier de polices (*.ttf) - + Error Adding Fonts Erreur dans l'ajout de polices - + Error Removing Fonts s/de/des/ pour être cohérent avec le suivant... Erreur lors de la suppression des polices - + Remove Fonts Retirer les polices - + Would you like to remove all fonts? Voulez-vous supprimer toutes les polices ? @@ -151,12 +151,12 @@ AppearanceOptionsWidget - + Form Formulaire - + User Interface Mode Mode de l'interface utilisateur @@ -164,17 +164,17 @@ AssistantClient - + Unable to send request: Assistant is not responding. Impossible d'envoyer la requête : Assistant ne répond pas. - + The binary '%1' does not exist. Le binaire '%1' n'existe pas. - + Unable to launch assistant (%1). Impossible de démarrer Assistant (%1). @@ -182,93 +182,93 @@ BrushPropertyManager - + No brush Pas de pinceau - + Solid c'est plutôt continu ou "trait continu" pour moi Trait continu - + Dense 1 Dense 1 - + Dense 2 Dense 2 - + Dense 3 Dense 3 - + Dense 4 Dense 4 - + Dense 5 Dense 5 - + Dense 6 Dense 6 - + Dense 7 Dense 7 - + Horizontal Horizontal - + Vertical Vertical - + Cross Croix - + Backward diagonal Diagonale arrière - + Forward diagonal Diagonale avant - + Crossing diagonal Diagonale croisée - + Style Style - + Color Couleur - + [%1, %2] [%1, %2] @@ -276,353 +276,357 @@ Command - - + + Change signal Modifier le signal - - + + Change slot Modifier le slot - + Change signal-slot connection Modfier la connection signal-slot - + Change sender expéditeur/source Modifier l'envoyeur - + Change receiver destinataire++/cible? Modifier le destinataire - + Create button group Créer un groupe de boutons - + Break button group Dissocier le groupe de bouton - + Break button group '%1' Dissossier le groupe de bouton '%1' - + Add buttons to group Ajouter les boutons au groupe - - + + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup Ajouter '%1' à '%2' - + Remove buttons from group Retirer les boutons du groupe - + Remove '%1' from '%2' Command description for removing buttons from a QButtonGroup Retirer '%1' de '%2' - + Add connection Ajouter une connexion - + Adjust connection Réajuster les connexions - + Delete connections Supprimer les connexions - + Change source Modifier la source - + Change target Modifier la cible - + Morph %1/'%2' into %3 MorphWidgetCommand description Transformer %1/'%2' en %3 - + Insert '%1' Insérer '%1' - + Change Z-order of '%1' l'ordre de '%1' sur l'axe z? profondeur ? Modifier la profondeur de '%1' - + Raise '%1' Élever '%1' - + Lower '%1' Abaisser '%1' - + Delete '%1' Supprimer '%1' - + Reparent '%1' Reparenter '%1' - + Promote to custom widget Promouvoir en widget personnalisé - + Demote from custom widget Annuler la promotion en widget personnalisé - + Lay out using grid Mettre en page à l'aide d'une grille - + Lay out vertically Mettre en page verticalement - Lay out horizontaly + Mettre en page horizontalement + + + + Lay out horizontally Mettre en page horizontalement - + Break layout Casser la mise en page - + Simplify Grid Layout Simplifier la mise en page en grille - - - + + + Move Page Déplacer la page - - - - + + + + Delete Page Supprimer la page - - + + Page Page - - - - + + + + Insert Page Insérer une page - + Change Tab order Modifier l'ordre des tabulations - + Create Menu Bar Créer une barre de menu - + Delete Menu Bar Supprimer la barre de menu - + Create Status Bar Créer une barre d'état - + Delete Status Bar Supprimer la barre d'état - + Add Tool Bar Ajouter une barre d'outil - + Add Dock Window Ajouter une fenêtre ancrable - + Adjust Size of '%1' Ajuster les dimensions de '%1' - + Change Form Layout Item Geometry Modifier la géométrie de l'élément de formulaire - + Change Layout Item Geometry Modifier la géométrie de l'élément de mise en page - + Delete Subwindow Supprimer la sous-fenêtre - + page page - + Insert Subwindow Insérer une sous-fenêtre - + subwindow sous-fenêtre - + Subwindow Sous fenêtre - + Change Table Contents Modifier le contenu de la table - + Change Tree Contents Modifier le contenu de l'arbre - - + + Add action Ajouter une action - - + + Remove action Supprimer l'action - + Add menu Ajouter un menu - + Remove menu Supprimer le menu - + Create submenu Créer une sous-fenêtre - + Delete Tool Bar Supprimer la barre d'outils - + Change layout of '%1' from %2 to %3 Modifier la mise en page de '%1' de %2 à %3 - + Set action text Définir le texte de l'action - + Insert action Insérer action - - + + Move action Déplacer action - + Change Title Modifier le titre - + Insert Menu Insérer menu - + Changed '%1' of '%2' Modifier '%1' de '%2' - + Changed '%1' of %n objects Modifier '%1' de %n objet @@ -630,12 +634,12 @@ - + Reset '%1' of '%2' Réinitialiser '%1' de '%2' - + Reset '%1' of %n objects Réinitialiser '%1' de %n objet @@ -643,12 +647,12 @@ - + Add dynamic property '%1' to '%2' Ajouter la propriété dynamique '%1' à '%2' - + Add dynamic property '%1' to %n objects Ajouter la propriété dynamique '%1' à %n objet @@ -656,12 +660,12 @@ - + Remove dynamic property '%1' from '%2' Supprimer la propriété dynamique '%1' de '%2' - + Remove dynamic property '%1' from %n objects Supprimer la propriété dynamique '%1' de %n objet @@ -669,12 +673,12 @@ - + Change script Modifier le script - + Change signals/slots Modifier signaux/slots @@ -682,24 +686,22 @@ ConnectDialog - + Configure Connection Configurer connexion - - + GroupBox GroupBox - - + Edit... Éditer... - + Show signals and slots inherited from QWidget Afficher les signaux et slots hérités de QWidget @@ -707,17 +709,17 @@ ConnectionDelegate - + <object> <objet> - + <signal> <signal> - + <slot> <slot> @@ -725,19 +727,19 @@ DPI_Chooser - + Standard (96 x 96) Embedded device standard screen resolution Standard (96 x 96) - + Greenphone (179 x 185) Embedded device screen resolution Greenphone (179 x 185) - + High (192 x 192) Embedded device high definition screen resolution "haute resolution" would be missleading @@ -747,89 +749,89 @@ Designer - + Qt Designer Qt Designer - + This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. Ce fichier contient des ressorts de premier niveau. <br>Ils ne sont <b>PAS</b> sauvegardé dans le formulaire. - + Perhaps you forgot to create a layout? Peut-être avez-vous oublié de créer un layout ? - + Invalid UI file: The root element <ui> is missing. Fichier UI invalide. L'élément racine <ui> est manquant. - + An error has occurred while reading the UI file at line %1, column %2: %3 - Une erreur est survenue lors de la lecture du fichier UI à la ligne %1, colonne %2: %3 - - - + Une erreur est survenue lors de la lecture du fichier UI à la ligne %1, colonne %2 : %3 + + + This file cannot be read because it was created using %1. Ce fichier ne peut pas être lu car il a été créé à l'aide de %1. - + This file was created using Designer from Qt-%1 and cannot be read. Ce fichier a été créé à l'aide du Designer de Qt-%1 et ne peut être lu. - + The converted file could not be read. Le fichier converti ne peut pas être lu. - + This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. Ce fichier a été créé par le Designer de Qt-%1 et sera converti au nouveau format par Qt Designer. - + The old form has not been touched, but you will have to save the form under a new name. L'ancienne interface n'a pas été modifiée, vous devez sauvergarder l'interface sous un nouveau nom. - + This file was created using Designer from Qt-%1 and could not be read: %2 Le fichier a été créé à l'aide de Designer de Qt-%1 et ne peut pas être lu : %2 - + Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. Veuillez le faire passer par <b>uic3&nbsp;-convert</b> pour le convertir au format de fichier de Qt 4. - + This file cannot be read because the extra info extension failed to load. Ce fichier ne peut pas être lu car les informations d'extension n'ont pu être chargées. - + Unable to launch %1. Impossible de lancer %1. - + %1 timed out. %1 est arrivé à échéance. - + Custom Widgets Widgets personnalisés - + Promoted Widgets Widgets promus @@ -837,12 +839,12 @@ DesignerMetaEnum - + %1 is not a valid enumeration value of '%2'. %1 n'est pas une valeur d'énumeration valide de '%2'. - + '%1' could not be converted to an enumeration value of type '%2'. '%1' ne peut pas être converti en une valeur d'énumération de type '%2'. @@ -850,7 +852,7 @@ DesignerMetaFlags - + '%1' could not be converted to a flag value of type '%2'. '%1' ne peut pas être converti en un drapeau de type '%2'. @@ -858,13 +860,13 @@ DeviceProfile - + '%1' is not a number. Reading a number for an embedded device profile '%1' n'est pas un nombre. - + An invalid tag <%1> was encountered. La balise invalide <%1> a été rencontré. @@ -872,27 +874,27 @@ DeviceProfileDialog - + &Family &Famille - + &Point Size &Taille en points - + Style Style - + Device DPI PPP/DPI de l'appareil - + Name Nom @@ -900,57 +902,57 @@ DeviceSkin - + The image file '%1' could not be loaded. Le fichier image '%1' n'a pas pu être chargé. - + The skin directory '%1' does not contain a configuration file. Le repertoire de revêtement '%1' ne contient pas un fichier de configuration. - + The skin configuration file '%1' could not be opened. Le fichier de configuration de revêtement '%1' ne peut pas être ouvert. - + The skin configuration file '%1' could not be read: %2 - Le fichier de configuration de revêtement '%1' ne peut pas être lu: %2 - - - + Le fichier de configuration de revêtement '%1' ne peut pas être lu : %2 + + + Syntax error: %1 Erreur de syntaxe : %1 - + The skin "up" image file '%1' does not exist. Le fichier image "up" de revêtement '%1' n'existe pas. - + The skin "down" image file '%1' does not exist. Le fichier image "down" de revêtement '%1' n'existe pas. - + The skin "closed" image file '%1' does not exist. Le fichier image "closed" de revêtement '%1' n'existe pas. - + The skin cursor image file '%1' does not exist. Le fichier image de revêtement '%1' n'existe pas. - + Syntax error in area definition: %1 Erreur de syntaxe dans la zone de définition : %1 - + Mismatch in number of areas, expected %1, got %2. Incohérence dans le nombre de zones, %1 attendu, %2 reçu. @@ -958,7 +960,7 @@ EmbeddedOptionsControl - + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Police</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Résolution</b></td><td>%4 x %5</td></tr></table></html> @@ -967,13 +969,13 @@ EmbeddedOptionsPage - + Embedded Design Tab in preferences dialog Design pour appareil mobile - + Device Profiles EmbeddedOptionsControl group box" Profils des appareils @@ -982,27 +984,27 @@ FontPanel - + Font Police - + &Writing system &Système d'écriture - + &Family &Famille - + &Style &Style - + &Point size &Taille en points @@ -1010,22 +1012,22 @@ FontPropertyManager - + PreferDefault PreferDefault - + NoAntialias NoAntialias - + PreferAntialias PreferAntialias - + Antialiasing Antialiasing @@ -1033,43 +1035,51 @@ FormBuilder - + Invalid stretch value for '%1': '%2' - Parsing layout stretch values + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values Valeur d'extension invalide pour '%1' : '%2' - + Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values Taille minimum invalide pour '%1' : '%2' FormEditorOptionsPage - + %1 % %1 % - + Preview Zoom Zoom de visualisation - + Default Zoom Zoom par défaut - + Forms Tab in preferences dialog Formulaires - + Default Grid Grille par défaut @@ -1077,38 +1087,38 @@ FormLayoutRowDialog - + Add Form Layout Row Ajouter une ligne de mise en page au formulaire - + &Label text: &Texte du label : - + Field &type: &Type du champ : - + &Field name: &Nom du champ : - + &Buddy: copain c'est un peu beaucoup ptet &Copain : - + &Row: &Ligne : - + Label &name: &Nom du label : @@ -1116,12 +1126,12 @@ FormWindow - + Unexpected element <%1> Element inattendu : <%1> - + Error while pasting clipboard contents at line %1, column %2: %3 Erreur lors du collage du contenu du presse-papier à la ligne %1, colonne %2 : %3 @@ -1129,62 +1139,62 @@ FormWindowSettings - + Form Settings Configuration du formulaire - + Layout &Default Mise en page par &défaut - + &Spacing: &Espacements : - + &Margin: &Marge : - + &Layout Function &Fonction de mise en page - + Ma&rgin: Ma&rge : - + Spa&cing: Espa&cement : - + &Pixmap Function Fonction de &pixmap - + &Include Hints Indication d'&include - + Grid Grille - + Embedded Design Design pour appareil mobile - + &Author &Auteur @@ -1192,7 +1202,7 @@ IconSelector - + All Pixmaps ( Tous les pixmaps ( @@ -1200,7 +1210,7 @@ ItemPropertyBrowser - + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser XX Icon Selected off @@ -1209,33 +1219,33 @@ MainWindowBase - + Main Not currently used (main tool bar) Principal - + File Fichier - + Edit Édition - + Tools Outils - + Form Formulaire - + Qt Designer Qt Designer @@ -1243,52 +1253,52 @@ NewForm - + Show this Dialog on Startup Afficher cette boîte de dialogue au démarrage - + C&reate C&réer - + Recent Récent - + New Form Nouveau formulaire - + &Close &Fermer - + &Open... &Ouvrir... - + &Recent Forms &Formulaires récents - + Read error Erreur de lecture - + A temporary form file could not be created in %1. Un fichier temporaire de formulaire n'a pas pu être créé dans %1. - + The temporary form file %1 could not be written. Le fichier temporaire de formulaire %1 n'a pas pu être écrit. @@ -1296,22 +1306,22 @@ ObjectInspectorModel - + Object Objet - + Class Classe - + separator séparateur - + <noname> <sans nom> @@ -1319,12 +1329,12 @@ ObjectNameDialog - + Change Object Name Modifier le nom de l'objet - + Object Name Nom de l'objet @@ -1332,12 +1342,12 @@ PluginDialog - + Plugin Information Information du plugin - + 1 1 @@ -1345,7 +1355,7 @@ PreferencesDialog - + Preferences Préférences @@ -1353,34 +1363,32 @@ PreviewConfigurationWidget - + Form Formulaire - + Print/Preview Configuration Configuration d'impression/prévisualisation - + Style Style - + Style sheet Feuille de style - - - + ... ... - + Device skin Revêtement de l'appareil @@ -1388,7 +1396,7 @@ PromotionModel - + Not used Usage of promoted widgets Non utilisé @@ -1397,8 +1405,8 @@ Q3WizardContainer - - + + Page Page @@ -1406,59 +1414,59 @@ QAbstractFormBuilder - + Unexpected element <%1> Élément imprévu <%1> - + An error has occurred while reading the UI file at line %1, column %2: %3 Une erreur s'est produite lors de la lecture du fichier UI à la ligne %1, colonne %2 : %3 - + Invalid UI file: The root element <ui> is missing. Fichier UI invalide : l'élément racine <ui> est manquant. - + The creation of a widget of the class '%1' failed. La création d'un widget de la classe '%1' a échoué. - + Attempt to add child that is not of class QWizardPage to QWizard. Tentative d'ajout d'enfant qui n'est pas de la classe QWizardPage à QWizard. - + Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. Tentative d'ajout d'un layout au widget '%1' (%2) qui a déjà un layout dont le type n'est pas boîte %3. Ceci indique une incohérence dans le fichier ui. - + Empty widget item in %1 '%2'. Widget vide dans %1 '%2'. - + Flags property are not supported yet. Les propriétés de type drapeau ne sont pas supportées. - + While applying tab stops: The widget '%1' could not be found. Lors de l'application des arrêts de tabulation : le widget '%1' ne peut pas être trouvé. - + Invalid QButtonGroup reference '%1' referenced by '%2'. Référence invalide '%1' à QButtonGroup, référencé par '%2'. - + This version of the uitools library is linked without script support. Cette version de la bibliothèque uitools n'a pas le support des scripts. @@ -1466,12 +1474,12 @@ QAxWidgetPlugin - + ActiveX control Control ActiveX - + ActiveX control widget Widget control ActiveX @@ -1479,22 +1487,22 @@ QAxWidgetTaskMenu - + Set Control Définir le contrôle - + Reset Control Réinitialiser le contrôle - + Licensed Control Contrôle licencié - + The control requires a design-time license Le contrôle requiert une license par interface @@ -1502,67 +1510,67 @@ QCoreApplication - + %1 is not a promoted class. %1 n'est pas une classe promue. - + The base class %1 is invalid. La classe de base %1 est invalide. - + The class %1 already exists. La classe %1 existe déjà. - + Promoted Widgets Widgets promus - + The class %1 cannot be removed La classe %1 ne peut pas être retirée - + The class %1 cannot be removed because it is still referenced. La classe %1 ne peut pas être retirée car elle est toujours référencée. - + The class %1 cannot be renamed La classe %1 ne peut pas être renommée - + The class %1 cannot be renamed to an empty name. La classe %1 ne peut pas être renommé avec un nom vide. - + There is already a class named %1. Une classe existe déjà avec le nom %1. - + Cannot set an empty include file. Impossible de créer un fichier include vide. - + Exception at line %1: %2 Exception à la ligne %1 : %2 - + Unknown error Erreur inconnue - + An error occurred while running the script for %1: %2 Script: %3 Une erreur s'est produite lors de l'exécution du script de %1 : %2 @@ -1572,17 +1580,17 @@ QDesigner - + %1 - warning Avertissement - %1 - + Qt Designer Qt Designer - + This application cannot be used for the Console edition of Qt Cette application ne peut pas être utilisée avec l'édition console de Qt @@ -1590,228 +1598,228 @@ QDesignerActions - + Saved %1. %1 sauvé. - + %1 already exists. Do you want to replace it? %1 existe déjà. Voulez-vous le remplacer ? - + Edit Widgets Éditer les widgets - + &New... &Nouveau... - + &Open... &Ouvrir... - + &Save &Enregistrer - + Save &As... Enregistrer &sous... - + Save A&ll Enregistrer &tout - + Save As &Template... Sauver comme &modèle... - - + + &Close &Fermer - + Save &Image... Enregistrer &image... - + &Print... Im&primer... - + &Quit &Quitter - + View &Code... &Visualizer le code... - + &Minimize &Minimiser - + Bring All to Front Amener tout au premier plan - + Preferences... Préférences... - + Additional Fonts... Polices additionnelles... - + ALT+CTRL+S ALT+CTRL+S - + CTRL+SHIFT+S CTRL+SHIFT+S - + CTRL+R CTRL+R - + CTRL+M CTRL+M - + Qt Designer &Help &Aide de Qt Designer - + Current Widget Help Aide du widget courant - + What's New in Qt Designer? Quoi de neuf dans Qt Designer ? - + About Plugins À propos des plugins - - + + About Qt Designer À propos de Qt Designer - + About Qt À propos de Qt - + Clear &Menu Réinitialiser le &menu - + &Recent Forms Formulaires &récents - - + + Open Form Ouvrir le formulaire - - - + + + Designer UI files (*.%1);;All Files (*) Fichier UI de Qt Designer (*.%1);;Tous les fichiers(*) - - + + Save Form As Enregistrer le formulaire sous - + Designer Designer - + Feature not implemented yet! Cette fonctionnalité n'est pas encore implémentée ! - + Code generation failed La génération du code à échoué - + Read error Erreur de lecture - + %1 Do you want to update the file location or generate a new form? %1 Voulez vous mettre à jour l'emplacement du fichier ou générer un nouveau formulaire ? - + &Update &Mettre à jour - + &New Form &Nouveau formulaire - - + + Save Form? Sauver le formulaire ? - + Could not open file Impossible d'ouvrir le fichier - + The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -1820,17 +1828,17 @@ Voulez-vous réessayer ou sélectionner un fichier différent ? - + Select New File Sélectionner un nouveau fichier - + Could not write file Impossible d'écrire le fichier - + It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -1839,65 +1847,65 @@ Voulez-vous réessayer ? - - + + Assistant Assistant - + &Close Preview &Fermer la prévisualisation - - + + The backup file %1 could not be written. Le fichier de backup %1 n'a pas pu être écrit. - + The backup directory %1 could not be created. Le dossier de backup %1 n'a pas pu être créé. - + The temporary backup directory %1 could not be created. Le dossier temporaire de backup %1 n'a pas pu être créé. - + Preview failed La prévisualisation a échoué - + Image files (*.%1) Fichiers image (*.%1) - - + + Save Image Sauver image - + Saved image %1. Image %1 sauvée. - + The file %1 could not be written. Le fichier %1 n'a pas pu être écrit. - + Please close all forms to enable the loading of additional fonts. Veuillez fermer tous les formulaires pour activer le chargement de polices additionnelles. - + Printed %1. Impression de %1 terminée. @@ -1905,7 +1913,7 @@ QDesignerAppearanceOptionsPage - + Appearance Tab in preferences dialog Apparence @@ -1914,17 +1922,17 @@ QDesignerAppearanceOptionsWidget - + Docked Window Fenêtre ancrable - + Multiple Top-Level Windows Fenêtres multiples - + Toolwindow Font Police des fenêtre d'outils @@ -1932,22 +1940,22 @@ QDesignerAxWidget - + Reset control Réinitialiser les contrôles - + Set control Définir les contrôles - + Control loaded Contrôle chargé - + A COM exception occurred when executing a meta call of type %1, index %2 of "%3". Une exception COM a été levée lors de l'execution du meta-appel de type %1, indice %2 de "%3". @@ -1955,17 +1963,17 @@ QDesignerFormBuilder - + Script errors occurred: Erreurs du script : - + The preview failed to build. La construction de la prévisualisation a échoué. - + Designer Designer @@ -1973,22 +1981,22 @@ QDesignerFormWindow - + %1 - %2[*] %1 - %2[*] - + Save Form? Enregistrer le formulaire ? - + Do you want to save the changes to this document before closing? Voulez-vous enregistrer les changements de ce document avant de le fermer ? - + If you don't save, your changes will be lost. Si vous ne sauvegardez pas, les changements seront perdus. @@ -1996,38 +2004,38 @@ QDesignerMenu - + Type Here Taper ici - + Add Separator Ajouter séparateur - + Insert separator Insérer séparateur - + Remove separator Retirer séparateur - + Remove action '%1' Supprimer l'action '%1' - - + + Add separator Ajouter séparateur - + Insert action Insérer action @@ -2035,22 +2043,22 @@ QDesignerMenuBar - + Type Here Taper ici - + Remove Menu '%1' Supprimer menu '%1' - + Remove Menu Bar Supprimer barre de menu - + Menu Menu @@ -2058,37 +2066,37 @@ QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 Une erreur XML a été rencontrée lors de l'analyse grammaticale du XML provenant du widget personnalisé %1 : %2 - + A required attribute ('%1') is missing. Un attribut obligatoire ('%1') est manquant. - + An invalid property specification ('%1') was encountered. Supported types: %2 Une spécification invalide de propriété ('%1') a été rencontrée. Types supportés : %2 - + '%1' is not a valid string property specification. '%1' n'est pas une spécification valide de propriété chaîne de caractères. - + The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. Le XML du widget personnalisé %1 ne contient aucun des éléments <widget> ou <ui>. - + The class attribute for the class %1 is missing. L'attribut de classe est manquant pour la classe %1. - + The class attribute for the class %1 does not match the class name %2. L'attribut de classe pour la classe %1 ne correspond pas au nom de la classe %2. @@ -2096,7 +2104,7 @@ QDesignerPropertySheet - + Dynamic Properties Propriétés dynamiques @@ -2104,31 +2112,31 @@ QDesignerResource - + The layout type '%1' is not supported, defaulting to grid. Le type de layout '%1' n'est pas supporté, replacement par une grille. - + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. L'extension du widget '%1' (%2) a retourné un widget non géré par Designer '%3' (%4) lors de la requête pour la page #%5. Les pages du conteneur ne devraient être ajoutées que par spécification dans le XML retourné par la méthode domXml() du widget personnalisé. - + Unexpected element <%1> Parsing clipboard contents Élément inattendu <%1> - + Error while pasting clipboard contents at line %1, column %2: %3 Parsing clipboard contents Erreur lors du collage du contenu du presse-papier à la ligne %1, colonne %2 : %3 - + Error while pasting clipboard contents: The root element <ui> is missing. Parsing clipboard contents Erreur lors du collage du contenu du presse-papier. L'élément racine <ui> est manquant. @@ -2137,12 +2145,12 @@ QDesignerSharedSettings - + The template path %1 could not be created. Le chemin du modèle %1 n'a pas pu être créé. - + An error has been encountered while parsing device profile XML: %1 Une erreur a été rencontrée lors de l'analyse grammaticale du XML du profil de l'appareil : %1 @@ -2150,33 +2158,33 @@ QDesignerToolWindow - + Property Editor Éditeur de propriétés - + Action Editor Éditeur d'actions - + Object Inspector Inspecteur d'objet - + Resource Browser plural Explorateur de ressources - + Signal/Slot Editor Éditeur de signaux et slots - + Widget Box Boîte de widget @@ -2184,62 +2192,62 @@ QDesignerWorkbench - + &File &Fichier - + Edit Édition - + F&orm F&ormulaire - + Preview in Prévisualisation avec - + &View Afficha&ge - + &Settings &Configuration - + &Window Fe&nêtre - + &Help &Aide - + Toolbars Barre d'outils - + Widget Box Boîte de widget - + Save Forms? Enregistrer les formulaires ? - + There are %n forms with unsaved changes. Do you want to review these changes before quitting? Il y a %n formulaire avec des changements non-enregistrés. Voulez-vous vérifier les changements avant de quitter? @@ -2247,37 +2255,37 @@ - + If you do not review your documents, all your changes will be lost. Si vous ne vérifiez pas vos documents, tous les changements seront perdus. - + Discard Changes Abandonner les changements - + Review Changes Vérifier les changements - + Backup Information Informations de sauvegarde - + The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? La dernière session de Designer n'a pas été fermée correctement. Des fichiers de sauvegarde existent. Voulez-vous les charger ? - + The file <b>%1</b> could not be opened. Le fichier <b>%1</b> n'a pas pu être ouvert. - + The file <b>%1</b> is not a valid Designer UI file. Le fichier <b>%1</b> n'est pas un fichier valide d'UI de Designer. @@ -2285,92 +2293,106 @@ QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method Un nom de classe vide a été passé à %1 (nom d'objet '%2'). - + QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder n'a pas pu créer le widget personnalisé de classe '%1'; passage à la classe de base '%2'. - + QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder n'a pas pu créer un widget de classe '%1'. - + The layout type `%1' is not supported. Le type de layout '%1' n'est pas supporté. - + The set-type property %1 could not be read. Le type du setteur de propriété %1 n'a pas pu être lu. - + The enumeration-type property %1 could not be read. Le type d'énumeration de propriété %1 n'a pas pu être lu. - + Reading properties of the type %1 is not supported yet. La lecture des propriétés de type %1 n'est pas supporté. - + The property %1 could not be written. The type %2 is not supported yet. La propriété %1 ne peut pas être écrite. Le type %2 n'est pas encore supporté. + + + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. + la valeur d'énumération '%1' est invalide. La valeur par défaut '%2' sera utilisée à la place. + + + + The flag-value '%1' is invalid. Zero will be used instead. + Le drapeau '%1' est invalide. Zero sera utilisé à la place. + QStackedWidgetEventFilter - + Previous Page Page précédente - + Next Page Page suivante - + Delete Supprimer - + Before Current Page Avant la page courante - + After Current Page Après la page courante - + Change Page Order... Modifier l'ordre des pages... - + Change Page Order Modifier l'ordre des pages - + Page %1 of %2 Page %1 de %2 - - + + Insert Page Insérer page @@ -2378,12 +2400,12 @@ QStackedWidgetPreviewEventFilter - + Go to previous page of %1 '%2' (%3/%4). Aller à la page précédente de %1 '%2' (%3/%4). - + Go to next page of %1 '%2' (%3/%4). Aller à la page suivante de %1 '%2' (%3/%4). @@ -2391,28 +2413,28 @@ QTabWidgetEventFilter - + Delete Supprimer - + Before Current Page Avant la page courante - + After Current Page Après la page courante - + Page %1 of %2 Page %1 de %2 - - + + Insert Page Insérer page @@ -2420,37 +2442,37 @@ QToolBoxHelper - + Delete Page Supprimer page - + Before Current Page Avant la page courante - + After Current Page Après la page courante - + Change Page Order... Modifier l'ordre des pages... - + Change Page Order Modifier l'ordre de pages - + Page %1 of %2 Page %1 de %2 - + Insert Page Insérer page @@ -2458,15 +2480,15 @@ QtBoolEdit - - - + + + True Vrai - - + + False Faux @@ -2474,12 +2496,12 @@ QtBoolPropertyManager - + True Vrai - + False Faux @@ -2487,7 +2509,7 @@ QtCharEdit - + Clear Char Effacer caractère @@ -2495,7 +2517,7 @@ QtColorEditWidget - + ... ... @@ -2503,22 +2525,22 @@ QtColorPropertyManager - + Red Rouge - + Green Vert - + Blue Bleu - + Alpha Alpha @@ -2526,97 +2548,97 @@ QtCursorDatabase - + Arrow Flèche - + Up Arrow Flèche vers le haut - + Cross Croix - + Wait Attendre - + IBeam IBeam - + Size Vertical Redimensionner verticalement - + Size Horizontal Redimensionner horizontalement - + Size Backslash Redimensionner diagonale droite - + Size Slash Redimensionner diagonale gauche - + Size All Redimensionner - + Blank Vide - + Split Vertical Scinder verticalement - + Split Horizontal Scinder horizontalement - + Pointing Hand Pointeur index - + Forbidden Interdit - + Open Hand Main ouverte - + Closed Hand Main fermée - + What's This Qu'est-ce que c'est ? - + Busy Occupé @@ -2624,12 +2646,12 @@ QtFontEditWidget - + ... ... - + Select Font Selectionner police @@ -2637,37 +2659,37 @@ QtFontPropertyManager - + Family Famille - + Point Size Taille en points - + Bold Gras - + Italic Italique - + Underline Souligné - + Strikeout Barré - + Kerning Crénage @@ -2675,7 +2697,7 @@ QtGradientDialog - + Edit Gradient Modifier le gradient @@ -2683,316 +2705,304 @@ QtGradientEditor - + Form Formulaire - + Gradient Editor Éditeur de gradient - + This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. Cette zone montre une prévisualisation du gradient édité. Elle permet aussi d'éditer les paramètres spécifiques au type de gradient tel que les points de départ et d'arrivée, le rayon, etc. par glisser-déposer. - + 1 1 - + 2 2 - + 3 3 - + 4 4 - + 5 5 - + Gradient Stops Editor Éditeur de point d'arrêt du gradient - + This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. Cette zone vous permet d'éditer les points d'arrêt du gardient. Double-cliquez sur un point d'arrêt existant pour le dupliquer. Double-cliquez à l'exterieur d'un point d'arrêt pour en créer un nouveau. Glissez-déposez un point pour le repositionner. Utilisez le bouton droit de la souris pour afficher le menu contextuel avec des actions supplémentaires. - + Zoom Zoom - - + Reset Zoom Réinitialiser le zoom - + Position Position - - - + Hue Teinte - + H T - - + Saturation Saturation - + S S - + Sat Sat - - + Value Valeur - + V V - + Val Val - - - + Alpha Alpha - + A A - + Type Type - + Spread Étendue - + Color Couleur - + Current stop's color Couleur du point d'arrêt courant - + Show HSV specification Montrer les spécifications TSV/HSV - + HSV TSV/HSV - + Show RGB specification Affichier les spécifications RGB - + RGB RGB - + Current stop's position Position du point d'arrêt courant - + % % - + Zoom In Zoomer - + Zoom Out Dézoomer - + Toggle details extension Inverser les détails d'exention - + > > - + Linear Type Type linéaire - - - - - - + ... ... - + Radial Type Type radial - + Conical Type Type conique - + Pad Spread Étendue par remplissage - + Repeat Spread Étendue par répétition - + Reflect Spread Étendue par réflexion - + Start X X de départ - + Start Y Y de départ - + Final X X de fin - + Final Y Y de fin - - + + Central X X central - - + + Central Y Y central - + Focal X X focal - + Focal Y Y focal - + Radius Rayon - + Angle Angle - + Linear Linéaire - + Radial Radial - + Conical Conique - + Pad Remplissage - + Repeat Répéter - + Reflect Réflexion @@ -3000,37 +3010,37 @@ QtGradientStopsWidget - + New Stop Nouveau point d'arrêt - + Delete Supprimer - + Flip All Tout renverser - + Select All Tout sélectionner - + Zoom In Zoomer - + Zoom Out Dézoomer - + Reset Zoom Réinitialiser le zoom @@ -3038,46 +3048,46 @@ QtGradientView - + Gradient View Vue du gradient - - + + New... Nouveau... - - + + Edit... Éditer... - - + + Rename Renommer - - + + Remove Retirer - + Grad Gradient - + Remove Gradient Retirer gradient - + Are you sure you want to remove the selected gradient? Êtes-vous sûr de vouloir supprimer le gradient sélectionné ? @@ -3085,7 +3095,8 @@ QtGradientViewDialog - + + Select Gradient Sélectionner gradient @@ -3093,7 +3104,7 @@ QtKeySequenceEdit - + Clear Shortcut Effacer les racourcis @@ -3101,17 +3112,17 @@ QtLocalePropertyManager - + %1, %2 %1, %2 - + Language Langue - + Country Pays @@ -3119,17 +3130,17 @@ QtPointFPropertyManager - + (%1, %2) (%1, %2) - + X X - + Y Y @@ -3137,17 +3148,17 @@ QtPointPropertyManager - + (%1, %2) (%1, %2) - + X X - + Y Y @@ -3155,12 +3166,12 @@ QtPropertyBrowserUtils - + [%1, %2, %3] (%4) [%1, %2, %3] (%4) - + [%1, %2] [%1, %2] @@ -3168,27 +3179,27 @@ QtRectFPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width Largeur - + Height Hauteur @@ -3196,27 +3207,27 @@ QtRectPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width Largeur - + Height Hauteur @@ -3224,175 +3235,173 @@ QtResourceEditorDialog - + Dialog Dialogue - + New File Nouveau fichier - - + N N - + Remove File Supprimer fichier - - + R S - + I - + New Resource Nouvelle ressource - + A A - + Remove Resource or File Supprimer ressource ou fichier - + %1 already exists. Do you want to replace it? %1 existe déjà. Voulez-vous le remplacer ? - + The file does not appear to be a resource file; element '%1' was found where '%2' was expected. Le fichier n'est pas un fichier ressource; l'élément '%1' a été trouvé à la place de %2. - + %1 [read-only] %1 [lecture seule] - - + + %1 [missing] %1 [manquant] - + <no prefix> <pas de préfixe> - - + + New Resource File Nouveau fichier de ressource - - + + Resource files (*.qrc) Fichier de ressource (*.qrc) - + Import Resource File Importer fichier de ressource - + newPrefix newPrefix - + <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>Avertissement :</b> le fichier</p><p>%1</p><p>est en dehors du répertoire parent du fichier de ressource courant.</p> - + <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>Pour résoudre le problème, appuyez sur :</p><table><tr><th align="left">Copier</th><td>Pour copier le fichier dans le répertoire parent du fichier de ressource.</td></tr><tr><th align="left">Copier sous...</th><td>Pour copier le fichier ressource dans un sous-répertoire du répertoire parent du fichier de ressource.</td></tr><tr><th align="left">Conserver</th><td>pour conserver l'emplacement courant.</td></tr></table> - + Add Files Ajouter fichiers - + Incorrect Path Chemin incorrect - - - - + + + + Copy Copier - + Copy As... Copier sous... - + Keep Conserver - + Skip Passer - + Clone Prefix Cloner le préfixe - + Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". Entrez le suffixe que vous voulez ajouter aux noms des fichiers clonés. Ceci peut être une extension de langue par exemple, comme "_fr'. - - + + Copy As Copier sous - + <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>Le fichier sélectionné</p><p>%1</p><p>est en dehors du répertoire du fichier de ressource courant :</p><p>%2</p><p>Veuillez sélectionner un chemin dans le répertoire courant.</p> - + Could not overwrite %1. Impossible d'écraser %1. - + Could not copy %1 to @@ -3403,108 +3412,108 @@ %2 - + A parse error occurred at line %1, column %2 of %3: %4 Une erreur d'analyse grammaticale est apparue à la ligne %1, colonne %2 de %3 : %4 - + Save Resource File Enregistrer le fichier de ressource - + Could not write %1: %2 Impossible d'écrire %1 : %2 - + Edit Resources Éditer les ressources - + New... Nouveau... - + Open... Ouvrir... - + Open Resource File Ouvrir fichier de ressource - - + + Remove Retirer - - + + Move Up Vers le Haut - - + + Move Down Vers le Bas - - + + Add Prefix Ajouter préfixe - + Add Files... Ajouter fichiers... - + Change Prefix Modifier le préfixe - + Change Language Modifier la langue - + Change Alias Modifier l'alias - + Clone Prefix... Cloner le préfixe... - + Prefix / Path Préfixe / chemin - + Language / Alias Langue / Alias - + <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>Avertissement:</b> Des problèmes sont apparus lors du rafraichissement des données des ressources :</p><pre>%1</pre></html> - + Resource Warning Avertissement relatif aux ressources @@ -3512,24 +3521,24 @@ QtResourceView - + Size: %1 x %2 %3 Taille : %1 x %2 %3 - + Edit Resources... Éditer ressources... - + Reload Recharger - + Copy Path Copier le chemin @@ -3537,7 +3546,7 @@ QtResourceViewDialog - + Select Resource Séléctionner ressource @@ -3545,17 +3554,17 @@ QtSizeFPropertyManager - + %1 x %2 %1 x %2 - + Width Largeur - + Height Hauteur @@ -3563,33 +3572,33 @@ QtSizePolicyPropertyManager - - + + <Invalid> <Invalide> - + [%1, %2, %3, %4] [%1, %2, %3, %4] - + Horizontal Policy Politique horizontale - + Vertical Policy Politique verticale - + Horizontal Stretch Étirement horizontal - + Vertical Stretch Étirement vertical @@ -3597,17 +3606,17 @@ QtSizePropertyManager - + %1 x %2 %1 x %2 - + Width Largeur - + Height Hauteur @@ -3615,107 +3624,107 @@ QtToolBarDialog - + Customize Toolbars Personnaliser les barres d'outils - + 1 1 - + Actions Actions - + Toolbars Barres d'outils - + Add new toolbar Ajouter une nouvelle barre d'outils - + New Nouveau - + Remove selected toolbar Supprimer la barre d'outils sélectionnée - + Remove Supprimer - + Rename toolbar Renommer la barre d'outils - + Rename Renommer - + Move action up Déplacer l'action vers le haut - + Up Monter - + Remove action from toolbar Retirer l'action de la barre d'outils - + <- <- - + Add action to toolbar Ajouter l'action à la barre d'outil - + -> -> - + Move action down Déplacer l'action vers le bas - + Down Descendre - + Current Toolbar Actions Actions de la barre d'outils courante - + Custom Toolbar Barre d'outils personnalisée - + < S E P A R A T O R > < S É P A R A T E U R > @@ -3723,12 +3732,12 @@ QtTreePropertyBrowser - + Property Propriété - + Value Valeur @@ -3736,64 +3745,64 @@ SaveFormAsTemplate - + Save Form As Template Enregistrer le formulaire comme un modèle - + &Name: &Nom : - + &Category: &Catégorie : - + Add path... Ajouter chemin... - + Template Exists Le modèle existe - + A template with the name %1 already exists. Do you want overwrite the template? Un modèle existe déjà avec le nom %1. Voulez-vous le remplacer ? - + Overwrite Template Remplacer modèle - + Open Error Erreur d'ouverture - + There was an error opening template %1 for writing. Reason: %2 Une erreur s'est produite à l'ouverture du modèle %1 en écriture. Raison : %2 - + Write Error Erreur d'écriture - + There was an error writing the template %1 to disk. Reason: %2 Une erreur s'est produite lors de l'écriture du modèle %1 sur le disque. Raison : %2 - + Pick a directory to save templates in Sélectionner le dossier dans lequel le modèle sera enregistré @@ -3801,7 +3810,7 @@ ScriptErrorDialog - + An error occurred while running the scripts for "%1": Une erreur est apparue lors de l'execution des scripts de "%1" : @@ -3811,22 +3820,22 @@ SelectSignalDialog - + Go to slot Aller au slot - + Select signal Sélectionner signal - + signal signal - + class classe @@ -3834,7 +3843,7 @@ SignalSlotConnection - + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) ENVOYER(%1), SIGNAL(%2), RECEVEUR(%3), SLOT(%4) @@ -3842,37 +3851,32 @@ SignalSlotDialogClass - + Signals and slots Signaux et slots - + Slots Slots - - + Add Ajouter - - - - + ... ... - - + Delete Supprimer - + Signals Signaux @@ -3880,12 +3884,12 @@ Spacer - + Horizontal Spacer '%1', %2 x %3 Ressort horizontal '%1', %2 x %3 - + Vertical Spacer '%1', %2 x %3 Ressort vertical '%1', %2 x %3 @@ -3893,7 +3897,7 @@ TemplateOptionsPage - + Template Paths Tab in preferences dialog Chemins des modèles @@ -3902,32 +3906,52 @@ ToolBarManager - + Configure Toolbars... Configurer les barres d'outils... - + Window Fenêtre - + Help Aide - + Style Style - + Dock views Ancrer les vues - + + File + Fichier + + + + Edit + Édition + + + + Tools + Outils + + + + Form + Formulaire + + + Toolbars Barres d'outils @@ -3935,30 +3959,78 @@ VersionDialog - + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Version %2 - + Qt Designer Qt Designer - + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt Designer est une interface de création d'interface graphique pour les applications Qt.<br/> - + %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). %1<br/>Copyright (C) 2010 Nokia Corporation et/ou ses filiales. + VideoPlayerTaskMenu + + + Available Mime Types + Types MIME disponibles + + + + Display supported mime types... + Afficher les types MIME supportés... + + + + Load... + Ouvrir... + + + + Play + Lecture + + + + Pause + Pause + + + + Stop + Arrêter + + + + Choose Video Player Media Source + Choisir une source de média pour le lecteur video + + + + An error has occurred in '%1': %2 + Une erreur s'est produite dans '%1' : %2 + + + + Video Player Error + Erreur du lecteur video + + + WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Le fichier contient un widget personnalisé '%1' dont la classe de base (%2) est différente de l'entrée dans la base de données de widget (%3). La base de données de widget n'a pas été modifiée. @@ -3966,87 +4038,87 @@ qdesigner_internal::ActionEditor - + New... Nouveau... - + Edit... Éditer... - + Go to slot... Aller au slot... - + Copy Copier - + Cut Couper - + Paste Coller - + Select all Tout sélectionner - + Delete Supprimer - + Actions Actions - + Configure Action Editor Configurer l'éditeur d'action - + Icon View Vue en icônes - + Detailed View Vue détaillée - + New action Nouvelle action - + Edit action Editer action - + Remove action '%1' Supprimer action '%1' - + Remove actions Supprimer les actions - + Used In Utilisé dans @@ -4054,32 +4126,32 @@ qdesigner_internal::ActionModel - + Name Nom - + Used Utilisé - + Text Texte - + Shortcut Raccourci - + Checkable Vérifiable - + ToolTip Info-bulle @@ -4087,27 +4159,27 @@ qdesigner_internal::BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. L'attribut requis '%2' est manquant pour l'élément '%1'. - + Empty brush name encountered. Un nom vide de pinceau a été rencontré. - + An unexpected element '%1' was encountered. L'élément inattendu '%1' a été rencontré. - + An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 - Une erreur est apparue lors de la lecture du fichier '%1' de définition des pinceaux à la ligne %2, colonne %3: %4 - - - + Une erreur est apparue lors de la lecture du fichier '%1' de définition des pinceaux à la ligne %2, colonne %3 : %4 + + + An error occurred when reading the resource file '%1' at line %2, column %3: %4 Une erreur est survenue lors de la lecture du fichier de ressource '%1' à la ligne %2, colonne %3 : %4 @@ -4115,17 +4187,17 @@ qdesigner_internal::BuddyEditor - + Add buddy Ajouter un copain - + Remove buddies Supprimer les copains - + Remove %n buddies Supprimer %n copain @@ -4133,7 +4205,7 @@ - + Add %n buddies Ajouter %n copain @@ -4141,7 +4213,7 @@ - + Set automatically Définir automatiquement @@ -4149,7 +4221,7 @@ qdesigner_internal::BuddyEditorPlugin - + Edit Buddies Éditer les copains @@ -4157,7 +4229,7 @@ qdesigner_internal::BuddyEditorTool - + Edit Buddies Éditer les copains @@ -4165,12 +4237,12 @@ qdesigner_internal::ButtonGroupMenu - + Select members Sélectionner les membres - + Break Casser @@ -4178,32 +4250,32 @@ qdesigner_internal::ButtonTaskMenu - + Assign to button group Assigner au groupe de boutons - + Button group Groupe de boutons - + New button group Nouveau groupe de boutons - + Change text... Modifier le texte... - + None Aucun - + Button group '%1' Groupe de boutons '%1' @@ -4211,57 +4283,57 @@ qdesigner_internal::CodeDialog - + Save... Enregistrer... - + Copy All Tout copier - + &Find in Text... &Rechercher dans le texte... - + A temporary form file could not be created in %1. Un fichier temporaire de formulaire n'a pas pu être créé dans %1. - + The temporary form file %1 could not be written. Le fichier temporaire de formulaire %1 n'a pas pu être écrit. - + %1 - [Code] %1 - [Code] - + Save Code Enregistrer le code - + Header Files (*.%1) Fichiers headers (*.%1) - + The file %1 could not be opened: %2 Le fichier %1 ne peut pas être ouvert : %2 - + The file %1 could not be written: %2 Le fichier %1 ne peut pas être écrit : %2 - + %1 - Error %1 - Erreur @@ -4269,7 +4341,7 @@ qdesigner_internal::ColorAction - + Text Color Couleur du texte @@ -4277,12 +4349,12 @@ qdesigner_internal::ComboBoxTaskMenu - + Edit Items... Éditer les éléments... - + Change Combobox Contents Modifier le contenu du Combobox @@ -4290,7 +4362,7 @@ qdesigner_internal::CommandLinkButtonTaskMenu - + Change description... Modifier la description... @@ -4298,17 +4370,17 @@ qdesigner_internal::ConnectionEdit - + Select All Tout sélectionner - + Deselect All Désélectionner tout - + Delete Supprimer @@ -4316,52 +4388,52 @@ qdesigner_internal::ConnectionModel - + Sender Émetteur - + Signal Signal - + Receiver Receveur - + Slot Slot - + <sender> <émetteur> - + <signal> <signal> - + <receiver> <receveur> - + <slot> <slot> - + The connection already exists!<br>%1 La connexion existe déjà !<br>%1 - + Signal and Slot Editor Éditeur de signaux et slots @@ -4369,42 +4441,42 @@ qdesigner_internal::ContainerWidgetTaskMenu - + Delete Supprimer - + Insert Insérer - + Insert Page Before Current Page Insérer la page avant la page courante - + Insert Page After Current Page Insérer la page après la page courante - + Add Subwindow Ajouter sous-fenêtre - + Subwindow Sous fenêtre - + Page Page - + Page %1 of %2 Page %1 de %2 @@ -4412,18 +4484,18 @@ qdesigner_internal::DPI_Chooser - + System (%1 x %2) System resolution Système (%1 x %2) - + User defined Défini par l'utilisateur - + x DPI X/Y separator x @@ -4432,49 +4504,49 @@ qdesigner_internal::DesignerPropertyManager - - + + AlignLeft AlignementGauche - + AlignHCenter AlignementCentreH - + AlignRight AlignementDroite - + AlignJustify AlignementJustifié - + AlignTop AlignementSommet - - + + AlignVCenter AlignementCentreV - + AlignBottom AlignementDessous - + %1, %2 %1, %2 - + Customized (%n roles) Personnalisé (%n rôle) @@ -4482,76 +4554,76 @@ - + Inherited pour la palette Héritée - + Horizontal Horizontal - + Vertical Vertical - + Normal Off Arrêt normal - + Normal On Marche normal - + Disabled Off Arrêt désactivé - + Disabled On Marche désactivé - + Active Off Arrêt activé - + Active On Marche activé - + Selected Off Arrêt sélectionné - + Selected On Marche sélectionné - - + + translatable Traduisible - - + + disambiguation désambiguation - - + + comment commentaire @@ -4559,48 +4631,48 @@ qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) Profils d'appareil (*.%1) - + Default Par défaut - + Save Profile Enregistrer le profil - + Save Profile - Error Enregistrer le profile - Erreur - + Unable to open the file '%1' for writing: %2 Impossible d'ouvrir le fichier '%1' en écriture : %2 - + Open profile Ouvrir profil - - + + Open Profile - Error Ouvrir profil - Erreur - + Unable to open the file '%1' for reading: %2 Impossible d'ouvrir le fichier '%1' en lecture : %2 - + '%1' is not a valid profile: %2 '%1' n'est pas un profil valide : %2 @@ -4608,57 +4680,57 @@ qdesigner_internal::Dialog - + Dialog Boîte de dialogue - + StringList Liste de chaîne de caractères - + New String Nouvelle chaîne de caractères - + &New &Nouveau - + Delete String Supprimer la chaîne de caractères - + &Delete &Supprimer - + &Value: &Valeur : - + Move String Up Déplacer la chaîne de caractères vers le haut - + Up Vers le haut - + Move String Down Déplacer la chaîne de caractères vers le bas - + Down Vers le bas @@ -4666,52 +4738,52 @@ qdesigner_internal::EmbeddedOptionsControl - + None Aucun - + Add a profile Ajouter un profil - + Edit the selected profile Éditer le profile sélectionné - + Delete the selected profile Supprimer le profil sélectionné - + Add Profile Ajouter profil - + New profile Nouveau profil - + Edit Profile Éditer profil - + Delete Profile Supprimer profil - + Would you like to delete the profile '%1'? Voulez-vous supprimer le profil '%1' ? - + Default Par défaut @@ -4719,20 +4791,29 @@ qdesigner_internal::FilterWidget - <Filter> - <Filtre> + <Filtre> + + + + Filter + Filtre + + + + Clear text + Effacer le texte qdesigner_internal::FormEditor - + Resource File Changed Fichier de ressource modifié - + The file "%1" has changed outside Designer. Do you want to reload it? Le fichier "%1" a été modifié en dehors de Designer. Voulez-vous le recharger ? @@ -4740,7 +4821,7 @@ qdesigner_internal::FormLayoutMenu - + Add form layout row... Ajouter une ligne au layout du formulaire... @@ -4748,33 +4829,37 @@ qdesigner_internal::FormWindow - + Edit contents Éditer le contenu - + F2 F2 - + Insert widget '%1' Insérer le widget '%1' - + Resize Redimensionner - - + Key Move Déplacement au clavier + + + Key Resize + Redimensionnement au clavier + - + Paste %n action(s) Coller %n action @@ -4782,7 +4867,7 @@ - + Paste %n widget(s) Coller %n widget @@ -4790,53 +4875,53 @@ - + Paste (%1 widgets, %2 actions) Coller (%1 widgets, %2 actions) - + Cannot paste widgets. Designer could not find a container without a layout to paste into. Impossible de coller les widgets. Designer n'a pas trouvé de conteneur sans layout pour coller. - + Break the layout of the container you want to paste into, select this container and then paste again. Retirez le layout du conteneur dans lequel vous voulez coller, sélectionnez ce conteneur et collez à nouveau. - + Paste error Erreur de collage - + Raise widgets Élever widgets - + Lower widgets Descendre widgets - + Select Ancestor Sélectionner les ancêtres - + Lay out Mettre en page - - + + Drop widget Supprimer widget - + A QMainWindow-based form does not contain a central widget. Un formulaire basé sur QMainWindow ne contenant pas de widget central. @@ -4844,12 +4929,12 @@ qdesigner_internal::FormWindowBase - + Delete '%1' Supprimer '%1' - + Delete Supprimer @@ -4857,200 +4942,208 @@ qdesigner_internal::FormWindowManager - + Cu&t Co&uper - + Cuts the selected widgets and puts them on the clipboard Coupe les widgets sélectionnés et les place dans le presse-papiers - + &Copy Cop&ier - + Copies the selected widgets to the clipboard Copie les widgets sélectionnés dans le presse-papiers - + &Paste C&oller - + Pastes the clipboard's contents Colle le contenu du presse-papiers - + &Delete &Supprimer - + Deletes the selected widgets Supprime les widgets sélectionnés - + Select &All Tout &sélectionner - + Selects all widgets Sélectionne tous les widgets - + Bring to &Front Amener au premier &plan - - + + Raises the selected widgets Élève les widgets sélectionnés - + Send to &Back Placer en &arrière plan - - + + Lowers the selected widgets Descend les widgets sélectionnés - + Adjust &Size Ajuster les &dimensions - + Adjusts the size of the selected widget Ajuster les dimensions du widget sélectionné - + Lay Out &Horizontally Mettre en page &horizontalement - - Lays out the selected widgets horizontaly + + Lays out the selected widgets horizontally Mettre en page horizontalement les widgets sélectionnés - + + Lays out the selected widgets horizontally in a splitter + Met en page les widgets sélectionnés horizontalement à l'aide d'un séparateur + + + Lays out the selected widgets horizontaly + Mettre en page horizontalement les widgets sélectionnés + + + Lay Out &Vertically Mettre en page &verticalement - + Lays out the selected widgets vertically Mettre en page verticalement les widgets sélectionnés - + Lay Out in a &Form Layout Mettre en page dans un layout de &formulaire - + Lays out the selected widgets in a form layout Mettre en page les widgets sélectionnés dans un layout de formulaire - + Lay Out in a &Grid Mettre en page dans une &grille - + Lays out the selected widgets in a grid Mettre en page les widgets sélectionnés dans une grille - + Lay Out Horizontally in S&plitter Mettre en page horizontalement avec un sé&parateur - Lays out the selected widgets horizontaly in a splitter - Met en page les widgets sélectionnés horizontalement à l'aide d'un séparateur - - - + Met en page les widgets sélectionnés horizontalement à l'aide d'un séparateur + + + Lay Out Vertically in Sp&litter Mettre en page verticalement avec un sépa&rateur - + Lays out the selected widgets vertically in a splitter Met en page les widgets sélectionnés verticalement à l'aide d'un séparateur - + &Break Layout &Casser la mise en page - + Breaks the selected layout Retire le layout sélectionné - + Si&mplify Grid Layout Si&mplifier le layout de grille - + Removes empty columns and rows Supprime les lignes et colonnes vides - + &Preview... &Prévisualisation... - + Preview current form Prévisualise le formulaire courant - + Form &Settings... Paramètres du &formulaire... - + Break Layout Casser la mise en page - + Adjust Size Ajuster les dimensions - + Could not create form preview Title of warning message box Impossible de créer la prévisualisation du formulaire - + Form Settings - %1 Paramètres du formulaire - %1 @@ -5058,12 +5151,12 @@ qdesigner_internal::FormWindowSettings - + None Aucun - + Device Profile: %1 Profil de périphérique : %1 @@ -5071,38 +5164,37 @@ qdesigner_internal::GridPanel - + Form Formulaire - + Grid Grille - + Visible Visible - + Grid &X Grille &X - - + Snap Grille aimantée - + Reset Réinitialisé - + Grid &Y Grille &Y @@ -5110,7 +5202,7 @@ qdesigner_internal::GroupBoxTaskMenu - + Change title... Modifier le titre... @@ -5118,7 +5210,7 @@ qdesigner_internal::HtmlTextEdit - + Insert HTML entity Insérer une entité HTML @@ -5126,92 +5218,92 @@ qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. Le fichier pixmap '%1' ne peut pas être lu. - + The file '%1' does not appear to be a valid pixmap file: %2 Le fichier '%1' n'est pas un fichier de pixmap valide : %2 - + The file '%1' could not be read: %2 Le fichier '%1' ne peut pas être lu : %2 - + Choose a Pixmap Choisissez un pixmap - + Pixmap Read Error Erreur de lecture de pixmap - + ... ... - + Normal Off Arrêt normal - + Normal On Marche normal - + Disabled Off Arrêt désactivé - + Disabled On Marche désactivé - + Active Off Arrêt activé - + Active On Marche activé - + Selected Off Arrêt sélectionné - + Selected On Marche sélectionné - + Choose Resource... Choisir ressource... - + Choose File... Choisir un fichier... - + Reset Réinitialiser - + Reset All Réinitialisé tout @@ -5219,58 +5311,58 @@ qdesigner_internal::ItemListEditor - + Items List Liste d'éléments - + New Item Nouvel élément - + &New &Nouveau - + Delete Item Supprimer élément - + &Delete &Supprimer - + Move Item Up Déplacer l'élément vers le haut - + U Monter - + Move Item Down Déplacer l'élément vers le bas - + D Descendre - - + + Properties &>> Propriétés &>> - + Properties &<< Propriétés &<< @@ -5278,12 +5370,12 @@ qdesigner_internal::LabelTaskMenu - + Change rich text... Modifier texte riche... - + Change plain text... Modifier texte simple... @@ -5291,7 +5383,7 @@ qdesigner_internal::LanguageResourceDialog - + Choose Resource Choisir ressource @@ -5299,7 +5391,7 @@ qdesigner_internal::LineEditTaskMenu - + Change text... Modifier texte... @@ -5307,17 +5399,17 @@ qdesigner_internal::ListWidgetEditor - + New Item Nouvel élément - + Edit List Widget Éditer le widget de liste - + Edit Combobox Éditer le Combobox @@ -5325,12 +5417,12 @@ qdesigner_internal::ListWidgetTaskMenu - + Edit Items... Éditer les éléments... - + Change List Contents Modifier le contenu de la liste @@ -5338,22 +5430,22 @@ qdesigner_internal::MdiContainerWidgetTaskMenu - + Next Subwindow Sous-fenêtre suivante - + Previous Subwindow Sous-fenêtre précédente - + Tile Côte à côte - + Cascade Cascade @@ -5361,7 +5453,7 @@ qdesigner_internal::MenuTaskMenu - + Remove Supprimer @@ -5369,7 +5461,7 @@ qdesigner_internal::MorphMenu - + Morph into Transformer en @@ -5377,43 +5469,42 @@ qdesigner_internal::NewActionDialog - + New Action... Nouvelle action... - + &Text: &Texte : - + Object &name: &Nom de l'objet : - + &Icon: &Icône : - + Shortcut: Raccourci : - + Checkable: Peut être cochée : - + ToolTip: Info-bulle : - - + ... ... @@ -5421,39 +5512,39 @@ qdesigner_internal::NewDynamicPropertyDialog - + Create Dynamic Property Créer une propriété dynamique - + Property Name Nom de la propriété - + horizontalSpacer Espaceur horizontal - + Property Type Type de la propriété - + Set Property Name Définir le nom de la propriété - + The current object already has a property named '%1'. Please select another, unique one. L'objet courant possède déjà une propriété nommée '%1'. Veuillez-sélectionner un autre nom. - + The '_q_' prefix is reserved for the Qt library. Please select another name. Le préfixe «_q_» est réservé pour la bibliothèque Qt. @@ -5463,83 +5554,83 @@ qdesigner_internal::NewFormWidget - + 0 0 - + Choose a template for a preview Choisir un modèle pour la prévisualisation - + Embedded Design Design pour appareil mobile - + Device: Appareil : - + Screen Size: Dimensions de l'écran : - + Default size Dimensions par défaut - + QVGA portrait (240x320) QVGA portrait (240x320) - + QVGA landscape (320x240) QVGA paysage (320x240) - + VGA portrait (480x640) VGA portrait (480x640) - + VGA landscape (640x480) VGA paysage (640x480) - + Widgets New Form Dialog Categories Widgets - + Custom Widgets Widgets personnalisé - + None Aucun - + Error loading form Erreur de chargement du formulaire - + Unable to open the form template file '%1': %2 Impossible d'ouvrir le fichier de modèle de formulaire '%1' : %2 - + Internal error: No template selected. Erreur interne : aucun modèle sélectionné. @@ -5547,37 +5638,37 @@ qdesigner_internal::NewPromotedClassPanel - + Add Ajouter - + New Promoted Class Nouvelle classe promue - + Base class name: Nom de la classe de base : - + Promoted class name: Nom de la classe promue : - + Header file: Fichier d'en-tête : - + Global include En-tête global - + Reset Réinitialiser @@ -5585,7 +5676,12 @@ qdesigner_internal::ObjectInspector - + + Change Current Page + Modifier la page courante + + + &Find in Text... &Rechercher dans le texte... @@ -5593,40 +5689,39 @@ qdesigner_internal::ObjectInspector::ObjectInspectorPrivate - Change Current Page - Modifier la page courante + Modifier la page courante qdesigner_internal::OrderDialog - + Change Page Order Modifier l'ordre des pages - + Page Order Ordre des pages - + Move page up Déplacer la page vers le haut - + Move page down Déplacer la page vers le bas - + Index %1 (%2) Indice %1 (%2) - + %1 %2 %1 %2 @@ -5634,47 +5729,47 @@ qdesigner_internal::PaletteEditor - + Edit Palette Éditer la palette - + Tune Palette Ajuster la palette - + Show Details Afficher les détails - + Compute Details Calculer les détails - + Quick Rapide - + Preview Prévisualisation - + Disabled Désactivé - + Inactive Inactif - + Active Actif @@ -5682,7 +5777,7 @@ qdesigner_internal::PaletteEditorButton - + Change Palette Modifier la palette @@ -5690,22 +5785,22 @@ qdesigner_internal::PaletteModel - + Color Role Rôle de la couleur - + Active Actif - + Inactive Inactif - + Disabled Désactivé @@ -5713,28 +5808,28 @@ qdesigner_internal::PixmapEditor - + Choose Resource... Choisir ressource... - + Choose File... Choisir fichier... - + Copy Path Chemin de copie - + Paste Path Chemin de collage - - + + ... ... @@ -5742,7 +5837,7 @@ qdesigner_internal::PlainTextEditorDialog - + Edit text Éditer le texte @@ -5750,37 +5845,37 @@ qdesigner_internal::PluginDialog - + Components Composants - + Plugin Information Information sur les plugins - + Refresh Rafraîchir - + Scan for newly installed custom widget plugins. Recherche des plugins personnalisés récemment installés. - + Qt Designer couldn't find any plugins Qt Designer n'a trouvé aucun plugin - + Qt Designer found the following plugins Qt Designer a trouvé les plugins suivants - + New custom widget plugins have been found. De nouveaux plugins de widgets ont été trouvés. @@ -5788,7 +5883,7 @@ qdesigner_internal::PreviewActionGroup - + %1 Style Style %1 @@ -5796,77 +5891,103 @@ qdesigner_internal::PreviewConfigurationWidget - + Default Par défaut - + None Aucun - + Browse... Parcourir... + + + Load Custom Device Skin + Charger le revêtement d'appareil personnalisé + + + + All QVFB Skins (*.%1) + Tous les revêtements QVFB (*.%1) + + + + %1 - Duplicate Skin + %1 - Revêtement doublon + + + + The skin '%1' already exists. + Le revêtement '%1' existe déjà. + + + + %1 - Error + %1 - Erreur + + + + %1 is not a valid skin directory: +%2 + %1 n'est pas un répertoire de revêtements valide : +%2 + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate - Load Custom Device Skin - Charger le revêtement d'appareil personnalisé - - - + Charger le revêtement d'appareil personnalisé + + All QVFB Skins (*.%1) - Tous les revêtements QVFB (*.%1) - - - + Tous les revêtements QVFB (*.%1) + + %1 - Duplicate Skin - %1 - Revêtement doublon - - - + %1 - Revêtement doublon + + The skin '%1' already exists. - Le revêtement '%1' existe déjà. - - - + Le revêtement '%1' existe déjà. + + %1 - Error - %1 - -Erreur - - - + %1 - -Erreur + + %1 is not a valid skin directory: %2 - %1 n'est pas un répertoire de revêtements valide : + %1 n'est pas un répertoire de revêtements valide : %2 qdesigner_internal::PreviewDeviceSkin - + &Portrait &Portrait - + Landscape (&CCW) Rotate form preview counter-clockwise Paysage (&dans le sens horaire) - + &Landscape (CW) Rotate form preview clockwise Paysage (&dans le sens anti-horaire) - + &Close &Fermer @@ -5874,7 +5995,7 @@ qdesigner_internal::PreviewManager - + %1 - [Preview] %1 - [prévisualisation] @@ -5882,7 +6003,7 @@ qdesigner_internal::PreviewMdiArea - + The moose in the noose ate the goose who was loose. Palette editor background @@ -5893,57 +6014,57 @@ qdesigner_internal::PreviewWidget - + Preview Window Fenêtre de prévisualisation - + LineEdit LineEdit - + ComboBox ComboBox - + PushButton PushButton - + ButtonGroup2 ButtonGroup2 - + CheckBox1 CheckBox1 - + CheckBox2 CheckBox2 - + ButtonGroup ButtonGroup - + RadioButton1 RadioButton1 - + RadioButton2 RadioButton2 - + RadioButton3 BoutonRadio1 @@ -5951,22 +6072,22 @@ qdesigner_internal::PromotionModel - + Name Nom - + Header file Fichier d'en-tête - + Global include En-tête global - + Usage Usage @@ -5974,27 +6095,27 @@ qdesigner_internal::PromotionTaskMenu - + Promoted widgets... Widgets promus... - + Promote to ... Promouvoir en... - + Change signals/slots... Modifier signaux/slots... - + Promote to Promouvoir en - + Demote to %1 Rétrograder en %1 @@ -6002,57 +6123,57 @@ qdesigner_internal::PropertyEditor - + Add Dynamic Property... Ajouter une propriété dynamique... - + Remove Dynamic Property Supprimer la propriété dynamique - + Sorting Tri - + Color Groups Groupes de couleur - + Tree View Vue arborescente - + Drop Down Button View - Liste déroulante - - - + Liste déroulante + + + String... Chaîne de caractères... - + Bool... Booléen... - + Other... Autre... - + Configure Property Editor Configurer l'éditeur de propriétés - + Object: %1 Class: %2 Objet : %1 @@ -6062,7 +6183,7 @@ qdesigner_internal::PropertyLineEdit - + Insert line break Insérer saut de ligne @@ -6070,27 +6191,27 @@ qdesigner_internal::QDesignerPromotionDialog - + Promoted Widgets Widgets promus - + Promoted Classes Classes promues - + Promote Promouvoir - + Change signals/slots... Modifier signaux/slots... - + %1 - Error %1 - Erreur @@ -6098,22 +6219,22 @@ qdesigner_internal::QDesignerResource - + Loading qrc file Chargement du fichier qrc - + The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> - Le fichier qrc spécifié <p><b>%1</b></p><p>n'a pas pu être trouvé. Voulez-vous mettre à jour l'emplacement du fichier?</p> - - - + Le fichier qrc spécifié <p><b>%1</b></p><p>n'a pas pu être trouvé. Voulez-vous mettre à jour l'emplacement du fichier ?</p> + + + New location for %1 Nouvel emplacement pour %1 - + Resource files (*.qrc) Fichier de ressource (*.qrc) @@ -6121,112 +6242,112 @@ qdesigner_internal::QDesignerTaskMenu - + Change objectName... Modifier objectName... - + Change toolTip... Modifier toolTip... - + Change whatsThis... Modifier whatsThis... - + Change styleSheet... Modifier la feuille de style... - + Create Menu Bar Créer une barre de menus - + Add Tool Bar Ajouter une barre d'outils - + Create Status Bar Créer une barre de status - + Remove Status Bar Supprimer la barre de status - + Change script... Modifier le script... - + Change signals/slots... Modifier signaux/slots... - + Go to slot... Aller au slot... - + Size Constraints Contrainte de taille - + Set Minimum Width Définir la largeur minimum - + Set Minimum Height Définir la hauteur minimum - + Set Minimum Size Définir la taille minimum - + Set Maximum Width Définir la largeur maximum - + Set Maximum Height Définir la hauteur maximum - + Set Maximum Size Définir la taille maximum - + Edit ToolTip Éditer l'info-bulle - + Edit WhatsThis Éditer «Qu'est-ce» - + no signals available Aucun signal disponible - + Set size constraint on %n widget(s) Définir les contraintes de dimensions sur %n widget @@ -6237,40 +6358,40 @@ qdesigner_internal::QDesignerWidgetBox - + An error has been encountered at line %1 of %2: %3 Une erreur a été rencontrée à la ligne %1 de %2 : %3 - + Unexpected element <%1> encountered when parsing for <widget> or <ui> L'élément inattendu <%1> a été rencontré lors de l'analyse des élements <widget> et <ui> - + Unexpected end of file encountered when parsing widgets. Fin de fichier inattendue lors de l'analyse grammaticale des widgets. - + A widget element could not be found. Un élement de widget n'a pas pu être trouvé. - - + + Unexpected element <%1> Élément <%1> inattendu - + A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 Une erreur d'analyse grammaticale est apparue à la ligne %1, colonne %2 du code XML spécifiant le widget %3 : %4 %5 - + The XML code specified for the widget %1 does not contain any widget elements. %2 Le code XML spécifié pour le widget %1 ne contient aucun élément widget. @@ -6280,73 +6401,73 @@ qdesigner_internal::QtGradientStopsController - + H T - + S S - + V V - - + + Hue Teinte - + Sat Sat - + Val Val - + Saturation Saturation - + Value Valeur - + R R - + G V - + B B - + Red Rouge - + Green Vert - + Blue Bleu @@ -6354,27 +6475,27 @@ qdesigner_internal::RichTextEditorDialog - + Edit text Éditer le texte - + Rich Text Texte riche - + Source Source - + &OK &OK - + &Cancel &Annuler @@ -6382,72 +6503,72 @@ qdesigner_internal::RichTextEditorToolBar - + Bold Gras - + CTRL+B CTRL+B - + Italic Italique - + CTRL+I CTRL+I - + Underline Souligné - + CTRL+U CTRL+U - + Left Align Aligner à gauche - + Center Centrer - + Right Align Aligner à droite - + Justify Justifier - + Superscript Exposant - + Subscript Indice - + Insert &Link Insérer &lien - + Insert &Image Insérer &image @@ -6455,17 +6576,17 @@ qdesigner_internal::ScriptDialog - + Edit script Éditer le script - + <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>Entrez un snippet de code Qt Script à exécuter lors du chargement du formulaire.<br>Le widget et ses enfants sont accessibles via les variables <i>widget</i> et <i>childWidgets</i>, respectivement. - + Syntax error Erreur de syntaxe @@ -6473,7 +6594,7 @@ qdesigner_internal::ScriptErrorDialog - + Script errors Erreurs de script @@ -6481,23 +6602,23 @@ qdesigner_internal::SignalSlotDialog - + There is already a slot with the signature '%1'. Un slot existe déjà avec la signature '%1'. - + There is already a signal with the signature '%1'. Un signal existe déjà avec la signature '%1'. - + %1 - Duplicate Signature %1 - Signature double - - + + Signals/Slots of %1 Signaux/slots de %1 @@ -6505,12 +6626,12 @@ qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots Éditer signaux/slots - + F4 F4 @@ -6518,7 +6639,7 @@ qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots Éditer signaux/slots @@ -6526,7 +6647,7 @@ qdesigner_internal::StatusBarTaskMenu - + Remove Supprimer @@ -6534,7 +6655,7 @@ qdesigner_internal::StringListEditorButton - + Change String List Modifier la liste de chaîne de caractères @@ -6542,38 +6663,38 @@ qdesigner_internal::StyleSheetEditorDialog - - + + Valid Style Sheet Feuille de style valide - + Add Resource... Ajouter ressource... - + Add Gradient... Ajouter gradient... - + Add Color... Ajouter couleur... - + Add Font... Ajouter police... - + Edit Style Sheet Éditer feuille de style - + Invalid Style Sheet Feuille de style invalide @@ -6581,27 +6702,27 @@ qdesigner_internal::TabOrderEditor - + Start from Here Démarrer à partir d'ici - + Restart Redémarrer - + Tab Order List... Ordre de la liste de tabulation... - + Tab Order List Ordre de la liste de tabulation - + Tab Order Ordre des tabulations @@ -6609,7 +6730,7 @@ qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order Éditer l'ordre des tabulations @@ -6617,7 +6738,7 @@ qdesigner_internal::TabOrderEditorTool - + Edit Tab Order Éditer l'ordre des tabulations @@ -6625,48 +6746,48 @@ qdesigner_internal::TableWidgetEditor - + Edit Table Widget Éditer le widget de table - + &Items &Éléments - + Table Items Éléments de la table - - + + Properties &>> Propriétés &>> - + New Column Nouvelle colonne - + New Row Nouvelle ligne - + &Columns &Colonne - + &Rows &Lignes - + Properties &<< Propriétés &<< @@ -6674,7 +6795,7 @@ qdesigner_internal::TableWidgetTaskMenu - + Edit Items... Éditer les éléments... @@ -6682,23 +6803,22 @@ qdesigner_internal::TemplateOptionsWidget - + Form Formulaire - + Additional Template Paths Chemins de modèles additionnels - - + ... ... - + Pick a directory to save templates in Choisir un répertoire où enregistrer les modèles @@ -6706,22 +6826,22 @@ qdesigner_internal::TextEditTaskMenu - + Edit HTML Éditer le HTML - + Change HTML... Modifier le HTML... - + Edit Text Éditer le texte - + Change Plain Text... Modifier le texte simple... @@ -6729,22 +6849,22 @@ qdesigner_internal::TextEditor - + Choose Resource... Choisir ressource... - + Choose File... Choisir fichier... - + ... ... - + Choose a File Choisir un fichier @@ -6752,27 +6872,27 @@ qdesigner_internal::ToolBarEventFilter - + Insert Separator before '%1' Insérer un séparateur avant '%1' - + Append Separator Ajouter un séparateur à la fin - + Remove action '%1' Supprimer l'action '%1' - + Remove Toolbar '%1' Supprimer la barre d'outils '%1' - + Insert Separator Insérer un séparateur @@ -6780,125 +6900,125 @@ qdesigner_internal::TreeWidgetEditor - + Edit Tree Widget Éditer un widget d'arborescence - + &Items &Éléments - + Tree Items Élément de l'arbre - + 1 1 - - + + New Item Nouvel élément - + &New &Nouveau - - + + New Subitem Nouveau sous-élément - + New &Subitem Nouveau &sous-élément - + Delete Item Supprimer l'élément - + &Delete &Supprimer - + Move Item Left (before Parent Item) Déplacer l'élément à gauche (avant l'élément parent) - + L G - + Move Item Right (as a First Subitem of the Next Sibling Item) Déplacer l'élément sur la droite (comme un premier sous-élément de l'élément à droite) - + R D - + Move Item Up Déplacer l'élément vers le haut - + U H - + Move Item Down Déplacer l'élément vers le bas - + D B - - + + Properties &>> Propriétés &>> - + New Column Nouvelle colonne - + &Columns &Colonnes - + Per column properties Propriétés par colonnes - + Common properties Propritétés de colonnes - + Properties &<< Propriétés &<< @@ -6906,7 +7026,7 @@ qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... Éditer les éléments... @@ -6914,7 +7034,7 @@ qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Avertissement : La création du widget a échoué dans la boîte de widget. Ceci peut être causé par un code XML invalide d'un widget personnalisé. @@ -6922,42 +7042,42 @@ qdesigner_internal::WidgetBoxTreeWidget - + Scratchpad bloc-notes - + Custom Widgets Widgets personnalisés - + Expand all Tout étendre - + Collapse all Tout replier - + List View Vue de liste - + Icon View Vue en icônes - + Remove Supprimer - + Edit name Éditer le nom @@ -6965,7 +7085,7 @@ qdesigner_internal::WidgetDataBase - + A custom widget plugin whose class name (%1) matches that of an existing class has been found. Un plugin de widgets personnalisés dont un nom de classe (%1) correspond à une classe existante à été trouvé. @@ -6973,7 +7093,7 @@ qdesigner_internal::WidgetEditorTool - + Edit Widgets Éditer les widgets @@ -6981,34 +7101,34 @@ qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. La fabrique (factory) de widget personnalisé, enregistrée pour les widgets de classe %1, a retourné 0. - + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Une discordance de nom de classe est apparue lors de la création d'un nouveau widget à l'aide de la fabrique de widget personnalisé enregistrée pour la classe %1. La fabrique a retourné un widget de classe %2. - + %1 Widget %1 Widget - + The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. Le conteneur '%1' de la page courante (%2) n'a pas pu être déterminé lors de la création du layout. Ceci indique une incohérence dans le fichier ui, probablement un layout étant construit sur un widget conteneur. - + Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. Temptative d'ajout d'un layout sur le widget '%1' (%2) qui a déjà un layout non pris en charge de type %3. Ceci indique une inconsistance dans le fichier ui. - + Cannot create style '%1'. Impossible de créer le style '%1'. @@ -7016,12 +7136,12 @@ qdesigner_internal::WizardContainerWidgetTaskMenu - + Next Suivant - + Back Précédent @@ -7029,7 +7149,7 @@ qdesigner_internal::ZoomMenu - + %1 % Zoom factor %1 % @@ -7038,7 +7158,7 @@ qdesigner_internal::ZoomablePreviewDeviceSkin - + &Zoom &Zoom diff -r ef0373b55136 -r 758a864f9613 translations/designer_ja.ts --- a/translations/designer_ja.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/designer_ja.ts Mon Oct 04 01:19:32 2010 +0300 @@ -2,1199 +2,800 @@ - - - - The moose in the noose -ate the goose who was loose. - 坊主が屏風に上手に坊主の絵を描いた。 - - - - <object> - <オブジェクト> - - - - <signal> - <シグナル> - - - - <slot> - <スロット> - - - - @default - - The moose in the noose -ate the goose who was loose. - 坊主が屏風に上手に坊主の絵を描いた。 - - - <object> - <オブジェクト> - - - <signal> - <シグナル> - - - <slot> - <スロット> - - - Solid - 塗りつぶし - - - Horizontal - 横 - - - Vertical - 縦 - - - Cross - 格子 - - - Texture - テクスチャ - - - Dense 1 - 密度 1 - - - Dense 2 - 密度 2 - - - Dense 3 - 密度 3 - - - Dense 4 - 密度 4 - - - Dense 5 - 密度 5 - - - Dense 6 - 密度 6 - - - Dense 7 - 密度 7 - - - AbstractFindWidget - &Previous - - - - + 前を検索(&P) + + &Next - - - - + 次を検索(&N) + + &Case sensitive - - - - + 大文字/小文字を区別する(&C) + + Whole &words - - - - + 単語単位で検索する(&W) + + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped - + <img src=":/trolltech/shared/images/wrap.png">&nbsp;先頭から再び検索します AddLinkDialog - Insert Link - - - - + リンクを挿入 + + Title: - - - - + タイトル: + + URL: - + URL: AppFontDialog - Additional Fonts - + フォントの追加 AppFontManager - '%1' is not a file. - - - - + '%1' はファイルではありません。 + + The font file '%1' does not have read permissions. - - - - + フォントファイル '%1' を読む権限がありません。 + + The font file '%1' is already loaded. - - - - + フォントファイル '%1' は既にロードされています。 + + The font file '%1' could not be loaded. - - - - + フォントファイル '%1' をロードできませんでした。 + + '%1' is not a valid font id. - - - - + '%1' は無効なフォント ID です。 + + There is no loaded font matching the id '%1'. - - - - + フォント ID '%1' に合致するフォントはロードされていません。 + + The font '%1' (%2) could not be unloaded. - + フォント '%1' (%2) をアンロードできませんでした。 AppFontWidget - Fonts - - - - + フォント + + Add font files - - - - + フォントファイルを追加 + + Remove current font file - - - - + 現在のフォントファイルを削除 + + Remove all font files - - - - + すべてのフォントファイルを削除 + + Add Font Files - - - - + フォントファイルを追加 + + Font files (*.ttf) - - - - + フォントファイル (*.ttf) + + Error Adding Fonts - - - - + フォントの追加エラー + + Error Removing Fonts - - - - + フォントの削除エラー + + Remove Fonts - - - - + フォントを削除 + + Would you like to remove all fonts? - + 全てのフォントを削除しますか? AppearanceOptionsWidget - Form - フォーム - - - + フォーム + + User Interface Mode - ユーザインターフェースモード + ユーザインターフェースモード AssistantClient - Unable to send request: Assistant is not responding. - - - - + リクエストを送信できません: Assistant が応答しません。 + + The binary '%1' does not exist. - - - - + バイナリファイル '%1' が存在しません。 + + Unable to launch assistant (%1). - - - - - BrushManagerProxy - - - The element '%1' is missing the required attribute '%2'. - - - - - Empty brush name encountered. - - - - - An unexpected element '%1' was encountered. - - - - - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 - - - - - An error occurred when reading the resource file '%1' at line %2, column %3: %4 - + assistant (%1) を起動できませんでした。 BrushPropertyManager - No brush - - - - + 透明 + + Solid - 塗りつぶし - - - + 塗りつぶし + + Dense 1 - 密度 1 - - - + 密度 1 + + Dense 2 - 密度 2 - - - + 密度 2 + + Dense 3 - 密度 3 - - - + 密度 3 + + Dense 4 - 密度 4 - - - + 密度 4 + + Dense 5 - 密度 5 - - - + 密度 5 + + Dense 6 - 密度 6 - - - + 密度 6 + + Dense 7 - 密度 7 - - - + 密度 7 + + Horizontal - 横 - - - + 横線 + + Vertical - 縦 - - - + 縦線 + + Cross - 格子 - - - + 格子 + + Backward diagonal - - - - + 斜線(右上がり) + + Forward diagonal - - - - + 斜線(右下がり) + + Crossing diagonal - - - - Texture - テクスチャ - - - + 交差する斜線 + + Style - - - - + スタイル + + Color - 色 - - - + 色 + + [%1, %2] - + [%1, %2] Command - - Change signal シグナルを変更 - - Change slot スロットを変更 - Change signal-slot connection - - - - + シグナル/スロット接続を変更 + + Change sender 発信者を変更 - Change receiver 受信者を変更 - Add connection シグナル/スロット接続を追加 - Adjust connection シグナル/スロット接続を調整 - Delete connections シグナル/スロット接続を削除 - Change source ソースを変更 - Change target ターゲットを変更 - Insert '%1' '%1' を挿入 - Change Z-order of '%1' - - - - + '%1' の Z オーダーを変更 + + Raise '%1' '%1' を前面に移動 - Lower '%1' '%1' を背面に移動 - Delete '%1' '%1' を削除 - Reparent '%1' '%1' の親をつけかえ - Promote to custom widget カスタムウィジェットに格上げ - Demote from custom widget カスタムウィジェットから格下げ - Lay out using grid 格子状にレイアウト - Lay out vertically - 垂直にレイアウト - - - + 垂直に並べる + + Lay out horizontally - 水平にレイアウト - - - + 水平に並べる + + Break layout レイアウトを破棄する - Simplify Grid Layout - - - - - - + 格子状のレイアウトを正規化する + + Move Page ページを移動 - - - - Delete Page ページを削除 - - Page ページ - - - page ページ - - - - Insert Page ページを挿入 - - tab - タブ - - - Change Tab order タブ順を変更 - Create Menu Bar メニューバーを作成 - Delete Menu Bar メニューバーを削除 - Create Status Bar ステータスバーを作成 - Delete Status Bar ステータスバーを削除 - Add Tool Bar ツールバーを追加 - Set Dock Window Widget - ドックウィンドウウィジェットの設定 - - - Add Dock Window ドックウィンドウを追加 - Adjust Size of '%1' '%1' のサイズを調整 - Change Form Layout Item Geometry - - - - + フォームレイアウトのアイテムの座標を変更 + + Change Layout Item Geometry - レイアウトアイテムの座標を変更 - - - Insert Row - 行を挿入 - - - + レイアウトのアイテムの座標を変更 + + Change Table Contents テーブルの内容を変更 - Change Tree Contents ツリーの内容を変更 - - Add action アクションを追加 - - Remove action - アクションを消去 - - - + アクションを削除 + + Add menu メニューを追加 - Remove menu - メニューを消去 - - - + メニューを削除 + + Create submenu サブメニューを作成 - Delete Tool Bar ツールバーを削除 - Set action text アクションのテキストを設定 - Insert action アクションを挿入 - - Move action アクションを移動 - Change Title タイトルを変更 - Insert Menu メニューを挿入 - changed '%1' of '%2' - '%2' の '%1' を変更 - - - changed '%1' of %2 objects - - '%2' オブジェクトの '%1' を変更 - - - - reset '%1' of '%2' - '%2' の '%1' をリセット - - - reset '%1' of %2 objects - - '%2' オブジェクトの '%1' をリセット - - - - add dynamic property '%1' to '%2' - ダイナミックプロパティ '%1' を '%2' に追加 - - - add dynamic property '%1' to %2 objects - - ダイナミックプロパティ '%1' を '%2' オブジェクトに追加 - - - - remove dynamic property '%1' from '%2' - ダイナミックプロパティ '%1' を '%2' から削除 - - - remove dynamic property '%1' from %2 objects - - ダイナミックプロパティ '%1' を '%2' オブジェクトから削除 - - - - changed comment of '%1' of '%2' - '%2' の '%1' のコメントを変更 + Change signals/slots + シグナル/スロットを変更 + + + Delete Subwindow + サブウィンドウを削除 + + + Insert Subwindow + サブウィンドウを挿入 + + + subwindow + サブウィンドウ + + + Subwindow + サブウィンドウ + + + Create button group + ボタングループを作成 + + + Break button group + ボタングループを破棄する + + + Break button group '%1' + ボタングループ '%1' を破棄する + + + Add buttons to group + グループにボタンを追加 + + + Add '%1' to '%2' + Command description for adding buttons to a QButtonGroup + '%2' に '%1' を追加 + + + Remove buttons from group + グループからボタンを削除 + + + Remove '%1' from '%2' + Command description for removing buttons from a QButtonGroup + '%2' から '%1' を削除 + + + Morph %1/'%2' into %3 + MorphWidgetCommand description + %1/'%2' を %3 へ変更 + + + Change layout of '%1' from %2 to %3 + '%1' のレイアウトを %2 から %3 に変更 + + + Change script + スクリプトを変更 + + + Changed '%1' of '%2' + '%2' の '%1' を変更しました - changed comment of '%1' of %2 objects - - '%2' オブジェクトの '%1' のコメントを変更 + Changed '%1' of %n objects + + %n 個のオブジェクトの '%1' を変更 - - Change signals/slots - - - - - Delete Subwindow - - - - - Insert Subwindow - - - - - subwindow - - - - - Subwindow - - - - - Create button group - - - - - Break button group - - - - - Break button group '%1' - - - - - Add buttons to group - - - - - - Add '%1' to '%2' - Command description for adding buttons to a QButtonGroup - - - - - Remove buttons from group - - - - - Remove '%1' from '%2' - Command description for removing buttons from a QButtonGroup - - - - - Morph %1/'%2' into %3 - MorphWidgetCommand description - - - - - Change layout of '%1' from %2 to %3 - - - - - Change script - スクリプトを変更 - - - - Changed '%1' of '%2' - + Reset '%1' of '%2' + '%2' の '%1' をリセット - - Changed '%1' of %n objects - - + Reset '%1' of %n objects + + %n 個のオブジェクトの '%1' をリセット - - Reset '%1' of '%2' - + Add dynamic property '%1' to '%2' + '%2' にダイナミックプロパティ '%1' を追加 - - Reset '%1' of %n objects - - + Add dynamic property '%1' to %n objects + + %n 個のオブジェクトにダイナミックプロパティ '%1' を追加 - - Add dynamic property '%1' to '%2' - + Remove dynamic property '%1' from '%2' + '%2' からダイナミックプロパティ '%1' を削除 - - Add dynamic property '%1' to %n objects - - - - - - - Remove dynamic property '%1' from '%2' - - - - Remove dynamic property '%1' from %n objects - - + + %n 個のオブジェクトからダイナミックプロパティ '%1' を削除 ConnectDialog - Configure Connection - シグナル/スロット接続を設定 - - - + シグナル/スロット接続を設定 + + GroupBox - - - - + グループボックス + + Edit... - 編集... - - - + 編集... + + Show signals and slots inherited from QWidget - + QWidget から継承したシグナルとスロットを表示する + + + + ConnectionDelegate + + <object> + <オブジェクト> + + + <signal> + <シグナル> + + + <slot> + <スロット> DPI_Chooser - Standard (96 x 96) Embedded device standard screen resolution - - - - + 標準 (96 × 96) + + Greenphone (179 x 185) Embedded device screen resolution - - - - + グリーンフォン (179 × 185) + + High (192 x 192) Embedded device high definition screen resolution - + 高解像度 (192 × 192) Designer - Qt Designer Qt Designer - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form.<br>Perhaps you forgot to create a layout? - このファイルには、トップレベルのスペーサが含まれています。<br>これらはフォームに保存されて<b>いませんでした</b>。<br>もしや、レイアウトの指定を忘れていませんか? - - - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. - - - - + このファイルには、トップレベルのスペーサが含まれています。<br>これらはフォームに保存されて<b>いませんでした</b>。 + + Perhaps you forgot to create a layout? - - - - - Invalid ui file: The root element <ui> is missing. - - - - - An error has occurred while reading the ui file at line %1, column %2: %3 - - - - + もしや、レイアウトの指定を忘れていませんか? + + This file cannot be read because it was created using %1. このファイルは読めません。%1 を使って作成されたからです。 - This file was created using Designer from Qt-%1 and cannot be read. このファイルは Qt-%1 の Designer で作成されたので、読めません。 - This file cannot be read because the extra info extension failed to load. このファイルは読めません。追加情報の拡張のロードに失敗したからです。 - The converted file could not be read. 変換されたファイルを読めませんでした。 - + Invalid UI file: The root element <ui> is missing. + 無効な UI ファイル: ルート要素 <ui> が見つかりません。 + + + An error has occurred while reading the UI file at line %1, column %2: %3 + UI ファイルの読み込み中にエラーが発生しました(%1 行、%2 列): %3 + + This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. - - - - + このファイルは Qt-%1 の Designer で作成されたため、Qt Designer の新しいフォームに更新できません。 + + The old form has not been touched, but you will have to save the form under a new name. - - - - + 古いフォームは変更していません。新しい名前でフォームをセーブしてください。 + + This file was created using Designer from Qt-%1 and could not be read: %2 - - - - + このファイルは Qt-%1 の Designer で作成されたため、読み込めません: +%2 + + Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. - - - - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. -The old form has been untouched, but you will have to save this form under a new name. - このファイルは Qt-%1 の Designer で作成されたものですが、Qt Designer によって新しいフォームに変換されます。 -古いフォームは放置されてきましたが、新しい名前で保存する必要があります。 - - - This file was created using Designer from Qt-%1 and could not be read:<br>%2<br>Please run it through <b>uic3 -convert</b> to convert it to Qt-4's ui format. - このファイルは Qt-%1 の Designer で作成されたものですが、読めませんでした:<br>%2<br><b>uic3 -convert</b> を実行して、Qt 4 の UI フォーマットに変換してください。 - - - + <b>uic3&nbsp;-convert</b>コマンドを実行して、Qt-4 の ui ファイルの形式に更新してください。 + + Custom Widgets カスタムウィジェット - Promoted Widgets 格上げされたウィジェット - Unable to launch %1. %1 を起動できませんでした。 - %1 timed out. %1 はタイムアウトしました。 - - Error opening resource file - リソースファイルのオープンエラー - - - Failed to open "%1": -%2 - "%1" のオープンに失敗: %2 - - - file name is empty - ファイル名が空です - - - XML error on line %1, col %2: %3 - %1 行目 %2 カラム目にXMLエラー: %3 - - - no <RCC> root element - <RCC> ルートエレメントがありません - DesignerMetaEnum - %1 is not a valid enumeration value of '%2'. - - - - + %1 は無効な列挙型 ’%2' の値です。 + + '%1' could not be converted to an enumeration value of type '%2'. - + '%1' は列挙型 '%2' の値に変換できませんでした。 DesignerMetaFlags - '%1' could not be converted to a flag value of type '%2'. - + '%1' はフラグ '%2' の値に変換できませんでした。 DeviceProfile - '%1' is not a number. Reading a number for an embedded device profile - - - - + '%1' は数字ではありません。 + + An invalid tag <%1> was encountered. - + 無効なタグ <%1> に遭遇しました。 DeviceProfileDialog - &Family - ファミリー(&F) - - - + ファミリー(&F) + + &Point Size - - - - + ポイントサイズ(&P) + + Style - - - - + スタイル + + Device DPI - - - - + デバイスのDPI + + Name - 名前 + 名前 DeviceSkin - The image file '%1' could not be loaded. - - - - + 画像ファイル '%1' をロードできませんでした。 + + The skin directory '%1' does not contain a configuration file. - - - - + スキンのディレクトリ '%1' に設定ファイルが見つかりません。 + + The skin configuration file '%1' could not be opened. - - - - + スキンの設定ファイル '%1' がオープンできませんでした。 + + Syntax error: %1 - - - - + 構文エラー: %1 + + The skin cursor image file '%1' does not exist. - - - - + スキンのカーソル画像 '%1' が存在しません。 + + Syntax error in area definition: %1 - - - - + 領域定義の構文エラー: %1 + + Mismatch in number of areas, expected %1, got %2. - - - - + 領域の数が異なります(想定 %1、取得 %2)。 + + The skin configuration file '%1' could not be read: %2 - - - - + スキンの設定ファイル '%1' が読めませんでした: %2 + + The skin "up" image file '%1' does not exist. - - - - + スキンの"up"画像ファイル '%1' が存在しません。 + + The skin "down" image file '%1' does not exist. - - - - + スキンの"down"画像ファイル '%1' が存在しません。 + + The skin "closed" image file '%1' does not exist. - + スキンの"closed"画像ファイル '%1' が存在しません。 EmbeddedOptionsControl - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description - + <html><table><tr><td><b>フォント</b></td><td>%1, %2</td></tr><tr><td><b>スタイル</b></td><td>%3</td></tr><tr><td><b>解像度</b></td><td>%4 × %5</td></tr></table></html> EmbeddedOptionsPage - Embedded Design Tab in preferences dialog - - - - + デザインプロファイル + + Device Profiles EmbeddedOptionsControl group box" - + デバイスプロファイル FontPanel - Font フォント - &Writing system ライティングシステム(&W) - &Family ファミリー(&F) - &Style スタイル(&S) - &Point size ポイントサイズ(&P) @@ -1202,180 +803,156 @@ FontPropertyManager - PreferDefault - - - - + デフォルト優先 + + NoAntialias - - - - + アンチエイリアスなし + + PreferAntialias - - - - + アンチエイリアス優先 + + Antialiasing - + アンチエイリアス FormBuilder - Invalid stretch value for '%1': '%2' - Parsing layout stretch values - - - - + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values + '%1' のストレッチ値が無効です: '%2' + + Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values - + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values + '%1' の最小サイズが無効です: '%2' FormEditorOptionsPage - %1 % - - - - + %1 % + + Preview Zoom - - - - + プレビューの拡大表示 + + Default Zoom - - - - + デフォルトの拡大率 + + Forms Tab in preferences dialog - - - - + フォーム + + Default Grid - デフォルトグリッド + デフォルトのグリッド表示 FormLayoutRowDialog - Add Form Layout Row - - - - + フォームレイアウトに行を追加 + + &Label text: - - - - + ラベルの文字列(&L): + + Field &type: - - - - + フィールドの型(&T): + + &Field name: - - - - + フィールドの名前(&F): + + &Buddy: - - - - + &Buddy: + + &Row: - - - - + 行(&R): + + Label &name: - + ラベルの名前(&N): FormWindow - Unexpected element <%1> - - - - + 予期せぬ要素 <%1> + + Error while pasting clipboard contents at line %1, column %2: %3 - + クリップボードの内容の貼り付け中にエラーが発生しました(行 %1, 列 %2): %3 FormWindowSettings - Form Settings フォーム設定 - Layout &Default デフォルトのレイアウト(&D) - &Spacing: 空白(&S): - &Margin: 余白(&M): - &Layout Function レイアウト関数(&L) - Ma&rgin: 余白(&R): - Spa&cing: 空白(&C): - Embedded Design - - - - + デザインプロファイル + + &Author 作者(&A) - &Include Hints フォームからインクルードするヘッダ(&I) - &Pixmap Function ピックスマップロード関数(&P) - Grid グリッド @@ -1383,344 +960,175 @@ IconSelector - All Pixmaps ( - 全てのピックスマップ ( + すべてのピックスマップ ( ItemPropertyBrowser - XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser - LanguageResourceDialog - - - Choose Resource - - - - - LayoutPropertySheet - - Layout - レイアウト - - - MainWindowBase - Main Not currently used (main tool bar) - - - - + メイン + + File - ファイル - - - + ファイル + + Edit - 編集 - - - + 編集 + + Tools - ツール - - - + ツール + + Form - フォーム - - - + フォーム + + Qt Designer - Qt Designer + Qt Designer NewForm - C&reate 作成(&R) - Recent - 最近 - - - + 最近使用したフォーム + + &Close 閉じる(&C) - &Open... オープン(&O)... - &Recent Forms 最近使用したフォーム(&R) - Error loading form - フォームのロードエラー - - - Choose a template for a preview - プレビューのためテンプレートを選択 - - - Read error 読み込みエラー - New Form 新しいフォーム - 0 - 0 - - - Show this Dialog on Startup 起動時にこのダイアログを表示 - Custom Widgets - カスタムウィジェット - - - A temporary form file could not be created in %1. - - - - + 一時フォームファイルを %1に作成できませんでした。 + + The temporary form file %1 could not be written. - - - - - NewFormWidget - - - Unable to open the form template file '%1': %2 - + 一時フォームファイル %1 に書き込めませんでした。 ObjectInspectorModel - Object - オブジェクト - - - + オブジェクト + + Class - クラス - - - + クラス + + separator - セパレータ - - - + セパレータ + + <noname> - <名前なし> + <名前なし> ObjectNameDialog - Change Object Name - オブジェクト名を変更 - - - + オブジェクト名を変更 + + Object Name - オブジェクト名 - - - - Oubliette - - Inventory - 棚卸し - - - You have <B>No</B> Items - アイテムが<B>ありません</B> - - - You have %1 of %2 items - - %2 アイテムのうちの %1 個を持っています - - - - OK - OK - - - Easter Egg Found - イースターエッグが見つかりました - - - Welcome to the Trolltech Business Card Hunt -Use the direction keys to move around and find the business cards for all the trolls. - Trolltech の名刺捜しゲームへようこそ矢印キーを使って移動し、Trolltech の全社員の名刺を見つけてください。 - - - You Did It! - よくできました! - - - You've collected all the Trolltech cards. It took you %1 steps. -There's nothing more here. You should get back to work. - あなたは Trolltech の全ての名刺を集めました。%1 回かかりました。これで終わりです。仕事に戻りましょう。 - - - That's rather anti-climatic - それは社会の風潮に反することです - - - Quit - 終了 + オブジェクト名 PluginDialog - Plugin Information - プラグイン情報 - - - + プラグイン情報 + + 1 - 1 + 1 PreferencesDialog - Docked Window - ドックウィンドウ - - - Multiple Top-Level Windows - 複数のトップレベルウィンドウ - - - Toolwindow Font - ツールウィンドウフォント - - - Default Grid - デフォルトグリッド - - - Pick a directory to save templates in - テンプレートを保存するディレクトリを選択してください - - - Preferences 設定 - - User Interface Mode - ユーザインターフェースモード - - - Additional Template Paths - 追加のテンプレートパス - - - ... - ... - PreviewConfigurationWidget - - Default - - - - - None - - - - - Browse... - - - - Form - フォーム - - - + フォーム + + Print/Preview Configuration - - - - + 印刷/プレビューの設定 + + Style - - - - + スタイル + + Style sheet - - - - + スタイルシート + + ... - ... - - - + ... + + Device skin - + デバイススキン PromotionModel - Not used Usage of promoted widgets - 使用されません + 使用されていません Q3WizardContainer - - Page ページ @@ -1728,720 +1136,472 @@ QAbstractFormBuilder - Unexpected element <%1> - - - - - An error has occurred while reading the ui file at line %1, column %2: %3 - - - - - Invalid ui file: The root element <ui> is missing. - - - - + 予期せぬ要素 <%1> + + + An error has occurred while reading the UI file at line %1, column %2: %3 + UI ファイルの読み込み中にエラーが発生しました(%1 行、%2 列): %3 + + + Invalid UI file: The root element <ui> is missing. + 無効な UI ファイル: ルート要素 <ui> が見つかりません。 + + The creation of a widget of the class '%1' failed. - クラス '%1' のウィジェットの作成に失敗しました。 - - - + クラス '%1' のウィジェットの作成に失敗しました。 + + Attempt to add child that is not of class QWizardPage to QWizard. - - - - + QWizardPage クラスを継承していないクラスは QWizard に追加できません。 + + Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. - - - - + ウィジェット '%1' (%2) は既にBOXタイプではないレイアウト %3 を所持しているため、レイアウトを追加できません。 +UI ファイルの記述が矛盾しています。 + + Empty widget item in %1 '%2'. - - - - + %1 '%2' は空のウィジェット要素です。 + + Flags property are not supported yet. - フラグのプロパティはサポートされていません。 - - - + フラグのプロパティはサポートされていません。 + + While applying tab stops: The widget '%1' could not be found. - タブストップの適用中: ウィジェット '%1' が見つかりません。 - - - + タブストップの適用中: ウィジェット '%1' が見つかりません。 + + Invalid QButtonGroup reference '%1' referenced by '%2'. - - - - + '%2' から参照された '%1' は無効な QButtonGroup です。 + + This version of the uitools library is linked without script support. - このバージョンの uitools は、スクリプトがサポートされていないライブラリがリンクされています。 - - - - QActiveXPlugin - - ActiveX control - ActiveX コントロール - - - ActiveX control widget - ActiveX コントロールウィジェット - - - - QActiveXPluginObject - - Control loaded - コントロールがロードされました - - - - QActiveXTaskMenu - - Set Control - コントロールを設定 - - - Licensed Control - ライセンスされたコントロール - - - The control requires a design-time license - このコントロールを使用するには、開発時ライセンスが必要です + このバージョンの uitools は、スクリプトがサポートされていないライブラリがリンクされています。 QAxWidgetPlugin - ActiveX control - ActiveX コントロール - - - + ActiveX コントロール + + ActiveX control widget - ActiveX コントロールウィジェット + ActiveX コントロールウィジェット QAxWidgetTaskMenu - Set Control - コントロールを設定 - - - + コントロールを設定 + + Reset Control - - - - + コントロールをリセット + + Licensed Control - ライセンスされたコントロール - - - + ライセンスされたコントロール + + The control requires a design-time license - このコントロールを使用するには、開発時ライセンスが必要です + このコントロールの利用には、開発時ライセンスが必要です QCoreApplication - %1 is not a promoted class. %1 は格上げされたクラスではありません。 - The base class %1 is invalid. - ベースクラス %1 は無効です。 - - - + 基底クラス %1 は無効です。 + + The class %1 already exists. - %1 というクラスはすでに存在します。 - - - + クラス %1 は既に存在します。 + + Promoted Widgets - 格上げされたウィジェット - - - + 格上げされたウィジェット + + The class %1 cannot be removed - %1 というクラスを削除できません - - - + クラス %1 を削除できません + + The class %1 cannot be removed because it is still referenced. - %1 というクラスは、参照されているので、削除できません。 - - - + クラス %1 は、参照されているため削除できません。 + + The class %1 cannot be renamed - %1 というクラスをリネームできません - - - + クラス %1 をリネームできません + + The class %1 cannot be renamed to an empty name. - %1 というクラスを空の名前にリネームすることはできません。 - - - + クラス %1 を空の名前にリネームすることはできません。 + + There is already a class named %1. - %1 というクラスは存在します。 - - - + クラス %1 は既に存在します。 + + Cannot set an empty include file. - 空のインクルードファイルを設定できません。 - - - + 空のインクルードファイルを設定できません。 + + Exception at line %1: %2 - %1 行目で例外が発生: %2 - - - + %1 行目で例外が発生: %2 + + Unknown error - 不明なエラー - - - + 不明なエラー + + An error occurred while running the script for %1: %2 Script: %3 - %1 のためにスクリプトを実行していてエラーが発生しました: %2 + %1 でスクリプトを実行中にエラーが発生しました: %2 スクリプト: %3 QDesigner - %1 - warning - %1 - 警告 - - - + %1 - 警告 + + Qt Designer Qt Designer - This application cannot be used for the Console edition of Qt このアプリケーションは、Qt コンソール版では使えません - QDesignerActionEditor - - Action Editor - アクションエディタ - - - QDesignerActions - Edit Widgets ウィジェットを編集 - &New Form... - 新しいフォーム(&N)... - - - &Open Form... - フォームを開く(&O)... - - - &Save Form - フォームを保存(&S) - - - Save Form &As... - 名前をつけてフォームを保存(&A)... - - - Save A&ll Forms - すべてのフォームを保存(&L) - - - Save Form As &Template... - フォームをテンプレートとして保存(&T)... - - - &Close Form - フォームを閉じる(&C) - - - &Quit 終了(&Q) - &Preview - プレビュー(&P) - - - Form &Settings... - フォームの設定(&S)... - - - &Minimize 最小化(&M) - Bring All to Front - 全てのウィンドウを前面に - - - + すべてのウィンドウを前面に + + Preferences... 設定... - CTRL+N - CTRL+N - - - CTRL+O - CTRL+O - - - Clear &Menu メニューをクリア(&M) - CTRL+S - CTRL+S - - - CTRL+SHIFT+S CTRL+SHIFT+S - CTRL+W - CTRL+W - - - - CTRL+Q - CTRL+Q - - - CTRL+Z - CTRL+Z - - - CTRL+SHIFT+Z - CTRL+SHIFT+Z - - - CTRL+R CTRL+R - %1 Style - %1 スタイル - - - CTRL+M CTRL+M - Qt Designer &Help Qt Designer ヘルプ(&H) - Current Widget Help 現在のウィジェットのヘルプ - What's New in Qt Designer? Qt Designer の新機能 - About Plugins プラグインについて - - About Qt Designer Qt Designer について - About Qt Qt について - - Open Form フォームを開く - - - Designer UI files (*.%1);;All Files (*) Designer UI ファイル(*.%1);;すべてのファイル (*) - Save form as - 名前を付けてフォームを保存 - - - Save - 保存 - - - %1 already exists. Do you want to replace it? - %1 はすでに存在します。上書きしますか? - - - + %1 は既に存在します。上書きしますか? + + Saved %1. - フォーム %1 は無事保存できました... - - - + フォーム %1 を保存しました。 + + Additional Fonts... - - - - + フォントの追加... + + ALT+CTRL+S - - - - + ALT+CTRL+S + + &Recent Forms - 最近使用したフォーム(&R) - - - + 最近使用したフォーム(&R) + + Designer Designer - Feature not implemented yet! 機能がまだ実装されていません! - Read error 読み込みエラー - %1 Do you want to update the file location or generate a new form? %1 ファイルの位置を更新しますか、それとも新しいフォームを生成しますか? - &Update 更新(&U) - &New Form 新しいフォーム(&N) - - Save Form? フォームを保存しますか? - Could not open file ファイルをオープンできませんでした - Saved image %1. - - - - + 画像 %1 を保存しました。 + + Please close all forms to enable the loading of additional fonts. - - - - + 追加したフォントをロードするにはすべてのフォームを閉じてください。 + + Printed %1. - - - - The file, %1, could not be opened -Reason: %2 -Would you like to retry or change your file? - ファイル %1 はオープンできませんでした -理由: %2 -リトライしますか、それともファイルを変更しますか? - - - + %1 を印刷しました。 + + Select New File 新しいファイルを選択 - Could not write file ファイルに書き込むことができませんでした - It was not possible to write the entire file, %1, to disk. -Reason:%2 -Would you like to retry? - ファイル %1 の全体をディスクに書き込むことができませんでした。 -理由: %2 -リトライしますか? - - - &Close Preview プレビューを閉じる(&C) - Form Settings - %1 - フォーム設定 - %1 - - - &New... - - - - + 新規(&N)... + + &Open... - オープン(&O)... - - - + 開く(&O)... + + &Save - - - - + 保存(&S) + + Save &As... - - - - + 名前をつけて保存(&A)... + + Save A&ll - - - - + すべて保存(&L) + + Save As &Template... - - - - - + テンプレートとして保存(&T)... + + &Close - 閉じる(&C) - - - + 閉じる(&C) + + Save &Image... - - - - + 画像を保存(&I)... + + &Print... - - - - + 印刷(&P)... + + View &Code... - - - - - + コードを表示(&C)... + + Save Form As - - - - + 名前を付けてフォームを保存 + + The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? - - - - + ファイル %1 はオープンできませんでした。 +原因: %2 +リトライしますか、それとも他のファイルを選択しますか? + + It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? - - - - - + ファイル %1 の全体をディスクに書き込むことができませんでした。 +原因: %2 +リトライしますか? + + The backup file %1 could not be written. - バックアップファイル %1 に書き込めませんでした。 - - - + バックアップファイル %1 に書き込めませんでした。 + + The backup directory %1 could not be created. - バックアップディレクトリ %1 を作成できませんでした。 - - - + バックアップディレクトリ %1 を作成できませんでした。 + + The temporary backup directory %1 could not be created. - バックアップ用の一時ディレクトリ %1 を作成できませんでした。 - - - + バックアップ用の一時ディレクトリ %1 を作成できませんでした。 + + Preview failed - - - - + プレビューできませんでした + + Code generation failed - - - - + コード生成に失敗しました + + Image files (*.%1) - - - - - + 画像ファイル (*.%1) + + Save Image - - - - + 画像を保存 + + The file %1 could not be written. - - - - - + ファイル %1 に書き込めませんでした。 + + Assistant - + Assistant QDesignerAppearanceOptionsPage - Appearance Tab in preferences dialog - + 外観 QDesignerAppearanceOptionsWidget - Docked Window - ドックウィンドウ - - - + ドックウィンドウ + + Multiple Top-Level Windows - 複数のトップレベルウィンドウ - - - + 複数のトップレベルウィンドウ + + Toolwindow Font - ツールウィンドウフォント + ツールウィンドウのフォント QDesignerAxWidget - Reset control - - - - + コントロールをリセット + + Set control - - - - + コントロールを設定 + + Control loaded - コントロールがロードされました - - - + コントロールがロードされました + + A COM exception occurred when executing a meta call of type %1, index %2 of "%3". - + 型 %1, インデックス %2("%3")のメタコールの実行時に COM 例外が発生しました。 QDesignerFormBuilder - Script errors occurred: - スクリプトエラーが発生しました: - - - + スクリプトエラーが発生しました: + + The preview failed to build. - プレビューのビルドに失敗しました。 - - - + プレビューのビルドに失敗しました。 + + Designer - Designer + Designer QDesignerFormWindow - %1 - %2[*] %1 - %2[*] - Save Form? フォームを保存しますか? - Do you want to save the changes to this document before closing? 閉じる前に、このドキュメントの変更を保存しますか? - If you don't save, your changes will be lost. 保存しない場合は、行った変更は失われます。 @@ -2449,38 +1609,30 @@ QDesignerMenu - Type Here ここに入力 - Add Separator セパレータを追加 - Insert separator セパレータを挿入 - Remove separator - セパレータを消去 - - - + セパレータを削除 + + Remove action '%1' - アクション '%1' を消去 - - - - + アクション '%1' を削除 + + Add separator セパレータを追加 - Insert action アクションを挿入 @@ -2488,75 +1640,56 @@ QDesignerMenuBar - Type Here ここに入力 - Remove Menu '%1' - メニュー '%1' を消去 - - - + メニュー '%1' を削除 + + Remove Menu Bar - メニューバーを消去 - - - + メニューバーを削除 + + Menu メニュー - QDesignerObjectInspector - - Object Inspector - オブジェクトインスペクタ - - - QDesignerPluginManager - An XML error was encountered when parsing the XML of the custom widget %1: %2 - - - - + カスタムウィジェット %1 の XML のパース中に XML エラーが発生しました: %2 + + + A required attribute ('%1') is missing. + 必須な属性('%1')がありません。 + + + An invalid property specification ('%1') was encountered. Supported types: %2 + 無効なプロパティの定義('%1')に遭遇しました。サポートする型: %2 + + + '%1' is not a valid string property specification. + '%1' は無効な文字列プロパティの定義です。 + + The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. - - - - + カスタムウィジェット %1 の XML に <widget> と <ui> のどちらの要素もありません。 + + The class attribute for the class %1 is missing. - %1 というクラスのクラス属性がありません。 - - - + クラス %1 にクラス属性がありません。 + + The class attribute for the class %1 does not match the class name %2. - %1 というクラスのクラス属性は %2 というクラス名と一致しません。 - - - - QDesignerPropertyEditor - - Property Editor - プロパティエディタ - - - Ctrl+I - Ctrl+I + クラス %1 のクラス属性はクラス名 %2 と一致しません。 QDesignerPropertySheet - Layout - レイアウト - - - Dynamic Properties ダイナミックプロパティ @@ -2564,2112 +1697,1366 @@ QDesignerResource - The layout type '%1' is not supported, defaulting to grid. - - - - + レイアウト '%1' はサポートされていません。格子状のレイアウトを使用します。 + + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. - - - - + ウィジェット '%1' (%2) のコンテナ拡張は %5 ページに Designer では利用できないウィジェット '%3' (%4) を使用しています。 +コンテナのページはカスタムウィジェットの domXml() メソッドが返す XML でのみ定義されている必要があります。 + + Unexpected element <%1> Parsing clipboard contents - - - - + 予期せぬ要素 <%1> + + Error while pasting clipboard contents at line %1, column %2: %3 Parsing clipboard contents - - - - + クリップボードの内容の貼り付け中にエラーが発生しました(行 %1, 列 %2): %3 + + Error while pasting clipboard contents: The root element <ui> is missing. Parsing clipboard contents - - - - - QDesignerResourceEditor - - Resource Editor - リソースエディタ + クリップボードの内容の貼り付け中にエラーが発生しました: ルート要素 <ui> が見つかりません。 QDesignerSharedSettings - The template path %1 could not be created. - テンプレートのパス %1 を作成できませんでした。 - - - + テンプレートのパス %1 を作成できませんでした。 + + An error has been encountered while parsing device profile XML: %1 - - - - - QDesignerSignalSlotEditor - - Signal/Slot Editor - シグナル/スロットエディタ - - - - QDesignerStackedWidget - - Previous Page - 前のページ - - - Next Page - 次のページ - - - Delete - 削除 - - - Before Current Page - このページの前 - - - After Current Page - このページの後 - - - Change Page Order... - ページの順序を変更... - - - Change Page Order - ページの順序を変更 - - - Page %1 of %2 - %2 ページのうちの %1 ページ - - - Insert Page - ページを挿入 - - - - QDesignerTabWidget - - Delete - 削除 - - - Before Current Page - このページの前 - - - After Current Page - このページの後 - - - Page %1 of %2 - %2 ページのうちの %1 ページ - - - Insert Page - ページを挿入 - - - - QDesignerTaskMenu - - Change objectName... - オブジェクト名を変更... - - - Change toolTip... - ツールチップを変更... - - - Change whatsThis... - ヒントを変更... - - - Change styleSheet... - スタイルシートを変更... - - - Create Menu Bar - メニューバーを作成 - - - Add Tool Bar - ツールバーを追加 - - - Create Status Bar - ステータスバーを作成 - - - Remove Status Bar - ステータスバーを消去 - - - Change script... - スクリプトを変更... - - - - QDesignerToolBox - - Delete Page - ページを削除 - - - Before Current Page - このページの前 - - - After Current Page - このページの後 - - - Change Page Order... - ページの順序を変更... - - - Change Page Order - ページの順序を変更 - - - Page %1 of %2 - %2 ページのうちの %1 ページ - - - Insert Page - ページを挿入 + デバイスプロファイルの XML のパース中にエラーが発生しました: %1 QDesignerToolWindow - Property Editor - プロパティエディタ - - - + プロパティエディタ + + Action Editor - アクションエディタ - - - + アクションエディタ + + Object Inspector - オブジェクトインスペクタ - - - + オブジェクトインスペクタ + + Resource Browser - - - - + リソースブラウザ + + Signal/Slot Editor - シグナル/スロットエディタ - - - - Widget Box - ウィジェットボックス - - - - QDesignerWidgetBox + シグナル/スロットエディタ + Widget Box - ウィジェットボックス - - - - An error has been encountered at line %1 of %2: %3 - - - - - Unexpected element <%1> encountered when parsing for <widget> or <ui> - - - - - Unexpected end of file encountered when parsing widgets. - - - - - A widget element could not be found. - + ウィジェットボックス QDesignerWorkbench - &File ファイル(&F) - &Recent Forms - 最近使用したフォーム(&R) - - - &Edit - 編集(&E) - - - F&orm フォーム(&O) - Preview in スタイルを指定してプレビュー - &Tools - ツール(&T) - - - &Window ウィンドウ(&W) - &Help ヘルプ(&H) - File - ファイル - - - Edit 編集 - Tools - ツール - - - Form - フォーム - - - Toolbars ツールバー Widget Box - ウィジェットボックス - - - Qt Designer - Qt Designer - - - + ウィジェットボックス + + Save Forms? フォームを保存しますか? - There are %1 forms with unsaved changes. Do you want to review these changes before quitting? - 変更分を保存されていないフォームが %1 個あります。終了する前に変更を確認しますか? - - - If you don't review your documents, all your changes will be lost. - ドキュメントを確認しない場合は、行ったすべての変更は失われます。 - - - &View - - - - + 表示(&V) + + &Settings - - - - + 設定(&S) + + If you do not review your documents, all your changes will be lost. - - - - + ドキュメントを確認しない場合、行ったすべての変更は失われます。 + + Discard Changes 変更を破棄 - Review Changes 変更内容を確認 - Backup Information バックアップ情報 - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? - - - - Designer was not correctly terminated during your last session.There are existing Backup files, do you want to load them? - 前回使用したときに Designer は正しく終了されませんでした。バックアップファイルが存在します。ロードしますか? - - - + 前回使用したときに Designer は正しく終了されませんでした。バックアップファイルが存在します。ロードしますか? + + + The file <b>%1</b> is not a valid Designer UI file. + ファイル <b>%1</b> は、無効な Designer の UI ファイルです。 + + The file <b>%1</b> could not be opened. ファイル <b>%1</b> はオープンできませんでした。 - - - The file <b>%1</b> is not a valid Designer ui file. - ファイル <b>%1</b> は、有効な Designer の UI ファイルではありません。 - - There are %n forms with unsaved changes. Do you want to review these changes before quitting? - - + + 変更分を保存されていないフォームが %n 個あります。終了する前に変更を確認しますか? QFormBuilder - An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method - - - - + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method + %1 (オブジェクト名: %2)に空のクラス名が渡されました。 + + QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. - - - - - QFormBuilder was unable to create a widget of the class '%1'. - QFormBuilder は、クラス '%1' のウィジェットを作成できませんでした。 - - - - The layout type `%1' is not supported. - レイアウトタイプ '%1' は、サポートされていません。 - - - - The set-type property %1 could not be read. - Set型のプロパティ %1 を読めませんでした。 - - - - The enumeration-type property %1 could not be read. - Enum 型のプロパティ %1 を読めませんでした。 - - - - Reading properties of the type %1 is not supported yet. - %1 という型のプロパティの読み込みは、サポートされていません。 - - - - The property %1 could not be written. The type %2 is not supported yet. - プロパティ %1 を書き込めませんでした。%2 という型はサポートされていません。 - - - - The enumeration-value '%1' is invalid. The default value '%2' will be used instead. - - - - - The flag-value '%1' is invalid. Zero will be used instead. - - - - - QFormInternal::QCoreApplication - - Syntax error. - 構文エラー。 - - - Exception at line %1: %2 - %1 行目で例外が発生: %2 - - - Unknown error - 不明なエラー - - - An error occurred while running the script for %1: %2 -Script: %3 - %1 のためにスクリプトを実行していてエラーが発生しました: %2 -スクリプト: %3 - - - - QFormInternal::QObject + QFormBuilder はクラス '%1' のカスタムウィジェットを作成できませんでした。クラス '%2' で作成します。 + QFormBuilder was unable to create a widget of the class '%1'. - QFormBuilder は、クラス '%1' のウィジェットを作成できませんでした。 + QFormBuilder は、クラス '%1' のウィジェットを作成できませんでした。 The layout type `%1' is not supported. - レイアウトタイプ '%1' は、サポートされていません。 + レイアウトタイプ '%1' はサポートされていません。 The set-type property %1 could not be read. - Set型のプロパティ %1 を読めませんでした。 + Set 型のプロパティ %1 を読めませんでした。 The enumeration-type property %1 could not be read. - Enum 型のプロパティ %1 を読めませんでした。 + Enum 型のプロパティ %1 を読めませんでした。 Reading properties of the type %1 is not supported yet. - %1 という型のプロパティの読み込みは、サポートされていません。 + %1 という型のプロパティの読み込みはサポートされていません。 The property %1 could not be written. The type %2 is not supported yet. - プロパティ %1 を書き込めませんでした。%2 という型はサポートされていません。 - - - - QObject - - Show all signals and slots - 全てのシグナルとスロットを表示 - - - Configure Connection - シグナル/スロット接続を設定 - - - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 -%5 - ウィジェット %3 のために指定された XML コードの %1 行目の %2 カラム目でパースエラーが発生しました: %4 -%5 - - - The XML code specified for the widget %1 contains an invalid root element %2. -%3 - ウィジェット %1 のために指定された XML コードは、無効なルートエレメント %2 を含んでいます。 -%3 - - - %1 - warning - %1 - 警告 - - - The backup file %1 could not be written. - バックアップファイル %1 に書き込めませんでした。 - - - The backup directory %1 could not be created. - バックアップディレクトリ %1 を作成できませんでした。 - - - The temporary backup directory %1 could not be created. - バックアップ用の一時ディレクトリ %1 を作成できませんでした。 - - - The template path %1 could not be created. - テンプレートのパス %1 を作成できませんでした。 - - - The plugin '%1' failed to load: %2 - プラグイン '%1' をロードできませんでした: %2 - - - Not used - 使用されません - - - Script errors occurred: - スクリプトエラーが発生しました: - - - Change Object Name - オブジェクト名を変更 - - - Object Name - オブジェクト名 - - - An error occurred while running the scripts for "%1": - - "%1" のためにスクリプトを実行していてエラーが発生しました: - - - - The creation of a widget of the class '%1' failed. - クラス '%1' のウィジェットの作成に失敗しました。 - - - Flags property are not supported yet. - フラグのプロパティはサポートされていません。 - - - While applying tab stops: The widget '%1' could not be found. - タブストップの適用中: ウィジェット '%1' が見つかりません。 - - - This version of the uitools library is linked without script support. - このバージョンの uitools は、スクリプトがサポートされていないライブラリがリンクされています。 - - - The icon specified by %1 could not be opened: %2 - %1 で指定されたアイコンをオープンできませんでした: %2 - - - separator - セパレータ - - - Object - オブジェクト - - - Class - クラス - - - <noname> - <名前なし> - - - The widgetbox could not load the file %1. - ウィジェットボックスは %1 というファイルをロードできませんでした。 - - - The widgetbox could not parse the file %1. An error occurred at line %2: %3 - ウィジェットボックスは、%1 というファイルをパースできません。%2 行目でエラーが発生しました: %3 - - - The file %1 does not appear to be a widgetbox file. - %1 というファイルは、ウィジェットボックスのファイルではないようです。 - - - An error occurred while parsing the file %1: %2 is not a valid child of the root element. - %1 というファイルのパース中にエラーが発生しました: %2 はルートエレメントの有効な子供ではありません。 - - - The class attribute for the class %1 does not match the class name %2. - %1 というクラスのクラス属性は %2 というクラス名と一致しません。 - - - The class attribute for the class %1 is missing. - %1 というクラスのクラス属性がありません。 - - - The style %1 could not be loaded. - %1 というスタイルをロードできませんでした。 - - - The preview failed to build. - プレビューのビルドに失敗しました。 - - - %1 - [Preview] - %1 - [プレビュー] - - - Designer - Designer - - - Change script - スクリプトを変更 - - - A custom widget plugin whose class name (%1) matches that of an existing class has been found. - クラス名 (%1) が既存のクラスと同じであるカスタムウィジェットプラグインが見つかりました。 - - - The custom widget factory registered for widgets of class %1 returned 0. - %1 というクラスのウィジェットのために登録されたカスタムウィジェットファクトリーが 0 を返しました。 - - - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. - %1 というクラスのウィジェットのために登録されたカスタムウィジェットファクトリーを使ってウィジェットを作成しているときに、クラス名のミスマッチが発生しました。%2 というクラスのウィジェットを返しました。 - - - QFormBuilder was unable to create a widget of the class '%1'. - QFormBuilder は、クラス '%1' のウィジェットを作成できませんでした。 - - - The layout type `%1' is not supported. - レイアウトタイプ '%1' は、サポートされていません。 - - - The set-type property %1 could not be read. - Set型のプロパティ %1 を読めませんでした。 - - - The enumeration-type property %1 could not be read. - Enum 型のプロパティ %1 を読めませんでした。 - - - Reading properties of the type %1 is not supported yet. - %1 という型のプロパティの読み込みは、サポートされていません。 - - - The property %1 could not be written. The type %2 is not supported yet. - プロパティ %1 を書き込めませんでした。%2 という型はサポートされていません。 - - - Color - 色 + プロパティ %1 を書き込めませんでした。%2 という型はサポートされていません。 + + + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. + 列挙型の値 '%1' は無効です。デフォルト値の '%2' を代わりに使用します。 + + + The flag-value '%1' is invalid. Zero will be used instead. + フラグの値 '%1' は無効です。代わりに 0 を使用します。 QStackedWidgetEventFilter - Previous Page - 前のページ - - - + 前のページ + + Next Page - 次のページ - - - + 次のページ + + Delete - 削除 - - - + 削除 + + Before Current Page - このページの前 - - - + このページの前 + + After Current Page - このページの後 - - - + このページの後 + + Change Page Order... - ページの順序を変更... - - - + ページの順序を変更... + + Change Page Order - ページの順序を変更 - - - + ページの順序を変更 + + Page %1 of %2 - %2 ページのうちの %1 ページ - - - + %2 ページ中の %1 ページ目 + + Insert Page - ページを挿入 + ページを挿入 QStackedWidgetPreviewEventFilter - Go to previous page of %1 '%2' (%3/%4). - - - - + %1 '%2' の前のページに移動(%3/%4)。 + + Go to next page of %1 '%2' (%3/%4). - + %1 '%2' の次のページに移動(%3/%4)。 QTabWidgetEventFilter - Delete - 削除 - - - + 削除 + + Before Current Page - このページの前 - - - + このページの前 + + After Current Page - このページの後 - - - + このページの後 + + Page %1 of %2 - %2 ページのうちの %1 ページ - - - + %2 ページ中の %1 ページ目 + + Insert Page - ページを挿入 + ページを挿入 QToolBoxHelper - Delete Page - ページを削除 - - - + ページを削除 + + Before Current Page - このページの前 - - - + このページの前 + + After Current Page - このページの後 - - - + このページの後 + + Change Page Order... - ページの順序を変更... - - - + ページの順序を変更... + + Change Page Order - ページの順序を変更 - - - + ページの順序を変更 + + Page %1 of %2 - %2 ページのうちの %1 ページ - - - + %2 ページ中の %1 ページ目 + + Insert Page - ページを挿入 + ページを挿入 QtBoolEdit - - - True - - - - - + 真 + + False - + 偽 QtBoolPropertyManager - True - - - - + 真 + + False - + 偽 QtCharEdit - Clear Char - + 文字をクリア QtColorEditWidget - ... - ... + ... QtColorPropertyManager - Red - 赤 - - - + 赤 + + Green - 緑 - - - + 緑 + + Blue - 青 - - - + 青 + + Alpha - アルファ + アルファ QtCursorDatabase - Cross - 格子 - - - + 十字型 + + Arrow - - - - + 矢印 + + Up Arrow - - - - + 上向き矢印 + + Wait - - - - + 待機 + + IBeam - - - - + I ビーム + + Size Vertical - - - - + サイズ変更(縦方向) + + Size Horizontal - - - - + サイズ変更(横方向) + + Size Backslash - - - - + サイズ変更(バックスラッシュ) + + Size Slash - - - - + サイズ変更(スラッシュ) + + Size All - - - - + サイズ変更(4方向) + + Blank - - - - + なし + + Split Vertical - - - - + 分割(縦方向) + + Split Horizontal - - - - + 分割(横方向) + + Pointing Hand - - - - + ハンド(指差し) + + Forbidden - - - - + 禁止 + + Open Hand - - - - + ハンド(オープン) + + Closed Hand - - - - + ハンド(クローズ) + + What's This - - - - + ヘルプ + + Busy - + ビジー QtFontEditWidget - ... - ... - - - + ... + + Select Font - + フォントを選択 QtFontPropertyManager - Bold - ボールド - - - + ボールド + + Italic - イタリック - - - + イタリック + + Underline - 下線 - - - + 下線 + + Family - - - - + ファミリー + + Point Size - - - - + ポイントサイズ + + Strikeout - - - - + 取消線 + + Kerning - + カーニング QtGradientDialog - Edit Gradient - グラデーションを編集 + グラデーションを編集 QtGradientEditor - Start X - 始点の X 座標 - - - + 始点の X 座標 + + Start Y - 始点の Y 座標 - - - + 始点の Y 座標 + + Final X - 終点の X 座標 - - - + 終点の X 座標 + + Final Y - 終点の Y 座標 - - - - + 終点の Y 座標 + + Central X - 中心の X 座標 - - - - + 中心の X 座標 + + Central Y - 中心の Y 座標 - - - + 中心の Y 座標 + + Focal X - 焦点の X 座標 - - - + 焦点の X 座標 + + Focal Y - 焦点の Y 座標 - - - + 焦点の Y 座標 + + Radius - 半径 - - - + 半径 + + Angle - 角度 - - - + 角度 + + + Linear + 線状 + + + Radial + 放射状 + + + Conical + 円錐状 + + + Pad + 区切りの色で補充 + + + Repeat + グラデーションの繰り返し + + + Reflect + グラデーションの反射 + + Form - フォーム - - - + フォーム + + Gradient Editor - - - - + グラデーションエディタ + + 1 - 1 - - - + 1 + + 2 - 2 - - - + 2 + + 3 - 3 - - - + 3 + + 4 - 4 - - - + 4 + + 5 - 5 - - - + 5 + + Gradient Stops Editor - - - - + グラデーション制御点エディタ + + This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. - - - - + このよう息でグラデーションの制御点を編集できます。配置済みの制御点をダブルクリックすると制御点を複製します。制御点以外の場所をダブルクリックすると新しい制御点を作成します。ドラッグ & ドロップで制御点の位置を調整します。マウスの右ボタンで表示されるポップアップメニューでそれ以外の操作を行います。 + + Zoom - ズーム - - - Zoom All - すべてズーム - - - + ズーム + + Position - 位置 - - - + 位置 + + Hue - 色相 - - - + 色相 + + H - - - - + H + + Saturation - 彩度 - - - + 彩度 + + S - - - - + S + + Sat - - - - + 彩度 + + Value - - - - + 明度 + + V - - - - + V + + Val - - - - + 明度 + + Alpha - アルファ - - - + アルファ + + A - - - - + A + + Type - グラデーションのタイプ - - - + グラデーションのタイプ + + Spread - 広がり方 - - - + 広がり方 + + Color - 色 - - - + 色 + + Current stop's color - - - - + 現在の制御点の色 + + HSV - HSV - - - + HSV + + RGB - RGB - - - + RGB + + Current stop's position - - - - + 現在の制御点の位置 + + % - % - - - + % + + Zoom In - 拡大 - - - + 拡大 + + Zoom Out - 縮小 - - - + 縮小 + + Toggle details extension - - - - + 詳細表示のオン/オフ + + > - - - - + > + + Linear Type - - - - + 線形 + + ... - ... - - - + ... + + Radial Type - - - - + 放射形 + + Conical Type - - - - + 円錐形 + + Pad Spread - - - - + 区切りの色で補充 + + Repeat Spread - - - - + グラデーションの繰り返し + + Reflect Spread - - - - + グラデーションの反射 + + This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. - - - - + この領域には編集中のグラデーションのプレビューを表示します。始点や終点、半径などのグラデーションを定義する各種のパラメータはドラッグ & ドロップで編集できます。 + + Show HSV specification - - - - + HSV 色空間で表示 + + Show RGB specification - - - - + RGB 色空間で表示 + + Reset Zoom - + ズームをリセット QtGradientStopsWidget - New Stop - 新しい終点 - - - + 新しい制御点 + + Delete - 削除 - - - + 削除 + + Flip All - - - - + すべて反転 + + Select All - すべてを選択 - - - + すべてを選択 + + Zoom In - 拡大 - - - + 拡大 + + Zoom Out - 縮小 - - - Zoom All - すべてズーム - - - + 縮小 + + Reset Zoom - + ズームをリセット QtGradientView - Grad - - - - + グラデーション + + Remove Gradient - - - - + グラデーションを削除 + + Are you sure you want to remove the selected gradient? - - - - - + 選択されたグラデーションを削除しますか? + + New... - 新規... - - - - + 新規... + + Edit... - 編集... - - - - + 編集... + + Rename - 名前の変更 - - - - + 名前の変更 + + Remove - 消去 - - - + 削除 + + Gradient View - + グラデーションビュー QtGradientViewDialog - Edit Gradient - グラデーションを編集 - - - - Select Gradient - + グラデーションを選択 QtKeySequenceEdit - Clear Shortcut - ショートカットをクリア + ショートカットをクリア QtLocalePropertyManager - %1, %2 - - - - + %1, %2 + + Language - - - - + 言語 + + Country - + 国 QtPointFPropertyManager - (%1, %2) - - - - + (%1, %2) + + X - - - - + X + + Y - + Y QtPointPropertyManager - (%1, %2) - - - - + (%1, %2) + + X - - - - + X + + Y - + Y QtPropertyBrowserUtils - [%1, %2, %3] (%4) - - - - + [%1, %2, %3] (%4) + + [%1, %2] - + [%1, %2] QtRectFPropertyManager - [(%1, %2), %3 x %4] - - - - + [(%1, %2), %3 × %4] + + X - - - - + X + + Y - - - - + Y + + Width - - - - + 幅 + + Height - + 高さ QtRectPropertyManager - [(%1, %2), %3 x %4] - - - - + [(%1, %2), %3 × %4] + + X - - - - + X + + Y - - - - + Y + + Width - - - - + 幅 + + Height - + 高さ QtResourceEditorDialog - %1 already exists. Do you want to replace it? - %1 はすでに存在します。上書きしますか? - - - + %1 は既に存在します。 +上書きしますか? + + The file does not appear to be a resource file; element '%1' was found where '%2' was expected. - - - - + このファイルはリソースファイルではありません。要素 '%2' があるべき場所に要素 '%1' が存在します。 + + %1 [read-only] - - - - - + %1 [読込専用] + + %1 [missing] - - - - + %1 [見つかりません] + + <no prefix> - - - - - + <プレフィックスなし> + + New Resource File - - - - - + 新しいリソースファイル + + Resource files (*.qrc) - リソースファイル (*.qrc) - - - + リソースファイル (*.qrc) + + Import Resource File - - - - + リソースファイルをインポート + + newPrefix - - - - + newPrefix + + Add Files - - - - + ファイルを追加 + + Incorrect Path - - - - - - - + 不正なパス + + Copy - - - - + コピー + + Copy As... - - - - + 名前を指定してコピー... + + Keep - - - - + キープ + + Skip - - - - + スキップ + + Clone Prefix - - - - + プレフィックスを複製 + + Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". - - - - - + 複製されたファイルの名前に追加する後置詞を入力してください。 +この指定はたとえば言語を示す "_ja" の様に使用されます。 + + Copy As - - - - + 名前を指定してコピー + + <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> - - - - + <p>選択したファイル:</p><p>%1</p><p>は現在のリソースファイルのあるディレクトリにありません:</p><p>%2</p>このディレクトリにある他のパスを選択してください。</p> + + Could not overwrite %1. - - - - + %1 を上書きできません。 + + Save Resource File - - - - + リソースファイルを保存 + + Edit Resources - - - - + リソースを編集 + + New... - 新規... - - - + 新規... + + Open... - 開く... - - - + 開く... + + <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> - - - - + <p><b>警告:</b> ファイル</p><p>%1</p><p>は現在のリソースファイルのあるディレクトリ以下とは別のディレクトリツリーにあります。</p> + + <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> - - - - + <p>この問題の解決には下記のいずれかのボタンを押してください:</p><table><tr><th align="left">コピー</th><td>ファイルをリソースファイルのあるディレクトリにコピーします。</td></tr><tr><th align="left">名前を指定してコピー...</th><td>ファイルをリソースファイルのあるディレクトリもしくはそのサブディレクトリに名前を指定してコピーします。</td></tr><tr><th align="left">キープ</th><td>現在のパスをそのまま使用します。</td></tr></table> + + Could not copy %1 to %2 - - - - + コピーできません: +%1 +から +%2 +へのコピー + + A parse error occurred at line %1, column %2 of %3: %4 - - - - + %3 の %1 行 %2 列のパース中にエラーが発生しました: +%4 + + Could not write %1: %2 - - - - + %1 に書き込むことが出来ませんでした: %2 + + Open Resource File - - - - - + リソースファイルを開く + + Remove - 消去 - - - - + 削除 + + Move Up - - - - - + 上へ移動 + + Move Down - - - - - + 下へ移動 + + Add Prefix - - - - + プレフィックスを追加 + + Add Files... - - - - + ファイルを追加... + + Change Prefix - - - - + プレフィックスを変更 + + Change Language - - - - + 言語を変更 + + Change Alias - - - - + エイリアスを変更 + + Clone Prefix... - - - - + プレフィックスを複製... + + Prefix / Path - - - - + プレフィックス / パス + + Language / Alias - - - - + 言語 / エイリアス + + <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> - - - - + <html><p><b>警告:</b> リソースのリロード中に問題が発生しました:</p><pre>%1</pre></html> + + Resource Warning - - - - + リソースの警告 + + Dialog - ダイアログ - - - + ダイアログ + + New File - - - - + 新しいファイル + + N - - - - + N + + Remove File - - - - + ファイルを削除 + + R - R - - - + R + + I - - - - + I + + New Resource - - - - + 新しいリソース + + A - - - - + A + + Remove Resource or File - + リソースもしくはファイルの削除 QtResourceView - Size: %1 x %2 %3 - - - - + サイズ: %1 × %2 +%3 + + Edit Resources... - - - - + リソースを編集... + + Reload - - - - + 再読込 + + Copy Path - + パスをコピー QtResourceViewDialog - Select Resource - + リソースを選択 QtSizeFPropertyManager - %1 x %2 - - - - + %1 × %2 + + Width - - - - + 幅 + + Height - + 高さ QtSizePolicyPropertyManager - - <Invalid> - - - - + <無効> + + [%1, %2, %3, %4] - - - - + [%1, %2, %3, %4] + + Horizontal Policy - - - - + 横方向のポリシー + + Vertical Policy - - - - + 縦方向のポリシー + + Horizontal Stretch - - - - + 横方向のストレッチ + + Vertical Stretch - + 縦方向のストレッチ QtSizePropertyManager - %1 x %2 - - - - + %1 × %2 + + Width - - - - + 幅 + + Height - + 高さ QtToolBarDialog - < S E P A R A T O R > - - - - + < セ パ レ ー タ ー > + + Customize Toolbars - - - - + ツールバーのカスタマイズ + + 1 - 1 - - - + 1 + + Actions - アクション - - - + アクション + + Toolbars - ツールバー - - - + ツールバー + + Add new toolbar - - - - + ツールバーを追加 + + New - 新規 - - - + 新規 + + Remove selected toolbar - - - - + 選択したツールバーを削除 + + Remove - 消去 - - - + 削除 + + Rename toolbar - - - - + ツールバーの名前の変更 + + Rename - 名前の変更 - - - + 名前の変更 + + Move action up - - - - + アクションを上に移動 + + Up - 上へ - - - + 上へ + + Remove action from toolbar - - - - + アクションをツールバーから削除 + + <- - - - - + ← + + Add action to toolbar - - - - + アクションをツールバーに追加 + + -> - - - - + → + + Move action down - - - - + アクションを下に移動 + + Down - 下へ - - - + 下へ + + Current Toolbar Actions - - - - + 現在のツールバーのアクション + + Custom Toolbar - + カスタムツールバー QtTreePropertyBrowser - Property - プロパティ - - - + プロパティ + + Value - + 値 SaveFormAsTemplate - Add path... パスを追加... - Template Exists テンプレートが存在します - A template with the name %1 already exists. Do you want overwrite the template? - %1 という名前のテンプレートがすでに存在します。 + %1 という名前のテンプレートが既に存在します。 上書きしますか? - Overwrite Template テンプレートを上書き - Open Error オープンエラー - There was an error opening template %1 for writing. Reason: %2 %1 というテンプレートを書き込み用にオープンしようとしてエラーになりました。理由: %2 - Write Error 書き込みエラー - There was an error writing the template %1 to disk. Reason: %2 %1 というテンプレートをディスクに書き込もうとしてエラーになりました。理由: %2 - Pick a directory to save templates in - テンプレートを保存するディレクトリを選択してください - - - + テンプレートを保存するディレクトリを選択してください + + Save Form As Template フォームをテンプレートとして保存 - &Category: カテゴリ(&C): - &Name: 名前(&N): @@ -4677,347 +3064,343 @@ ScriptErrorDialog - An error occurred while running the scripts for "%1": - "%1" のためにスクリプトを実行していてエラーが発生しました: + "%1" でスクリプトの実行中にエラーが発生しました: SelectSignalDialog - Go to slot - - - - + スロットへ移動 + + Select signal - - - - + シグナルを選択 + + signal - - - - + シグナル + + class - + クラス SignalSlotConnection - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) - + 送信者(%1), シグナル(%2), 受信者(%3), スロット(%4) SignalSlotDialogClass - Signals and slots - - - - + シグナルとスロット + + Slots - - - - + スロット + + ... - ... - - - + ... + + Signals - - - - + シグナル + + Add - 追加 - - - + 追加 + + Delete - 削除 + 削除 Spacer - Horizontal Spacer '%1', %2 x %3 - - - - + 横方向のスペーサー '%1', %2 × %3 + + Vertical Spacer '%1', %2 x %3 - + 縦方向のスペーサー '%1', %2 × %3 TemplateOptionsPage - Template Paths Tab in preferences dialog - + テンプレートのパス ToolBarManager - Configure Toolbars... - - - - + ツールバーの設定... + + Window - - - - + ウィンドウ + + Help - - - - + ヘルプ + + Style - - - - + スタイル + + Dock views - - - - + ドックビュー + + + File + ファイル + + + Edit + 編集 + + + Tools + ツール + + + Form + フォーム + + Toolbars - ツールバー + ツールバー VersionDialog - <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>バージョン %2 - Open Source Edition - オープンソース版 - - - Qt Designer Qt Designer - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt Designer は、Qt アプリケーションをデザインするための GUI ツールです。<br/> - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qt.nokia.com/company/model.html">http://qt.nokia.com/company/model.html</a> for an overview of Qt licensing.<br/> - このバージョンの Qt Designer は、オープンソースアプリケーションを開発するための Qt オープンソース版の一部です。Qt は、クロスプラットフォームなアプリケーションを開発するための包括的な C++ のフレームワークです。<br/><br/>独占的な（ソースが隠された）アプリケーションを開発するには、Qt の商用ライセンスが必要です。Qt のライセンスの概要については <a href="http://qt.nokia.com/company/model.html">http://qt.nokia.com/company/model.html</a> をご覧ください。<br/> - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - このプログラムは、Qt 商用ライセンス契約書の定める条件の下であなたの利用が認められています。詳細は、ソフトウェアと一緒に配布される LICENSE ファイルを参照してください。<br/> - - - - %1<br/>%2<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> - %1<br/>%2<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 全ての権利は保護されています。<br/><br/>プログラムは「設計」、「市場性」および「特定の目的への適合性」も含む、あらゆる種類の「保証がなく」、「そのままで」提供されます。<br/> + %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + + + + VideoPlayerTaskMenu + + Available Mime Types + 利用可能な MIME タイプ + + + Display supported mime types... + サポートしている MIME タイプの表示... + + + Load... + ロード... + + + Play + 再生 + + + Pause + 一時停止 + + + Stop + 停止 + + + Choose Video Player Media Source + ビデオプレイヤーで再生するメディアのソースを選択 + + + An error has occurred in '%1': %2 + '%1' でエラーが発生しました: %2 + + + Video Player Error + ビデオプレイヤーエラー WidgetDataBase - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. - + ファイルに含まれるカスタムウィジェット '%1' の基底クラス(%2)が現在のウィジェットデータベースの基底クラス(%3)と異なります。ウィジェットデータベースは変更していません。 qdesigner_internal::ActionEditor - Actions アクション - New... 新規... - Delete 削除 - New action 新しいアクション - Edit action アクションを編集 - Designer - Designer - - - Feature not implemented! - その機能は実装されていません! - - - Edit... - 編集... - - - + 編集... + + Go to slot... - - - - + スロットへ移動... + + Copy - - - - + コピー + + Cut - - - - + 切り取り + + Paste - 貼り付け - - - + 貼り付け + + Select all - - - - + すべてを選択 + + Configure Action Editor - - - - + アクションエディタの設定 + + Icon View - - - - + アイコン表示 + + Detailed View - - - - + 詳細表示 + + Remove actions - - - - + アクションの削除 + + Remove action '%1' - アクション '%1' を消去 - - - + アクション '%1' を削除 + + Used In - - - - - qdesigner_internal::ActionFilterWidget - - Filter: - フィルタ: + 使用元 qdesigner_internal::ActionModel - Name - 名前 - - - + 名前 + + Used - - - - + 使用中 + + Text - - - - + テキスト + + Shortcut - - - - + ショートカット + + Checkable - - - - + チェック可 + + ToolTip - + ツールチップ + + + + qdesigner_internal::BrushManagerProxy + + The element '%1' is missing the required attribute '%2'. + 要素 '%1' に必須な属性 '%2' がありません。 + + + Empty brush name encountered. + ブラシの名前が空です。 + + + An unexpected element '%1' was encountered. + 予期せぬ要素 <%1> に遭遇しました。 + + + An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 + ブラシの定義ファイル '%1' の読み込み中にエラーが発生しました(%2 行, %3 列): %4 + + + An error occurred when reading the resource file '%1' at line %2, column %3: %4 + リソースファイル '%1' の読み込み中にエラーが発生しました(%2 行, %3 列): %4 qdesigner_internal::BuddyEditor - Add buddy buddy を追加 - Remove buddies - buddy を消去 + buddy を削除 - Remove %n buddies - - + + %n 個の buddy を削除 - Add %n buddies - - + + %n 個の buddy を追加 - Set automatically - + 自動的にセット qdesigner_internal::BuddyEditorPlugin - Edit Buddies buddy を編集 @@ -5025,7 +3408,6 @@ qdesigner_internal::BuddyEditorTool - Edit Buddies buddy を編集 @@ -5033,124 +3415,102 @@ qdesigner_internal::ButtonGroupMenu - Select members - - - - + メンバーを選択 + + Break - + ボタングループを破棄 qdesigner_internal::ButtonTaskMenu - Assign to button group - - - - + ボタングループに割り当て + + Button group - - - - + ボタングループ + + New button group - - - - + 新しいボタングループ + + Change text... テキストを変更... - None - - - - + なし + + Button group '%1' - + ボタングループ '%1' qdesigner_internal::CodeDialog - Save... - - - - + 保存... + + Copy All - - - - + すべてコピー + + &Find in Text... - - - - + テキストを検索(&F)... + + A temporary form file could not be created in %1. - - - - + 一時フォームファイルを %1に作成できませんでした。 + + The temporary form file %1 could not be written. - - - - + 一時フォームファイル %1 に書き込めませんでした。 + + %1 - [Code] - - - - + %1 - [コード] + + Save Code - - - - + コードを保存 + + Header Files (*.%1) - - - - + ヘッダファイル (*.%1) + + The file %1 could not be opened: %2 - - - - + ファイル %1 はオープンできませんでした: %2 + + The file %1 could not be written: %2 - - - - + ファイル %1 に書き込めませんでした: %2 + + %1 - Error - %1 - エラー + %1 - エラー qdesigner_internal::ColorAction - Text Color - + テキストの色 qdesigner_internal::ComboBoxTaskMenu - Edit Items... アイテムを編集... - Change Combobox Contents コンボボックスの内容を変更 @@ -5158,928 +3518,663 @@ qdesigner_internal::CommandLinkButtonTaskMenu - Change description... - - - - - qdesigner_internal::ConnectionDelegate - - <object> - <オブジェクト> - - - <signal> - <シグナル> - - - <slot> - <スロット> + 記述を変更... qdesigner_internal::ConnectionEdit - Select All - すべてを選択 - - - + すべてを選択 + + Deselect All - - - - + すべてを選択解除 + + Delete - 削除 + 削除 qdesigner_internal::ConnectionModel - Sender 発信者 - Signal シグナル - Receiver 受信者 - Slot スロット - <sender> <発信者> - <signal> <シグナル> - <receiver> <受信者> - <slot> <スロット> - The connection already exists!<br>%1 - - - - + その接続は既に存在します!<br>%1 + + Signal and Slot Editor シグナルスロットエディタ - - The connection already exists!<br>SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) - すでに接続が存在します!<br>送信者(%1)、シグナル(%2)、受信者(%3)、スロット(%4) - qdesigner_internal::ContainerWidgetTaskMenu - Delete Page - ページを削除 - - - Insert Page Before Current Page このページの前にページを挿入 - Insert Page After Current Page このページの後にページを挿入 - Add Subwindow - - - - + 新しいサブウィンドウ + + Delete - 削除 - - - + 削除 + + Insert - - - - + 挿入 + + Subwindow - - - - + サブウィンドウ + + Page - ページ - - - + ページ + + Page %1 of %2 - %2 ページのうちの %1 ページ + %2 ページ中の %1 ページ目 qdesigner_internal::DPI_Chooser - System (%1 x %2) System resolution - - - - + システム (%1 × %2) + + User defined - - - - + ユーザ定義 + + x DPI X/Y separator - + × qdesigner_internal::DesignerPropertyManager - - AlignLeft - - - - + 左端揃え + + AlignHCenter - - - - + 中央揃え(横方向) + + AlignRight - - - - + 右端揃え + + AlignJustify - - - - + 両端揃え + + AlignTop - - - - - + 上端揃え + + AlignVCenter - - - - + 中央揃え(縦方向) + + AlignBottom - - - - + 下端揃え + + %1, %2 - + %1, %2 - Customized (%n roles) - - + + カスタムパレット (%n ロール) - Inherited - - - - + 親から継承 + + Horizontal - 横 - - - + 横方向 + + Vertical - 縦 - - - + 縦方向 + + Normal Off - - - - + 通常 オフ + + Normal On - - - - + 通常 オン + + Disabled Off - - - - + 無効化 オフ + + Disabled On - - - - + 無効化 オン + + Active Off - - - - + アクティブ オフ + + Active On - - - - + アクティブ オン + + Selected Off - - - - + 選択済み オフ + + Selected On - - - - - + 選択済み オン + + translatable - - - - - + 翻訳可能 + + disambiguation - - - - - + あいまいさ回避 + + comment - + コメント qdesigner_internal::DeviceProfileDialog - Device Profiles (*.%1) - - - - + デバイスプロファイル (*.%1) + + Default - - - - + デフォルト + + Save Profile - - - - + プロファイルを保存 + + Save Profile - Error - - - - + プロファイルを保存 - エラー + + Unable to open the file '%1' for writing: %2 - - - - + ファイル '%1' を書き込み用にオープンできませんでした: %2 + + Open profile - - - - - + プロファイルをオープン + + Open Profile - Error - - - - + プロファイルをオープン - Error + + Unable to open the file '%1' for reading: %2 - - - - + ファイル '%1' を読み込み用にオープンできませんでした: %2 + + '%1' is not a valid profile: %2 - + '%1' は無効なプロファイルです: %2 qdesigner_internal::Dialog - Dialog ダイアログ - StringList 文字列リスト - New String 新しい文字列 - &New 新規(&N) - Delete String 文字列を削除 - &Delete 削除(&D) - &Value: 値(&V): - Move String Up 文字列を上へ - Up 上へ - Move String Down 文字列を下へ - Down 下へ - qdesigner_internal::EditableResourceModel - - Invalid files - 無効なファイル - - - Files referenced in a qrc must be in the qrc's directory or one of its subdirectories:<p><b>%1</b><p>Some of the selected files do not comply with this. - qrc から参照されているファイルは、qrc のディレクトリもしくはサブディレクトリのいずれかにある必要があります:<p><b>%1</b><p>選択されたファイルの中には、この条件に従わないものがあります。 - - - Only insert files which comply - 条件に従うファイルだけを挿入する - - - Files referenced in a qrc must be in the qrc's directory or one of its subdirectories:<p><b>%1</b><p>The selected files do not comply with this. - qrc から参照されているファイルは、qrc のディレクトリもしくはサブディレクトリのいずれかにある必要があります:<p><b>%1</b><p>選択されたファイルは、この条件に従っていません。 - - - Error loading resource file - リソースファイルのロードエラー - - - Failed to open "%1": -%2 - "%1" のオープンに失敗: %2 - - - Error saving resource file - リソースファイルの保存エラー - - - Failed to save "%1": -%2 - "%1" の保存に失敗: -%2 - - - qdesigner_internal::EmbeddedOptionsControl - None - - - - + なし + + Add a profile - - - - + プロファイルを追加 + + Edit the selected profile - - - - + 選択したプロファイルを編集 + + Delete the selected profile - - - - + 選択したプロファイルを削除 + + Add Profile - - - - + プロファイルを追加 + + New profile - - - - + 新しいプロファイル + + Edit Profile - - - - + プロファイルを編集 + + Delete Profile - - - - + プロファイルを削除 + + Would you like to delete the profile '%1'? - - - - + プロファイル '%1' を削除しますか? + + Default - + デフォルト qdesigner_internal::FilterWidget - - <Filter> - - - - - qdesigner_internal::FindIconDialog - - Find Icon - アイコン検索 - - - Specify resource - リソースを指定 - - - Specify image file - イメージファイルを指定 - - - Parent directory - 親ディレクトリ + Filter + フィルタ + + + Clear text + テキストをクリア qdesigner_internal::FormEditor - Resource File Changed - - - - + リソースファイルが変更されました + + The file "%1" has changed outside Designer. Do you want to reload it? - + ファイル "%1" は Designer 以外で変更されました。リロードしますか? qdesigner_internal::FormLayoutMenu - Add form layout row... - + フォームレイアウトに行を追加... qdesigner_internal::FormWindow - Edit contents 内容を編集 - F2 F2 - Insert widget '%1 - ウィジェット '%1 を挿入 - - - Resize サイズ変更 - - Key Move - キーの移動 - - - Paste - 貼り付け - - - + 移動キー + + Paste error 貼り付けエラー - Can't paste widgets. Designer couldn't find a container -to paste into which does not contain a layout. Break the layout -of the container you want to paste into and select this container -and then paste again. - ウィジェットを貼り付けられません。Designer は、ウィジェットを貼り付けることができる、レイアウトを含まないコンテナを見つけることができませんでした。貼り付け先のコンテナのレイアウトを破棄し、もう一度そのコンテナを選んで貼り付けてください。 - - - Break layout - レイアウトを破棄する - - - Lay out レイアウト - - Drop widget ウィジェットの貼り付け - Paste %n action(s) - - + + %n 個のアクションの貼り付け - Insert widget '%1' - + ウィジェット '%1' を挿入 + + + Key Resize + リサイズキー - Paste %n widget(s) - - + + %n 個のウィジェットの貼り付け - Paste (%1 widgets, %2 actions) - - - - + %1 個のウィジェットと %2 個のアクションの貼り付け + + Cannot paste widgets. Designer could not find a container without a layout to paste into. - - - - + ウィジェットを貼り付けできません。Designer は貼り付け先となるレイアウトを持たないコンテナを見つけられません。 + + Break the layout of the container you want to paste into, select this container and then paste again. - - - - + 貼り付け先となるコンテナのレイアウトを破棄して、改めてそのコンテナを選択して貼り付けてください。 + + Raise widgets - - - - + ウィジェットを前面に移動 + + Lower widgets - - - - + ウィジェットを後方に移動 + + Select Ancestor - - - - + Ancestor を選択 + + A QMainWindow-based form does not contain a central widget. - + QMainWindow ベースのフォームにセントラルウィジェットが含まれていません。 qdesigner_internal::FormWindowBase - Delete 削除 - Delete '%1' - '%1' を削除 + '%1' を削除 qdesigner_internal::FormWindowManager - Cu&t 切り取り(&T) - Cuts the selected widgets and puts them on the clipboard 選択されたウィジェットを切り取ってクリップボードに出力 - &Copy コピー(&C) - Copies the selected widgets to the clipboard 選択されたウィジェットをクリップボードにコピー - &Paste 貼り付け(&P) - Pastes the clipboard's contents クリップボードの中身をペースト - &Delete 削除(&D) - Deletes the selected widgets 選択したウィジェットを削除 - Select &All すべてを選択(&A) - Selects all widgets すべてのウィジェットを選択 - Bring to &Front 前面へ移動(&F) - - Raises the selected widgets 選択したウィジェットを前へ移動 - Send to &Back 背面へ移動(&B) - - Lowers the selected widgets 選択したウィジェットを後へ移動 - Adjust &Size サイズ調整(&S) - Adjusts the size of the selected widget 選択されたウィジィトのサイズを調整 - Lay Out &Horizontally 水平に並べる(&H) - Lays out the selected widgets horizontally 選択したウィジェットを水平に並べる - Lay Out &Vertically 垂直に並べる(&V) - Lays out the selected widgets vertically 選択したウィジェットを垂直に並べる - Lay Out in a &Form Layout - - - - + フォームレイアウトで並べる(&F) + + Lays out the selected widgets in a form layout - - - - + 選択したウィジェットをフォームレイアウトに配置 + + Lay Out in a &Grid 格子状に並べる(&G) - Lays out the selected widgets in a grid 選択したウィジェットを格子状に並べる - Lay Out Horizontally in S&plitter 水平にスプリッタの中に並べる(&P) - Lays out the selected widgets horizontally in a splitter 選択されたウィジェットをスプリッタの中で水平方向に配置 - Lay Out Vertically in Sp&litter 垂直にスプリッタの中に並べる(&L) - Lays out the selected widgets vertically in a splitter 選択されたウィジェットをスプリッタの中で垂直方向に配置 - &Break Layout レイアウトを破棄(&B) - Breaks the selected layout 選択されたレイアウトを破棄 - Si&mplify Grid Layout - - - - + 格子状のレイアウトを正規化する(&M) + + &Preview... - - - - + プレビュー(&P)... + + Preview current form - - - - + 現在のフォームをプレビュー + + Form &Settings... - フォームの設定(&S)... - - - + フォームの設定(&S)... + + Break Layout レイアウトを破棄する - Adjust Size サイズ調整 - Could not create form preview Title of warning message box - - - - + フォームがプレビューできません + + Form Settings - %1 - フォーム設定 - %1 - - - + フォーム設定 - %1 + + Removes empty columns and rows - + 空の列と行を削除 qdesigner_internal::FormWindowSettings - None - - - - + なし + + Device Profile: %1 - - - - - qdesigner_internal::GraphicsPropertyEditor - - <no icon> - <アイコンなし> - - - <no pixmap> - <ピックスマップなし> - - - ... - ... + デバイスプロファイル: %1 qdesigner_internal::GridPanel - Form フォーム - Grid グリッド - Visible グリッドを表示 - Grid &X X軸のグリッド間隔(&X) - Snap 補正 - Reset リセット - Grid &Y Y軸のグリッド間隔(&Y) @@ -6087,7 +4182,6 @@ qdesigner_internal::GroupBoxTaskMenu - Change title... タイトルを変更... @@ -6095,180 +4189,153 @@ qdesigner_internal::HtmlTextEdit - Insert HTML entity - + HTML エンティティを挿入 qdesigner_internal::IconSelector - The pixmap file '%1' cannot be read. - - - - + ピクスマップファイル '%1' を読めません。 + + The file '%1' does not appear to be a valid pixmap file: %2 - - - - + ファイル '%1' は無効な画像ファイルです: %2 + + The file '%1' could not be read: %2 - - - - + ファイル '%1' は読めませんでした: %2 + + Choose a Pixmap - - - - + ピクスマップの選択 + + Pixmap Read Error - - - - + ピクスマップの読み込みエラー + + ... - ... - - - + ... + + Normal Off - - - - + 通常 オフ + + Normal On - - - - + 通常 オン + + Disabled Off - - - - + 無効化 オフ + + Disabled On - - - - + 無効化 オン + + Active Off - - - - + アクティブ オフ + + Active On - - - - + アクティブ オン + + Selected Off - - - - + 選択済み オフ + + Selected On - - - - + 選択済み オン + + Choose Resource... - - - - + リソースを選択... + + Choose File... - - - - + ファイルを選択... + + Reset - リセット - - - + リセット + + Reset All - + すべてリセット qdesigner_internal::ItemListEditor - Properties &<< - - - - - + プロパティ &<< + + Properties &>> - - - - + プロパティ &>> + + Items List - アイテム一覧 - - - + アイテム一覧 + + New Item - 新しいアイテム - - - + 新しいアイテム + + &New - 新規(&N) - - - + 新規(&N) + + Delete Item - アイテムを削除 - - - + アイテムを削除 + + &Delete - 削除(&D) - - - + 削除(&D) + + Move Item Up - このアイテムを上へ - - - + このアイテムを上へ + + U - U - - - + U + + Move Item Down - このアイテムを下へ - - - + このアイテムを下へ + + D - D + D qdesigner_internal::LabelTaskMenu - Change rich text... リッチテキストを変更... - Change plain text... プレインテキストを変更... + qdesigner_internal::LanguageResourceDialog + + Choose Resource + リソースを選択 + + + qdesigner_internal::LineEditTaskMenu - Change text... テキストを変更... @@ -6276,90 +4343,25 @@ qdesigner_internal::ListWidgetEditor - Edit List Widget リストウィジェットを編集 - Edit Combobox コンボボックスを編集 - New Item 新しいアイテム - - Dialog - ダイアログ - - - Items List - アイテム一覧 - - - Move Item Down - このアイテムを下へ - - - D - D - - - &Pixmap - ピックスマップ(&P) - - - Set Item Pixmap - このアイテムのピックスマップを設定 - - - ... - ... - - - Reset Item Pixmap - このアイテムのピックスマップをリセット - - - &Text - テキスト(&T) - - - Set Item Text - このアイテムのテキストを設定 - - - Move Item Up - このアイテムを上へ - - - U - U - - - &New Item - 新しいアイテム(&N) - - - Delete Item - アイテムを削除 - - - &Delete Item - アイテムを削除(&D) - qdesigner_internal::ListWidgetTaskMenu - Edit Items... アイテムを編集... - Change List Contents リストの内容を変更 @@ -6367,81 +4369,67 @@ qdesigner_internal::MdiContainerWidgetTaskMenu - Next Subwindow - - - - + 次のサブウィンドウ + + Previous Subwindow - - - - + 前のサブウィンドウ + + Tile - - - - + タイル表示 + + Cascade - + カスケード表示 qdesigner_internal::MenuTaskMenu - Remove - 消去 + 削除 qdesigner_internal::MorphMenu - Morph into - + 他のクラスへ変更 qdesigner_internal::NewActionDialog - New Action... 新しいアクション... - &Text: テキスト(&T): - Shortcut: - - - - + ショートカット: + + Checkable: - - - - + チェック可: + + ToolTip: - - - - + ツールチップ: + + ... - ... - - - + ... + + &Icon: アイコン(&I): - Object &name: オブジェクト名(&N): @@ -6449,163 +4437,133 @@ qdesigner_internal::NewDynamicPropertyDialog - Set Property Name プロパティ名を設定 - The current object already has a property named '%1'. Please select another, unique one. - 現在のオブジェクトには、すでに '%1' という名前のプロパティが存在します。 + 現在のオブジェクトには、既に '%1' という名前のプロパティが存在します。 別のユニークな名前を選んでください。 - The '_q_' prefix is reserved for Qt library. -Please select another name. - '_q_' というプリフィックスは Qt ライブラリのために予約されています。 -別の名前を選んでください。 - - - Create Dynamic Property ダイナミックプロパティを作成 - Property Name プロパティ名 - Property Type プロパティ型 - The '_q_' prefix is reserved for the Qt library. Please select another name. - - - - + 前置詞 '_q_' は Qt ライブラリのために予約されています。 +別の名前を選んでください。 + + horizontalSpacer - + 横方向のスペーサー qdesigner_internal::NewFormWidget - Default size - - - - + デフォルトのサイズ + + QVGA portrait (240x320) - - - - + QVGA ポートレイト (240×320) + + QVGA landscape (320x240) - - - - + QVGA ランドスケープ (320×240) + + VGA portrait (480x640) - - - - + VGA ポートレイト (480×640) + + VGA landscape (640x480) - - - - + VGA ランドスケープ (640×480) + + Widgets New Form Dialog Categories - - - - + ウィジェット + + Custom Widgets - カスタムウィジェット - - - + カスタムウィジェット + + None - - - - + なし + + Error loading form - フォームのロードエラー - - - + フォームのロードエラー + + + Unable to open the form template file '%1': %2 + フォームのテンプレートファイル '%1' をオープンできません: %2 + + Internal error: No template selected. - - - - + 内部エラー: テンプレートが選択されていません。 + + 0 - 0 - - - + 0 + + Choose a template for a preview - プレビューのためテンプレートを選択 - - - + プレビュー用のテンプレートを選択 + + Embedded Design - - - - + デザインプロファイル + + Device: - - - - + デバイス: + + Screen Size: - + 画面サイズ: qdesigner_internal::NewPromotedClassPanel - Add 追加 - New Promoted Class 新しい格上げされたクラス - Base class name: ベースクラス名: - Promoted class name: 格上げされたクラス名: - Header file: ヘッダファイル: - Global include グローバルにインクルードする - Reset リセット @@ -6613,120 +4571,76 @@ qdesigner_internal::ObjectInspector - Object - オブジェクト - - - Class - クラス - - - <noname> - <名前なし> - - - separator - セパレータ - - - + Change Current Page + 現在のページを変更 + + &Find in Text... - - - - - qdesigner_internal::ObjectInspector::ObjectInspectorPrivate - - - Change Current Page - + テキストを検索(&F)... qdesigner_internal::OrderDialog - Index %1 (%2) インデックス %1 (%2) - %1 %2 - - - - + %1 %2 + + Change Page Order ページの順序を変更 - Page Order ページの順序 - Up - 上へ - - - Down - 下へ - - - Move page up - - - - + このページを上へ + + Move page down - + このページを下へ qdesigner_internal::PaletteEditor - Edit Palette パレットを編集 - Tune Palette パレットを調整 - Show Details - 全てのパレットを設定 - - - + すべてのパレットを設定 + + Compute Details アクティブパレットを設定 - Quick 簡易設定 - Preview プレビュー - Disabled 無効化 - Inactive 非アクティブ - Active アクティブ @@ -6734,7 +4648,6 @@ qdesigner_internal::PaletteEditorButton - Change Palette パレットを変更 @@ -6742,22 +4655,18 @@ qdesigner_internal::PaletteModel - Color Role 色役割 - Active アクティブ - Inactive 非アクティブ - Disabled 無効化 @@ -6765,202 +4674,193 @@ qdesigner_internal::PixmapEditor - Copy Path - - - - + パスをコピー + + Paste Path - - - - + パスを貼り付け + + Choose Resource... - - - - + リソースを選択... + + Choose File... - - - - - + ファイルを選択... + + ... - ... + ... qdesigner_internal::PlainTextEditorDialog - Edit text - テキストを編集 + テキストを編集 qdesigner_internal::PluginDialog - Components コンポーネント - Plugin Information プラグイン情報 - Refresh リフレッシュ - Scan for newly installed custom widget plugins. 新しくインストールされたカスタムウィジェットプラグインをスキャンします。 - Qt Designer couldn't find any plugins プラグインは見つかりませんでした - Qt Designer found the following plugins 以下のプラグインが見つかりました - New custom widget plugins have been found. 新しいカスタムウィジェットのプラグインが見つかりました。 - - TextLabel - テキストラベル - - - 1 - 1 - qdesigner_internal::PreviewActionGroup - %1 Style - %1 スタイル - - - - qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate - - + %1 スタイル + + + + qdesigner_internal::PreviewConfigurationWidget + + Default + デフォルト + + + None + なし + + + Browse... + 参照... + + Load Custom Device Skin - - - - + カスタムデバイススキンのロード + + All QVFB Skins (*.%1) - - - - + すべての QVFB スキン (*.%1) + + %1 - Duplicate Skin - - - - + %1 - 重複したスキン + + The skin '%1' already exists. - - - - + スキン '%1' は既に存在します。 + + %1 - Error - %1 - エラー - - - + %1 - エラー + + %1 is not a valid skin directory: %2 - + %1 は無効なスキンディレクトリです: +%2 qdesigner_internal::PreviewDeviceSkin - + &Portrait + ポートレイト(&P) + + + Landscape (&CCW) + Rotate form preview counter-clockwise + ランドスケープ (&CCW) + + + &Landscape (CW) + Rotate form preview clockwise + ランドスケープ(&L) (CW) + + &Close - 閉じる(&C) + 閉じる(&C) qdesigner_internal::PreviewManager - %1 - [Preview] - %1 - [プレビュー] - - - %1 Style - %1 スタイル + %1 - [プレビュー] + + + + qdesigner_internal::PreviewMdiArea + + The moose in the noose +ate the goose who was loose. + Palette editor background + 坊主が屏風に上手に +坊主の絵を描いた。 qdesigner_internal::PreviewWidget - Preview Window プレビューウィンドウ - LineEdit 行編集 - ComboBox コンボボックス - PushButton プッシュボタン - ButtonGroup2 ボタングループ2 - CheckBox1 チェックボックス1 - CheckBox2 チェックボックス2 - ButtonGroup ボタングループ - RadioButton1 ラジオボタン1 - RadioButton2 ラジオボタン2 - RadioButton3 ラジオボタン3 @@ -6968,22 +4868,18 @@ qdesigner_internal::PromotionModel - Name 名前 - Header file ヘッダファイル - Global include グローバルにインクルードする - Usage 使い方 @@ -6991,184 +4887,120 @@ qdesigner_internal::PromotionTaskMenu - Promoted widgets... 格上げされたウィジェット... - Promote to ... 格上げ先を指定... - Promote to 格上げ先 - Demote to %1 %1 へ格下げ - Change signals/slots... - + シグナル/スロットを変更... qdesigner_internal::PropertyEditor - Add Dynamic Property... ダイナミックプロパティを追加... - Remove Dynamic Property ダイナミックプロパティを削除 - Sorting - - - - + ソート + + Color Groups - - - - + カラーグループ + + Tree View - - - - + ツリー表示 + + Drop Down Button View - - - - + ドロップダウンボタン表示 + + Configure Property Editor - - - - + プロパティエディタの設定 + + Object: %1 Class: %2 - - - - + オブジェクト: %1 +クラス: %2 + + String... - - - - + 文字列... + + Bool... - - - - + ブーリアン... + + Other... - + その他... qdesigner_internal::PropertyLineEdit - Insert line break 改行を挿入 - qdesigner_internal::QCoreApplication - - The base class %1 is invalid. - ベースクラス %1 は無効です。 - - - The class %1 already exists. - %1 というクラスはすでに存在します。 - - - Promoted Widgets - 格上げされたウィジェット - - - The class %1 cannot be removed - %1 というクラスを削除できません - - - The class %1 cannot be removed because it is still referenced. - %1 というクラスは、参照されているので、削除できません。 - - - The class %1 cannot be renamed - %1 というクラスをリネームできません - - - The class %1 cannot be renamed to an empty name. - %1 というクラスを空の名前にリネームすることはできません。 - - - There is already a class named %1. - %1 というクラスは存在します。 - - - Cannot set an empty include file. - 空のインクルードファイルを設定できません。 - - - qdesigner_internal::QDesignerPromotionDialog - Promoted Widgets 格上げされたウィジェット - Promoted Classes 格上げされたクラス - Promote 格上げ - %1 - Error %1 - エラー - Change signals/slots... - + シグナル/スロットを変更... qdesigner_internal::QDesignerResource - Loading qrc file qrc ファイルをロードしています - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> 指定された qrc ファイル <p><b>%1</b></p><p>が見つかりません。ファイルの置き場所を変更したいですか?</p> - New location for %1 %1 の新しい場所 - Resource files (*.qrc) リソースファイル (*.qrc) @@ -7176,876 +5008,283 @@ qdesigner_internal::QDesignerTaskMenu - Change objectName... - オブジェクト名を変更... - - - + オブジェクト名を変更... + + Change toolTip... - ツールチップを変更... - - - + ツールチップを変更... + + Change whatsThis... - ヒントを変更... - - - + ヒントを変更... + + Change styleSheet... - スタイルシートを変更... - - - + スタイルシートを変更... + + Create Menu Bar - メニューバーを作成 - - - + メニューバーを作成 + + Add Tool Bar - ツールバーを追加 - - - + ツールバーを追加 + + Create Status Bar - ステータスバーを作成 - - - + ステータスバーを作成 + + Remove Status Bar - ステータスバーを消去 - - - + ステータスバーを削除 + + Change script... - スクリプトを変更... - - - + スクリプトを変更... + + Go to slot... - - - - + スロットへ移動... + + Edit ToolTip - - - - + ツールチップを編集 + + Edit WhatsThis - - - - + ヒントを編集 + + no signals available - + シグナルがありません - Set size constraint on %n widget(s) - - + + %n 個のウィジェットで限界サイズを設定 - Change signals/slots... - - - - + シグナル/スロットを変更... + + Size Constraints - - - - + 限界サイズ + + Set Minimum Width - - - - + 幅の最小値を設定 + + Set Minimum Height - - - - + 高さの最小値を設定 + + Set Minimum Size - - - - + サイズの最小値を設定 + + Set Maximum Width - - - - + 幅の最大値を設定 + + Set Maximum Height - - - - + 高さの最大値を設定 + + Set Maximum Size - + サイズの最大値を設定 qdesigner_internal::QDesignerWidgetBox - - Unexpected element <%1> - - - - + 予期せぬ要素 <%1> + + A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 - ウィジェット %3 のために指定された XML コードの %1 行目の %2 カラム目でパースエラーが発生しました: %4 + ウィジェット %3 のために指定された XML コードの %1 行目の %2 カラム目でパースエラーが発生しました: %4 %5 - The XML code specified for the widget %1 does not contain any widget elements. %2 - - - - - qdesigner_internal::QObject - - The icon specified by %1 could not be opened: %2 - %1 で指定されたアイコンをオープンできませんでした: %2 - - - The widgetbox could not load the file %1. - ウィジェットボックスは %1 というファイルをロードできませんでした。 - - - The widgetbox could not parse the file %1. An error occurred at line %2: %3 - ウィジェットボックスは、%1 というファイルをパースできません。%2 行目でエラーが発生しました: %3 - - - The file %1 does not appear to be a widgetbox file. - %1 というファイルは、ウィジェットボックスのファイルではないようです。 - - - An error occurred while parsing the file %1: %2 is not a valid child of the root element. - %1 というファイルのパース中にエラーが発生しました: %2 はルートエレメントの有効な子供ではありません。 - - - The class attribute for the class %1 does not match the class name %2. - %1 というクラスのクラス属性は %2 というクラス名と一致しません。 - - - The class attribute for the class %1 is missing. - %1 というクラスのクラス属性がありません。 - - - The style %1 could not be loaded. - %1 というスタイルをロードできませんでした。 - - - The preview failed to build. - プレビューのビルドに失敗しました。 - - - %1 - [Preview] - %1 - [プレビュー] - - - Designer - Designer - - - Change script - スクリプトを変更 - - - A custom widget plugin whose class name (%1) matches that of an existing class has been found. - クラス名 (%1) が既存のクラスと同じであるカスタムウィジェットプラグインが見つかりました。 - - - The custom widget factory registered for widgets of class %1 returned 0. - %1 というクラスのウィジェットのために登録されたカスタムウィジェットファクトリーが 0 を返しました。 - - - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. - %1 というクラスのウィジェットのために登録されたカスタムウィジェットファクトリーを使ってウィジェットを作成しているときに、クラス名のミスマッチが発生しました。%2 というクラスのウィジェットを返しました。 - - - - qdesigner_internal::QPropertyEditorModel - - <noname> - <名前なし> - - - Property - プロパティ - - - Value - 値 - - - - qdesigner_internal::QtBrushDialog - - Edit Brush - ブラシを編集 - - - - qdesigner_internal::QtBrushEditor - - New Brush - 新しいブラシ - - - Gradient - グラデーション - - - Texture - テクスチャ - - - Color Pattern - カラーパターン - - - Rename F2 - 名前の変更 F2 - - - Form - フォーム - - - Edit... - 編集... - - - Edit Gradient - グラデーションを編集 - - - Gradient... - グラデーション... - - - Edit Color Pattern - カラーパターンを編集 - - - Color Pattern... - カラーパターン... - - - Edit Texture - テクスチャを編集 - - - Texture... - テクスチャ... - - - Remove From Custom - カスタムカラーから除く - - - Add To Custom - カスタムカラーに追加 - - - Apply Custom - カスタムカラーに適用 - - - Apply - 適用 - - - - qdesigner_internal::QtBrushPatternDialog - - Edit Color Pattern - カラーパターンを編集 - - - - qdesigner_internal::QtBrushPatternEditor - - Hue - 色相 - - - Saturation - 彩度 - - - Value - 明度 - - - Red - 赤 - - - Green - 緑 - - - Blue - 青 - - - No Brush - 透明 - - - Solid - 塗りつぶし - - - Dense 1 - 密度 1 - - - Dense 2 - 密度 2 - - - Dense 3 - 密度 3 - - - Dense 4 - 密度 4 - - - Dense 5 - 密度 5 - - - Dense 6 - 密度 6 - - - Dense 7 - 密度 7 - - - Horizontal - 横 - - - Vertical - 縦 - - - Cross - 格子 - - - Backward Diagonal - 左下から右上の斜線 - - - Forward Diagonal - 左上から右下への斜線 - - - Crossing Diagonal - 交差する斜線 - - - Form - フォーム - - - Pattern - パターン - - - Alpha - アルファ - - - Color - 色 - - - Preview - プレビュー - - - HSV - HSV - - - RGB - RGB - - - - qdesigner_internal::QtGradientDialog - - Edit Gradient - グラデーションを編集 - - - - qdesigner_internal::QtGradientEditor - - - Linear - 線状 - - - - Radial - 放射状 - - - - Conical - 円錐状 - - - - Pad - 区切りの色で補充 - - - - Repeat - グラデーションの繰り返し - - - - Reflect - グラデーションの反射 - - - Form - フォーム - - - Start X - 始点の X 座標 - - - Start Y - 始点の Y 座標 - - - Final X - 終点の X 座標 - - - Final Y - 終点の Y 座標 - - - Spread - 広がり方 - - - Central Y - 中心の Y 座標 - - - Focal X - 焦点の X 座標 - - - Focal Y - 焦点の Y 座標 - - - Radius - 半径 - - - Central X - 中心の X 座標 - - - Angle - 角度 - - - Type - グラデーションのタイプ + ウィジェット %1 を定義する XML のコードにどのウィジェットの要素もありません。 +%2 + + + An error has been encountered at line %1 of %2: %3 + %2 の %1 行目でエラーが発生しました: %3 + + + Unexpected element <%1> encountered when parsing for <widget> or <ui> + <widget> もしくは <ui> のパース中に予期せぬ要素 <%1> が現れました + + + Unexpected end of file encountered when parsing widgets. + ウィジェットのパース中に予期せずファイルが途中で終了しました。 + + + A widget element could not be found. + ウィジェット要素が見つかりません。 qdesigner_internal::QtGradientStopsController - H - - - - + H + + S - - - - + S + + V - - - - - - Hue - 色相 - - - - Sat - - - - - Val - - - - - Saturation - 彩度 - - - - Value - - - - - R - R - - - - G - - - - - B - - - - - Red - 赤 - - - - Green - 緑 - - - - Blue - 青 - - - - qdesigner_internal::QtGradientStopsEditor + V + Hue - 色相 + 色相 + + + Sat + 彩度 + + + Val + 明度 Saturation - 彩度 + 彩度 Value - 明度 + 明度 + + + R + R + + + G + G + + + B + B Red - 赤 + 赤 Green - 緑 + 緑 Blue - 青 - - - Form - フォーム - - - % - % - - - Position - 位置 - - - Zoom - ズーム - - - Color - 色 - - - Zoom All - すべてズーム - - - Alpha - アルファ - - - Zoom Out - 縮小 - - - Zoom In - 拡大 - - - HSV - HSV - - - RGB - RGB - - - - qdesigner_internal::QtGradientStopsWidget - - New Stop - 新しい終点 - - - Delete - 削除 - - - Select All - すべてを選択 - - - Zoom In - 拡大 - - - Zoom Out - 縮小 - - - Zoom All - すべてズーム - - - - qdesigner_internal::ResourceEditor - - <no resource files> - <リソースファイルなし> - - - Open file - ファイルをオープン - - - All files (*) - すべてのファイル(*) - - - Resource Editor - リソースエディタ - - - Resource Editor: %1 - リソースエディタ: %1 - - - New... - 新規... - - - Open... - 開く... - - - Untitled - タイトルなし - - - Save resource file - リソースファイルを保存 - - - Resource files (*.qrc) - リソースファイル (*.qrc) - - - New resource file - 新しいリソースファイル - - - Open resource file - リソースファイルを開く - - - Resource editor - リソースエディタ - - - Current Resource: - 現在のリソース: - - - ... - ... - - - + - + - - - - - - - - - &Add Files... - ファイルを追加(&A)... + 青 qdesigner_internal::RichTextEditorDialog - Edit text テキストを編集 - &OK OK(&O) - &Cancel キャンセル(&C) - Rich Text - - - - + リッチテキスト + + Source - + ソース qdesigner_internal::RichTextEditorToolBar - Insert &Image - - - - + 画像を挿入(&I) + + Bold ボールド - CTRL+B CTRL+B - Italic イタリック - CTRL+I Ctrl+I - Underline 下線 - CTRL+U CTRL+U - Left Align - - - - + 左端揃え + + Center - - - - + 中央揃え + + Right Align - - - - + 右端揃え + + Justify - - - - + 両端揃え + + Superscript - - - - + 上付き文字 + + Subscript - - - - + 下付き文字 + + Insert &Link - - - - Color - 色 + リンクを挿入(&L) qdesigner_internal::ScriptDialog - Edit script スクリプトを編集 - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>フォームをロードしているときに実行する Qt スクリプトの断片を入力してください。<br>ウィジェットとその子ウィジェットは、それぞれ <i>widget</i>、<i>childWidgets</i> という変数でアクセスできます。 - Syntax error 構文エラー @@ -8053,51 +5292,36 @@ qdesigner_internal::ScriptErrorDialog - Script errors スクリプトのエラー - qdesigner_internal::Sentinel - - New Tool Bar - 新しいツールバー - - - qdesigner_internal::SignalSlotDialog - There is already a slot with the signature '%1'. - - - - + シグネイチャが '%1' であるスロットは既に存在します。 + + There is already a signal with the signature '%1'. - - - - + シグネイチャが '%1' であるシグナルは既に存在します。 + + %1 - Duplicate Signature - - - - - + %1 - 重複したシグネイチャ + + Signals/Slots of %1 - + %1 のシグナル/スロット qdesigner_internal::SignalSlotEditorPlugin - Edit Signals/Slots シグナル/スロットを編集 - F4 F4 @@ -8105,7 +5329,6 @@ qdesigner_internal::SignalSlotEditorTool - Edit Signals/Slots シグナル/スロットを編集 @@ -8113,114 +5336,74 @@ qdesigner_internal::StatusBarTaskMenu - Remove - 消去 + 削除 qdesigner_internal::StringListEditorButton - Change StringList - 文字列リストを変更 - - - Change String List - + 文字列のリストを変更 qdesigner_internal::StyleSheetEditorDialog - Edit Style Sheet スタイルシートを変更 - - Valid Style Sheet 有効なスタイルシート - Add Color... - - - - + 色を追加... + + Add Font... - - - - + フォントを追加... + + Invalid Style Sheet - 無効なスタイルシート - - - + 無効なスタイルシート + + Add Resource... - - - - + リソースを追加... + + Add Gradient... - - - - - qdesigner_internal::StyledButton - - All Pixmaps ( - 全てのピックスマップ ( - - - %1-Pixmaps (%2) - - %1-ピックスマップ(%2) - - - All Files (*.*) - すべてのファイル(*.*) - - - Open Image - イメージを開く + グラデーションを追加... qdesigner_internal::TabOrderEditor - Start from Here - - - - + この番号から設定 + + Restart - - - - + 1番から設定 + + Tab Order List... - - - - + タブ順のリスト... + + Tab Order List - - - - + タブ順のリスト + + Tab Order - + タブ順 qdesigner_internal::TabOrderEditorPlugin - Edit Tab Order タブ順を編集 @@ -8228,7 +5411,6 @@ qdesigner_internal::TabOrderEditorTool - Edit Tab Order タブ順を編集 @@ -8236,168 +5418,45 @@ qdesigner_internal::TableWidgetEditor - New Column 新しい列 - New Row 新しい行 - &Columns - - - - + 列(&C) + + &Rows - - - - + 行(&R) + + Properties &<< - - - - - + プロパティ &<< + + Properties &>> - - - - + プロパティ &>> + + Edit Table Widget テーブルウィジェットを編集 - &Items - - - - Rows - 行 - - - Move Row Down - この行を下へ - - - D - D - - - Move Row Up - この行を上へ - - - U - U - - - Table Rows - テーブルの行 - - - New - 新規 - - - Rename Row - 行の名前を変更 - - - Rename - 名前の変更 - - - Delete Row - 行を削除 - - - Delete - 削除 - - - Pixmap - ピックスマップ - - - Set Row Pixmap - この行のピックスマップを設定 - - - ... - ... - - - Reset Row Pixmap - この行のピックスマップをリセット - - - + アイテム(&I) + + Table Items テーブルのアイテム - - &Text - テキスト(&T) - - - Set Item Text - このアイテムのテキストを設定 - - - Reset Item Pixmap - このアイテムのピックスマップをリセット - - - Set Item Pixmap - このアイテムのピックスマップを設定 - - - &Pixmap - ピックスマップ(&P) - - - Columns - 列 - - - Rename Column - 列の名前を変更 - - - Delete Column - 列を削除 - - - Move Column Up - この列を上へ - - - Move Column Down - この列を下へ - - - Table Columns - テーブルの列 - - - Set Column Pixmap - この列のピックスマップを設定 - - - Reset Column Pixmap - この列のピックスマップをリセット - qdesigner_internal::TableWidgetTaskMenu - Edit Items... アイテムを編集... @@ -8405,321 +5464,185 @@ qdesigner_internal::TemplateOptionsWidget - Pick a directory to save templates in - テンプレートを保存するディレクトリを選択してください - - - + テンプレートを保存するディレクトリを選択してください + + Form - フォーム - - - + フォーム + + Additional Template Paths - 追加のテンプレートパス - - - + 追加のテンプレートパス + + ... - ... + ... qdesigner_internal::TextEditTaskMenu - Edit HTML - - - - + HTML を編集 + + Change HTML... HTML を変更... - Edit Text - - - - + テキストを編集 + + Change Plain Text... - + プレインテキストを変更... qdesigner_internal::TextEditor - Choose Resource... - - - - + リソースを選択... + + Choose File... - - - - + ファイルを選択... + + Choose a File - - - - + ファイルを選択 + + ... - ... + ... qdesigner_internal::ToolBarEventFilter - Insert Separator セパレータを挿入 - Remove action '%1' - アクション '%1' を消去 - - - + アクション '%1' を削除 + + Remove Toolbar '%1' - ツールバー '%1' を消去 - - - + ツールバー '%1' を削除 + + Insert Separator before '%1' - - - - + '%1' の前にセパレータを挿入 + + Append Separator - - - - - qdesigner_internal::ToolBarTaskMenu - - Customize... - カスタマイズ... + セパレータを追加 qdesigner_internal::TreeWidgetEditor - &Columns - - - - + 列(&C) + + Per column properties - - - - + 各列毎のプロパティ + + Common properties - - - - - + 共通するプロパティ + + New Item 新しいアイテム - Properties &<< - - - - - + プロパティ &<< + + Properties &>> - - - - New Sub Item - 新しいサブアイテム - - - + プロパティ &>> + + New Column 新しい列 - Edit Tree Widget ツリーウィジェットを編集 - &Items - - - - + アイテム(&I) + + Tree Items ツリーのアイテム - &Pixmap - ピックスマップ(&P) - - - Set Item Pixmap - このアイテムのピックスマップを設定 - - - ... - ... - - - Reset Item Pixmap - このアイテムのピックスマップをリセット - - - &Text - テキスト(&T) - - - Set Item Text - このアイテムのテキストを設定 - - - &New Item - 新しいアイテム(&N) - - - - New Subitem 新しいサブアイテム - New &Subitem 新しいサブアイテム(&S) - Delete Item アイテムを削除 - &Delete Item - アイテムを削除(&D) - - - &New - 新規(&N) - - - + 新規(&N) + + &Delete - 削除(&D) - - - + 削除(&D) + + Move Item Left (before Parent Item) このアイテムを左へ（親アイテムの前に） - L L - Move Item Right (as a First Subitem of the Next Sibling Item) このアイテムを右へ（すぐ後の兄弟アイテムの最初のサブアイテム） - R R - Move Item Up このアイテムを上へ - U U - Move Item Down このアイテムを下へ - D D - Columns - 列 - - - Pixmap - ピックスマップ - - - Set Column Pixmap - この列のピックスマップを設定 - - - Reset Column Pixmap - この列のピックスマップをリセット - - - New - 新規 - - - Rename Column - 列の名前を変更 - - - Rename - 名前の変更 - - - Delete Column - 列を削除 - - - Delete - 削除 - - - Move Column Up - この列を上へ - - - Move Column Down - この列を下へ - - - Tree Columns - ツリーの列 - - - 1 - 1 + 1 qdesigner_internal::TreeWidgetTaskMenu - Edit Items... アイテムを編集... @@ -8727,93 +5650,55 @@ qdesigner_internal::WidgetBox - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. - - - - - qdesigner_internal::WidgetBoxTreeView - - Scratchpad - スクラッチパッド - - - Custom Widgets - カスタムウィジェット - - - Expand all - すべて展開する - - - Collapse all - すべて折りたたむ - - - Remove - 消去 - - - Edit name - 名前を編集 + 警告: ウィジェットボックス内にウィジェットを作成できません。カスタムウィジェットの XML が無効です。 qdesigner_internal::WidgetBoxTreeWidget - Scratchpad - スクラッチパッド - - - + スクラッチパッド + + Custom Widgets - カスタムウィジェット - - - + カスタムウィジェット + + Expand all - すべて展開する - - - + すべて展開する + + Collapse all - すべて折りたたむ - - - + すべて折りたたむ + + List View - - - - + リスト表示 + + Icon View - - - - + アイコン表示 + + Remove - 消去 - - - + 削除 + + Edit name - 名前を編集 + 名前を編集 qdesigner_internal::WidgetDataBase - A custom widget plugin whose class name (%1) matches that of an existing class has been found. - クラス名 (%1) が既存のクラスと同じであるカスタムウィジェットプラグインが見つかりました。 + クラス名 (%1) が既存のクラスと同じであるカスタムウィジェットプラグインが見つかりました。 qdesigner_internal::WidgetEditorTool - Edit Widgets ウィジェットを編集 @@ -8821,57 +5706,56 @@ qdesigner_internal::WidgetFactory - The custom widget factory registered for widgets of class %1 returned 0. - %1 というクラスのウィジェットのために登録されたカスタムウィジェットファクトリーが 0 を返しました。 - - - + クラス %1 のウィジェット用に登録されたカスタムウィジェットファクトリーが 0 を返しました。 + + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. - %1 というクラスのウィジェットのために登録されたカスタムウィジェットファクトリーを使ってウィジェットを作成しているときに、クラス名のミスマッチが発生しました。%2 というクラスのウィジェットを返しました。 - - - + クラス %1 のウィジェット用に登録されたカスタムウィジェットファクトリーを用いてウィジェットを作成中に、クラス名のミスマッチが発生しました。%2 というクラスのウィジェットを返しました。 + + %1 Widget %1 ウィジェット - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. - - - - + コンテナ '%1' (%2) の現在のページにレイアウトが作成できません。UI ファイルに矛盾が発生しています。レイアウトがコンテナウィジェット上に作成されている可能性があります。 + + Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. - - - - + ウィジェット '%1' (%2) にレイアウトを追加できません。既に %3 型のレイアウトが存在します。 +UI ファイルに矛盾が発生しています。 + + Cannot create style '%1'. - + スタイル '%1' を作成できません。 qdesigner_internal::WizardContainerWidgetTaskMenu - Next - - - - + 進む + + Back - + 戻る qdesigner_internal::ZoomMenu - %1 % Zoom factor - + %1 % + + + + qdesigner_internal::ZoomablePreviewDeviceSkin + + &Zoom + ズーム(&Z) diff -r ef0373b55136 -r 758a864f9613 translations/designer_pl.ts --- a/translations/designer_pl.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/designer_pl.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,27 +4,22 @@ AbstractFindWidget - &Previous &Poprzednie - &Next &Następne - &Case sensitive Uwzględniaj &wielkość liter - Whole &words &Całe słowa - <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;Przeszukano od początku @@ -32,17 +27,14 @@ AddLinkDialog - Insert Link Wstaw odsyłacz - Title: Tytuł: - URL: Adres URL: @@ -50,7 +42,6 @@ AppFontDialog - Additional Fonts Dodatkowe czcionki @@ -58,37 +49,30 @@ AppFontManager - '%1' is not a file. '%1' nie jest plikiem. - The font file '%1' does not have read permissions. Plik z czcionką '%1' nie ma praw do odczytu. - The font file '%1' is already loaded. Plik z czcionką '%1' jest już wczytany. - The font file '%1' could not be loaded. Nie można wczytać pliku z czcionką %1. - '%1' is not a valid font id. '%1' nie jest poprawnym identyfikatorem czcionki. - There is no loaded font matching the id '%1'. Brak wczytanej czcionki o identyfikatorze '%1'. - The font '%1' (%2) could not be unloaded. Nie można usunąć czcionki '%1' (%2). @@ -96,52 +80,42 @@ AppFontWidget - Fonts Czcionki - Add font files Dodaj pliki z czcionkami - Remove current font file Usuń bieżący plik z czcionką - Remove all font files Usuń wszystkie pliki z czcionkami - Add Font Files Dodaj pliki z czcionkami - Font files (*.ttf) Pliki z czcionkami (*.ttf) - Error Adding Fonts Błąd podczas dodawania czcionek - Error Removing Fonts Błąd podczas usuwania czcionek - Remove Fonts Unuń czcionki - Would you like to remove all fonts? Czy chcesz usunąć wszystkie czcionki? @@ -149,12 +123,10 @@ AppearanceOptionsWidget - Form Formularz - User Interface Mode Tryb interfejsu użytkownika @@ -162,17 +134,14 @@ AssistantClient - Unable to send request: Assistant is not responding. Nie można wysłac komendy. Asystent nie odpowiada. - The binary '%1' does not exist. Plik binarny '%1' nie istnieje. - Unable to launch assistant (%1). Nie można uruchomić asystenta (%1). @@ -180,92 +149,74 @@ BrushPropertyManager - No brush Brak szczotki - Solid Jednolity - Dense 1 Gęstość 1 - Dense 2 Gęstość 2 - Dense 3 Gęstość 3 - Dense 4 Gęstość 4 - Dense 5 Gęstość 5 - Dense 6 Gęstość 6 - Dense 7 Gęstość 7 - Horizontal Poziomo - Vertical Pionowo - Cross Krzyżyk - Backward diagonal Linie pochylone w prawo - Forward diagonal Linie pochylone w lewo - Crossing diagonal Linie krzyżujące się - Style Styl - Color Kolor - [%1, %2] [%1, %2] @@ -273,360 +224,277 @@ Command - - Change signal Zmień sygnał - - Change slot Zmień slot - Change signal-slot connection Zmień połączenie sygnału ze slotem - Change sender Zmień nadawcę - Change receiver Zmień odbiorcę - Add connection Dodaj połączenie - Adjust connection Dopasuj połączenie - Delete connections Usuń połączenia - Change source Zmień źródło - Change target Zmień przeznaczenie - Insert '%1' Wstaw '%1' - Raise '%1' Przenieś na wierzch '%1' - Lower '%1' Przenieś na spód '%1' - Delete '%1' Usuń '%1' - Reparent '%1' Zmień rodzica '%1' - Promote to custom widget Zastąp widżet - Demote from custom widget Przywróć do oryginalnego widżetu - Lay out using grid Rozmieść używając siatki - Lay out vertically Rozmieść w pionie - Lay out horizontally Rozmieść w poziomie - Break layout Usuń rozmieszczenie - - - Move Page Przenieś stronę - - - - Delete Page Usuń stronę - - Page Strona - page strona - - - - Insert Page Wstaw stronę - Change Tab order Zmień kolejność tabulacji - Create Menu Bar Utwórz pasek menu - Delete Menu Bar Usuń pasek menu - Create Status Bar Utwórz pasek stanu - Delete Status Bar Usuń pasek stanu - Add Tool Bar Dodaj pasek narzędzi - Add Dock Window Dodaj okno dokowalne - Adjust Size of '%1' Dopasuj rozmiar '%1' - Change Form Layout Item Geometry Zmień geometrię elementu w formularzu - Change Layout Item Geometry Zmień geometrię elementu w rozmieszczeniu - Change Table Contents Zmień zawartość tabeli - Change Tree Contents Zmień zawartość drzewa - - Add action Dodaj akcję - - Remove action Usuń akcję - Add menu Dodaj menu - Remove menu Usuń menu - Create submenu Utwórz podmenu - Delete Tool Bar Usuń pasek narzędzi - Set action text Ustaw tekst akcji - Insert action Wstaw akcję - - Move action Przenieś akcję - Change Title Zmień tytuł - Insert Menu Wstaw menu - Change signals/slots Zmień sygnały/sloty - Delete Subwindow Usuń podokno - Insert Subwindow Wstaw podokno - subwindow podokno - Subwindow Podokno - Change Z-order of '%1' Zmień porządek głębokości (Z-order) dla '%1' - Simplify Grid Layout Uprość rozmieszczenie w siatce - Create button group Utwórz grupę przycisków - Break button group Usuń grupę przycisków - Break button group '%1' Usuń grupę przycisków '%1' - Add buttons to group Dodaj przyciski do grupy - - Add '%1' to '%2' Command description for adding buttons to a QButtonGroup Dodaj '%1' do '%2' - Remove buttons from group Usuń przyciski z grupy - Remove '%1' from '%2' Command description for removing buttons from a QButtonGroup Usuń '%1' z '%2' - Morph %1/'%2' into %3 MorphWidgetCommand description Przekształć %1/%2 w %3 - Change layout of '%1' from %2 to %3 Zmień rozmieszczenie widżetu '%1' z %2 na %3 - Change script Zmień skrypt - Changed '%1' of '%2' Zmień '%1' w '%2' - Changed '%1' of %n objects Zmieniono '%1' w %n obiekcie @@ -635,12 +503,10 @@ - Reset '%1' of '%2' Przywróć domyślną wartość '%1' w '%2' - Reset '%1' of %n objects Przywrócono domyślną wartość '%1' w '%n' obiekcie @@ -649,12 +515,10 @@ - Add dynamic property '%1' to '%2' Dodaj dynamiczną właściwość '%1' do '%2' - Add dynamic property '%1' to %n objects Dodaj dynamiczną właściwość '%1' do %n obiektu @@ -663,12 +527,10 @@ - Remove dynamic property '%1' from '%2' Usuń dynamiczną właściwość '%1' z '%2' - Remove dynamic property '%1' from %n objects Usuń dynamiczną właściwość '%1' z %n obiektu @@ -680,22 +542,18 @@ ConnectDialog - Configure Connection Skonfiguruj połączenie - GroupBox GroupBox - Edit... Edycja... - Show signals and slots inherited from QWidget Pokaż sygnały i sloty klasy QWidget @@ -703,17 +561,14 @@ ConnectionDelegate - <object> <obiekt> - <signal> <sygnał> - <slot> <slot> @@ -721,19 +576,16 @@ DPI_Chooser - Standard (96 x 96) Embedded device standard screen resolution Standardowa (96 x 96) - Greenphone (179 x 185) Embedded device screen resolution Greenphone'a (179 x 185) - High (192 x 192) Embedded device high definition screen resolution Wysoka (192 x 192) @@ -742,89 +594,72 @@ Designer - Qt Designer Qt Designer - Custom Widgets Własne widżety - Promoted Widgets Zastępcze widżety - Unable to launch %1. Nie można uruchomić %1. - %1 timed out. %1 przekroczony czas operacji. - This file cannot be read because it was created using %1. Nie można odczytać pliku ponieważ został utworzony przy użyciu %1. - This file cannot be read because the extra info extension failed to load. Nie można odczytać pliku ponieważ dodatkowe informacje nie mogły zostać załadowane. - The converted file could not be read. Nie można odczytać skonwertowanego pliku. - Invalid UI file: The root element <ui> is missing. Niepoprawny plik UI: brak głównego elementu <ui>. - An error has occurred while reading the UI file at line %1, column %2: %3 Wystąpił błąd podczas czytania zawartości pliku UI, linia %1, kolumna %2: %3 - This file was created using Designer from Qt-%1 and cannot be read. Ten plik został utworzony za pomocą Qt Designer w wersji %1 i nie można go odczytać. - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. Ten plik zawiera dystansy na najwyższym poziomie.<br><b>NIE</b> zostały one jednak zachowane w pliku. - Perhaps you forgot to create a layout? Możliwe że zapomniałeś utworzyć rozmieszczenia? - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. Ten plik został utworzony za pomocą Qt Designer w wersji %1 i będzie skonwertowany przez Qt Designer'a do nowego formularza. - The old form has not been touched, but you will have to save the form under a new name. Stary formularz nie był zmieniony, ale nowy będzie musiał być zapisany pod nową nazwą. - This file was created using Designer from Qt-%1 and could not be read: %2 Ten plik został utworzony za pomocą Qt Designer w wersji %1 i nie można go odczytać. %2 - Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. Uruchom go przez <b>uic3&nbsp;-convert</b> aby skonwertować do formatu Qt-4. @@ -832,12 +667,10 @@ DesignerMetaEnum - %1 is not a valid enumeration value of '%2'. %1 nie jest poprawną wartością typu wyliczeniowego '%2'. - '%1' could not be converted to an enumeration value of type '%2'. Nie można skonwertować '%1' do wartości typu wyliczeniowego '%2'. @@ -845,7 +678,6 @@ DesignerMetaFlags - '%1' could not be converted to a flag value of type '%2'. Nie można skonwertować '%1' do wartości typu flaga '%2'. @@ -853,13 +685,11 @@ DeviceProfile - '%1' is not a number. Reading a number for an embedded device profile '%1' nie jest liczbą. - An invalid tag <%1> was encountered. Napotkano niepoprawny tag <%1>. @@ -867,27 +697,22 @@ DeviceProfileDialog - &Family &Rodzina - &Point Size &Wielkość punktu - Style Styl - Device DPI Rozdzielczość urządzenia - Name Nazwa @@ -895,57 +720,46 @@ DeviceSkin - The image file '%1' could not be loaded. Nie można wczytać pliku z obrazkiem %1. - The skin directory '%1' does not contain a configuration file. Katalog ze skórkami (skin) '%1' nie zawiera pliku konfiguracyjnego. - The skin configuration file '%1' could not be opened. Nie można otworzyć pliku z konfiguracją skórki (skin) '%1'. - Syntax error: %1 Błąd składni: %1 - The skin cursor image file '%1' does not exist. Plik z obrazkiem kursora '%1' dla skórki (skin) nie istnieje. - Syntax error in area definition: %1 Błąd składni w definicji obszaru: %1 - Mismatch in number of areas, expected %1, got %2. Niezgodność w ilości obszarów, spodziewano się %1, otrzymano %2. - The skin configuration file '%1' could not be read: %2 Nie można odczytać pliku z konfiguracją skórki (skin) '%1', powód: %2 - The skin "up" image file '%1' does not exist. Plik z obrazkiem "do góry" '%1' dla skórki (skin) nie istnieje. - The skin "down" image file '%1' does not exist. Plik z obrazkiem "w dół" '%1' dla skórki (skin) nie istnieje. - The skin "closed" image file '%1' does not exist. Plik z obrazkiem "zamknięte" '%1' dla skórki (skin) nie istnieje. @@ -953,7 +767,6 @@ EmbeddedOptionsControl - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Styl</b></td><td>%3</td></tr><tr><td><b>Rozdzielczość</b></td><td>%4 x %5</td></tr></table></html> @@ -962,13 +775,11 @@ EmbeddedOptionsPage - Embedded Design Tab in preferences dialog Projekt dla urządzeń specjalizowanych - Device Profiles EmbeddedOptionsControl group box" Profile urządzeń @@ -977,27 +788,22 @@ FontPanel - Font Czcionka - &Writing system Sys&tem pisania - &Family &Rodzina - &Style &Styl - &Point size &Wielkość punktu @@ -1005,22 +811,18 @@ FontPropertyManager - PreferDefault Preferuj domyślny - NoAntialias Brak antyaliasingu - PreferAntialias Preferuj antyaliasing - Antialiasing Antyaliasing @@ -1028,7 +830,6 @@ FormBuilder - Invalid stretch value for '%1': '%2' Parsing layout stretch values ---------- @@ -1038,7 +839,6 @@ Niepoprawna wartość rozciągniecia dla '%1': '%2' - Invalid minimum size for '%1': '%2' Parsing grid layout minimum size values ---------- @@ -1051,28 +851,23 @@ FormEditorOptionsPage - %1 % %1 % - Preview Zoom Powiększanie podglądu - Default Zoom Domyślne powiększenie - Forms Tab in preferences dialog Formularze - Default Grid Domyślna siatka @@ -1080,37 +875,30 @@ FormLayoutRowDialog - Add Form Layout Row Dodaj wiersz do formularza - &Label text: Text &etykiety: - Field &type: &Typ pola: - &Field name: Nazwa &pola: - &Buddy: Etykieta &skojarzona: - &Row: &Wiersz: - Label &name: &Nazwa etykiety: @@ -1118,12 +906,10 @@ FormWindow - Unexpected element <%1> Niespodziewany element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Błąd podczas wklejania zawartości schowka, linia %1, kolumna %2: %3 @@ -1131,62 +917,50 @@ FormWindowSettings - Form Settings Ustawienia formularza - &Pixmap Function Funkcja ustawiania &pixmapy - &Include Hints Dodatkowe pliki &nagłówkowe - Embedded Design Projekt dla urządzeń specjalizowanych - &Author &Autor - Layout &Default &Rozmieszczenie domyślne - &Spacing: &Odstępy: - &Margin: &Marginesy: - &Layout Function Funkcja &rozmieszczania widżetów - Ma&rgin: Ma&rginesy: - Spa&cing: Od&stępy: - Grid Siatka @@ -1194,7 +968,6 @@ IconSelector - All Pixmaps ( Wszystkie pixmapy ( @@ -1202,7 +975,6 @@ ItemPropertyBrowser - XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser XX ikona wybrana wyłączona @@ -1211,33 +983,27 @@ MainWindowBase - Main Not currently used (main tool bar) Główny - File Plik - Edit Edycja - Tools Narzędzia - Form Formularz - Qt Designer Qt Designer @@ -1245,52 +1011,42 @@ NewForm - New Form Nowy formularz - &Open... &Otwórz... - C&reate &Utwórz - &Close Za&mknij - Show this Dialog on Startup Pokazuj to okno przy uruchamianiu - Recent Ostatnie - &Recent Forms Os&tatnio edytowane formularze - Read error Błąd odczytu - A temporary form file could not be created in %1. Nie można utworzyć pliku z tymczasowym formularzem w %1. - The temporary form file %1 could not be written. Nie można zapisać pliku z tymczasowym formularzem w %1. @@ -1298,22 +1054,18 @@ ObjectInspectorModel - Object Obiekt - Class Klasa - separator separator - <noname> <brak_nazwy> @@ -1321,12 +1073,10 @@ ObjectNameDialog - Change Object Name Zmień nazwę obiektu - Object Name Nazwa obiektu @@ -1334,12 +1084,10 @@ PluginDialog - Plugin Information Informacje o wtyczkach - 1 1 @@ -1347,7 +1095,6 @@ PreferencesDialog - Preferences Ustawienia @@ -1355,32 +1102,26 @@ PreviewConfigurationWidget - Form Formularz - Print/Preview Configuration Konfiguracja wydruku/podglądu - Style Styl - Style sheet Arkusz stylu - ... ... - Device skin Skórka (skin) urządzenia @@ -1388,7 +1129,6 @@ PromotionModel - Not used Usage of promoted widgets Nie używana @@ -1397,8 +1137,6 @@ Q3WizardContainer - - Page Strona @@ -1406,59 +1144,48 @@ QAbstractFormBuilder - Unexpected element <%1> Niespodziewany element <%1> - An error has occurred while reading the UI file at line %1, column %2: %3 Wystąpił błąd podczas czytania zawartości pliku ui, linia %1, kolumna %2: %3 - Invalid UI file: The root element <ui> is missing. Niepoprawny plik UI: brak głównego elementu <ui>. - The creation of a widget of the class '%1' failed. Utworzenie widżetu klasy '%1' nie powiodło się. - Attempt to add child that is not of class QWizardPage to QWizard. Próba dodania potomka który nie jest klasy QWizardPage do QWizard. - Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. Próba dodania rozmieszczenia do widżetu '%1' (%2) który posiada już niezarządzane rozmieszczenie typu %3. To wskazuje na niespójność w pliku ui. - Empty widget item in %1 '%2'. Pusty element w %1 '%2'. - Flags property are not supported yet. Właściwości typu flaga nie są jeszcze obsługiwane. - While applying tab stops: The widget '%1' could not be found. Podczas przypisywania kolejności tabulacji: widżet '%1' nie został znaleziony. - Invalid QButtonGroup reference '%1' referenced by '%2'. Niepoprawny odnośnik QButtonGroup '%1', użyty w '%2'. - This version of the uitools library is linked without script support. Ta wersja biblioteki uitools nie zawiera obsługi skryptów. @@ -1466,12 +1193,10 @@ QAxWidgetPlugin - ActiveX control Kontrolka ActiveX - ActiveX control widget Widżet z kontrolką ActiveX @@ -1479,22 +1204,18 @@ QAxWidgetTaskMenu - Set Control Ustaw kontrolkę - Reset Control Przywróć pustą zawartość kontrolce - Licensed Control Kontrolka licencjonowana - The control requires a design-time license Kontrolka wymaga licencji podczas projektowania @@ -1502,67 +1223,54 @@ QCoreApplication - %1 is not a promoted class. %1 nie jest klasą zastępczą. - The base class %1 is invalid. Klasa podstawowa %1 jest niewłaściwa. - The class %1 already exists. Klasa %1 już istnieje. - Promoted Widgets Zastępcze widżety - The class %1 cannot be removed Nie można usunąć klasy %1 - The class %1 cannot be removed because it is still referenced. Nie można usunąć klasy %1 ponieważ w dalszym ciągu są do niej odwołania. - The class %1 cannot be renamed Nie można zmienić nazwy klasy %1 - The class %1 cannot be renamed to an empty name. Nie można zmienić nazwy klasy %1 na pustą nazwę. - There is already a class named %1. Istnieje już klasa o nazwie %1. - Cannot set an empty include file. Nie można ustawić pustego pliku nagłówkowego. - Exception at line %1: %2 Wyjątek w linii %1: %2 - Unknown error Nieznany błąd - An error occurred while running the script for %1: %2 Script: %3 Wystąpił błąd podczas uruchamiana skryptu dla %1: %2 @@ -1572,17 +1280,14 @@ QDesigner - %1 - warning %1 - ostrzeżenie - Qt Designer Qt Designer - This application cannot be used for the Console edition of Qt Nie można użyć tej aplikacji w wydaniu Qt Console @@ -1590,105 +1295,82 @@ QDesignerActions - Clear &Menu Wyczyść &menu - &Quit Za&kończ - Edit Widgets Modyfikuj widżety - CTRL+R CTRL+R - &Minimize &Zminimalizuj - CTRL+M CTRL+M - Bring All to Front Wszystkie na wierzch - Additional Fonts... Dodatkowe czcionki... - Qt Designer &Help Pomo&c Qt Designer - Current Widget Help Pomoc dla bieżącego widżetu - What's New in Qt Designer? Co nowego w Qt Designer? - About Plugins Informacje o wtyczkach - - About Qt Designer Informacje o Qt Designer - About Qt Informacje o Qt - &Recent Forms Os&tatnio edytowane formularze - - Open Form Otwórz formularz - Designer Projektant - Feature not implemented yet! Cecha nie zaimplementowana! - - Save Form? Zachować formularz? - The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -1697,145 +1379,114 @@ Czy chcesz spróbować ponownie lub zmienić nazwę pliku? - Select New File Wybierz nowy plik - %1 already exists. Do you want to replace it? %1 już istnieje. Czy chcesz go zastąpić? - &Close Preview Za&mknij podgląd - Preferences... Ustawienia... - CTRL+SHIFT+S CTRL+SHIFT+S - - - Designer UI files (*.%1);;All Files (*) Pliki Designer UI (*.%1);;Wszystkie pliki (*) - Saved %1. Formularz %1 zachowany pomyślnie. - Read error Błąd odczytu - %1 Do you want to update the file location or generate a new form? %1 Czy chcesz zaktualizować położenie pliku lub wygenerować nowy formularz? - &Update &Uaktualnij - &New Form Nowy &formularz - Could not open file Nie można otworzyć pliku - Could not write file Nie można zapisać pliku - &New... &Nowy... - &Open... &Otwórz... - &Save &Zachowaj - Save &As... Zachowaj j&ako... - Save A&ll Zachowaj &wszystko - Save As &Template... Zachowaj jako &szablon... - - &Close Za&mknij - Save &Image... Zachowaj o&brazek... - &Print... &Drukuj... - View &Code... Pokaż &kod... - - Save Form As Zachowaj formularz jako - Preview failed Nie można utworzyć podglądu - Code generation failed Nie można wygenerować kodu - It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -1844,60 +1495,46 @@ Czy chcesz spróbować ponownie? - - The backup file %1 could not be written. Nie można zapisać pliku zapasowego %1. - The backup directory %1 could not be created. Nie można utworzyć katalogu %1 na pliki zapasowe. - The temporary backup directory %1 could not be created. Nie można utworzyć tymczasowego katalogu %1 na pliki zapasowe. - Image files (*.%1) Pliki z obrazkami (*.%1) - - Save Image Zachowaj obrazek - The file %1 could not be written. Nie można zapisać pliku %1. - - Assistant Assistant - Saved image %1. Zachowano obrazek %1. - Please close all forms to enable the loading of additional fonts. Zamknij wszystkie formularze aby umożliwić wczytanie dodatkowych czcionek. - Printed %1. Wydrukowano %1. - ALT+CTRL+S ALT+CTRL+S @@ -1905,7 +1542,6 @@ QDesignerAppearanceOptionsPage - Appearance Tab in preferences dialog Wygląd @@ -1914,17 +1550,14 @@ QDesignerAppearanceOptionsWidget - Docked Window Okna dokowalne - Multiple Top-Level Windows Wiele okien głównych - Toolwindow Font Czcionka okna narzędzi @@ -1932,22 +1565,18 @@ QDesignerAxWidget - Reset control Przywróć pustą zawartość kontrolce - Set control Ustaw kontrolkę - Control loaded Kontrolka wczytana - A COM exception occurred when executing a meta call of type %1, index %2 of "%3". Wystąpił wyjątek COM podczas wykonywania metody typu %1 o indeksie %2 w "%3". @@ -1955,17 +1584,14 @@ QDesignerFormBuilder - Script errors occurred: Wystąpiły błędy w skrypcie: - The preview failed to build. Nie można utworzyć podglądu. - Designer Projektant @@ -1973,22 +1599,18 @@ QDesignerFormWindow - %1 - %2[*] %1 - %2[*] - Save Form? Zachować formularz? - Do you want to save the changes to this document before closing? Czy chcesz zachować zmiany w tym dokumencie przed zamknięciem? - If you don't save, your changes will be lost. Jeśli ich nie zachowasz, zostaną utracone. @@ -1996,38 +1618,30 @@ QDesignerMenu - Type Here Wpisz tutaj - Add Separator Dodaj separator - Remove action '%1' Usuń akcję '%1' - Insert action Wstaw akcję - - Add separator Dodaj separator - Insert separator Wstaw separator - Remove separator Usuń separator @@ -2035,22 +1649,18 @@ QDesignerMenuBar - Type Here Wpisz tutaj - Remove Menu '%1' Usuń menu '%1' - Remove Menu Bar Usuń pasek menu - Menu Menu @@ -2058,37 +1668,30 @@ QDesignerPluginManager - An XML error was encountered when parsing the XML of the custom widget %1: %2 Wystąpił błąd XML podczas przetwarzania kodu XML dla własnego widżetu %1: %2 - A required attribute ('%1') is missing. Brak wymaganego atrybutu "%1". - An invalid property specification ('%1') was encountered. Supported types: %2 Wystąpiła błędna specyfikacja właściwości "%1". Obsługiwane typy: %2 - '%1' is not a valid string property specification. "%1" nie jest poprawną specyfikacją właściwości typu ciąg. - The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. Kod XML własnego widżetu %1 nie zawiera żadnego elementu <widget> ani <ui>. - The class attribute for the class %1 is missing. Atrybut "class" dla klasy %1 nie istnieje. - The class attribute for the class %1 does not match the class name %2. Atrybut "class" dla klasy %1 nie odpowiada nazwie klasy %2. @@ -2096,7 +1699,6 @@ QDesignerPropertySheet - Dynamic Properties Dynamiczne właściwości @@ -2104,31 +1706,26 @@ QDesignerResource - The layout type '%1' is not supported, defaulting to grid. Rozmieszczenie typu '%1' nie jest obsługiwane. Będzie ono zastąpione siatką. - The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. Rozszerzenie pojemnikowe widżetu "%1" (%2) zwróciło widżet który nie jest zarządzany przez Designera "%3" (%4) podczas pytania o stronę #%5. Strony pojemników powinny być dodawane jedynie poprzez wyspecyfikowanie ich w XML zwróconym przez metodę domXml() w widżecie użytkownika. - Unexpected element <%1> Parsing clipboard contents Niespodziewany element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Parsing clipboard contents Błąd podczas wklejania zawartości schowka, linia %1, kolumna %2: %3 - Error while pasting clipboard contents: The root element <ui> is missing. Parsing clipboard contents Błąd podczas wklejania zawartości schowka: Brak głównego elementu <ui>. @@ -2137,12 +1734,10 @@ QDesignerSharedSettings - The template path %1 could not be created. Nie można utworzyć ścieżki %1 dla szablonów. - An error has been encountered while parsing device profile XML: %1 Wystąpił błąd podczas przetwarzania kodu XML dla profilu urządzenia: %1 @@ -2150,32 +1745,26 @@ QDesignerToolWindow - Property Editor Edytor właściwości - Action Editor Edytor akcji - Object Inspector Hierarchia obiektów - Resource Browser Przeglądarka zasobów - Signal/Slot Editor Edytor sygnałów/slotów - Widget Box Panel widżetów @@ -2183,97 +1772,78 @@ QDesignerWorkbench - &File &Plik - F&orm &Formularz - Preview in Podgląd w stylu - &View &Widok - &Settings U&stawienia - Widget Box Panel widżetów - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? Designer nie został poprawnie zamknięty w trakcie ostatniej sesji. Istnieją pliki zapasowe, czy chcesz je otworzyć? - The file <b>%1</b> is not a valid Designer UI file. Plik <b>%1</b> nie jest poprawnym plikiem UI Designera. - &Window &Okno - &Help Pomo&c - Edit Edycja - Toolbars Paski narzędzi - Save Forms? Zachować formularze? - If you do not review your documents, all your changes will be lost. Jeśli nie przejrzysz dokumentów, wszystkie zmiany zostaną utracone. - Review Changes Przeglądnij zmiany - Discard Changes Odrzuć zmiany - Backup Information Informacja o kopiach zapasowych - The file <b>%1</b> could not be opened. Nie można otworzyć pliku <b>%1</b>. - There are %n forms with unsaved changes. Do you want to review these changes before quitting? Jest %n formularz z niezachowanymi zmianami. Czy chcesz przejrzeć zmiany przed wyjściem z programu? @@ -2285,7 +1855,6 @@ QFormBuilder - An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method ---------- @@ -2295,47 +1864,38 @@ Pusta nazwa klasy została przekazana do %1 (nazwa obiektu: '%2'). - QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder nie mógł utworzyć własnego widżetu klasy '%1'. Będzie on zastąpiony klasą bazową '%2'. - QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder nie mógł utworzyć widżetu klasy '%1'. - The layout type `%1' is not supported. Typ rozmieszczenia '%1' nie jest obsługiwany. - The set-type property %1 could not be read. Nie można odczytać właściwości %1 typu zbiór. - The enumeration-type property %1 could not be read. Nie można odczytać właściwości %1 typu wyliczeniowego. - Reading properties of the type %1 is not supported yet. Odczytywanie właściwości typu %1 nie jest jeszcze obsługiwane. - The property %1 could not be written. The type %2 is not supported yet. Nie można zapisać właściwości %1. Typ %2 nie jest jeszcze obsługiwany. - The enumeration-value '%1' is invalid. The default value '%2' will be used instead. Wartość "%1" typu wyliczeniowego jest niepoprawna. Użyta zostanie domyślna wartość "%2". - The flag-value '%1' is invalid. Zero will be used instead. Wartość "%1" flagi jest niepoprawna. Użyta zostanie wartość zerowa. @@ -2343,48 +1903,38 @@ QStackedWidgetEventFilter - Previous Page Poprzednia strona - Next Page Następna strona - Delete Usuń - Before Current Page Przed bieżącą stroną - After Current Page Za bieżącą stroną - Change Page Order... Zmień porządek stron... - Change Page Order Zmień porządek stron - Page %1 of %2 Strona %1 z %2 - - Insert Page Wstaw stronę @@ -2392,12 +1942,10 @@ QStackedWidgetPreviewEventFilter - Go to previous page of %1 '%2' (%3/%4). Przejdź do poprzedniej strony %1 '%2' (%3/%4). - Go to next page of %1 '%2' (%3/%4). Przejdź do następnej strony %1 '%2' (%3/%4). @@ -2405,28 +1953,22 @@ QTabWidgetEventFilter - Delete Usuń - Before Current Page Przed bieżącą stroną - After Current Page Za bieżącą stroną - Page %1 of %2 Strona %1 z %2 - - Insert Page Wstaw stronę @@ -2434,37 +1976,30 @@ QToolBoxHelper - Delete Page Usuń stronę - Before Current Page Przed bieżącą stroną - After Current Page Za bieżącą stroną - Change Page Order... Zmień porządek stron... - Change Page Order Zmień porządek stron - Page %1 of %2 Strona %1 z %2 - Insert Page Wstaw stronę @@ -2472,15 +2007,10 @@ QtBoolEdit - - - True Prawda - - False Fałsz @@ -2488,12 +2018,10 @@ QtBoolPropertyManager - True Prawda - False Fałsz @@ -2501,7 +2029,6 @@ QtCharEdit - Clear Char Wyczyść znak @@ -2509,7 +2036,6 @@ QtColorEditWidget - ... ... @@ -2517,22 +2043,18 @@ QtColorPropertyManager - Red Czerwień - Green Zieleń - Blue Błękit - Alpha Kanał alfa @@ -2540,97 +2062,78 @@ QtCursorDatabase - Cross Krzyż - Arrow Strzałka - Up Arrow Strzałka do góry - Wait Oczekiwanie - IBeam Kursor tekstowy - Size Vertical Rozmiar N-S - Size Horizontal Rozmiar W-E - Size Backslash Rozmiar NW-SE - Size Slash Rozmiar NE-SW - Size All Rozmiar N-E-S-W - Blank Pusty - Split Vertical Podzielony pionowo - Split Horizontal Podzielony poziomo - Pointing Hand Rączka wskazująca - Forbidden Zabroniony - Open Hand Rączka otwarta - Closed Hand Rączka zamknięta - What's This Co to jest - Busy Zajęty @@ -2638,12 +2141,10 @@ QtFontEditWidget - ... ... - Select Font Wybierz czcionkę @@ -2651,37 +2152,30 @@ QtFontPropertyManager - Bold Pogrubiony - Italic Kursywa - Underline Podkreślony - Family Rodzina - Point Size Wielkość punktu - Strikeout Przekreślony - Kerning Kerning @@ -2689,7 +2183,6 @@ QtGradientDialog - Edit Gradient Modyfikuj gradient @@ -2697,304 +2190,242 @@ QtGradientEditor - Start X Początek X - Start Y Początek Y - Final X Koniec X - Final Y Koniec Y - - Central X Środek X - - Central Y Środek Y - Focal X Ogniskowa X - Focal Y Ogniskowa Y - Radius Promień - Angle Kąt - Linear Liniowy - Radial Radialny - Conical Stożkowy - Pad Brak - Repeat Powtórzone - Reflect Odbite - Form Formularz - Gradient Editor Edytor gradientu - 1 1 - 2 2 - 3 3 - 4 4 - 5 5 - Gradient Stops Editor Edytor punktów gradientu - This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. Ten obszar pozwala na edycję punktów gradientu. Aby skopiować istniejący punkt kliknij dwukrotnie na jego uchwyt. W celu stworzenia nowego punktu kliknij dwukrotnie poza istniejącymi uchwytami punków. Przeciągnij i upuść uchwyt aby go przesunąć. Naciśnij prawy przycisk myszy aby pokazać menu z dodatkowymi akcjami. - Zoom Powiększenie - Position Pozycja - Hue Barwa - H H - Saturation Nasycenie - S S - Sat Nasycenie - Value Wartość - V V - Val Wartość - Alpha Kanał alfa - A A - Type Rodzaj - Spread Rozciąganie - Color Kolor - Current stop's color Kolor bieżącego punktu - HSV HSV - RGB RGB - Current stop's position Pozycja bieżącego punktu - % % - Zoom In Powiększ - Zoom Out Pomniejsz - Toggle details extension Przełącz rozszerzenie ze szczegółami - > > - Linear Type Typ liniowy - ... ... - Radial Type Typ radialny - Conical Type Typ stożkowy - Pad Spread Powtarzaj punkt brzegowy - Repeat Spread Powtarzaj cały zakres - Reflect Spread Powtarzaj z odbiciami - This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. Ten obszar pokazuje podgląd edytowanego gradientu. Możesz tutaj również zmieniać parametry specyficzne dla typu gradientu, takie jak: punkt początkowy i końcowy, promień, itp... poprzez przeciągnięcie i upuszczenie uchwytu. - Show HSV specification Pokaż specyfikację HSV - Show RGB specification Pokaż specyfikację RGB - Reset Zoom Normalny rozmiar @@ -3002,37 +2433,30 @@ QtGradientStopsWidget - New Stop Nowy punkt - Delete Usuń - Flip All Odwróć wszystko - Select All Zaznacz wszystko - Zoom In Powiększ - Zoom Out Pomniejsz - Reset Zoom Normalny rozmiar @@ -3040,46 +2464,34 @@ QtGradientView - Grad Grad - Remove Gradient Usuń gradient - Are you sure you want to remove the selected gradient? Czy na pewno chcesz usunąć zaznaczony gradient? - - New... Nowy... - - Edit... Modyfikuj... - - Rename Zmień nazwę - - Remove Usuń - Gradient View Widok gradientów @@ -3087,8 +2499,6 @@ QtGradientViewDialog - - Select Gradient Wybierz gradient @@ -3096,7 +2506,6 @@ QtKeySequenceEdit - Clear Shortcut Wyczyść skrót @@ -3104,17 +2513,14 @@ QtLocalePropertyManager - %1, %2 %1, %2 - Language Język - Country Kraj @@ -3122,17 +2528,14 @@ QtPointFPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3140,17 +2543,14 @@ QtPointPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3158,12 +2558,10 @@ QtPropertyBrowserUtils - [%1, %2, %3] (%4) [%1, %2, %3] (%4) - [%1, %2] [%1, %2] @@ -3171,27 +2569,22 @@ QtRectFPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Szerokość - Height Wysokość @@ -3199,27 +2592,22 @@ QtRectPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Szerokość - Height Wysokość @@ -3227,128 +2615,98 @@ QtResourceEditorDialog - %1 already exists. Do you want to replace it? %1 już istnieje. Czy chcesz go zastąpić? - The file does not appear to be a resource file; element '%1' was found where '%2' was expected. Plik nie wygląda na plik z zasobami; znaleziono element '%1' podczas gdy oczekiwano elementu '%2'. - %1 [read-only] %1 - [tylko do odczytu] - - %1 [missing] %1 - [brak pliku] - <no prefix> <brak przedrostka> - - New Resource File Nowy plik z zasobami - - Resource files (*.qrc) Pliki z zasobami (*.qrc) - Import Resource File Zaimportuj plik z zasobami - newPrefix nowyPrzedrostek - Add Files Dodaj pliki - Incorrect Path Niepoprawna ścieżka - - - - Copy Skopiuj - Copy As... Skopiuj jako... - Keep Pozostaw - Skip Opuść - Clone Prefix Sklonuj przedrostek - Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". Wprowadź przyrostek jaki ma być dodany do sklonowanych plików. To może być np. rozszerzenie określające język: "_de". - - Copy As Skopiuj jako - <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>Zaznaczony plik:</p><p>%1</p><p>jest umiejscowiony na zewnątrz katalogu z bieżącym plikiem z zasobami:</p><p>%2</p><p>Zaznacz inną ścieżkę w tym katalogu.<p> - Could not overwrite %1. Nie można nadpisać %1. - <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>Ostrzeżenie:</b> Plik</p><p>%1</p><p>jest na zewnątrz katalogu w którym jest bieżący plik z zasobami.</p> - <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>Aby rozwiązać problem, naciśnij:</p><table><tr><th align="left">Skopiuj</th><td>żeby skopiować plik do katalogu w którym jest plik z zasobami.</td></tr><tr><th align="left">Skopiuj jako...</th><td>żeby skopiować plik do poddrzewa katalogu w którym jest plik z zasobami.</td></tr><tr><th align="left">Zatrzymaj</th><td>żeby użyć jego bieżącą ścieżkę.</td></tr></table> - Could not copy %1 to @@ -3359,153 +2717,120 @@ %2 - A parse error occurred at line %1, column %2 of %3: %4 Wystąpił błąd przetwarzania w linii %1, kolumnie %2 w %3: %4 - Save Resource File Zachowaj plik z zasobami - Edit Resources Edytor zasobów - New... Nowy... - Open... Otwórz... - - Remove Usuń - - Move Up Przenieś do góry - - Move Down Przenieś w dół - - Add Prefix Dodaj przedrostek - Add Files... Dodaj pliki... - Change Prefix Zmień przedrostek - Change Language Zmień język - Change Alias Zmień alias - Clone Prefix... Sklonuj przedrostek... - Prefix / Path Przedrostek / Ścieżka - Language / Alias Język / Alias - <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>Ostrzeżenie:</b> Natrafiono na problemy podczas przeładowania zasobów:</p><pre>%1</pre></html> - Resource Warning Ostrzeżenie z systemu zasobów - Dialog Okno dialogowe - New File Nowy plik - N N - Remove File Usuń plik - R R - I I - New Resource Nowy zasób - A A - Remove Resource or File Usuń zasób lub plik - Could not write %1: %2 Nie można zapisać "%1", %2 - Open Resource File Otwórz plik z zasobami @@ -3513,24 +2838,20 @@ QtResourceView - Size: %1 x %2 %3 Rozmiar: %1 x %2 %3 - Edit Resources... Modyfikuj zasoby... - Reload Przeładuj - Copy Path Skopiuj ścieżkę @@ -3538,7 +2859,6 @@ QtResourceViewDialog - Select Resource Wybierz zasób @@ -3546,17 +2866,14 @@ QtSizeFPropertyManager - %1 x %2 %1 x %2 - Width Szerokość - Height Wysokość @@ -3564,33 +2881,26 @@ QtSizePolicyPropertyManager - - <Invalid> <Niepoprawna> - [%1, %2, %3, %4] [%1, %2, %3, %4] - Horizontal Policy Strategia pozioma - Vertical Policy Strategia pionowa - Horizontal Stretch Rozciąganie w poziomie - Vertical Stretch Rozciąganie w pionie @@ -3598,17 +2908,14 @@ QtSizePropertyManager - %1 x %2 %1 x %2 - Width Szerokość - Height Wysokość @@ -3616,107 +2923,86 @@ QtToolBarDialog - < S E P A R A T O R > < S E P A R A T O R > - Customize Toolbars Dostosuj paski narzędzi - 1 1 - Actions Akcje - Toolbars Paski narzędzi - New Nowy - Remove Usuń - Rename Zmień nazwę - Up Do góry - <- <- - -> -> - Down W dół - Current Toolbar Actions Akcje bieżącego paska narzędzi - Custom Toolbar Własne paski narzędzi - Add new toolbar Dodaj nowy pasek narzędzi - Remove selected toolbar Usuń wybrany pasek narzędzi - Rename toolbar Zmień nazwę paska narzędzi - Move action up Przenieś akcję w górę - Remove action from toolbar Usuń akcję z paska narzędzi - Add action to toolbar Dodaj akcję do paska narzędzi - Move action down Przenieś akcję w dół @@ -3724,12 +3010,10 @@ QtTreePropertyBrowser - Property Właściwość - Value Wartość @@ -3737,64 +3021,52 @@ SaveFormAsTemplate - Add path... Dodaj ścieżkę... - Template Exists Szablon istnieje - Overwrite Template Nadpisz szablon - Open Error Błąd otwarcia - There was an error opening template %1 for writing. Reason: %2 Wystąpił błąd podczas otwierania szablonu %1 do zapisu. Powód: %2 - Write Error Błąd zapisu - There was an error writing the template %1 to disk. Reason: %2 Wystąpił błąd podczas zapisywania szablonu %1 na dysk. Powód: %2 - Pick a directory to save templates in Wybierz katalog do zachowywania szablonów - &Category: &Kategoria: - &Name: &Nazwa: - A template with the name %1 already exists. Do you want overwrite the template? Szablon o nazwie %1 już istnieje. Czy chcesz nadpisać szablon? - Save Form As Template Zachowaj formularz jako szablon @@ -3802,7 +3074,6 @@ ScriptErrorDialog - An error occurred while running the scripts for "%1": Wystąpił błąd podczas uruchamiana skryptu dla "%1": @@ -3812,22 +3083,18 @@ SelectSignalDialog - Go to slot Przejdź do slotu - Select signal Wybierz sygnał - signal sygnał - class klasa @@ -3835,7 +3102,6 @@ SignalSlotConnection - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) NADAJNIK(%1), SYGNAŁ(%2), ODBIORNIK(%3), SLOT(%4) @@ -3843,32 +3109,26 @@ SignalSlotDialogClass - Signals and slots Sygnały i sloty - Slots Sloty - ... ... - Signals Sygnały - Add Dodaj - Delete Usuń @@ -3876,12 +3136,10 @@ Spacer - Horizontal Spacer '%1', %2 x %3 Poziomy dystans '%1', %2 x %3 - Vertical Spacer '%1', %2 x %3 Pionowy dystans '%1', %2 x %3 @@ -3889,7 +3147,6 @@ TemplateOptionsPage - Template Paths Tab in preferences dialog Ścieżki z szablonami @@ -3898,52 +3155,42 @@ ToolBarManager - Configure Toolbars... Skonfiguruj paski narzędzi... - Window Okno - Help Pomoc - Style Styl - Dock views Dokowalne widoki - File Plik - Edit Edycja - Tools Narzędzia - Form Formularz - Toolbars Paski narzędzi @@ -3951,22 +3198,18 @@ VersionDialog - Qt Designer Qt Designer - %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). - <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Wersja %2 - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt Designer jest aplikacją umożliwiającą projektowanie interfejsów graficznych użytkownika w aplikacjach korzystających z Qt.<br/> @@ -3974,47 +3217,38 @@ VideoPlayerTaskMenu - Available Mime Types Dostępne typy mime - Display supported mime types... Pokaż dostępne typy mime... - Load... Załaduj... - Play Odtwórz - Pause Pauza - Stop Zatrzymaj - Choose Video Player Media Source Wybierz źródło odtwarzacza wideo - An error has occurred in '%1': %2 Wystąpił błąd w "%1": %2 - Video Player Error Błąd odtwarzacza wideo @@ -4022,7 +3256,6 @@ WidgetDataBase - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Plik zawiera własny widżet '%1' którego klasa bazowa (%2) różni się od bieżącego elementu w bazie danych z widżetami (%3). Baza danych z widżetami została niezmieniona. @@ -4030,87 +3263,70 @@ qdesigner_internal::ActionEditor - Actions Akcje - New... Nowa... - Delete Usuń - New action Nowa akcja - Edit action Modyfikuj akcję - Edit... Modyfikuj... - Go to slot... Przejdź do slotu... - Copy Skopiuj - Cut Wytnij - Paste Wklej - Select all Zaznacz wszystko - Configure Action Editor Skonfiguruj edytor akcji - Icon View Widok z ikonkami - Detailed View Szczegółowy widok - Remove actions Usuń akcje - Remove action '%1' Usuń akcję '%1' - Used In Użyta w @@ -4118,32 +3334,26 @@ qdesigner_internal::ActionModel - Name Nazwa - Used Użyta - Text Tekst - Shortcut Skrót - Checkable Przełączalny - ToolTip Podpowiedź @@ -4151,27 +3361,22 @@ qdesigner_internal::BrushManagerProxy - The element '%1' is missing the required attribute '%2'. Brak wymaganego atrybutu '%2' w elemencie '%1'. - Empty brush name encountered. Wystąpiła pusta nazwa szczotki. - An unexpected element '%1' was encountered. Wystąpił niespodziewany element '%1'. - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 Wystąpił błąd podczas czytania pliku z definicją szczotki '%1' w linii %2, w kolumnie %3: %4 - An error occurred when reading the resource file '%1' at line %2, column %3: %4 Wystąpił błąd podczas czytania pliku z zasobami '%1' w linii %2, w kolumnie %3: %4 @@ -4179,17 +3384,14 @@ qdesigner_internal::BuddyEditor - Add buddy Dodaj skojarzoną etykietę - Remove buddies Usuń skojarzoną etykietę - Remove %n buddies Usuń %n skojarzoną etykietę @@ -4198,7 +3400,6 @@ - Add %n buddies Dodaj %n skojarzoną etykietę @@ -4207,7 +3408,6 @@ - Set automatically Ustaw automatycznie @@ -4215,7 +3415,6 @@ qdesigner_internal::BuddyEditorPlugin - Edit Buddies Modyfikuj skojarzone etykiety @@ -4223,7 +3422,6 @@ qdesigner_internal::BuddyEditorTool - Edit Buddies Modyfikuj skojarzone etykiety @@ -4231,12 +3429,10 @@ qdesigner_internal::ButtonGroupMenu - Select members Zaznacz składniki grupy - Break Usuń grupę @@ -4244,32 +3440,26 @@ qdesigner_internal::ButtonTaskMenu - Assign to button group Przypisz do grupy przycisków - Button group Grupa przycisków - New button group Nowej - Change text... Zmień tekst... - None Żadnej - Button group '%1' Grupa przycisków '%1' @@ -4277,57 +3467,46 @@ qdesigner_internal::CodeDialog - Save... Zachowaj... - Copy All Skopiuj wszystko - &Find in Text... Z&najdź w tekście... - A temporary form file could not be created in %1. Nie można utworzyć pliku z tymczasowym formularzem w %1. - The temporary form file %1 could not be written. Nie można zapisać pliku z tymczasowym formularzem w %1. - %1 - [Code] %1 - [Kod] - Save Code Zachowaj kod - Header Files (*.%1) Pliki nagłówkowe (*.%1) - The file %1 could not be opened: %2 Nie można otworzyć pliku "%1", %2 - The file %1 could not be written: %2 Nie można zapisać pliku "%1", %2 - %1 - Error %1 - Błąd @@ -4335,7 +3514,6 @@ qdesigner_internal::ColorAction - Text Color Color tekstu @@ -4343,12 +3521,10 @@ qdesigner_internal::ComboBoxTaskMenu - Edit Items... Modyfikuj elementy... - Change Combobox Contents Zmień zawartość combobox'a @@ -4356,7 +3532,6 @@ qdesigner_internal::CommandLinkButtonTaskMenu - Change description... Zmień opis... @@ -4364,17 +3539,14 @@ qdesigner_internal::ConnectionEdit - Select All Zaznacz wszystko - Delete Usuń - Deselect All Odznacz wszystko @@ -4382,52 +3554,42 @@ qdesigner_internal::ConnectionModel - Sender Nadajnik - Signal Sygnał - Receiver Odbiornik - Slot Slot - <sender> <nadajnik> - <signal> <sygnał> - <receiver> <odbiornik> - <slot> <slot> - Signal and Slot Editor Edytor sygnałów i slotów - The connection already exists!<br>%1 Połączenie już istnieje!<br>%1 @@ -4435,42 +3597,34 @@ qdesigner_internal::ContainerWidgetTaskMenu - Insert Page Before Current Page Wstaw stronę przed bieżącą stroną - Insert Page After Current Page Wstaw stronę za bieżącą stroną - Add Subwindow Dodaj podokno - Delete Usuń - Insert Wstaw - Subwindow Podokno - Page Strona - Page %1 of %2 Strona %1 z %2 @@ -4478,18 +3632,15 @@ qdesigner_internal::DPI_Chooser - System (%1 x %2) System resolution Systemowa (%1 x %2) - User defined Zdefiniowana przez użytkownika - x DPI X/Y separator x @@ -4498,49 +3649,38 @@ qdesigner_internal::DesignerPropertyManager - - AlignLeft Wyrównanie do lewej - AlignHCenter Wyrównanie w poziomie do środka - AlignRight Wyrównanie do prawej - AlignJustify Wyjustowanie - AlignTop Wyrównanie do góry - - AlignVCenter Wyrównanie w pionie do środka - AlignBottom Wyrównanie do dołu - %1, %2 %1, %2 - Customized (%n roles) Dostosowana (%n rola) @@ -4549,75 +3689,58 @@ - Inherited Odziedziczony - Horizontal Poziomo - Vertical Pionowo - Normal Off Normalny wyciśnięty - Normal On Normalny wciśnięty - Disabled Off Wyłączony wyciśnięty - Disabled On Wyłączony wciśnięty - Active Off Aktywny wyciśnięty - Active On Aktywny wciśnięty - Selected Off Zaznaczony wyciśnięty - Selected On Zaznaczony wciśnięty - - translatable przetłumaczalny - - disambiguation ujednoznacznienie - - comment komentarz @@ -4625,48 +3748,38 @@ qdesigner_internal::DeviceProfileDialog - Device Profiles (*.%1) Profile urządzeń (*.%1) - Default Domyślny - Save Profile Zachowaj profil - Save Profile - Error Błąd podczas zachowywania profilu - Unable to open the file '%1' for writing: %2 Nie można otworzyć pliku '%1' do zapisu: %2 - Open profile Otwórz profil - - Open Profile - Error Błąd podczas otwierania profilu - Unable to open the file '%1' for reading: %2 Nie można otworzyć pliku '%1' do odczytu: %2 - '%1' is not a valid profile: %2 '%1' nie jest poprawnym profilem: %2 @@ -4674,57 +3787,46 @@ qdesigner_internal::Dialog - Dialog Okno dialogowe - StringList Lista napisów - New String Nowy napis - &New &Nowy - Delete String Usuń napis - &Delete &Usuń - &Value: &Wartość: - Move String Up Przenieś w górę - Up Do góry - Move String Down Przenieś w dół - Down W dół @@ -4732,52 +3834,42 @@ qdesigner_internal::EmbeddedOptionsControl - None Brak - Add a profile Dodaj profil - Edit the selected profile Modyfikuj zaznaczony profil - Delete the selected profile Usuń zaznaczony profil - Add Profile Dodaj profil - New profile Nowy profil - Edit Profile Modyfikuj profil - Delete Profile Usuń profil - Would you like to delete the profile '%1'? Czy chcesz usunąć profil '%1'? - Default Domyślny @@ -4785,12 +3877,10 @@ qdesigner_internal::FilterWidget - Filter Filtr - Clear text Wyczyść tekst @@ -4798,12 +3888,10 @@ qdesigner_internal::FormEditor - Resource File Changed Zmieniony plik z zasobami - The file "%1" has changed outside Designer. Do you want to reload it? Plik "%1" zmienił się na zewnątrz Designera. Czy chcesz go ponownie załadować? @@ -4811,7 +3899,6 @@ qdesigner_internal::FormLayoutMenu - Add form layout row... Dodaj wiersz do formularza... @@ -4819,58 +3906,46 @@ qdesigner_internal::FormWindow - Edit contents Modyfikuj zawartość - F2 F2 - Resize Zmień rozmiar - Key Move Przeniesienie - Key Resize Zmiana rozmiaru - Cannot paste widgets. Designer could not find a container without a layout to paste into. Nie można wkleić widżetów. Nie można było odnaleźć pojemnika bez rozmieszczenia do którego można by wkleić widżety. - Break the layout of the container you want to paste into, select this container and then paste again. Usuń rozmieszczenie w pojemniku do którego chcesz wkleić, zaznacz ten pojemnik i ponownie wklej. - Paste error Błąd wklejania - Lay out Rozmieść - - Drop widget Upuść widżet - Paste %n action(s) Wklej %n akcję @@ -4879,12 +3954,10 @@ - Insert widget '%1' Wstaw widżet '%1 - Paste %n widget(s) Wklej %n widżet @@ -4893,27 +3966,22 @@ - Paste (%1 widgets, %2 actions) Wklej (%1 widżetów, %2 akcji) - Select Ancestor Wybierz przodka - A QMainWindow-based form does not contain a central widget. Formularz bazujący na QMainWindow nie zawiera centralnego widżetu. - Raise widgets Przenieś widżety na wierzch - Lower widgets Przenieś widżety na spód @@ -4921,12 +3989,10 @@ qdesigner_internal::FormWindowBase - Delete Usuń - Delete '%1' Usuń '%1' @@ -4934,200 +4000,159 @@ qdesigner_internal::FormWindowManager - Cu&t Wy&tnij - Cuts the selected widgets and puts them on the clipboard Wycina zaznaczone widżety i umieszcza je w schowku - &Copy S&kopiuj - Copies the selected widgets to the clipboard Kopiuje zaznaczone widżety do schowka - &Paste Wk&lej - Pastes the clipboard's contents Wkleja zawartość schowka - &Delete &Usuń - Deletes the selected widgets Usuwa zaznaczone widżety - Select &All Zaznacz &wszystko - Selects all widgets Wybiera wszystkie widżety - Bring to &Front Przenieś na w&ierzch - - Raises the selected widgets Przenosi zaznaczone widżety na wierzch - Send to &Back Przenieś na &spód - - Lowers the selected widgets Przenosi zaznaczone widżety na spód - Adjust &Size Dopasuj &wielkość - Adjusts the size of the selected widget Dopasuj wielkość zaznaczonego widżetu - Lay Out &Horizontally Rozmieść w po&ziomie - Lays out the selected widgets horizontally Rozmieszcza zaznaczone widżety w poziomie - Lay Out &Vertically Rozmieść w pio&nie - Lays out the selected widgets vertically Rozmieszcza zaznaczone widżety w pionie - Lay Out in a &Grid Rozmieść w &siatce - Lays out the selected widgets in a grid Rozmieszcza zaznaczone widżety w siatce - Lay Out Horizontally in S&plitter Rozmieść poziomo w s&plitterze - Lays out the selected widgets horizontally in a splitter Rozmieszcza zaznaczone widżety poziomo w splitterze - Lay Out Vertically in Sp&litter Rozmieść pionowo w sp&litterze - Lays out the selected widgets vertically in a splitter Rozmieszcza zaznaczone widżety pionowo w splitterze - &Break Layout &Usuń rozmieszczenie - Breaks the selected layout Usuwa zaznaczone rozmieszczenie - &Preview... Pod&gląd... - Preview current form Podgląd bierzącego formularza - Form &Settings... Us&tawienia formularza... - Break Layout Usuń rozmieszczenie - Adjust Size Dopasuj wielkość - Could not create form preview Title of warning message box Nie można utworzyć podglądu formularza - Form Settings - %1 Ustawienia formularza - %1 - Removes empty columns and rows Usuń puste kolumny i wiersze - Lay Out in a &Form Layout Rozmieść w &formularzu - Lays out the selected widgets in a form layout Rozmieszcza zaznaczone widżety w formularzu - Si&mplify Grid Layout Up&rość rozmieszczenie w siatce @@ -5135,12 +4160,10 @@ qdesigner_internal::FormWindowSettings - None Żaden - Device Profile: %1 Profil urządzenia: %1 @@ -5148,37 +4171,30 @@ qdesigner_internal::GridPanel - Visible Widoczna - Snap Przyciągaj - Reset Przywróć ustawienia - Form Formularz - Grid Siatka - Grid &X Siatka &X - Grid &Y Siatka &Y @@ -5186,7 +4202,6 @@ qdesigner_internal::GroupBoxTaskMenu - Change title... Zmień tytuł... @@ -5194,7 +4209,6 @@ qdesigner_internal::HtmlTextEdit - Insert HTML entity Wstaw jednostkę HTML @@ -5202,92 +4216,74 @@ qdesigner_internal::IconSelector - The pixmap file '%1' cannot be read. Nie można odczytać pliku z pixmapą %1. - The file '%1' does not appear to be a valid pixmap file: %2 Plik '%1' nie wygląda na poprawny plik z pixmapą: %2 - The file '%1' could not be read: %2 Nie można odczytać pliku "%1", %2 - Pixmap Read Error Błąd przy odczycie pixmapy - ... ... - Normal Off Normalny wyciśnięty - Normal On Normalny wciśnięty - Disabled Off Wyłączony wyciśnięty - Disabled On Wyłączony wciśnięty - Active Off Aktywny wyciśnięty - Active On Aktywny wciśnięty - Selected Off Zaznaczony wyciśnięty - Selected On Zaznaczony wciśnięty - Choose Resource... Wybierz zasób... - Choose File... Wybierz plik... - Reset Przywróć - Reset All Przywróć wszystkie - Choose a Pixmap Wybierz pixmapę @@ -5295,58 +4291,46 @@ qdesigner_internal::ItemListEditor - Properties &<< Własciwości &<< - - Properties &>> Własciwości &>> - Items List Lista elementów - New Item Nowy element - &New &Nowy - Delete Item Usuń element - &Delete &Usuń - Move Item Up Przenieś element do góry - U U - Move Item Down Przenieś element w dół - D D @@ -5354,12 +4338,10 @@ qdesigner_internal::LabelTaskMenu - Change rich text... Zmień tekst sformatowany... - Change plain text... Zmień zwykły tekst... @@ -5367,7 +4349,6 @@ qdesigner_internal::LanguageResourceDialog - Choose Resource Wybierz zasób @@ -5375,7 +4356,6 @@ qdesigner_internal::LineEditTaskMenu - Change text... Zmień tekst... @@ -5383,17 +4363,14 @@ qdesigner_internal::ListWidgetEditor - New Item Nowy element - Edit List Widget Modyfikuj listę - Edit Combobox Modyfikuj combobox @@ -5401,12 +4378,10 @@ qdesigner_internal::ListWidgetTaskMenu - Edit Items... Modyfikuj elementy... - Change List Contents Zmień zawartość listy @@ -5414,22 +4389,18 @@ qdesigner_internal::MdiContainerWidgetTaskMenu - Next Subwindow Następne podokno - Previous Subwindow Poprzednie podokno - Tile Obok siebie - Cascade Kaskadowo @@ -5437,7 +4408,6 @@ qdesigner_internal::MenuTaskMenu - Remove Usuń @@ -5445,7 +4415,6 @@ qdesigner_internal::MorphMenu - Morph into Przekształć w @@ -5453,42 +4422,34 @@ qdesigner_internal::NewActionDialog - New Action... Nowa akcja... - &Text: &Tekst: - &Icon: &Ikonka: - Shortcut: Skrót: - Checkable: Przełączalny: - ToolTip: Podpowiedź: - ... ... - Object &name: &Nazwa obiektu: @@ -5496,41 +4457,34 @@ qdesigner_internal::NewDynamicPropertyDialog - Set Property Name Ustaw nazwę właściwości - The current object already has a property named '%1'. Please select another, unique one. Bieżący obiekt posiada już właściwość o nazwie '%1'. Wybierz inną, unikalną nazwę. - Create Dynamic Property Utwórz dynamiczną właściwość - Property Name Nazwa właściwości - Property Type Typ właściwości - The '_q_' prefix is reserved for the Qt library. Please select another name. Przedrostek '_q_' jest zarezerwowany dla biblioteki Qt. Wybierz inną nazwę. - horizontalSpacer poziomy dystans @@ -5538,83 +4492,67 @@ qdesigner_internal::NewFormWidget - Default size Domyślny rozmiar - QVGA portrait (240x320) QVGA portret (240x320) - QVGA landscape (320x240) QVGA pejzaż (320x240) - VGA portrait (480x640) VGA portret (480x640) - VGA landscape (640x480) VGA pejzaż (640x480) - Widgets New Form Dialog Categories Widżety - Custom Widgets Własne widżety - None Żadne - Error loading form Błąd podczas ładowania formularza - Unable to open the form template file '%1': %2 Nie można otworzyć pliku '%1' z szablonem formularza: %2 - Internal error: No template selected. Błąd wewnętrzny: Nie zaznaczono szablonu. - 0 0 - Choose a template for a preview Wybierz szablon do podglądu - Embedded Design Projekt dla urządzeń specjalizowanych - Device: Urządzenie: - Screen Size: Rozmiar ekranu: @@ -5622,37 +4560,30 @@ qdesigner_internal::NewPromotedClassPanel - Add Dodaj - New Promoted Class Nowa klasa zastępcza - Base class name: Nazwa bazowej klasy: - Promoted class name: Nazwa zastępczej klasy: - Header file: Plik nagłówkowy: - Global include Nagłówek globalny - Reset Przywróć ustawienia @@ -5660,12 +4591,10 @@ qdesigner_internal::ObjectInspector - Change Current Page Zmień bieżącą stronę - &Find in Text... Z&najdź w tekście... @@ -5673,32 +4602,26 @@ qdesigner_internal::OrderDialog - Index %1 (%2) Indeks %1 (%2) - Change Page Order Zmień porządek stron - Page Order Porządek stron - Move page up Przenieś stronę do góry - Move page down Przenieś stronę w dół - %1 %2 %1 %2 @@ -5706,47 +4629,38 @@ qdesigner_internal::PaletteEditor - Edit Palette Modyfikuj paletę - Tune Palette Dopasuj paletę - Show Details Pokazuj szczegóły - Compute Details Obliczaj szczegóły - Quick Szybko - Preview Podgląd - Disabled Wyszarzony - Inactive Nieaktywny - Active Aktywny @@ -5754,7 +4668,6 @@ qdesigner_internal::PaletteEditorButton - Change Palette Zmień paletę @@ -5762,22 +4675,18 @@ qdesigner_internal::PaletteModel - Color Role Rola koloru - Active Aktywna - Inactive Nieaktywna - Disabled Wyszarzona @@ -5785,28 +4694,22 @@ qdesigner_internal::PixmapEditor - Copy Path Skopiuj ścieżkę - Paste Path Wklej ścieżkę - Choose Resource... Wybierz zasób... - Choose File... Wybierz plik... - - ... ... @@ -5814,7 +4717,6 @@ qdesigner_internal::PlainTextEditorDialog - Edit text Modyfikuj tekst @@ -5822,37 +4724,30 @@ qdesigner_internal::PluginDialog - Components Komponenty - Plugin Information Informacje o wtyczkach - Qt Designer couldn't find any plugins Qt Designer nie mógł znaleźć żadnej wtyczki - Qt Designer found the following plugins Qt Designer znalazł następujące wtyczki: - Refresh Odśwież - Scan for newly installed custom widget plugins. Szukaj nowo zainstalowanych wtyczek z widżetami. - New custom widget plugins have been found. Znaleziono nową wtyczkę z widżetami. @@ -5860,7 +4755,6 @@ qdesigner_internal::PreviewActionGroup - %1 Style Styl %1 @@ -5868,47 +4762,38 @@ qdesigner_internal::PreviewConfigurationWidget - Default Domyślny - None Żadna - Browse... Przeglądaj... - Load Custom Device Skin Załaduj dostosowaną skórkę (skin) urządzenia - All QVFB Skins (*.%1) Wszystkie skórki (skin) QVFB (*.%1) - %1 - Duplicate Skin %1 - zduplikowana skórka (skin) - The skin '%1' already exists. Skórka (skin) '%1' już istnieje. - %1 - Error %1 - Błąd - %1 is not a valid skin directory: %2 %1 nie jest poprawnym katalogiem ze skórką (skin) @@ -5918,24 +4803,20 @@ qdesigner_internal::PreviewDeviceSkin - &Portrait P&ortret - Landscape (&CCW) Rotate form preview counter-clockwise Pejzaż (&CCW) - &Landscape (CW) Rotate form preview clockwise P&ejzaż (CW) - &Close Za&mknij @@ -5943,7 +4824,6 @@ qdesigner_internal::PreviewManager - %1 - [Preview] %1 - [Podgląd] @@ -5951,7 +4831,6 @@ qdesigner_internal::PreviewMdiArea - The moose in the noose ate the goose who was loose. Palette editor background @@ -5962,57 +4841,46 @@ qdesigner_internal::PreviewWidget - Preview Window Podgląd okna - LineEdit LineEdit - ComboBox Combobox - PushButton PushButton - ButtonGroup2 ButtonGroup2 - CheckBox1 Checkbox1 - CheckBox2 CheckBox2 - ButtonGroup ButtonGroup - RadioButton1 RadioButton1 - RadioButton2 RadioButton2 - RadioButton3 RadioBUtton3 @@ -6020,22 +4888,18 @@ qdesigner_internal::PromotionModel - Name Nazwa - Header file Plik nagłówkowy - Global include Nagłówek globalny - Usage Użycie @@ -6043,27 +4907,22 @@ qdesigner_internal::PromotionTaskMenu - Promoted widgets... Zastępcze widżety... - Promote to ... Zastąp... - Promote to Zastąp - Demote to %1 Przywróć do %1 - Change signals/slots... Zmień sygnały/sloty... @@ -6071,59 +4930,48 @@ qdesigner_internal::PropertyEditor - Add Dynamic Property... Dodaj dynamiczną właściwość ... - Remove Dynamic Property Usuń dynamiczną właściwość - Sorting Sortowanie - Color Groups Kolorowanie grup - Tree View Widok drzewiasty - Drop Down Button View Widok z rozszerzalnymi przyciskami - Configure Property Editor Skonfiguruj edytor właściwości - Object: %1 Class: %2 Obiekt: %1 Klasa: %2 - String... String... - Bool... Bool... - Other... Inne... @@ -6131,7 +4979,6 @@ qdesigner_internal::PropertyLineEdit - Insert line break Wstaw znak końca linii @@ -6139,27 +4986,22 @@ qdesigner_internal::QDesignerPromotionDialog - Promoted Widgets Zastępcze widżety - Promoted Classes Zastępcze klasy - Promote Zastąp - %1 - Error %1 - Błąd - Change signals/slots... Zmień sygnały/sloty... @@ -6167,22 +5009,18 @@ qdesigner_internal::QDesignerResource - Loading qrc file ładowanie pliku qrc - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> Plik qrc <p><b>%1</b></p><p> nie został znaleziony. Czy chcesz uaktualnić ścieżkę do pliku?</p> - New location for %1 Nowe położenie dla %1 - Resource files (*.qrc) Pliki z zasobami (*.qrc) @@ -6190,57 +5028,46 @@ qdesigner_internal::QDesignerTaskMenu - Change objectName... Zmień nazwę obiektu... - Change toolTip... Zmień podpowiedź... - Change whatsThis... Zmień "co to jest"... - Create Menu Bar Utwórz pasek menu - Add Tool Bar Dodaj pasek narzędzi - Create Status Bar Utwórz pasek stanu - Change styleSheet... Zmień arkusz stylu... - Remove Status Bar Usuń pasek stanu - Change script... Zmień skrypt... - no signals available brak dostępnych sygnałów - Set size constraint on %n widget(s) Ustaw ograniczenie rozmiaru w %n obiekcie @@ -6249,57 +5076,46 @@ - Change signals/slots... Zmień sygnały/sloty... - Go to slot... Przejdź do slotu... - Size Constraints Ograniczenia rozmiaru - Set Minimum Width Ustaw minimalną szerokość - Set Minimum Height Ustaw minimalną wysokość - Set Minimum Size Ustaw minimalny rozmiar - Set Maximum Width Ustaw maksymalną szerokość - Set Maximum Height Ustaw maksymalną wysokość - Set Maximum Size Ustaw maksymalny rozmiar - Edit ToolTip Modyfikuj podpowiedź - Edit WhatsThis Modyfikuj "Co to jest" @@ -6307,42 +5123,34 @@ qdesigner_internal::QDesignerWidgetBox - - Unexpected element <%1> Niespodziewany element <%1> - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 Wystąpił błąd przetwarzania w linii %1, kolumnie %2 kodu XML określonego dla widżetu %3: %4 %5 - The XML code specified for the widget %1 does not contain any widget elements. %2 Kod XML określony dla widżetu %1 nie zawiera żadnego elementu typu widżet. %2 - An error has been encountered at line %1 of %2: %3 Wystąpił błąd w linii %1 w %2: %3 - Unexpected element <%1> encountered when parsing for <widget> or <ui> Wystąpił niespodziewany element <%1> podczas przetwarzania elementu <widget> lub <ui> - Unexpected end of file encountered when parsing widgets. Wystąpił niespodziewany koniec pliku podczas przetwarzania widżetów. - A widget element could not be found. Nie można odnależć elementu <widget>. @@ -6350,73 +5158,58 @@ qdesigner_internal::QtGradientStopsController - H H - S S - V V - - Hue Barwa - Sat Nas. - Val Wart. - Saturation Nasycenie - Value Wartość - R R - G G - B B - Red Czerwień - Green Zieleń - Blue Błękit @@ -6424,27 +5217,22 @@ qdesigner_internal::RichTextEditorDialog - Edit text Modyfikuj tekst - &Cancel &Anuluj - &OK &OK - Rich Text Rich Text - Source Źródło @@ -6452,72 +5240,58 @@ qdesigner_internal::RichTextEditorToolBar - Bold Pogrubienie - Italic Kursywa - CTRL+I CTRL+I - Underline Podkreślenie - CTRL+U CTRL+U - CTRL+B CTRL+B - Left Align Wyrównanie do lewej - Center Wyrównanie do środka - Right Align Wyrównanie do prawej - Justify Wyjustuj - Superscript Indeks górny - Subscript Indeks dolny - Insert &Link Wstaw &Odsyłacz - Insert &Image Wstaw &obrazek @@ -6525,17 +5299,14 @@ qdesigner_internal::ScriptDialog - Edit script Modyfikuj skrypt - Syntax error Błąd składni - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>Wprowadź skrypt Qt który będzie wykonany podczas ładowania formularza.<br>Widżet i jego dzieci są dostępne przez zmienne <i>widget</i> i <i>childWidgets</i>, odpowiednio. @@ -6543,7 +5314,6 @@ qdesigner_internal::ScriptErrorDialog - Script errors Błędy skryptu @@ -6551,23 +5321,18 @@ qdesigner_internal::SignalSlotDialog - There is already a slot with the signature '%1'. Slot '%1' już istnieje. - There is already a signal with the signature '%1'. Sygnał '%1' już istnieje. - %1 - Duplicate Signature %1 - zduplikowany zapis - - Signals/Slots of %1 Sygnały/sloty obiektu %1 @@ -6575,12 +5340,10 @@ qdesigner_internal::SignalSlotEditorPlugin - Edit Signals/Slots Modyfikuj sygnały/sloty - F4 F4 @@ -6588,7 +5351,6 @@ qdesigner_internal::SignalSlotEditorTool - Edit Signals/Slots Modyfikuj sygnały/sloty @@ -6596,7 +5358,6 @@ qdesigner_internal::StatusBarTaskMenu - Remove Usuń @@ -6604,7 +5365,6 @@ qdesigner_internal::StringListEditorButton - Change String List Zmień listę tekstów @@ -6612,38 +5372,30 @@ qdesigner_internal::StyleSheetEditorDialog - Edit Style Sheet Modyfikuj arkusz stylu - - Valid Style Sheet Poprawny arkusz stylu - Invalid Style Sheet Niepoprawny arkusz stylu - Add Resource... Dodaj zasób... - Add Gradient... Dodaj gradient... - Add Color... Dodaj kolor... - Add Font... Dodaj czcionkę... @@ -6651,27 +5403,22 @@ qdesigner_internal::TabOrderEditor - Start from Here Rozpocznij stąd - Restart Rozpocznij od nowa - Tab Order List... Lista kolejności tabulacji... - Tab Order List Lista kolejności tabulacji - Tab Order Kolejność tabulacji @@ -6679,7 +5426,6 @@ qdesigner_internal::TabOrderEditorPlugin - Edit Tab Order Modyfikuj kolejność tabulacji @@ -6687,7 +5433,6 @@ qdesigner_internal::TabOrderEditorTool - Edit Tab Order Modyfikuj kolejność tabulacji @@ -6695,48 +5440,38 @@ qdesigner_internal::TableWidgetEditor - Edit Table Widget Modyfikuj tablę - &Items &Elementy - New Row Nowy wiersz - &Columns &Kolumny - &Rows &Wiersze - Properties &<< Własciwości &<< - - Properties &>> Własciwości &>> - Table Items Elementy tabeli - New Column Nowa kolumna @@ -6744,7 +5479,6 @@ qdesigner_internal::TableWidgetTaskMenu - Edit Items... Modyfikuj elementy... @@ -6752,22 +5486,18 @@ qdesigner_internal::TemplateOptionsWidget - Pick a directory to save templates in Wybierz katalog do zachowywania szablonów - Form Formularz - Additional Template Paths Dodatkowe ścieżki z szablonami - ... ... @@ -6775,22 +5505,18 @@ qdesigner_internal::TextEditTaskMenu - Change HTML... Zmień HTML... - Edit HTML Modyfikuj HTML - Edit Text Modyfikuj tekst - Change Plain Text... Zmień zwykły tekst... @@ -6798,22 +5524,18 @@ qdesigner_internal::TextEditor - Choose Resource... Wybierz zasób... - Choose File... Wybierz plik... - Choose a File Wybierz plik - ... ... @@ -6821,27 +5543,22 @@ qdesigner_internal::ToolBarEventFilter - Insert Separator Wstaw separator - Remove action '%1' Usuń akcję '%1' - Remove Toolbar '%1' Usuń pasek narzędzi '%1' - Insert Separator before '%1' Wstaw separator przed '%1' - Append Separator Dodaj separator @@ -6849,125 +5566,98 @@ qdesigner_internal::TreeWidgetEditor - Edit Tree Widget Modyfikuj drzewo - &Items &Elementy - Tree Items Drzewo elementów - &Columns &Kolumny - Per column properties Właściowści dla kolumny - Common properties Wspólne właściwości - - New Item Nowy element - - New Subitem Nowy podelement - Properties &<< Własciwości &<< - - Properties &>> Własciwości &>> - New &Subitem Nowy &podelement - Delete Item Usuń element - Move Item Left (before Parent Item) Przenieś element w lewo (przed element nadrzędny) - L L - Move Item Right (as a First Subitem of the Next Sibling Item) Przenieś element w prawo (jako pierwszy podelement kolejnego elementu) - R R - Move Item Up Przenieś element do góry - U U - Move Item Down Przenieś element w dół - D D - New Column Nowa kolumna - 1 1 - &New &Nowy - &Delete &Usuń @@ -6975,7 +5665,6 @@ qdesigner_internal::TreeWidgetTaskMenu - Edit Items... Modyfikujj elementy... @@ -6983,7 +5672,6 @@ qdesigner_internal::WidgetBox - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Ostrzeżenie: Błąd tworzenia widżetu w panelu widżetów. Mogło to być spowodowane niepoprawnym kodem XML widżetu. @@ -6991,42 +5679,34 @@ qdesigner_internal::WidgetBoxTreeWidget - Scratchpad Notatnik - Custom Widgets Własne widżety - Expand all Rozwiń wszystkie - Collapse all Zwiń wszystkie - List View Widok w formie listy - Icon View Widok z ikonkami - Remove Usuń - Edit name Modyfikuj nazwę @@ -7034,7 +5714,6 @@ qdesigner_internal::WidgetDataBase - A custom widget plugin whose class name (%1) matches that of an existing class has been found. Została znaleziona wtyczka widżetu, w której nazwa klasy (%1) odpowiada istniejącej już klasie. @@ -7042,7 +5721,6 @@ qdesigner_internal::WidgetEditorTool - Edit Widgets Modyfikuj widżety @@ -7050,34 +5728,28 @@ qdesigner_internal::WidgetFactory - The custom widget factory registered for widgets of class %1 returned 0. Fabryka widżetów użytkownika zarejestrowana dla widżetów klasy %1 zwróciła 0. - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Wystąpiła niezgodność nazwy klasy podczas tworzenia widżetu przy pomocy fabryki widżetów użytkownika zarejestrowanej dla klasy %1. Zwrócony został widżet klasy %2. - %1 Widget Widżet %1 - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. Podczas tworzenia rozmieszczenia nie można było określić bieżącej strony (%2) pojemnika '%1'. Wskazuje to na niespójność pliku ui, prawdopodobnie utworzone zostało zbędne rozmieszczenie dla tego pojemnika. - Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. Próba dodania rozmieszczenia do widżetu '%1' (%2) który posiada już niezarządzane rozmieszczenie typu %3. To wskazuje na niespójność w pliku "ui". - Cannot create style '%1'. Nie można utworzyć stylu '%1'. @@ -7085,12 +5757,10 @@ qdesigner_internal::WizardContainerWidgetTaskMenu - Next Dalej - Back Wstecz @@ -7098,7 +5768,6 @@ qdesigner_internal::ZoomMenu - %1 % Zoom factor %1 % @@ -7107,7 +5776,6 @@ qdesigner_internal::ZoomablePreviewDeviceSkin - &Zoom &Powiększenie diff -r ef0373b55136 -r 758a864f9613 translations/designer_ru.ts --- a/translations/designer_ru.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/designer_ru.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,27 +4,22 @@ AbstractFindWidget - &Previous &Предыдущий - &Next &Следующий - &Case sensitive &Учитывать регистр - Whole &words Слова &целиком - <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;Поиск с начала @@ -32,17 +27,14 @@ AddLinkDialog - Insert Link Вставить ссылку - Title: Заголовок: - URL: URL: @@ -50,7 +42,6 @@ AppFontDialog - Additional Fonts Дополнительные шрифты @@ -58,37 +49,30 @@ AppFontManager - '%1' is not a file. '%1' не является файлом. - The font file '%1' does not have read permissions. Файл шрифтов '%1' не доступен для чтения. - The font file '%1' is already loaded. Файл шрифтов '%1'уже загружен. - The font file '%1' could not be loaded. Файл шрифтов '%1' не может быть загружен. - '%1' is not a valid font id. '%1' не является корректным идентификатором шрифта. - There is no loaded font matching the id '%1'. Нет загруженного шрифта, соответствующего идентификатору '%1'. - The font '%1' (%2) could not be unloaded. Шрифт '%1' (%2) не может быть выгружен. @@ -96,52 +80,42 @@ AppFontWidget - Fonts Шрифты - Add font files Добавить файлы шрифтов - Remove current font file Удалить текущий файл шрифта - Remove all font files Удалить все файлы шрифтов - Add Font Files Добавить файлы шрифтов - Font files (*.ttf) Файлы шрифтов (*.ttf) - Error Adding Fonts Ошибка добавления шрифтов - Error Removing Fonts Ошибка удаления шрифтов - Remove Fonts Удалить шрифты - Would you like to remove all fonts? Желаете удалить все шрифты? @@ -149,12 +123,10 @@ AppearanceOptionsWidget - Form Форма - User Interface Mode Режим пользовательского интерфейса @@ -162,17 +134,14 @@ AssistantClient - Unable to send request: Assistant is not responding. Невозможно отправить запрос: Qt Assistant не отвечает. - The binary '%1' does not exist. Исполняемый файл '%1' не существует. - Unable to launch assistant (%1). Невозможно запустить Qt Assistant (%1). @@ -180,92 +149,74 @@ BrushPropertyManager - No brush Пустая - Solid Сплошная - Dense 1 Плотность 1 - Dense 2 Плотность 2 - Dense 3 Плотность 3 - Dense 4 Плотность 4 - Dense 5 Плотность 5 - Dense 6 Плотность 6 - Dense 7 Плотность 7 - Horizontal Горизонтальная - Vertical Вертикальная - Cross Крестообразная - Backward diagonal Обратная диагональ - Forward diagonal Диагональ - Crossing diagonal Пересекающиеся диагонали - Style Стиль - Color Цвет - [%1, %2] [%1, %2] @@ -273,350 +224,269 @@ Command - - Change signal Сменить сигнал - - Change slot Сменить слот - Change signal-slot connection Изменить соединение сигнал-слот - Change sender Сменить отправителя - Change receiver Сменить получателя - Create button group Создать группу кнопок - Break button group Разбить группу кнопок - Break button group '%1' Разбить группу кнопок '%1' - Add buttons to group Добавить кнопки в группу - - Add '%1' to '%2' Command description for adding buttons to a QButtonGroup Добавить '%1' в '%2' - Remove buttons from group Удалить кнопки из группы - Remove '%1' from '%2' Command description for removing buttons from a QButtonGroup Удалить '%1' из '%2' - Add connection Добавить соединение - Adjust connection Настроить соединение - Delete connections Удалить соединения - Change source Сменить источник - Change target Сменить приёмника - Morph %1/'%2' into %3 MorphWidgetCommand description Преобразовать %1/'%2' в %3 - Insert '%1' Вставить '%1' - Change Z-order of '%1' Изменить порядок удалённости '%1' - Raise '%1' Поднять '%1' - Lower '%1' Опустить '%1' - Delete '%1' Удалить '%1' - Reparent '%1' Сменить владельца у '%1' - Promote to custom widget Преобразовать в пользовательский виджет - Demote from custom widget Преобразовать из пользовательского виджета - Lay out using grid Скомпоновать, используя сетку - Lay out vertically Скомпоновать по вертикали - Lay out horizontally Скомпоновать по горизонтали - Break layout Разбить компоновку - Simplify Grid Layout Упрощённая компоновка по сетке - - - Move Page Переместить страницу - - - - Delete Page Удалить страницу - - Page Страница - page страница - - - - Insert Page Вставить страницу - Change Tab order Изменить последовательность переключений - Create Menu Bar Создать панель меню - Delete Menu Bar Удалить панель меню - Create Status Bar Создать строку состояния - Delete Status Bar Удалить строку состояния - Add Tool Bar Добавить панель инструментов - Add Dock Window Добавить прикрепляемое окно - Adjust Size of '%1' Подогнать размер '%1' - Change Form Layout Item Geometry Изменить геометрию элементов компоновки столбцами - Change Layout Item Geometry Изменить геометрию элементов компоновки - Delete Subwindow Удалить дочернее окно - Insert Subwindow Вставить дочернее окно - subwindow дочернее окно - Subwindow Дочернее окно - Change Table Contents Изменить содержимое таблицы - Change Tree Contents Изменить содержимое дерева - - Add action Добавить действие - - Remove action Удалить действие - Add menu Добавить меню - Remove menu Удалить меню - Create submenu Создать дочернее меню - Delete Tool Bar Удалить панель инструментов - Change layout of '%1' from %2 to %3 Изменить компоновку '%1' с %2 на %3 - Set action text Установить текст действия - Insert action Вставить действие - - Move action Переместить действие - Change Title Изменить заголовок - Insert Menu Вставить меню - Changed '%1' of '%2' Изменено '%1' у '%2' - Changed '%1' of %n objects Изменено '%1' у %n объекта @@ -625,12 +495,10 @@ - Reset '%1' of '%2' Восстановлено '%1' у '%2' - Reset '%1' of %n objects Восстановлено '%1' у %n объекта @@ -639,12 +507,10 @@ - Add dynamic property '%1' to '%2' Добавлено динамическое свойство '%1' '%2' - Add dynamic property '%1' to %n objects Добавлено динамическое свойство '%1' %n объекту @@ -653,12 +519,10 @@ - Remove dynamic property '%1' from '%2' Удалено динамическое свойство '%1' у '%2' - Remove dynamic property '%1' from %n objects Удалено динамическое свойство '%1' у %n объекта @@ -667,12 +531,10 @@ - Change script Изменить сценарий - Change signals/slots Изменить сигналы/слоты @@ -680,22 +542,18 @@ ConnectDialog - Configure Connection Настройка соединения - GroupBox GroupBox - Edit... Изменить... - Show signals and slots inherited from QWidget Показывать сигналы и слоты, унаследованные от QWidget @@ -703,17 +561,14 @@ ConnectionDelegate - <object> <объект> - <signal> <сигнал> - <slot> <слот> @@ -721,19 +576,16 @@ DPI_Chooser - Standard (96 x 96) Embedded device standard screen resolution Стандартное (96 x 96) - Greenphone (179 x 185) Embedded device screen resolution Greenphone (179 x 185) - High (192 x 192) Embedded device high definition screen resolution Высокое (192 x 192) @@ -742,89 +594,72 @@ Designer - Qt Designer Qt Designer - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. Этот файл содержит верхнеуровневые разделители.<br>Они <b>НЕ</b> были сохранены в форме. - Perhaps you forgot to create a layout? Возможно, вы забыли создать компоновщик? - Invalid UI file: The root element <ui> is missing. Некорректный файл UI: Отсутствует корневой элемент <ui>. - An error has occurred while reading the UI file at line %1, column %2: %3 При чтении файла UI в строке %1 позиции %2 возникла ошибка: %3 - This file cannot be read because it was created using %1. Не удалось прочитать файл, так как он был создан с использованием %1. - This file was created using Designer from Qt-%1 and cannot be read. Не удалось прочитать файл, так как он был создан с использованием Designer из Qt-%1. - The converted file could not be read. Не удалось прочитать преобразованный файл. - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. Этот файл был создан с использованием Designer из Qt-%1 и будет преобразован в новый формат. - The old form has not been touched, but you will have to save the form under a new name. Старая форма была изменена, но вы можете сохранить форму под новым именем. - This file was created using Designer from Qt-%1 and could not be read: %2 Не удалось прочитать файл, так как он был создан с использованием Designer из Qt-%1: %2 - Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. Пожалуйста, пропустите его через <b>uic3&nbsp;-convert</b> для преобразования в формат ui для Qt-4. - This file cannot be read because the extra info extension failed to load. Не удалось прочитать файл, так как возникла ошибка при загрузке расширения дополнительной информации. - Custom Widgets Пользовательские виджеты - Promoted Widgets Преобразованные виджеты - Unable to launch %1. Невозможно запустить %1. - %1 timed out. %1 время ожидания истекло. @@ -832,12 +667,10 @@ DesignerMetaEnum - %1 is not a valid enumeration value of '%2'. %1 не является корректным перечислением типа '%2'. - '%1' could not be converted to an enumeration value of type '%2'. Не удалось преобразовать '%1' к значению перечисления '%2'. @@ -845,7 +678,6 @@ DesignerMetaFlags - '%1' could not be converted to a flag value of type '%2'. Не удалось преобразовать '%1' к флаговому значению типа '%2'. @@ -853,13 +685,11 @@ DeviceProfile - '%1' is not a number. Reading a number for an embedded device profile '%1' не является числом. - An invalid tag <%1> was encountered. Обнаружен некоррекнтый тэг <%1>. @@ -867,27 +697,22 @@ DeviceProfileDialog - &Family &Шрифт - &Point Size &Размер - Style Начертание - Device DPI DPI устройства - Name Название @@ -895,57 +720,46 @@ DeviceSkin - The image file '%1' could not be loaded. Не удалось загрузить файл изображения '%1'. - The skin directory '%1' does not contain a configuration file. Каталог '%1' не содержит файла настроек обложки. - The skin configuration file '%1' could not be opened. Не удалось открыть файл настроек обложки '%1'. - The skin configuration file '%1' could not be read: %2 Не удалось прочитать файл настроек обложки '%1': %2 - Syntax error: %1 Синтаксическая ошибка: %1 - The skin "up" image file '%1' does not exist. Отсутствует файл изображения "up" обложки '%1'. - The skin "down" image file '%1' does not exist. Отсутствует файл изображения "down" обложки '%1'. - The skin "closed" image file '%1' does not exist. Отсутствует файл изображения обложки "closed" '%1'. - The skin cursor image file '%1' does not exist. Отсутствует файл изображения курсора обложки '%1'. - Syntax error in area definition: %1 Синтаксическая ошибка в определении области: %1 - Mismatch in number of areas, expected %1, got %2. Несоответствие количества областей: ожидалось %1, найдено %2. @@ -953,7 +767,6 @@ EmbeddedOptionsControl - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Шрифт</b></td><td>%1, %2</td></tr><tr><td><b>Стиль</b></td><td>%3</td></tr><tr><td><b>Разрешение</b></td><td>%4 x %5</td></tr></table></html> @@ -962,13 +775,11 @@ EmbeddedOptionsPage - Embedded Design Tab in preferences dialog Оформление портативных устройств - Device Profiles EmbeddedOptionsControl group box" Профили устройств @@ -977,27 +788,22 @@ FontPanel - Font Шрифт - &Writing system Система &письма - &Family &Шрифт - &Style &Начертание - &Point size &Размер @@ -1005,22 +811,18 @@ FontPropertyManager - PreferDefault По умолчанию - NoAntialias Без сглаживания - PreferAntialias Сглаживание, если возможно - Antialiasing Сглаживание @@ -1028,43 +830,44 @@ FormBuilder - Invalid stretch value for '%1': '%2' - Parsing layout stretch values + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values Некорректный коэффициент растяжения для '%1': '%2' - Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values Некорректный минимальный размер для '%1': '%2' FormEditorOptionsPage - %1 % %1 % - Preview Zoom Масштаб предпросмотра - Default Zoom Масштаб по умолчанию - Forms Tab in preferences dialog Формы - Default Grid Сетка по умолчанию @@ -1072,37 +875,30 @@ FormLayoutRowDialog - Add Form Layout Row Добавление строки компоновщика формы - &Label text: Текст &метки: - Field &type: &Тип поля: - &Field name: Имя п&оля: - &Buddy: П&артнёр: - &Row: &Строка: - Label &name: Имя м&етки: @@ -1110,12 +906,10 @@ FormWindow - Unexpected element <%1> Неожиданный элемент <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Ошибка вставки содержимого из буфера обмена в строке %1, позиции %2: %3 @@ -1123,62 +917,50 @@ FormWindowSettings - Form Settings Настройки формы - Layout &Default Компоновка по &умолчанию - &Spacing: &Отступ: - &Margin: &Границы: - &Layout Function &Функция компоновки - Ma&rgin: Г&раницы: - Spa&cing: О&тступ: - &Author &Автор - &Include Hints &Подключить подсказки - &Pixmap Function &Загрузчик изображений - Grid Сетка - Embedded Design Оформление портативных устройств @@ -1186,7 +968,6 @@ IconSelector - All Pixmaps ( Растровые изображения ( @@ -1194,7 +975,6 @@ ItemPropertyBrowser - XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser XX Пикт Выделена откл @@ -1203,33 +983,27 @@ MainWindowBase - Main Not currently used (main tool bar) Главное - File Файл - Edit Правка - Tools Инструменты - Form Форма - Qt Designer Qt Designer @@ -1237,52 +1011,42 @@ NewForm - C&reate &Создать - Recent Последние - &Close &Закрыть - &Open... &Открыть... - &Recent Forms &Последние формы - Read error Ошибка чтения - New Form Новая форма - Show this Dialog on Startup Показывать диалог при старте - A temporary form file could not be created in %1. Временный файл формы не может быть создан в %1. - The temporary form file %1 could not be written. Временный файл формы %1 не может быть записан. @@ -1290,22 +1054,18 @@ ObjectInspectorModel - Object Объект - Class Класс - separator разделитель - <noname> <без имени> @@ -1313,12 +1073,10 @@ ObjectNameDialog - Change Object Name Изменить имя объекта - Object Name Имя объекта @@ -1326,12 +1084,10 @@ PluginDialog - Plugin Information Информация о модуле - 1 1 @@ -1339,7 +1095,6 @@ PreferencesDialog - Preferences Настройки @@ -1347,32 +1102,26 @@ PreviewConfigurationWidget - Form Форма - Print/Preview Configuration Настройка печати/предпросмотра - Style Стиль - Style sheet Таблица стилей - ... ... - Device skin Обложка устройства @@ -1380,7 +1129,6 @@ PromotionModel - Not used Usage of promoted widgets Не используется @@ -1389,8 +1137,6 @@ Q3WizardContainer - - Page Страница @@ -1398,59 +1144,48 @@ QAbstractFormBuilder - Unexpected element <%1> Неожиданный элемент <%1> - An error has occurred while reading the UI file at line %1, column %2: %3 Возникла ошибка при чтении файла UI в строке %1 позиции %2: %3 - Invalid UI file: The root element <ui> is missing. Некорректный файл UI: отсутствует корневой элемент <ui>. - The creation of a widget of the class '%1' failed. Не удалось создание виджета класса '%1'. - Attempt to add child that is not of class QWizardPage to QWizard. Попытка добавить в QWizard дочерний виджет, который не является классом QWizardPage. - Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. Попытка добавить компоновщик виджету '%1' (%2), у которого уже имеется компоновщик типа %3. Это указывает на некорректность файла UI. - Empty widget item in %1 '%2'. Пустой элемент виджета в %1 '%2'. - Flags property are not supported yet. Флаговые свойства еще не поддерживаются. - While applying tab stops: The widget '%1' could not be found. При применении позиций табуляции: не удалось найти виджет '%1'. - Invalid QButtonGroup reference '%1' referenced by '%2'. '%2' содержит некорректную ссылку на QButtonGroup '%1'. - This version of the uitools library is linked without script support. Данная версия библиотеки uitools собрана без поддержки сценариев. @@ -1458,12 +1193,10 @@ QAxWidgetPlugin - ActiveX control Элемент управления ActiveX - ActiveX control widget Виджет элемента управления ActiveX @@ -1471,22 +1204,18 @@ QAxWidgetTaskMenu - Set Control Установить элемент управления - Reset Control Удалить элемент управления - Licensed Control Лицензионный элемент управления - The control requires a design-time license Компонент требует лицензию периода разработки @@ -1494,68 +1223,55 @@ QCoreApplication - %1 is not a promoted class. %1 не является преобразованным классом. - The base class %1 is invalid. Неверный базовый класс %1. - The class %1 already exists. Класс %1 уже существует. - Promoted Widgets Преобразованные виджеты - The class %1 cannot be removed Нельзя удалить класс %1 - The class %1 cannot be removed because it is still referenced. Нельзя удалить класс %1, так как на него ещё есть ссылки. - The class %1 cannot be renamed Нельзя переименовать класс %1 - The class %1 cannot be renamed to an empty name. Нельзя дать классу %1 пустое имя. - There is already a class named %1. Уже есть класс с именем %1. - Cannot set an empty include file. перевод близко к тексту - буквальный совсем глаз режет Пустое имя у подключаемого файла не допустимо. - Exception at line %1: %2 Исключение в строке %1: %2 - Unknown error Неизвестная ошибка - An error occurred while running the script for %1: %2 Script: %3 При выполнении сценария %1 возникла ошибка: %2 @@ -1565,17 +1281,14 @@ QDesigner - %1 - warning %1 - предупреждение - Qt Designer Qt Designer - This application cannot be used for the Console edition of Qt Это приложение не может быть использовано для консольной версии Qt @@ -1583,248 +1296,194 @@ QDesignerActions - Saved %1. Сохранено %1. - Edit Widgets Изменение виджетов - &Quit &Выход - &Minimize &Свернуть - Bring All to Front Перенести все назад - Preferences... Настройки... - Clear &Menu Очистить &меню - CTRL+SHIFT+S - CTRL+R - CTRL+M - Qt Designer &Help &Справка по Qt Designer - Current Widget Help Справка по виджету - What's New in Qt Designer? Что нового в Qt Designer? - About Plugins О модулях - - About Qt Designer О Qt Designer - About Qt О Qt - - Open Form Открыть форму - - - Designer UI files (*.%1);;All Files (*) UI файлы Qt Designer (*.%1);;Все файлы (*) - %1 already exists. Do you want to replace it? %1 уже существует. Хотите заменить его? - Additional Fonts... Дополнительные шрифты... - &Recent Forms &Последние формы - Designer Qt Designer - Feature not implemented yet! Возможность ещё не реализована! - Read error Ошиька чтения - %1 Do you want to update the file location or generate a new form? %1 Вы хотите обновить расположение файла или генерировать новую форму? - &Update &Обновить - &New Form &Новая форма - - Save Form? Сохранить форму? - Could not open file Невозможно открыть файл - Select New File Выбрать новый файл - Could not write file Невозможно записать файл - &Close Preview &Закрыть предпросмотр - &New... &Новый... - &Open... &Открыть... - &Save &Сохранить - Save &As... Сохранить &как... - Save A&ll Сохранить &все - Save As &Template... Сохранить как &шаблон... - - &Close &Закрыть - Save &Image... Сохранить &Изображение... - &Print... &Печать... - View &Code... Показать &код... - ALT+CTRL+S - - Save Form As Сохранить форму как - Preview failed Ошибка предпросмотра - Code generation failed Ошибка генерации кода - The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -1833,7 +1492,6 @@ Вы хотите повторить или выбрать другой файл? - It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -1842,55 +1500,42 @@ Желаете повторить? - - Assistant Qt Assistant - - The backup file %1 could not be written. Не удалось записать файл резервной копии %1. - The backup directory %1 could not be created. Не удалось создать каталог резервных копий %1. - The temporary backup directory %1 could not be created. Не удалось создать временный каталог резервных копий %1. - Image files (*.%1) Файлы изображений (*.%1) - - Save Image Сохранить изображение - Saved image %1. Сохранить изображение %1. - The file %1 could not be written. Файл %1 не может быть записан. - Please close all forms to enable the loading of additional fonts. Пожалуйста закройте все формы, чтобы разрешить загрузку дополнительных шрифтов. - Printed %1. Распечатано %1. @@ -1898,7 +1543,6 @@ QDesignerAppearanceOptionsPage - Appearance Tab in preferences dialog Оформление @@ -1907,17 +1551,14 @@ QDesignerAppearanceOptionsWidget - Docked Window Всё в одном окне верхнего уровня - Multiple Top-Level Windows Множество окон верхнего уровня - Toolwindow Font Шрифт окна инструментов @@ -1925,22 +1566,18 @@ QDesignerAxWidget - Reset control Сбросить элемент управления - Set control Установить элемент управления - Control loaded Элемент управления загружен - A COM exception occurred when executing a meta call of type %1, index %2 of "%3". Возникло исключение COM при выполнении мета-вызова типа %1, индекс %2 "%3". @@ -1948,17 +1585,14 @@ QDesignerFormBuilder - Script errors occurred: Возникла ошибка сценария: - The preview failed to build. Не удалось создать предпросмотр. - Designer Qt Designer @@ -1966,22 +1600,18 @@ QDesignerFormWindow - %1 - %2[*] %1 - %2[*] - Save Form? Сохранить форму? - Do you want to save the changes to this document before closing? Документ был изменен, хотите сохранить изменения? - If you don't save, your changes will be lost. Если вы не сохраните, ваши изменения будут потеряны. @@ -1989,38 +1619,30 @@ QDesignerMenu - Type Here Пишите здесь - Add Separator Добавить разделитель - Insert separator Вставить разделитель - Remove separator Удалить разделитель - Remove action '%1' Удалить действие '%1' - - Add separator Добавить разделитель - Insert action Вставить действие @@ -2028,22 +1650,18 @@ QDesignerMenuBar - Type Here Пишите здесь - Remove Menu '%1' Удалить меню '%1' - Remove Menu Bar Удалить панель меню - Menu Меню @@ -2051,37 +1669,30 @@ QDesignerPluginManager - An XML error was encountered when parsing the XML of the custom widget %1: %2 Обнаружена ошибка XML при разборе XML пользовательского виджета %1: %2 - A required attribute ('%1') is missing. Отсутствует необходимый атрибут ('%1'). - An invalid property specification ('%1') was encountered. Supported types: %2 Обнаружена неверная спецификация ('%1') свойства. Поддерживаются типы: %2 - '%1' is not a valid string property specification. '%1' не является корректной спецификацией строкового свойства. - The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. XML пользовательского виджета %1 не содержит элементов <widget> и <ui>. - The class attribute for the class %1 is missing. Отсутствует атрибут для класса %1. - The class attribute for the class %1 does not match the class name %2. Атрибут для класса %1 не совпадает с именем класса %2. @@ -2089,7 +1700,6 @@ QDesignerPropertySheet - Dynamic Properties Динамические свойства @@ -2097,31 +1707,26 @@ QDesignerResource - The layout type '%1' is not supported, defaulting to grid. Компоновка типа '%1' не поддерживается, заменена на компоновку сеткой. - The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. Контейнерное расширение виджета '%1' (%2) возвратило виджет, который не управляется Qt Designer '%3' (%4), при запросе страницы №%5. Страницы контейнера должны быть добавлены указанием их в XML, который возвращается методом domXml() пользовательского виджета. - Unexpected element <%1> Parsing clipboard contents Неожиданный элемент <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Parsing clipboard contents Ошибка вставки содержимого буфера обмена в строку %1, позицию %2: %3 - Error while pasting clipboard contents: The root element <ui> is missing. Parsing clipboard contents Ошибка вставки содержимого буфера обмена: отсутствует корневой элемент <ui>. @@ -2130,12 +1735,10 @@ QDesignerSharedSettings - The template path %1 could not be created. Не удалось создать временный путь %1. - An error has been encountered while parsing device profile XML: %1 Обнаружена ошибка при разборе XML профиля устройства: %1 @@ -2143,32 +1746,26 @@ QDesignerToolWindow - Property Editor Редактор свойств - Action Editor Редактор действий - Object Inspector Инспектор объектов - Resource Browser Обозреватель ресурсов - Signal/Slot Editor Редактор Сигналов/Слотов - Widget Box Панель виджетов @@ -2176,47 +1773,38 @@ QDesignerWorkbench - &File &Файл - F&orm Ф&орма - Preview in Предпросмотр в - &Window &Окно - &Help &Справка - Edit Правка - Toolbars Панель инструментов - Save Forms? Сохранить форму? - There are %n forms with unsaved changes. Do you want to review these changes before quitting? Имеется %n форма с несохранёнными изменениями. Желаете просмотреть изменения перед выходом? @@ -2225,52 +1813,42 @@ - &View &Вид - &Settings &Настройки - Widget Box Панель виджетов - If you do not review your documents, all your changes will be lost. Если не просматривать изменения, все изменения будут потеряны. - Discard Changes Отменить изменения - Review Changes Показать изменения - Backup Information Информация о резервированых копиях - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? Последняя сессия Qt Designer не была завершена корректно. Остались резервные копии файлов. Желаете загрузить их? - The file <b>%1</b> could not be opened. Не удалось открыть файл <b>%1</b>. - The file <b>%1</b> is not a valid Designer UI file. Файл <b>%1</b> не является корректным UI файлом Qt Designer. @@ -2278,53 +1856,47 @@ QFormBuilder - An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method Методу %1 (объекта '%2') было передано пустое имя класса. - QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder не смог создать пользовательский виджет класса '%1'; был создан базовый класс '%2'. - QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder не смог создать пользовательский виджет класса '%1'. - The layout type `%1' is not supported. Компоновка типа '%1' не поддерживается. - The set-type property %1 could not be read. Не удалось прочитать свойство %1 множественного типа. - The enumeration-type property %1 could not be read. Не удалось прочитать свойство %1 перечисляемого типа. - Reading properties of the type %1 is not supported yet. Чтение свойств типа %1 ещё не поддерживается. - The property %1 could not be written. The type %2 is not supported yet. Не удалось записать свойство %1. Тип %2 ещё не поддерживается. - The enumeration-value '%1' is invalid. The default value '%2' will be used instead. Значение '%1' перечисляемого типа некорректно. Будет использовано значение по умолчанию '%2'. - The flag-value '%1' is invalid. Zero will be used instead. Значение флага '%1' перечисляемого типа некорректно. Будет использовано значение '0' (нуль). @@ -2332,48 +1904,38 @@ QStackedWidgetEventFilter - Previous Page Предыдущая страница - Next Page Следующая страница - Delete Удалить - Before Current Page Перед текущей страницей - After Current Page После текущей страницы - Change Page Order... Изменить порядок страниц... - Change Page Order Изменить порядок страниц - Page %1 of %2 Страница %1 из %2 - - Insert Page Вставить страницу @@ -2381,12 +1943,10 @@ QStackedWidgetPreviewEventFilter - Go to previous page of %1 '%2' (%3/%4). Перейти к предыдущей странице из %1 '%2' (%3/%4). - Go to next page of %1 '%2' (%3/%4). Перейти к следующей странице из %1 '%2' (%3/%4). @@ -2394,28 +1954,22 @@ QTabWidgetEventFilter - Delete Удалить - Before Current Page Перед текущей страницей - After Current Page После текущей страницы - Page %1 of %2 Страница %1 из %2 - - Insert Page Вставить страницу @@ -2423,37 +1977,30 @@ QToolBoxHelper - Delete Page Удалить страницу - Before Current Page Перед текущей страницей - After Current Page После текущей страницы - Change Page Order... Изменить порядок страниц... - Change Page Order Изменить порядок страниц - Page %1 of %2 Страница %1 из %2 - Insert Page Вставить страницу @@ -2461,15 +2008,10 @@ QtBoolEdit - - - True Вкл. - - False Выкл. @@ -2477,12 +2019,10 @@ QtBoolPropertyManager - True Вкл. - False Выкл. @@ -2490,7 +2030,6 @@ QtCharEdit - Clear Char Стереть символ @@ -2498,7 +2037,6 @@ QtColorEditWidget - ... ... @@ -2506,22 +2044,18 @@ QtColorPropertyManager - Red Красный - Green Зелёный - Blue Синий - Alpha Альфа @@ -2529,97 +2063,78 @@ QtCursorDatabase - Arrow Arrow - Up Arrow Up Arrow - Cross Cross - Wait Wait - IBeam IBeam - Size Vertical Size Vertical - Size Horizontal Size Horizontal - Size Backslash Size Backslash - Size Slash Size Slash - Size All Size All - Blank Blank - Split Vertical Split Vertical - Split Horizontal Split Horizontal - Pointing Hand Pointing Hand - Forbidden Forbidden - Open Hand Open Hand - Closed Hand Closed Hand - What's This What's This - Busy Busy @@ -2627,12 +2142,10 @@ QtFontEditWidget - ... ... - Select Font Выбрать шрифт @@ -2640,37 +2153,30 @@ QtFontPropertyManager - Family Шрифт - Point Size Размер - Bold Жирный - Italic Курсив - Underline Подчёркнутый - Strikeout Зачёркнутый - Kerning Интервал @@ -2678,7 +2184,6 @@ QtGradientDialog - Edit Gradient Правка градиента @@ -2686,304 +2191,242 @@ QtGradientEditor - Start X X начала - Start Y Y начала - Final X X конца - Final Y Y конца - - Central X X центра - - Central Y Y центра - Focal X X фокуса - Focal Y Y фокуса - Radius Радиус - Angle Угол - Linear Линейный - Radial Радиальный - Conical Конический - Pad Равномерная - Repeat Цикличная - Reflect Зеркальная - Form Форма - Gradient Editor Редактор градиента - This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. Эта область отображает предварительный вариант настраиваемого градиента. Также она позволяет менять с помощью перетаскивания характерные для градиента параметры, такие как: начальная и конечная точки, радиус и пр. - 1 1 - 2 2 - 3 3 - 4 4 - 5 5 - Gradient Stops Editor Редактор опорных точек градиента - This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. Эта область позволяет редактировать опорные точки градиента. Двойной щелчок на существующей точке создаст её копию. Двойной клик вне существующей точки создаст новую. Точки можно перемещать путем удерживания левой кнопки. По правой кнопке можно получить контекстное меню дополнительных действий. - Zoom Масштаб - Reset Zoom 100% - Position Положение - Hue Оттенок - H H - Saturation Насыщенность - S S - Sat Насыщение - Value Значение - V V - Val Значение - Alpha Альфа - A A - Type Тип - Spread Заливка - Color Цвет - Current stop's color Цвет текущей точки - Show HSV specification Настройки в виде HSV - HSV HSV - Show RGB specification Настройки в виде RGB - RGB RGB - Current stop's position Положение текущей точки - % % - Zoom In Увеличить - Zoom Out Уменьшить - Toggle details extension Показать/скрыть детальные настройки - > > - Linear Type Линейный тип - ... ... - Radial Type Радиальный тип - Conical Type Конический тип - Pad Spread Равномерная заливка - Repeat Spread Цикличная заливка - Reflect Spread Зеркальная заливка @@ -2991,37 +2434,30 @@ QtGradientStopsWidget - New Stop Новая точка - Delete Удалить - Flip All Отобразить зеркально - Select All Выделить всё - Zoom In Увеличить - Zoom Out Уменьшить - Reset Zoom Сбросить масштаб @@ -3029,46 +2465,34 @@ QtGradientView - Grad Градиент - Remove Gradient Удалить градиент - Are you sure you want to remove the selected gradient? Вы действительно желаете удалить выбранный градиент? - - New... Новый... - - Edit... Правка... - - Rename Переименовать - - Remove Удалить - Gradient View Просмотр градиента @@ -3076,8 +2500,6 @@ QtGradientViewDialog - - Select Gradient Выбрать градиент @@ -3085,7 +2507,6 @@ QtKeySequenceEdit - Clear Shortcut Удалить комбинацию горячих клавиш @@ -3093,17 +2514,14 @@ QtLocalePropertyManager - %1, %2 %1, %2 - Language Язык - Country Страна @@ -3111,17 +2529,14 @@ QtPointFPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3129,17 +2544,14 @@ QtPointPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3147,12 +2559,10 @@ QtPropertyBrowserUtils - [%1, %2, %3] (%4) [%1, %2, %3] (%4) - [%1, %2] [%1, %2] @@ -3160,27 +2570,22 @@ QtRectFPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Ширина - Height Высота @@ -3188,27 +2593,22 @@ QtRectPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Ширина - Height Высота @@ -3216,128 +2616,98 @@ QtResourceEditorDialog - %1 already exists. Do you want to replace it? %1 уже существует. Хотите заменить его? - The file does not appear to be a resource file; element '%1' was found where '%2' was expected. Похоже, файл не является файлом ресурсов, так как вместо элемента '%2' стоит '%1'. - %1 [read-only] %1 [только для чтения] - - %1 [missing] %1 [отсутствует] - <no prefix> <без префикса> - - New Resource File Новый файл ресурсов - - Resource files (*.qrc) Файл ресурсов (*.qrc) - Import Resource File Импортировать файл ресурсов - newPrefix newPrefix - <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>Предупреждение:</b> Файл</p><p>%1</p><p>находится за пределами каталога текущего файла ресурсов.</p> - <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>Для решения нажмите:</p><table><tr><th align="left">Копировать</th><td>, чтобы скопировать в каталог файла ресурсов.</td></tr><tr><th align="left">Копировать как...</th><td>, чтобы скопировать в подкаталог каталога файла ресурсов.</td></tr><tr><th align="left">Оставить</th><td>, чтобы использовать текущее размещение.</td></tr></table> - Add Files Добавить файлы - Incorrect Path Неверный путь - - - - Copy Копировать - Copy As... Копировать как... - Keep Оставить - Skip Пропустить - Clone Prefix Приставка при клонировании - Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". Введите окончание, которое нужно добавлять к именам клонируемых файлов. Это может быть, например, языковое расширение, вроде "_ru". - - Copy As Копировать как - <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>Выбранный файл:</p><p>%1</p><p>находится вне каталога текущего файла ресурсов:</p><p>%2</p><p>Пожалуйста, выберите путь внутри этого каталога.<p> - Could not overwrite %1. Не удалось перезаписать %1. - Could not copy %1 to @@ -3348,153 +2718,120 @@ %2 - A parse error occurred at line %1, column %2 of %3: %4 Возникла ошибка разбора в строке %1 позиции %2 из %3: %4 - Save Resource File Сохранение файла ресурсов - Could not write %1: %2 Не удалось записать %1: %2 - Edit Resources Правка ресурсов - New... Новый... - Open... Открыть... - Open Resource File Открыть файл ресурсов - - Remove Удалить - - Move Up Поднять - - Move Down Опустить - - Add Prefix Добавить приставку - Add Files... Добавить файлы... - Change Prefix Сменить приставку - Change Language Сменить язык - Change Alias Сменить псевдоним - Clone Prefix... Приставка при клонировании... - Prefix / Path Приставка / Путь - Language / Alias Язык / Псевдоним - <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>Предупреждение:</b> Возникли проблемы при перезагрузке ресурсов:</p><pre>%1</pre></html> - Resource Warning Предупреждение - Dialog Диалог - New File Новый файл - N N - Remove File Удалить файл - R R - I I - New Resource Новый ресурс - A A - Remove Resource or File Удалить ресурс или файл @@ -3502,24 +2839,20 @@ QtResourceView - Size: %1 x %2 %3 Размер: %1 x %2 %3 - Edit Resources... Изменить ресурсы... - Reload Перезагрузить - Copy Path Скопировать путь @@ -3527,7 +2860,6 @@ QtResourceViewDialog - Select Resource Выбрать ресурс @@ -3535,17 +2867,14 @@ QtSizeFPropertyManager - %1 x %2 %1 x %2 - Width Ширина - Height Высота @@ -3553,33 +2882,26 @@ QtSizePolicyPropertyManager - - <Invalid> <Неверный> - [%1, %2, %3, %4] [%1, %2, %3, %4] - Horizontal Policy Горизонтальная политика - Vertical Policy Вертикальная политика - Horizontal Stretch Горизонтальное растяжение - Vertical Stretch Вертикальное растяжение @@ -3587,17 +2909,14 @@ QtSizePropertyManager - %1 x %2 %1 x %2 - Width Ширина - Height Высота @@ -3605,107 +2924,86 @@ QtToolBarDialog - Custom Toolbar Пользовательская панель инструментов - < S E P A R A T O R > < Р А З Д Е Л И Т Е Л Ь > - Customize Toolbars Настройка панелей инструментов - 1 1 - Actions Действия - Toolbars Панель инструментов - Add new toolbar Добавить новую панель инструментов - New Новая - Remove selected toolbar Удалить выбранную панель инструментов - Remove Удалить - Rename toolbar Переименовать панель инструментов - Rename Переименовать - Move action up Переместить действие вверх - Up Вверх - Remove action from toolbar Удалить действие из панели инструментов - <- <- - Add action to toolbar Добавить действие на панель инструментов - -> -> - Move action down Переместить действие вниз - Down Вниз - Current Toolbar Actions Текущие действия панели инструментов @@ -3713,12 +3011,10 @@ QtTreePropertyBrowser - Property Свойство - Value Значение @@ -3726,64 +3022,52 @@ SaveFormAsTemplate - Add path... Добавить путь... - Template Exists Шаблон существует - A template with the name %1 already exists. Do you want overwrite the template? Шаблон с именем %1 уже существует. Желаете заменить шаблон? - Overwrite Template Заменить шаблон - Open Error Ошибка открытия - There was an error opening template %1 for writing. Reason: %2 Возникла ошибка открытия шаблона %1 для записи. Причина: %2 - Write Error Ошибка записи - There was an error writing the template %1 to disk. Reason: %2 Возникла ошибка записи шаблона %1 на диск. Причина: %2 - Pick a directory to save templates in Выберите каталог для сохранения шаблонов - Save Form As Template Сохранить форму как шаблон - &Category: &Категория: - &Name: &Имя: @@ -3791,7 +3075,6 @@ ScriptErrorDialog - An error occurred while running the scripts for "%1": При выполнения сценариев для "%1" возникла ошибка: @@ -3801,22 +3084,18 @@ SelectSignalDialog - Go to slot Переход к слоту - Select signal Выбор сигнала - signal сигнал - class класс @@ -3824,7 +3103,6 @@ SignalSlotConnection - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) ОТПРАВИТЕЛЬ(%1), СИГНАЛ(%2), ПОЛУЧАТЕЛЬ(%3), СЛОТ(%4) @@ -3832,32 +3110,26 @@ SignalSlotDialogClass - Signals and slots Сигналы и слоты - Slots Слоты - Add Добавить - ... ... - Delete Удалить - Signals Сигналы @@ -3865,12 +3137,10 @@ Spacer - Horizontal Spacer '%1', %2 x %3 Горизонтальный разделитель '%1', %2 x %3 - Vertical Spacer '%1', %2 x %3 Вертикальный разделитель '%1', %2 x %3 @@ -3878,7 +3148,6 @@ TemplateOptionsPage - Template Paths Tab in preferences dialog Слово "пути" опустил, т.к. с другими вкладками не перепутать, а длинная вкладка не смотрится. @@ -3888,52 +3157,42 @@ ToolBarManager - Configure Toolbars... Настройка панелей инструментов... - Window Окно - Help Справка - Style Стиль - Dock views Прикрепляемые панели - File Файл - Edit Правка - Tools Инструменты - Form Форма - Toolbars Панели инструментов @@ -3941,30 +3200,64 @@ VersionDialog - <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Версия %2 - Qt Designer Qt Designer - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt Designer - дизайнер графического интерфейса пользователя для Qt-приложений.<br/> - %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). %1<br/>Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения. + VideoPlayerTaskMenu + + Available Mime Types + Доступные типы данных + + + Display supported mime types... + Показывать поддерживаемые типы данных... + + + Load... + Загрузить... + + + Play + Воспроизвести + + + Pause + Пауза + + + Stop + Остановить + + + Choose Video Player Media Source + Выберите источник медиа-данных + + + An error has occurred in '%1': %2 + В "%1" произошла ошибка: %2 + + + Video Player Error + Ошибка видеоплеера + + + WidgetDataBase - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Файл содержит пользовательский виджет '%1', базовый класс (%2) которого отличается от текущей записи в базе виджетов (%3). База виджетов оставлена без изменений. @@ -3972,87 +3265,70 @@ qdesigner_internal::ActionEditor - New... Новое... - Edit... Правка... - Go to slot... Перейти к слоту... - Copy Копировать - Cut Вырезать - Paste Вставить - Select all Выделить всё - Delete Удалить - Actions Действия - Configure Action Editor Настроить редактор действий - Icon View Значки - Detailed View Подробно - New action Новое действие - Edit action Правка действия - Remove action '%1' Удалить действие '%1' - Remove actions Удаление дествий - Used In Используется в @@ -4060,32 +3336,26 @@ qdesigner_internal::ActionModel - Name Имя - Used Используется - Text Текст - Shortcut Горячая клавиша - Checkable Триггерное - ToolTip Подсказка @@ -4093,27 +3363,22 @@ qdesigner_internal::BrushManagerProxy - The element '%1' is missing the required attribute '%2'. У элемента '%1' отсутствует необходимый атрибут '%2'. - Empty brush name encountered. Обнаружено пустое название кисти. - An unexpected element '%1' was encountered. Обнаружен неожиданный элемент '%1'. - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 При чтении файла описания кистей '%1' возникла ошибка разбора строки %2 в позиции %3: %4 - An error occurred when reading the resource file '%1' at line %2, column %3: %4 При чтении файла ресурсов '%1' возникла ошибка разбора строки %2 в позиции %3: %4 @@ -4121,17 +3386,14 @@ qdesigner_internal::BuddyEditor - Add buddy Добавить партнёра - Remove buddies Удалить партнёров - Remove %n buddies Удалить %n партнёра @@ -4140,7 +3402,6 @@ - Add %n buddies Добавить %n партнёра @@ -4149,7 +3410,6 @@ - Set automatically Установить автоматически @@ -4157,7 +3417,6 @@ qdesigner_internal::BuddyEditorPlugin - Edit Buddies Изменение партнёров @@ -4165,7 +3424,6 @@ qdesigner_internal::BuddyEditorTool - Edit Buddies Изменение партнёров @@ -4173,12 +3431,10 @@ qdesigner_internal::ButtonGroupMenu - Select members Выбрать элементы - Break Разделить @@ -4186,32 +3442,26 @@ qdesigner_internal::ButtonTaskMenu - Assign to button group Назначить группу кнопок - Button group Группа кнопок - New button group Новая группа кнопок - Change text... Изменить текст... - None Нет - Button group '%1' Группа кнопок '%1' @@ -4219,57 +3469,46 @@ qdesigner_internal::CodeDialog - Save... Сохранить... - Copy All Копировать всё - &Find in Text... &Найти в тексте... - A temporary form file could not be created in %1. Не удалось создать временный файл формы в %1. - The temporary form file %1 could not be written. Не удалось записать временный файл формы %1. - %1 - [Code] %1 - [код] - Save Code Сохранить код - Header Files (*.%1) Заголовочные файлы (*.%1) - The file %1 could not be opened: %2 Не удалось открыть файл %1: %2 - The file %1 could not be written: %2 Не удалось записать файл %1: %2 - %1 - Error %1 - Ошибка @@ -4277,7 +3516,6 @@ qdesigner_internal::ColorAction - Text Color Цвет текста @@ -4285,12 +3523,10 @@ qdesigner_internal::ComboBoxTaskMenu - Edit Items... Изменить элементы... - Change Combobox Contents Изменено содержимое Combobox @@ -4298,7 +3534,6 @@ qdesigner_internal::CommandLinkButtonTaskMenu - Change description... Изменить описание... @@ -4306,17 +3541,14 @@ qdesigner_internal::ConnectionEdit - Select All Выделить всё - Deselect All Снять выделение - Delete Удалить @@ -4324,52 +3556,42 @@ qdesigner_internal::ConnectionModel - Sender Отправитель - Signal Сигнал - Receiver Получатель - Slot Слот - <sender> <отправитель> - <signal> <сигнал> - <receiver> <получатель> - <slot> <слот> - The connection already exists!<br>%1 Подключение уже существует!<br>%1 - Signal and Slot Editor Радактор сигналов и слотов @@ -4377,42 +3599,34 @@ qdesigner_internal::ContainerWidgetTaskMenu - Delete Удалить - Insert Вставить - Insert Page Before Current Page Вставить страницу перед текущей - Insert Page After Current Page Вставить страницу после текущей - Add Subwindow Добавить дочернее окно - Subwindow Дочернее окно - Page Страница - Page %1 of %2 Страница %1 из %2 @@ -4420,18 +3634,15 @@ qdesigner_internal::DPI_Chooser - System (%1 x %2) System resolution Системное (%1 x %2) - User defined Пользовательское - x DPI X/Y separator x @@ -4440,49 +3651,38 @@ qdesigner_internal::DesignerPropertyManager - - AlignLeft - AlignHCenter - AlignRight - AlignJustify - AlignTop - - AlignVCenter - AlignBottom - %1, %2 %1, %2 - Customized (%n roles) Настроено (%n роль) @@ -4491,75 +3691,58 @@ - Inherited Унаследованная - Horizontal Горизонтальное - Vertical Вертикальное - Normal Off Нормальный, выкл - Normal On Нормальный, вкл - Disabled Off Выключенный, выкл - Disabled On Выключенный, вкл - Active Off Активный, выкл - Active On Активный, вкл - Selected Off Выбранный, выкл - Selected On Выбранный, вкл - - translatable переводимый - - disambiguation уточнение - - comment примечание @@ -4567,48 +3750,38 @@ qdesigner_internal::DeviceProfileDialog - Device Profiles (*.%1) Профили устройства (*.%1) - Default По умолчанию - Save Profile Сохранение профиля - Save Profile - Error Ошибка сохранения профиля - Unable to open the file '%1' for writing: %2 Не удалось открыть файл '%1' для записи: %2 - Open profile Открытие профиля - - Open Profile - Error Ошибка отрытия профиля - Unable to open the file '%1' for reading: %2 Не удалось открыть файл '%1' для чтения: %2 - '%1' is not a valid profile: %2 '%1' не является корректным профилем: %2 @@ -4616,57 +3789,46 @@ qdesigner_internal::Dialog - Dialog Диалог - StringList Список строк - New String Новая строка - &New &Новая - Delete String Удалить строку - &Delete &Удалить - &Value: &Значение: - Move String Up Переместить строку вверх - Up Вверх - Move String Down Переместить строку вниз - Down Вниз @@ -4674,52 +3836,42 @@ qdesigner_internal::EmbeddedOptionsControl - None Нет - Add a profile Добавить профиль - Edit the selected profile Изменить выбранный профиль - Delete the selected profile Удалить выбранный профиль - Add Profile Добавление профиля - New profile Новый профиль - Edit Profile Изменение профиля - Delete Profile Удаление профиля - Would you like to delete the profile '%1'? Желаете удалить профиль '%1'? - Default По умолчанию @@ -4727,12 +3879,10 @@ qdesigner_internal::FilterWidget - Filter Фильтр - Clear text Очистить текст @@ -4740,12 +3890,10 @@ qdesigner_internal::FormEditor - Resource File Changed Файл ресурсов был изменён - The file "%1" has changed outside Designer. Do you want to reload it? Файл "%1" был изменён вне Qt Designer. Желаете перезагрузить его? @@ -4753,7 +3901,6 @@ qdesigner_internal::FormLayoutMenu - Add form layout row... Добавить строку компоновщика формы... @@ -4761,37 +3908,30 @@ qdesigner_internal::FormWindow - Edit contents Изменить содержимое - F2 - Insert widget '%1' Вставить виджет '%1' - Resize Изменение размера - Key Move Перемещение клавишей - Key Resize Изменение размера клавишей - Paste %n action(s) Вставлено %n действие @@ -4800,7 +3940,6 @@ - Paste %n widget(s) Вставлен %n виджет @@ -4809,53 +3948,42 @@ - Paste (%1 widgets, %2 actions) Вставлено (%1 виджетов, %2 действий) - Cannot paste widgets. Designer could not find a container without a layout to paste into. Не удалось вставить виджеты. Qt Designer не смог найти контейнер без компоновщика для вставки виджетов. - Break the layout of the container you want to paste into, select this container and then paste again. Удалите компоновщик из контейнера, в который желаете вставить виджеты, выберите его и повторите вставку. - Paste error Ошибка вставки - Raise widgets Поднятие виджетов - Lower widgets Опускание виджетов - Select Ancestor Выбрать предка - Lay out Компоновка - - Drop widget Вставка виджета - A QMainWindow-based form does not contain a central widget. Форма, основанная на QMainWindow, не содержит центрального виджета. @@ -4863,12 +3991,10 @@ qdesigner_internal::FormWindowBase - Delete '%1' Удалить '%1' - Delete Удалить @@ -4876,200 +4002,159 @@ qdesigner_internal::FormWindowManager - Cu&t &Вырезать - Cuts the selected widgets and puts them on the clipboard Вырезает выбранные виджеты и помещает их в буфер обмена - &Copy &Копировать - Copies the selected widgets to the clipboard Копирует выбранные виджеты в буфер обмена - &Paste В&ставить - Pastes the clipboard's contents Вставляет содержимое буфера обмена - &Delete &Удалить - Deletes the selected widgets Удаляет выбранные виджеты - Select &All &Выделить все - Selects all widgets Выделяет все виджеты - Bring to &Front Переместить &вперед - - Raises the selected widgets Поднимает выбранные виджеты на передний план - Send to &Back Переместить &назад - - Lowers the selected widgets Опускает выбранные виджеты на задний план - Adjust &Size Подогнать &размер - Adjusts the size of the selected widget Подгоняет размер выбранного виджета - Lay Out &Horizontally Скомпоновать по &горизонтали - Lays out the selected widgets horizontally Компонует выделенные виджеты по горизонтали (QHBoxLayout) - Lay Out &Vertically Скомпоновать по &вертикали - Lays out the selected widgets vertically Компонует выделенные виджеты по вертикали (QVBoxLayout) - Lay Out in a &Form Layout Скомпоновать в &две колонки - Lays out the selected widgets in a form layout Компонует выделенные виджеты в две колонки (QFormLayout) - Lay Out in a &Grid Скомпоновать по &сетке - Lays out the selected widgets in a grid Компонует выделенные виджеты по сетке (QGridLayout) - Lay Out Horizontally in S&plitter Скомпоновать по г&оризонтали с разделителем - Lays out the selected widgets horizontally in a splitter Компонует выделенные виджеты по горизонтали (QSplitter) - Lay Out Vertically in Sp&litter Скомпоновать по в&ертикали с разделителем - Lays out the selected widgets vertically in a splitter Компонует выделенные виджеты по вертикали (QSplitter) - &Break Layout &Удалить компоновщик - Breaks the selected layout Удаляет выбранный компоновщик - Si&mplify Grid Layout Упрост&ить компоновку по сетке - Removes empty columns and rows Удаляет пустые колонки и строки в QGridLayout - &Preview... &Предпросмотр... - Preview current form Предпросмотр формы - Form &Settings... &Настройки формы... - Break Layout Удалить компоновщик - Adjust Size Подогнать размер - Could not create form preview Title of warning message box Не удалось создать предпросмотр формы - Form Settings - %1 Настройки формы - %1 @@ -5077,12 +4162,10 @@ qdesigner_internal::FormWindowSettings - None Нет - Device Profile: %1 Профиль устройства: %1 @@ -5090,37 +4173,30 @@ qdesigner_internal::GridPanel - Form Форма - Grid Сетка - Visible Видимая - Grid &X Сетка &X - Snap Прилипать - Reset Сбросить - Grid &Y Сетка &Y @@ -5128,7 +4204,6 @@ qdesigner_internal::GroupBoxTaskMenu - Change title... Изменить заголовок... @@ -5136,7 +4211,6 @@ qdesigner_internal::HtmlTextEdit - Insert HTML entity Вставить элемент HTML @@ -5144,92 +4218,74 @@ qdesigner_internal::IconSelector - The pixmap file '%1' cannot be read. Невозможно прочитать файл растрового изображения '%1'. - The file '%1' does not appear to be a valid pixmap file: %2 Файл '%1' не похож на корректный файл растрового изображения: %2 - The file '%1' could not be read: %2 Не удалось прочитать файл %1: %2 - Choose a Pixmap Выбор растрового изображения - Pixmap Read Error Ошибка чтения растрового изображения - ... ... - Normal Off Нормальный, выкл - Normal On Нормальный, вкл - Disabled Off Выключенный, выкл - Disabled On Выключенный, вкл - Active Off Активный, выкл - Active On Активный, вкл - Selected Off Выбранный, выкл - Selected On Выбранный, вкл - Choose Resource... Выбрать ресурс... - Choose File... Выбрать файл... - Reset Сбросить - Reset All Сбросить всё @@ -5237,58 +4293,46 @@ qdesigner_internal::ItemListEditor - Properties &<< Свойства &<< - - Properties &>> Свойства &>> - Items List Список элементов - New Item Новый элемент - &New &Новый - Delete Item Удалить элемент - &Delete &Удалить - Move Item Up Переместить элемент вверх - U U - Move Item Down Переместить элемент вниз - D D @@ -5296,12 +4340,10 @@ qdesigner_internal::LabelTaskMenu - Change rich text... Изменить форматированный текст... - Change plain text... Изменить обычный текст... @@ -5309,7 +4351,6 @@ qdesigner_internal::LanguageResourceDialog - Choose Resource Выбор ресурса @@ -5317,7 +4358,6 @@ qdesigner_internal::LineEditTaskMenu - Change text... Изменить текст... @@ -5325,17 +4365,14 @@ qdesigner_internal::ListWidgetEditor - New Item Новый элемент - Edit List Widget Изменение виджета List - Edit Combobox Изменение виджета ComboBox @@ -5343,12 +4380,10 @@ qdesigner_internal::ListWidgetTaskMenu - Edit Items... Изменить элементы... - Change List Contents Изменение содержимого списка @@ -5356,22 +4391,18 @@ qdesigner_internal::MdiContainerWidgetTaskMenu - Next Subwindow Следующее дочернее докно - Previous Subwindow Предыдущее дочернее докно - Tile Замостить - Cascade Каскадом @@ -5379,7 +4410,6 @@ qdesigner_internal::MenuTaskMenu - Remove Удалить @@ -5387,7 +4417,6 @@ qdesigner_internal::MorphMenu - Morph into Преобразовать в @@ -5395,42 +4424,34 @@ qdesigner_internal::NewActionDialog - New Action... Новое действие... - &Text: &Текст: - Object &name: &Имя объекта: - &Icon: &Значок: - Shortcut: Горячая клавиша: - Checkable: Триггерное: - ToolTip: Подсказка: - ... ... @@ -5438,41 +4459,34 @@ qdesigner_internal::NewDynamicPropertyDialog - Set Property Name Установка имени свойства - The current object already has a property named '%1'. Please select another, unique one. Объект уже содержит свойство с именем '%1'. Укажите другое имя. - The '_q_' prefix is reserved for the Qt library. Please select another name. Приставка '_q_' зарезервирована для целей библиотеки Qt. Укажите другое имя. - Create Dynamic Property Создание динамического свойства - Property Name Имя свойства - horizontalSpacer - Property Type Тип свойства @@ -5480,83 +4494,67 @@ qdesigner_internal::NewFormWidget - Default size Размер по умолчанию - QVGA portrait (240x320) QVGA книжная (240x320) - QVGA landscape (320x240) QVGA альбомная (320x240) - VGA portrait (480x640) VGA книжная (480x640) - VGA landscape (640x480) VGA альбомная (640x480) - Widgets New Form Dialog Categories Виджеты - Custom Widgets Пользовательские виджеты - None Нет - Error loading form Ошибка загрузки формы - Unable to open the form template file '%1': %2 Невозможно открыть файл шаблона формы '%1': %2 - Internal error: No template selected. Внутренняя ошибка: Шаблон не выбран. - 0 0 - Choose a template for a preview Выберите шаблон для предпросмотра - Embedded Design Оформление портативных устройств - Device: Устройство: - Screen Size: Размер экрана: @@ -5564,37 +4562,30 @@ qdesigner_internal::NewPromotedClassPanel - Add Добавить - New Promoted Class Новый преобразованный класс - Base class name: Имя базового класса: - Promoted class name: Имя преобразованного класса: - Header file: Заголовочный файл: - Global include Глобальное включение - Reset Восстановить @@ -5602,12 +4593,10 @@ qdesigner_internal::ObjectInspector - &Find in Text... &Найти в тексте... - Change Current Page Смена текущей страницы @@ -5615,32 +4604,26 @@ qdesigner_internal::OrderDialog - Index %1 (%2) Индекс %1 (%2) - %1 %2 %1 %2 - Change Page Order Изменение порядка страниц - Page Order Порядок страниц - Move page up Переместить страницу выше - Move page down Переместить страницу ниже @@ -5648,47 +4631,38 @@ qdesigner_internal::PaletteEditor - Edit Palette Правка палитры - Tune Palette Настройка палитры - Show Details Показывать детали - Compute Details Расчитывать детали - Quick Быстрый - Preview Предпросмотр - Disabled Выключенная - Inactive Неактивная - Active Активная @@ -5696,7 +4670,6 @@ qdesigner_internal::PaletteEditorButton - Change Palette Изменить палитру @@ -5704,22 +4677,18 @@ qdesigner_internal::PaletteModel - Color Role Роль цвета - Active Активный - Inactive Неактивный - Disabled Выключенный @@ -5727,28 +4696,22 @@ qdesigner_internal::PixmapEditor - Choose Resource... Выбрать ресурс... - Choose File... Выбрать файл... - Copy Path Скопировать путь - Paste Path Вставить путь - - ... ... @@ -5756,7 +4719,6 @@ qdesigner_internal::PlainTextEditorDialog - Edit text Правка текста @@ -5764,37 +4726,30 @@ qdesigner_internal::PluginDialog - Components Компоненты - Plugin Information Информация о модуле - Refresh Обновить - Scan for newly installed custom widget plugins. Поиск вновь установленных модулей пользовательских виджетов. - Qt Designer couldn't find any plugins Qt Designer не может найти ни одного модуля - Qt Designer found the following plugins Qt Designer нашёл следующие модули - New custom widget plugins have been found. Найдены новые модули пользовательских виджетов. @@ -5802,7 +4757,6 @@ qdesigner_internal::PreviewActionGroup - %1 Style Стиль %1 @@ -5810,47 +4764,38 @@ qdesigner_internal::PreviewConfigurationWidget - Default По умолчанию - None Нет - Browse... Обзор... - Load Custom Device Skin Загрузить особую обложку устройства - All QVFB Skins (*.%1) Все обложки QVFB (*.%1) - %1 - Duplicate Skin %1 - Повторяющаяся обложка - The skin '%1' already exists. Обложка '%1' уже существует. - %1 - Error %1 - Ошибка - %1 is not a valid skin directory: %2 %1 не является корректным каталогом обложек: @@ -5860,24 +4805,20 @@ qdesigner_internal::PreviewDeviceSkin - &Portrait &Книжная - Landscape (&CCW) Rotate form preview counter-clockwise Альбомная (&против ЧС) - &Landscape (CW) Rotate form preview clockwise &Альбомная (по ЧС) - &Close &Закрыть @@ -5885,7 +4826,6 @@ qdesigner_internal::PreviewManager - %1 - [Preview] %1 - [Предпросмотр] @@ -5893,7 +4833,6 @@ qdesigner_internal::PreviewMdiArea - The moose in the noose ate the goose who was loose. Palette editor background @@ -5903,57 +4842,46 @@ qdesigner_internal::PreviewWidget - Preview Window Окно предпросмотра - LineEdit LineEdit - ComboBox ComboBox - PushButton PushButton - ButtonGroup2 ButtonGroup2 - CheckBox1 CheckBox1 - CheckBox2 CheckBox2 - ButtonGroup ButtonGroup - RadioButton1 RadioButton1 - RadioButton2 RadioButton2 - RadioButton3 RadioButton3 @@ -5961,22 +4889,18 @@ qdesigner_internal::PromotionModel - Name Имя - Header file Заголовочный файл - Global include Глобальное включение - Usage Использование @@ -5984,27 +4908,22 @@ qdesigner_internal::PromotionTaskMenu - Promoted widgets... Преобразованные виджеты... - Promote to ... Преобразовать в ... - Change signals/slots... Изменить сигналы/слоты... - Promote to Преобразовать в - Demote to %1 Преобразовать в %1 @@ -6012,57 +4931,46 @@ qdesigner_internal::PropertyEditor - Add Dynamic Property... Добавить динамическое свойство... - Remove Dynamic Property Удалить динамическое свойство - Sorting Сортировка - Color Groups Цветовые группы - Tree View Древовидный список - Drop Down Button View Вид выпадающего списка - String... Строка... - Bool... Булево... - Other... Другое... - Configure Property Editor Настроить радактор свойств - Object: %1 Class: %2 Объект: %1 @@ -6072,7 +4980,6 @@ qdesigner_internal::PropertyLineEdit - Insert line break Вставить разрыв строки @@ -6080,27 +4987,22 @@ qdesigner_internal::QDesignerPromotionDialog - Promoted Widgets Преобразованные виджеты - Promoted Classes Преобразованные классы - Promote Преобразовать - Change signals/slots... Изменить сигналы/слоты... - %1 - Error %1 - Ошибка @@ -6108,22 +5010,18 @@ qdesigner_internal::QDesignerResource - Loading qrc file Загрузка файла qrc - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> Не удалось найти указанный файл qrc <p><b>%1</b></p><p>Желаете обновить его расположение?</p> - New location for %1 Новое расположение %1 - Resource files (*.qrc) Файл ресурсов (*.qrc) @@ -6131,112 +5029,90 @@ qdesigner_internal::QDesignerTaskMenu - Change objectName... Изменить objectName... - Change toolTip... Изменить toolTip... - Change whatsThis... Изменить whatsThis... - Change styleSheet... Изменить styleSheet... - Create Menu Bar Создать панель меню - Add Tool Bar Добавить панель инструментов - Create Status Bar Создать строку состояния - Remove Status Bar Удалить строку состояния - Change script... Изменить сценарий... - Change signals/slots... Изменить сигналы/слоты... - Go to slot... Перейти к слоту... - Size Constraints Ограничения размера - Set Minimum Width Установить минимальную ширину - Set Minimum Height Установить минимальную высоту - Set Minimum Size Установить минимальный размер - Set Maximum Width Установить максимальную ширину - Set Maximum Height Установить максимальную высоту - Set Maximum Size Установить максимальный размер - Edit ToolTip Правка текста всплывающей подсказки - Edit WhatsThis Правка текста подсказки режима "Что это?" - no signals available Нет доступных сигналов - Set size constraint on %n widget(s) Установка ограничений размера для %n виджета @@ -6248,42 +5124,34 @@ qdesigner_internal::QDesignerWidgetBox - - Unexpected element <%1> Неожиданный элемент <%1> - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 Возникла ошибка разбора в строке %1 позиции %2 кода XML, определённого для виджета %3: %4 %5 - The XML code specified for the widget %1 does not contain any widget elements. %2 Код XML, определённый для виджета %1, не содержит каких-либо элементов виджетов. %2 - An error has been encountered at line %1 of %2: %3 Обнаружена ошибка в строке %1 из %2: %3 - Unexpected element <%1> encountered when parsing for <widget> or <ui> Обнаружен неожиданный элемент <%1> вместо <widget> или <ui> - Unexpected end of file encountered when parsing widgets. Файл неожиданно закончился при разборе виджетов. - A widget element could not be found. Не удалось обнаружить элемент виджета. @@ -6291,73 +5159,58 @@ qdesigner_internal::QtGradientStopsController - H H - S S - V V - - Hue Оттенок - Sat Насыщ - Val Знач - Saturation Насыщенность - Value Значение - R R - G G - B B - Red Красный - Green Зелёный - Blue Синий @@ -6365,27 +5218,22 @@ qdesigner_internal::RichTextEditorDialog - Edit text Правка текста - Rich Text Форматированный текст - Source Исходник - &OK &ОК - &Cancel От&мена @@ -6393,72 +5241,58 @@ qdesigner_internal::RichTextEditorToolBar - Bold Жирный - CTRL+B - Italic Курсив - CTRL+I - Underline Подчёркнутый - CTRL+U - Left Align По левому краю - Center По центру - Right Align По правому краю - Justify По ширине - Superscript Верхний индекс - Subscript Нижний индекс - Insert &Link Вставить &ссылку - Insert &Image Вставить &изображение @@ -6466,17 +5300,14 @@ qdesigner_internal::ScriptDialog - Edit script Правка сценария - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>Укажите сценарий Qt, который должен выполняться при загрузке формы.<br>Виджет и его дочерние виджеты доступны через переменные <i>widget</i> и <i>childWidgets</i>. - Syntax error Синтаксическая ошибка @@ -6484,7 +5315,6 @@ qdesigner_internal::ScriptErrorDialog - Script errors Ошибки сценария @@ -6492,23 +5322,18 @@ qdesigner_internal::SignalSlotDialog - There is already a slot with the signature '%1'. Уже есть слот с сигнатурой '%1'. - There is already a signal with the signature '%1'. Уже есть сигнал с сигнатурой '%1'. - %1 - Duplicate Signature %1 - Повторяющаяся сигнатура - - Signals/Slots of %1 Сигналы/слоты %1 @@ -6516,12 +5341,10 @@ qdesigner_internal::SignalSlotEditorPlugin - Edit Signals/Slots Изменение сигналов/слотов - F4 @@ -6529,7 +5352,6 @@ qdesigner_internal::SignalSlotEditorTool - Edit Signals/Slots Изменение сигналов/слотов @@ -6537,7 +5359,6 @@ qdesigner_internal::StatusBarTaskMenu - Remove Удалить @@ -6545,7 +5366,6 @@ qdesigner_internal::StringListEditorButton - Change String List Изменить список строк @@ -6553,38 +5373,30 @@ qdesigner_internal::StyleSheetEditorDialog - - Valid Style Sheet Корректная таблица стилей - Add Resource... Добавить ресурс... - Add Gradient... Добавить градиент... - Add Color... Добавить цвет... - Add Font... Добавить шрифт... - Edit Style Sheet Правка таблицы стилей - Invalid Style Sheet Некорректная таблица стилей @@ -6592,27 +5404,22 @@ qdesigner_internal::TabOrderEditor - Start from Here Начать отсюда - Restart Перезапустить - Tab Order List... Список порядка переключений... - Tab Order List Список порядка переключений - Tab Order Порядок переключений @@ -6620,7 +5427,6 @@ qdesigner_internal::TabOrderEditorPlugin - Edit Tab Order Изменение порядка переключений @@ -6628,7 +5434,6 @@ qdesigner_internal::TabOrderEditorTool - Edit Tab Order Изменить порядок переключений @@ -6636,48 +5441,38 @@ qdesigner_internal::TableWidgetEditor - - Properties &>> Свойства &>> - Edit Table Widget Правка табличного виджета - &Items &Элементы - Table Items Элементы таблицы - New Column Новый столбец - New Row Новая строка - &Columns С&толбцы - &Rows &Строки - Properties &<< Свойства &<< @@ -6685,7 +5480,6 @@ qdesigner_internal::TableWidgetTaskMenu - Edit Items... Изменить элементы... @@ -6693,22 +5487,18 @@ qdesigner_internal::TemplateOptionsWidget - Pick a directory to save templates in Выберите каталог для сохранения шаблонов - Form Форма - Additional Template Paths Дополнительные пути к шаблонам - ... ... @@ -6716,22 +5506,18 @@ qdesigner_internal::TextEditTaskMenu - Edit HTML Правка HTML - Change HTML... Изменить HTML... - Edit Text Правка текста - Change Plain Text... Правка обычного текста... @@ -6739,22 +5525,18 @@ qdesigner_internal::TextEditor - Choose Resource... Выбрать ресурс... - Choose File... Выбрать файл... - ... ... - Choose a File Выбор файла @@ -6762,27 +5544,22 @@ qdesigner_internal::ToolBarEventFilter - Insert Separator before '%1' Вставить разделитель перед '%1' - Append Separator Добавить разделитель - Remove action '%1' Удалить действие '%1' - Remove Toolbar '%1' Удалить панель инструментов '%1' - Insert Separator Вставить разделитель @@ -6790,125 +5567,98 @@ qdesigner_internal::TreeWidgetEditor - New Column Новый столбец - &Columns С&толбцы - Per column properties Свойства столбца - Common properties Общие свойства - - New Item Новый элемент - - New Subitem Новый дочерний элемент - Properties &<< Свойства &<< - - Properties &>> Свойства &>> - Edit Tree Widget Изменение виджета Дерево - &Items &Элементы - Tree Items Элементы дерева - 1 1 - &New &Новый - New &Subitem Новый &дочерний элемент - Delete Item Удалить элемент - &Delete &Удалить - Move Item Left (before Parent Item) Переместить элемент влево (перед родительским) - L L - Move Item Right (as a First Subitem of the Next Sibling Item) Переместить элемент вправо (сделать первым дочерним элементом соседнего элемента) - R - Move Item Up Переместить элемент вверх - U U - Move Item Down Переместить элемент вниз - D D @@ -6916,7 +5666,6 @@ qdesigner_internal::TreeWidgetTaskMenu - Edit Items... Изменить элементы... @@ -6924,7 +5673,6 @@ qdesigner_internal::WidgetBox - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Предупреждение: Не удалось создать виджет. Это могло произойти из-за некорректного XML пользовательского виджета. @@ -6932,42 +5680,34 @@ qdesigner_internal::WidgetBoxTreeWidget - Scratchpad Блокнот - Custom Widgets Пользовательские виджеты - Expand all Развернуть всё - Collapse all Свернуть всё - List View Список - Icon View Значки - Remove Удалить - Edit name Изменить имя @@ -6975,7 +5715,6 @@ qdesigner_internal::WidgetDataBase - A custom widget plugin whose class name (%1) matches that of an existing class has been found. Обнаружен пользовательский модуль виджета, имя класса (%1) которого совпадает с уже имеющимся. @@ -6983,7 +5722,6 @@ qdesigner_internal::WidgetEditorTool - Edit Widgets Изменение виджетов @@ -6991,34 +5729,28 @@ qdesigner_internal::WidgetFactory - The custom widget factory registered for widgets of class %1 returned 0. Пользовательская фабрика виджетов, зарегистрированная для класса %1, вернула 0. - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Обнаружено несоответствие имени класса при создании виджета с использованием пользовательской фабрики виджетов, зарегистрированной для класса %1. Она вернула виджет класса %2. - %1 Widget Виджет %1 - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. При создании компоновщика не удалось определить текущую страницу контейнера '%1' (%2). Это указывает на некорректность файла ui - возможно, компоновщик был создан для контейнерного виджета. - Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. Попытка добавить компоновщик виджету '%1' (%2), у которого уже есть компоновщик типа %3. Это указывает на некорректность файла ui. - Cannot create style '%1'. Не удалось создать стиль '%1'. @@ -7026,12 +5758,10 @@ qdesigner_internal::WizardContainerWidgetTaskMenu - Next Далее - Back Назад @@ -7039,7 +5769,6 @@ qdesigner_internal::ZoomMenu - %1 % Zoom factor %1 % @@ -7048,7 +5777,6 @@ qdesigner_internal::ZoomablePreviewDeviceSkin - &Zoom Мас&штаб diff -r ef0373b55136 -r 758a864f9613 translations/designer_sl.ts --- a/translations/designer_sl.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/designer_sl.ts Mon Oct 04 01:19:32 2010 +0300 @@ -1,30 +1,32 @@ + 2010-08-28 14:05+0200 + MIME-Version,Content-Type,Content-Transfer-Encoding,Plural-Forms,X-Language,X-Qt-Contexts,Last-Translator,PO-Revision-Date,Project-Id-Version,Language-Team,X-Generator + Lokalize 1.1 + Slovenian <lugos-slo@lugos.si> + + # Jure Repinc <jlp@holodeck1.com>, 2010. + Jure Repinc <jlp@holodeck1.com> AbstractFindWidget - &Previous &Predhodni - &Next &Naslednji - &Case sensitive O&bčutljiv na velikost črk - Whole &words &Cele besede - <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;Iskanje se nadaljuje na drugem koncu @@ -32,17 +34,14 @@ AddLinkDialog - Insert Link Vstavi povezavo - Title: Besedilo: - URL: URL: @@ -50,7 +49,6 @@ AppFontDialog - Additional Fonts Dodatne pisave @@ -58,37 +56,30 @@ AppFontManager - '%1' is not a file. »%1« ni datoteka. - The font file '%1' does not have read permissions. Datoteka s pisavo »%1« nima dovoljenj za branje. - The font file '%1' is already loaded. Datoteka s pisavo »%1« je že naložena. - The font file '%1' could not be loaded. Datoteke s pisavo »%1« ni bilo moč naložiti. - '%1' is not a valid font id. »%1« ni veljaven ID za pisavo. - There is no loaded font matching the id '%1'. Ni naložene pisave, ki bi se ujemala z ID-jem »%1«. - The font '%1' (%2) could not be unloaded. Pisave »%1« (%2) ni bilo moč odstraniti. @@ -96,52 +87,42 @@ AppFontWidget - Fonts Pisave - Add font files Dodaj datoteke s pisavami - Remove current font file Odstrani trenutno datoteko s pisavo - Remove all font files Odstrani vse datoteke s pisavami - Add Font Files Dodaj datoteke s pisavami - Font files (*.ttf) Datoteke s pisavami (*.ttf) - Error Adding Fonts Napaka pri dodajanju pisav - Error Removing Fonts Napaka pri odstranjevanju pisav - Remove Fonts Odstrani pisave - Would you like to remove all fonts? Ali želite odstraniti vse pisave? @@ -149,12 +130,10 @@ AppearanceOptionsWidget - Form Obrazec - User Interface Mode Način uporabniškega vmesnika @@ -162,17 +141,14 @@ AssistantClient - Unable to send request: Assistant is not responding. Ni moč poslati zahtevka: pomočnik se ne odziva. - The binary '%1' does not exist. Program »%1« ne obstaja. - Unable to launch assistant (%1). Ni moč zaganti pomočnika (%1). @@ -180,92 +156,74 @@ BrushPropertyManager - No brush Brez čopiča - Solid Enobarven - Dense 1 Gost 1 - Dense 2 Gost 2 - Dense 3 Gost 3 - Dense 4 Gost 4 - Dense 5 Gost 5 - Dense 6 Gost 6 - Dense 7 Gost 7 - Horizontal Vodoraven - Vertical Navpičen - Cross Križ - Backward diagonal Poševen nazaj - Forward diagonal Poševen naprej - Crossing diagonal Poševen prekrižan - Style Slog - Color Barva - [%1, %2] [%1, %2] @@ -273,360 +231,280 @@ Command - - Change signal Spremeni signal - - Change slot Spremeni režo - Change signal-slot connection Spremeni povezavo signal-reža - Change sender Spremeni pošiljatelja - Change receiver Spremeni prejemnika - Add connection Dodaj povezavo - Adjust connection Prilagodi povezavo - Delete connections Zbriši povezave - Change source Spremeni izvor - Change target Spremeni cilj - Insert '%1' Vstavi »%1« - Raise '%1' Dvigni »%1« - Lower '%1' Spusti »%1« - Delete '%1' Zbriši »%1« - Reparent '%1' Spremeni starša od »%1« - Promote to custom widget Povišaj v gradnik po meri - Demote from custom widget Ponižaj iz gradnika po meri - Lay out using grid Razporedi z uporabo mreže - Lay out vertically Razporedi navpično - Lay out horizontally Razporedi vodoravno - Break layout Razbij razporeditev - - - Move Page Premakni stran - - - - Delete Page Zbriši stran - - Page Stran - page stran - - - - Insert Page Vstavi stran - Change Tab order Spremeni vrstni red tabulatorke - Create Menu Bar Ustvari menijsko vrstico - Delete Menu Bar Zbriši menijsko vrstico - Create Status Bar Ustvari vrstico stanja - Delete Status Bar Zbriši vrstico stanja - Add Tool Bar Dodaj orodjarno - Add Dock Window Dodaj podokno - Adjust Size of '%1' Prilagodi velikost za »%1« - Change Form Layout Item Geometry Spremeni geometrijo razporeditve na obrazcu - Change Layout Item Geometry Spremeni geometrijo razporeda - Change Table Contents Spremeni vsebino tabele - Change Tree Contents Spremeni vsebino drevesa - - Add action Dodaj dejanje - - Remove action Odstrani dejanje - Add menu Dodaj meni - Remove menu Odstrani meni - Create submenu Ustvari podmeni - Delete Tool Bar Zbriši orodjarno - Set action text Nastavi besedilo dejanja - Insert action Vstavi dejanje - - Move action Premakni dejanje - Change Title Spremeni naslov - Insert Menu Vstavi meni - Change signals/slots Spremeni signale/reže - Delete Subwindow Zbriši podokno - Insert Subwindow Vstavi podokno - subwindow podokno - Subwindow Podokno - Change Z-order of '%1' Spremeni vrstni red v smeri Z od »%1« - Simplify Grid Layout Poenostavi razporeditev v mrežo - Create button group Ustvari skupino gumbov - Break button group Razbij skupino gumbov - Break button group '%1' Razbij skupino gumbov »%1« - Add buttons to group Dodaj gumbe v skupino - - Add '%1' to '%2' - Command description for adding buttons to a QButtonGroup + Command description for adding buttons to a QButtonGroup + Dodaj »%1« v »%2« - Remove buttons from group Odstrani gumbe iz te skupine - Remove '%1' from '%2' - Command description for removing buttons from a QButtonGroup + Command description for removing buttons from a QButtonGroup + Odstrani »%1« iz »%2« - Morph %1/'%2' into %3 - MorphWidgetCommand description + MorphWidgetCommand description + Pretvori %1/»%2« v %3 - Change layout of '%1' from %2 to %3 Spremeni razpored od »%1« iz %2 v %3 - Change script Spremeni skript - Changed '%1' of '%2' Spremenil »%1« od »%2« - Changed '%1' of %n objects Spremenil »%1« od %n objekta @@ -636,12 +514,10 @@ - Reset '%1' of '%2' Ponastavi »%1« od »%2« - Reset '%1' of %n objects Ponastavi »%1« od %n objekta @@ -651,12 +527,10 @@ - Add dynamic property '%1' to '%2' Dodaj dinamično lastnost »%1« k »%2« - Add dynamic property '%1' to %n objects Dodaj dinamično lastnost »%1« k %n objektu @@ -666,12 +540,10 @@ - Remove dynamic property '%1' from '%2' Odstrani dinamično lastnost »%1« od »%2« - Remove dynamic property '%1' from %n objects Odstrani dinamično lastnost »%1« od %n objekta @@ -684,22 +556,18 @@ ConnectDialog - Configure Connection Nastavi povezavo - GroupBox Skupina - Edit... Urejanje ... - Show signals and slots inherited from QWidget Prikaži signale in reže podedovane od QWidget @@ -707,17 +575,14 @@ ConnectionDelegate - <object> <objekt> - <signal> <signal> - <slot> <reža> @@ -725,110 +590,93 @@ DPI_Chooser - Standard (96 x 96) - Embedded device standard screen resolution + Embedded device standard screen resolution + Običajna (96 × 96) - Greenphone (179 x 185) - Embedded device screen resolution + Embedded device screen resolution + Greenphone (179 × 185) - High (192 x 192) - Embedded device high definition screen resolution + Embedded device high definition screen resolution + Visoka (192 × 192) Designer - Qt Designer Qt Designer - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. Ta datoteka vsebuje praznine, ki so na vrhu.<br><b>Niso</b> bile shranjene v ta obrazec. - Perhaps you forgot to create a layout? Morda ste pozabili ustvariti razpored? - Invalid UI file: The root element <ui> is missing. Neveljavna datoteka UI: manjka vrhnji element <ui>. - An error has occurred while reading the UI file at line %1, column %2: %3 Prišlo je do napake med branjem datoteke UI v vrstici %1, stolpcu %2: %3 - This file cannot be read because it was created using %1. Te datoteke ni moč prebrati, ker je bila ustvarjena z %1. - This file was created using Designer from Qt-%1 and cannot be read. Ta datoteka je bila ustvarjena s Qt Designerjem iz Qt %1 in je ni moč prebrati. - This file cannot be read because the extra info extension failed to load. Te datoteke ni moč prebrati, ker je spodletelo nalaganje razširitve za dodatne podatke. - The converted file could not be read. Pretvorjene datoteke ni bilo moč prebrati. - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. Ta datoteka je bila ustvarjena s Qt Designerjem iz Qt %1 in bo pretvorjena v novo obliko. - The old form has not been touched, but you will have to save the form under a new name. Stara oblika ni bila spremenjena, vendar boste novo obliko morali shraniti pod novim imenom. - This file was created using Designer from Qt-%1 and could not be read: %2 Ta datoteka je bila ustvarjena s Qt Designerjem iz Qt %1 in je ni bilo moč prebrati: %2 - Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. Poženite jo skozi <b>uic3&nbsp;-convert</b> in jo tako pretvorite v zapis UI za Qt 4. - Custom Widgets Gradniki po meri - Promoted Widgets Povišani gradniki - Unable to launch %1. Ni moč zagnati %1. - %1 timed out. Čas za %1 je potekel. @@ -836,12 +684,10 @@ DesignerMetaEnum - %1 is not a valid enumeration value of '%2'. %1 ni veljavna vrednost številčenja od »%2«. - '%1' could not be converted to an enumeration value of type '%2'. »%1« ne more biti pretvorjeno v vrednost številčenja vrste »%2«. @@ -849,7 +695,6 @@ DesignerMetaFlags - '%1' could not be converted to a flag value of type '%2'. »%1« ne more biti pretvorjeno v vrednost zastavice vrste »%2«. @@ -857,13 +702,12 @@ DeviceProfile - '%1' is not a number. - Reading a number for an embedded device profile + Reading a number for an embedded device profile + »%1« ni številka. - An invalid tag <%1> was encountered. Dosežena je bila neveljavna oznaka <%1>. @@ -871,27 +715,22 @@ DeviceProfileDialog - &Family &Družina - &Point Size - &Velikost točke - - - + &Velikost v točkah + + Style Slog - Device DPI Ločljivost (točk/palec) - Name Ime @@ -899,57 +738,46 @@ DeviceSkin - The image file '%1' could not be loaded. Slikovne datoteke »%1« ni bilo moč naložiti. - The skin directory '%1' does not contain a configuration file. Mapa s temo »%1« ne vsebuje nastavitvene datoteke. - The skin configuration file '%1' could not be opened. Nastavitvene datoteke za temo »%1« ni bilo moč odpreti. - Syntax error: %1 Skladenjska napaka: %1 - The skin cursor image file '%1' does not exist. Slikovna datoteka s kazalcem za temo »%1« ne obstaja. - Syntax error in area definition: %1 Skladenjska napaka pri določitvi območja: %1 - Mismatch in number of areas, expected %1, got %2. Neujemanje v številu območij, pričakovano %1, dobljeno %2. - The skin configuration file '%1' could not be read: %2 Nastavitvene datoteke za temo »%1« ni bilo moč prebrati: %2 - The skin "up" image file '%1' does not exist. Datoteka slike »up« teme »%1« ne obstaja. - The skin "down" image file '%1' does not exist. Datoteka slike »down« teme »%1« ne obstaja. - The skin "closed" image file '%1' does not exist. Datoteka slike »closed« teme »%1« ne obstaja. @@ -957,74 +785,65 @@ EmbeddedOptionsControl - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> - Format embedded device profile description + Format embedded device profile description + <html><table><tr><td><b>Pisava</b></td><td>%1, %2</td></tr><tr><td><b>Slog</b></td><td>%3</td></tr><tr><td><b>Ločljivost</b></td><td>%4 × %5</td></tr></table></html> EmbeddedOptionsPage - Embedded Design - Tab in preferences dialog + Tab in preferences dialog + Vgrajena zasnova - Device Profiles - EmbeddedOptionsControl group box" + EmbeddedOptionsControl group box" + Profili naprav FontPanel - Font Pisava - &Writing system S&istem pisanja - &Family &Družina - &Style &Slog - &Point size - &Velikost točke + &Velikost v točkah FontPropertyManager - PreferDefault Prednost ima privzeto - NoAntialias Brez glajenja robov - PreferAntialias Prednost ima glajenje robov - Antialiasing Glajenje robov @@ -1032,43 +851,47 @@ FormBuilder - Invalid stretch value for '%1': '%2' - Parsing layout stretch values + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values + Neveljavna vrednost razširjanja za »%1«: »%2« - Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values + Neveljavna najmanjša velikost za »%1«: »%2« FormEditorOptionsPage - %1 % %1 % - Preview Zoom Povečava ogleda - Default Zoom Privzeta povečava - Forms - Tab in preferences dialog + Tab in preferences dialog + Obrazci - Default Grid Privzeta mreža @@ -1076,37 +899,30 @@ FormLayoutRowDialog - Add Form Layout Row Dodaj vrstico razporeditve na obrazcu - &Label text: &Besedilo oznake: - Field &type: &Vrsta polja: - &Field name: &Ime polja: - &Buddy: &Kolega: - &Row: &Vrstica: - Label &name: &Ime oznake: @@ -1114,12 +930,10 @@ FormWindow - Unexpected element <%1> Nepričakovan element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Napaka pri lepljenju vsebine odložišča v vrstici %1, stolpcu %2: %3 @@ -1127,62 +941,50 @@ FormWindowSettings - Form Settings Nastavitve obrazca - Layout &Default &Privzeto za razpored - &Spacing: &Razmik: - &Margin: &Rob: - &Layout Function &Funkcija za razpored - Ma&rgin: R&ob: - Spa&cing: R&azmik: - Embedded Design Vgrajena zasnova - &Author &Avtor - &Include Hints Namigi za &vključevanje - &Pixmap Function F&unkcija za sličico - Grid Mreža @@ -1190,7 +992,6 @@ IconSelector - All Pixmaps ( Vse sličice ( @@ -1198,42 +999,37 @@ ItemPropertyBrowser - XX Icon Selected off - Sample string to determinate the width for the first column of the list item property browser + Sample string to determinate the width for the first column of the list item property browser + XX Ikona Izbrano izklopljeno MainWindowBase - Main - Not currently used (main tool bar) + Not currently used (main tool bar) + Glavna - File Datoteka - Edit Urejanje - Tools Orodja - Form Obrazec - Qt Designer Qt Designer @@ -1241,52 +1037,42 @@ NewForm - C&reate &Ustvari - Recent Nedavno - &Close &Zapri - &Open... &Odpri ... - &Recent Forms &Nedavni obrazci - Read error Napaka pri branju - New Form Nov obrazec - Show this Dialog on Startup Prikaži to pogovorno okno ob zagonu - A temporary form file could not be created in %1. Začasne datoteke obrazca v %1 ni bilo moč ustvariti. - The temporary form file %1 could not be written. V začasno datoteko obrazca %1 ni bilo moč pisati. @@ -1294,22 +1080,18 @@ ObjectInspectorModel - Object Objekt - Class Razred - separator ločitelj - <noname> <neimenovano> @@ -1317,12 +1099,10 @@ ObjectNameDialog - Change Object Name Spremeni ime objekta - Object Name Ime objekta @@ -1330,12 +1110,10 @@ PluginDialog - Plugin Information Podatki o vstavkih - 1 1 @@ -1343,7 +1121,6 @@ PreferencesDialog - Preferences Nastavitve @@ -1351,32 +1128,26 @@ PreviewConfigurationWidget - Form Obrazec - Print/Preview Configuration Nastavitev tiskanja/ogleda - Style Slog - Style sheet Slogovna predloga - ... ... - Device skin Tema naprave @@ -1384,17 +1155,15 @@ PromotionModel - Not used - Usage of promoted widgets + Usage of promoted widgets + Ni uporabljeno Q3WizardContainer - - Page Stran @@ -1402,59 +1171,48 @@ QAbstractFormBuilder - Unexpected element <%1> Nepričakovan element <%1> - An error has occurred while reading the UI file at line %1, column %2: %3 Prišlo je do napake med branjem datoteke UI v vrstici %1, stolpcu %2: %3 - Invalid UI file: The root element <ui> is missing. Neveljavna datoteka UI: manjka vrhnji element <ui>. - The creation of a widget of the class '%1' failed. Ustvarjanje gradnika razreda »%1« ni uspelo. - Attempt to add child that is not of class QWizardPage to QWizard. Poskus dodajanja podgradnika, ki ni razreda QWizardPage ali QWizard. - Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. Poskus dodajanja razporeda gradniku »%1« (%2), ki že ima razpored ne-okvirne vrste %3. To nakazuje na neskladnost v datoteki *.ui. - Empty widget item in %1 '%2'. Prazna postavka gradnika v %1 »%2«. - Flags property are not supported yet. Lastnosti z zastavicami še niso podprte. - While applying tab stops: The widget '%1' could not be found. Med uveljavljanjem postankov tabulatorke: gradnika »%1« ni bilo moč najti. - Invalid QButtonGroup reference '%1' referenced by '%2'. Neveljavna referenca »%1« na QButtonGroup od »%2«. - This version of the uitools library is linked without script support. Ta različica knjižnice uitools nima podpore za skripte. @@ -1462,12 +1220,10 @@ QAxWidgetPlugin - ActiveX control Kontrolnik ActiveX - ActiveX control widget Gradnik kontrolnika ActiveX @@ -1475,22 +1231,18 @@ QAxWidgetTaskMenu - Set Control Nastavi kontrolnik - Reset Control Ponastavi kontrolnik - Licensed Control Licenciran kontrolnik - The control requires a design-time license Kontrolnik potrebuje licenco za čas snovanja @@ -1498,67 +1250,54 @@ QCoreApplication - %1 is not a promoted class. %1 ni povišan razred. - The base class %1 is invalid. Osnovni razred %1 ni veljaven. - The class %1 already exists. Razred %1 že obstaja. - Promoted Widgets Povišani gradniki - The class %1 cannot be removed Razreda %1 ni moč odstraniti - The class %1 cannot be removed because it is still referenced. Razreda %1 ni moč odstraniti, ker se nanj še vedno nanašajo reference. - The class %1 cannot be renamed Razreda %1 ni moč preimenovati - The class %1 cannot be renamed to an empty name. Razreda %1 ni moč preimenovati s praznim imenom. - There is already a class named %1. Razred z imenom %1 že obstaja. - Cannot set an empty include file. Ni moč nastaviti prazne vključene datoteke. - Exception at line %1: %2 Izjema v vrstici %1: %2 - Unknown error Neznana napaka - An error occurred while running the script for %1: %2 Script: %3 Prišlo je do napake pri zaganjanju skripta za %1: %2 @@ -1568,17 +1307,14 @@ QDesigner - %1 - warning %1 - opozorilo - Qt Designer Qt Designer - This application cannot be used for the Console edition of Qt Programa ni moč uporabiti za konzolno izdajo Qt @@ -1586,186 +1322,146 @@ QDesignerActions - Edit Widgets Urejanje gradnikov - &Quit Konča&j - &Minimize Po&manjšaj - Bring All to Front Prinesi vse v ospredje - Preferences... Nastavitve ... - Clear &Menu Počisti &meni - CTRL+SHIFT+S CTRL+SHIFT+S - CTRL+R CTRL+R - CTRL+M CTRL+M - Qt Designer &Help P&riročnik za Qt Designer - Current Widget Help Pomoč za trenutni gradnik - What's New in Qt Designer? Kaj je novega v Qt Designerju? - About Plugins O vstavkih - - About Qt Designer O Qt Designer - About Qt O Qt - - Open Form Odpri obrazec - - - Designer UI files (*.%1);;All Files (*) Designerjeve datoteke UI (*.%1);;Vse datoteke (*) - %1 already exists. Do you want to replace it? %1 že obstaja. Ali jo želite nadomestiti? - Saved %1. Shranil %1. - Additional Fonts... Dodatne pisave ... - &Recent Forms N&edavni obrazci - Designer Qt Designer - Feature not implemented yet! Zmožnost še ni izdelana. - Read error Napaka pri branju - %1 Do you want to update the file location or generate a new form? %1 Ali želite posodobiti lokacijo datoteke ali ustvariti nov obrazec? - &Update &Posodobi - &New Form &Nov obrazec - - Save Form? Shranim obrazec? - Could not open file Ni bilo moč odpreti datoteke - Select New File Izberite novo datoteko - Could not write file Ni bilo moč zapisati datoteke - &Close Preview &Zapri ogled - Save &Image... S&hrani sliko ... - &Print... &Natisni ... - The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -1774,7 +1470,6 @@ Ali žalite poskusiti znova ali izbrati drugo datoteko? - It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -1783,117 +1478,90 @@ Ali želite poskusiti znova? - - The backup file %1 could not be written. Varnostne kopije datoteke %1 ni bilo moč zapisati. - The backup directory %1 could not be created. Mape %1 za varnostne kopije ni bilo moč ustvariti. - The temporary backup directory %1 could not be created. Začasne mape %1 za varnostne kopije ni bilo moč ustvariti. - Image files (*.%1) Slikovne datoteke (*.%1) - - Save Image Shrani sliko - The file %1 could not be written. Datoteke %1 ni bilo moč zapisati. - &New... &Nova ... - &Open... &Odpri ... - &Save &Shrani - Save &As... Shrani &kot ... - Save A&ll Shrani &vse - Save As &Template... Shrani kot &predlogo ... - - &Close &Zapri - View &Code... Prikaži &kodo ... - - Save Form As Shrani obrazec kot - Preview failed Ogled ni uspel - Code generation failed Ustvarjanje kode ni uspelo - - Assistant Pomočnik - Saved image %1. Shranil sliko %1. - Please close all forms to enable the loading of additional fonts. Da bi omogočili nalaganje dodatnih pisav zaprite vse obrazce. - Printed %1. Natisnil %1. - ALT+CTRL+S ALT+CTRL+S @@ -1901,26 +1569,23 @@ QDesignerAppearanceOptionsPage - Appearance - Tab in preferences dialog + Tab in preferences dialog + Videz QDesignerAppearanceOptionsWidget - Docked Window Zasidrana okna - Multiple Top-Level Windows Več ločenih oken - Toolwindow Font Pisava oken z orodji @@ -1928,22 +1593,18 @@ QDesignerAxWidget - Reset control Ponastavi kontrolnik - Set control Nastavi kontrolnik - Control loaded Kontrolnik je naložen - A COM exception occurred when executing a meta call of type %1, index %2 of "%3". med izvajanjem meta-klica vrste %1 je prišlo do izjeme COM, indeks %2 od »%3«. @@ -1951,17 +1612,14 @@ QDesignerFormBuilder - Script errors occurred: Prišlo je do napak v skriptu: - The preview failed to build. Grajenje ogleda ni uspelo. - Designer Qt Designer @@ -1969,22 +1627,18 @@ QDesignerFormWindow - %1 - %2[*] %1 - %2[*] - Save Form? Shranim obrazec? - Do you want to save the changes to this document before closing? Ali želite pred zaprtjem shraniti spremembe v tem dokumentu? - If you don't save, your changes will be lost. Če ne shranite, bodo spremembe izgubljene. @@ -1992,38 +1646,30 @@ QDesignerMenu - Type Here Pišite sem - Add Separator Dodaj ločnico - Insert separator Vstavi ločnico - Remove separator Odstrani ločnico - Remove action '%1' Odstrani dejanje »%1« - - Add separator Dodaj ločnico - Insert action Vstavi dejanje @@ -2031,22 +1677,18 @@ QDesignerMenuBar - Type Here Pišite sem - Remove Menu '%1' Odstrani meni »%1« - Remove Menu Bar Odstrani menijsko vrstico - Menu Meni @@ -2054,37 +1696,30 @@ QDesignerPluginManager - An XML error was encountered when parsing the XML of the custom widget %1: %2 Med razčlenjevanjem datoteke XML gradnika po meri %1 je prišlo do napake XML: %2 - A required attribute ('%1') is missing. Manjka obvezna lastnost (»%1«). - An invalid property specification ('%1') was encountered. Supported types: %2 Dosežena je bila neveljavna specifikacija lastnosti (»%1«). Podprte vrste: %2 - '%1' is not a valid string property specification. »%1« ni veljavna specifikacija lastnosti z nizom. - The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. XML gradnika po meri »%1« ne vsebuje niti elementa <widget> niti <ui>. - The class attribute for the class %1 is missing. Manjka razredna lastnost za razred %1. - The class attribute for the class %1 does not match the class name %2. Razredna lastnost za razred %1 se ne ujema z razredovim imenom %2. @@ -2092,7 +1727,6 @@ QDesignerPropertySheet - Dynamic Properties Dinamične lastnosti @@ -2100,45 +1734,41 @@ QDesignerResource - The layout type '%1' is not supported, defaulting to grid. Vrsta razpored »%1« ni podprta, preklapljam na mrežo. - The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. Ko je bila povprašana po strani št. %5, je razširitev vsebnika gradnika »%1« (%2) vrnila gradnik, s katerim ne upravlja Qt Designer »%3« (%4). Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml() gradnika po meri. - Unexpected element <%1> - Parsing clipboard contents + Parsing clipboard contents + Nepričakovan element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 - Parsing clipboard contents + Parsing clipboard contents + Napaka pri lepljenju vsebine odložišča v vrstici %1, stolpcu %2: %3 - Error while pasting clipboard contents: The root element <ui> is missing. - Parsing clipboard contents + Parsing clipboard contents + Napaka pri lepljenju vsebine odložišča: manjka vrhnji element <ui>. QDesignerSharedSettings - The template path %1 could not be created. Poti %1 za predlogo ni bilo moč ustvariti. - An error has been encountered while parsing device profile XML: %1 Med razčlenjevanjem XML-a profila naprave je prišlo do napake: %1 @@ -2146,32 +1776,26 @@ QDesignerToolWindow - Property Editor Urejevalnik lastnosti - Action Editor Urejevalnik dejanj - Object Inspector Preiskovalnik objektov - Resource Browser Brskalnik po virih - Signal/Slot Editor Urejevalnik signalov/rež - Widget Box Podokno z gradniki @@ -2179,97 +1803,78 @@ QDesignerWorkbench - &File &Datoteka - F&orm &Obrazec - Preview in Ogled v - &Window O&kno - &Help &Pomoč - Edit Urejanje - Toolbars Orodjarne - Save Forms? Shranim obrazce? - &View &Videz - &Settings &Nastavitve - Widget Box Podokno z gradniki - If you do not review your documents, all your changes will be lost. Če ne pregledate svojih dokumentov, bodo vse spremembe izgubljene. - Discard Changes Zavrzi spremembe - Review Changes Pregled sprememb - Backup Information Podatki o varnostnih kopijah - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? Zadnja seja Qt Designerja ni bila končana pravilno. Na disku so ostale varnostne kopije datotek. Ali jih želite naložiti? - The file <b>%1</b> could not be opened. Datoteke <b>%1</b> ni bilo moč odpreti. - The file <b>%1</b> is not a valid Designer UI file. Datoteka <b>%1</b> ni veljavna Designerjeva datoteka UI. - There are %n forms with unsaved changes. Do you want to review these changes before quitting? Odprt je %n obrazec z neshranjenimi spremembami. Ali želite pred zaprtjem pregledati te spremembe? @@ -2282,92 +1887,87 @@ QFormBuilder - An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method + Prazno ime razreda je bilo posredovano do %1 (ime objekta: »%2«). - QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder ni mogel ustvariti gradnika po meri razreda »%1«; uporabljen je bil osnovni razred »%2«. - QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder ni mogel ustvariti gradnika razreda »%1«. - The layout type `%1' is not supported. Vrsta razporeda »%1« ni podprta. - The set-type property %1 could not be read. Lastnosti %1 z vrsto množice ni bilo moč prebrati. - The enumeration-type property %1 could not be read. Lastnosti %1 z vrsto naštevanja ni bilo moč prebrati. - Reading properties of the type %1 is not supported yet. Branje lastnosti vrste %1 še ni podprto. - The property %1 could not be written. The type %2 is not supported yet. Lastnosti %1 ni bilo moč zapisati. Vrsta %2 še ni podprta. + + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. + Vrednost oštevilčenja »%1« ni veljavna. Namesto nje bo uporabljena privzeta vrednost »%2«. + + + The flag-value '%1' is invalid. Zero will be used instead. + Vrednost zastavice »%1« ni veljavna. Namesto nje bo uporabljena ničla. + QStackedWidgetEventFilter - Previous Page Predhodna stran - Next Page Naslednja stran - Delete Zbriši - Before Current Page Pred trenutno stran - After Current Page Za trenutno stran - Change Page Order... Spremeni vrstni red strani ... - Change Page Order Spremeni vrstni red strani - Page %1 of %2 Stran %1 od %2 - - Insert Page Vstavi stran @@ -2375,12 +1975,10 @@ QStackedWidgetPreviewEventFilter - Go to previous page of %1 '%2' (%3/%4). Pojdi na predhodno stran od %1 »%2« (%3/%4). - Go to next page of %1 '%2' (%3/%4). Pojdi na naslednjo stran od %1 »%2« (%3/%4). @@ -2388,28 +1986,22 @@ QTabWidgetEventFilter - Delete Zbriši - Before Current Page Pred trenutno stran - After Current Page Za trenutno stran - Page %1 of %2 Stran %1 od %2 - - Insert Page Vstavi stran @@ -2417,37 +2009,30 @@ QToolBoxHelper - Delete Page Zbriši stran - Before Current Page Pred trenutno stran - After Current Page Za trenutno stran - Change Page Order... Spremeni vrsti red strani ... - Change Page Order Spremeni vrstni red strani - Page %1 of %2 Stran %1 od %2 - Insert Page Vstavi stran @@ -2455,15 +2040,10 @@ QtBoolEdit - - - True Pravilno - - False Napačno @@ -2471,12 +2051,10 @@ QtBoolPropertyManager - True Pravilno - False Napačno @@ -2484,7 +2062,6 @@ QtCharEdit - Clear Char Počisti znak @@ -2492,7 +2069,6 @@ QtColorEditWidget - ... ... @@ -2500,22 +2076,18 @@ QtColorPropertyManager - Red Rdeča - Green Zelena - Blue Modra - Alpha Alfa @@ -2523,97 +2095,78 @@ QtCursorDatabase - Arrow Puščica - Up Arrow Puščica navzgor - Cross Križec - Wait Čakanje - IBeam Črtica | - Size Vertical Velikost navpično - Size Horizontal Velikost vodoravno - Size Backslash Velikost poševno nazaj - Size Slash Velikost poševno - Size All Velikost v vse smeri - Blank Prazno - Split Vertical Razdelitev navpično - Split Horizontal Razdelitev vodoravno - Pointing Hand Roka, ki kaže - Forbidden Prepovedano - Open Hand Odprta dlan - Closed Hand Zaprta dlan - What's This Kaj je to - Busy Zasedeno @@ -2621,12 +2174,10 @@ QtFontEditWidget - ... ... - Select Font Izberite pisavo @@ -2634,37 +2185,30 @@ QtFontPropertyManager - Family Družina - Point Size - Velikost točke - - - + Velikost v točkah + + Bold Polkrepko - Italic Ležeče - Underline Podčrtano - Strikeout Prečrtano - Kerning Spodsekavanje @@ -2672,7 +2216,6 @@ QtGradientDialog - Edit Gradient Uredi preliv @@ -2680,304 +2223,242 @@ QtGradientEditor - Start X Začetni X - Start Y Začetni Y - Final X Končni X - Final Y Končni Y - - Central X Središčni X - - Central Y Središčni Y - Focal X Žariščni X - Focal Y Žariščni Y - Radius Polmer - Angle Kot - Linear Linearen - Radial Radialen - Conical Stožčast - Pad Zapolni - Repeat Ponovi - Reflect Odbij - Form Obrazec - Gradient Editor Urejevalnik preliva - 1 1 - 2 2 - 3 3 - 4 4 - 5 5 - Gradient Stops Editor Urejevalnik postankov preliva - This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. To območje vam omogoča urejanje postankov preliva. Da podvojite obstoječo ročko postanka dvokliknite nanjo. Za ustvaritev novega postanka dvokliknite izven obstoječih ročic postankov. Da spremenite položaj postanka povlecite in spustite njegovo ročko. Če kliknete z desnim gumbom miške, se bo pojavil priročni meni z dodatnimi dejanji. - Zoom Povečava - Position Položaj - Hue Odtenek - H H - Saturation Zasičenost - S S - Sat Zas. - Value Vrednost - V V - Val Vre. - Alpha Alfa - A A - Type Vrsta - Spread Razširitev - Color Barva - Current stop's color Barva trenutnega postanka - HSV HSV - RGB RGB - Current stop's position Položaj trenutnega postanka - % % - Zoom In Povečaj - Zoom Out Zmanjšaj - Toggle details extension Preklopi prikaz podrobnosti - > > - Linear Type Linearna vrsta - ... ... - Radial Type Radialna vrsta - Conical Type Stožčasta vrsta - Pad Spread Razširitev z zapolnitvijo - Repeat Spread Razširitev s ponovitvijo - Reflect Spread Razširitev z odbojem - This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. To območje prikazuje ogled urejevanega preliva. Omogoča vam tudi urejanje parametrov, ki so specifični za vrsto preliva, na primer začetna in končna točka, polmer in podobno. Za to uporabite vlečenje in spuščanje. - Show HSV specification Prikaži specifikacijo HSV - Show RGB specification Prikaži specifikacijo RGB - Reset Zoom Ponastavi povečavo @@ -2985,37 +2466,30 @@ QtGradientStopsWidget - New Stop Nov postanek - Delete Zbriši - Flip All Obrni vse - Select All Izberi vse - Zoom In Povečaj - Zoom Out Zmanjšaj - Reset Zoom Ponastavi povečavo @@ -3023,46 +2497,34 @@ QtGradientView - Grad Preliv - Remove Gradient Odstrani preliv - Are you sure you want to remove the selected gradient? Ali res želite odstraniti izbrani preliv? - - New... Nov ... - - Edit... Urejanje ... - - Rename Preimenuj - - Remove Odstrani - Gradient View Prikaz preliva @@ -3070,7 +2532,6 @@ QtGradientViewDialog - Select Gradient Izberite preliv @@ -3078,7 +2539,6 @@ QtKeySequenceEdit - Clear Shortcut Počisti bližnjico @@ -3086,17 +2546,14 @@ QtLocalePropertyManager - %1, %2 %1, %2 - Language Jezik - Country Država @@ -3104,17 +2561,14 @@ QtPointFPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3122,17 +2576,14 @@ QtPointPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3140,12 +2591,10 @@ QtPropertyBrowserUtils - [%1, %2, %3] (%4) [%1, %2, %3] (%4) - [%1, %2] [%1, %2] @@ -3153,27 +2602,22 @@ QtRectFPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 × %4] - X X - Y Y - Width Širina - Height Višina @@ -3181,27 +2625,22 @@ QtRectPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 × %4] - X X - Y Y - Width Širina - Height Višina @@ -3209,128 +2648,98 @@ QtResourceEditorDialog - %1 already exists. Do you want to replace it? %1 že obstaja. Ali jo želite nadomestiti? - The file does not appear to be a resource file; element '%1' was found where '%2' was expected. Kot kaže datoteka ni datoteka z viri. Najden je bil element »%1«, pričakovan pa element »%2«. - %1 [read-only] %1 [samo za branje] - - %1 [missing] %1 [manjka] - <no prefix> <brez predpone> - - New Resource File Nova datoteka z viri - - Resource files (*.qrc) Datoteke z viri (*.qrc) - Import Resource File Uvozi datoteko z viri - newPrefix novaPredpona - Add Files Dodaj datoteke - Incorrect Path Nepravilna pot - - - - Copy Skopiraj - Copy As... Skopiraj kot ... - Keep Obdrži - Skip Preskoči - Clone Prefix Kloniraj predpono - Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". Vnesite pripono, ki jo želite dodati imenom kloniranih datotek. To bi, na primer, lahko bila pripona jezika kot je »_sl«. - - Copy As Skopiraj kot - <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>Izbrana datoteka:</p><p>%1</p><p>je izven mape trenutne datoteke z viri:</p><p>%2</p><p>Izberite drugo pot znotraj te mape.<p> - Could not overwrite %1. Ni bilo moč nadomestiti %1. - <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>Opozorilo:</b> Datoteka</p><p>%1</p><p>je izven matične mape trenutne datoteke z viri.</p> - <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>Da razrešite težavo, kliknite:</p><table><tr><th align="left">Skopiraj</th><td>da skopirate datoteko v matično mapo datoteke z viri</td></tr><tr><th align="left">Skopiraj kot ...</th><td>da skopirate datoteko v podmapo matične mape datoteke z viri</td></tr><tr><th align="left">Obdrži</th><td>da uporabite trenutno lokacijo</td></tr></table> - Could not copy %1 to @@ -3341,153 +2750,120 @@ %2 - A parse error occurred at line %1, column %2 of %3: %4 Prišlo je do napake razčlenjevanja v vrstici %1, stolpcu %2 v %3: %4 - Save Resource File Shrani datoteko z viri - Edit Resources Urejanje virov - New... Nova ... - Open... Odpri ... - - Remove Odstrani - - Move Up Premakni gor - - Move Down Pomakni dol - - Add Prefix Dodaj predpono - Add Files... Dodaj datoteke ... - Change Prefix Spremeni predpono - Change Language Spremeni jezik - Change Alias Spremeni drugo ime - Clone Prefix... Kloniraj predpono ... - Prefix / Path Predpona / pot - Language / Alias Jezik / drugo ime - <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>Opozorilo:</b> Med ponovnim nalaganjem virov je prišlo do težav:</p><pre>%1</pre></html> - Resource Warning Opozorilo o virih - Dialog Pogovorno okno - New File Nova datoteka - N N - Remove File Odstrani datoteko - R R - I I - New Resource Nov vir - A A - Remove Resource or File Odstrani vir ali datoteko - Could not write %1: %2 Ni moč zapisati %1: %2 - Open Resource File Odpri datoteko z viri @@ -3495,24 +2871,20 @@ QtResourceView - Size: %1 x %2 %3 Velikost: %1 × %2 %3 - Edit Resources... Urejanje virov ... - Reload Znova naloži - Copy Path Skopiraj pot @@ -3520,7 +2892,6 @@ QtResourceViewDialog - Select Resource Izberite vir @@ -3528,17 +2899,14 @@ QtSizeFPropertyManager - %1 x %2 %1 × %2 - Width Širina - Height Višina @@ -3546,33 +2914,26 @@ QtSizePolicyPropertyManager - - <Invalid> <neveljavno> - [%1, %2, %3, %4] [%1, %2, %3, %4] - Horizontal Policy Vodoravna politika - Vertical Policy Navpična politika - Horizontal Stretch Vodoravna praznina - Vertical Stretch Navpična praznina @@ -3580,17 +2941,14 @@ QtSizePropertyManager - %1 x %2 %1 × %2 - Width Širina - Height Višina @@ -3598,107 +2956,86 @@ QtToolBarDialog - < S E P A R A T O R > < L O Č I T E L J > - Customize Toolbars Prilagodi orodjarne - 1 1 - Actions Dejanja - Toolbars Orodjarne - New Novo - Remove Odstrani - Rename Preimenuj - Up Gor - <- <- - -> -> - Down Dol - Current Toolbar Actions Trenutna dejanja v orodjarni - Custom Toolbar Orodjarna po meri - Add new toolbar Dodaj novo orodjarno - Remove selected toolbar Odstrani izbrano orodjarno - Rename toolbar Preimenuj orodjarno - Move action up Premakni dejanje gor - Remove action from toolbar Odstrani dejanje iz orodjarne - Add action to toolbar Dodaj dejanje v orodjarno - Move action down Premakni dejanje dol @@ -3706,12 +3043,10 @@ QtTreePropertyBrowser - Property Lastnost - Value Vrednost @@ -3719,64 +3054,52 @@ SaveFormAsTemplate - Add path... Dodaj pot ... - Template Exists Predloga obstaja - A template with the name %1 already exists. Do you want overwrite the template? Predloga z imenom %1 že obstaja. Ali želite nadomestiti predlogo? - Overwrite Template Nadomesti predlogo - Open Error Napaka pri odpiranju - There was an error opening template %1 for writing. Reason: %2 Prišlo je do napake pri odpiranju predloge %1 za pisanje. Razlog: %2 - Write Error Napaka pri pisanju - There was an error writing the template %1 to disk. Reason: %2 Prišlo je do napake pri pisanju predloge %1 na disk. Razlog: %2 - Pick a directory to save templates in Izberite mapo za shranjevanje predlog - Save Form As Template Shranjevanje obrazca kot predloge - &Category: &Kategorija: - &Name: &Ime: @@ -3784,7 +3107,6 @@ ScriptErrorDialog - An error occurred while running the scripts for "%1": Prišlo je do napake med poganjanjem skriptov za »%1«: @@ -3794,22 +3116,18 @@ SelectSignalDialog - Go to slot Pojdi na režo - Select signal Izbiranje signala - signal signal - class razred @@ -3817,7 +3135,6 @@ SignalSlotConnection - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) POŠILJATELJ(%1), SIGNAL(%2), PREJEMNIK (%3), REŽA(%4) @@ -3825,32 +3142,26 @@ SignalSlotDialogClass - Signals and slots Signali in reže - Slots Reže - ... ... - Signals Signali - Add Dodaj - Delete Zbriši @@ -3858,12 +3169,10 @@ Spacer - Horizontal Spacer '%1', %2 x %3 Vodoravni ločitelj »%1«, %2 x %3 - Vertical Spacer '%1', %2 x %3 Navpični ločitelj »%1«, %2 x %3 @@ -3871,41 +3180,51 @@ TemplateOptionsPage - Template Paths - Tab in preferences dialog + Tab in preferences dialog + Poti za predloge ToolBarManager - Configure Toolbars... Nastavi orodjarne ... - Window Okno - Help Pomoč - Style Slog - Dock views Podokna - + File + Datoteka + + + Edit + Urejanje + + + Tools + Orodja + + + Form + Obrazec + + Toolbars Orodjarne @@ -3913,30 +3232,64 @@ VersionDialog - <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Različica %2 - Qt Designer Qt Designer - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt Designer je snovalnik grafičnih uporabniških vmesnikov za Qt programe.<br/> - %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). %1<br/>Avtorske pravice © 2009 Nokia Corporation in/ali njene podružnice. + VideoPlayerTaskMenu + + Available Mime Types + Razpoložljive vrste MIME + + + Display supported mime types... + Prikaži podprte vrste MIME ... + + + Load... + Naloži ... + + + Play + Predvajaj + + + Pause + Premor + + + Stop + Ustavi + + + Choose Video Player Media Source + Izberite večpredstavnostni vir za predvajalnik videa + + + An error has occurred in '%1': %2 + V »%1« je prišlo do napake: %2 + + + Video Player Error + Napaka predvajalnika videa + + + WidgetDataBase - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Datoteka vsebuje gradnik po meri »%1«, katerega osnovni razred (%2) se razlikuje od trenutnega vnosa v podatkovni zbirki gradnikov (%3). Podatkovna zbirka gradnikov je ostala nespremenjena. @@ -3944,87 +3297,70 @@ qdesigner_internal::ActionEditor - Actions Dejanja - New... Novo ... - Delete Zbriši - New action Novo dejanje - Edit action Uredi dejanje - Edit... Uredi ... - Go to slot... Pojdi na režo ... - Copy Skopiraj - Cut Izreži - Paste Prilepi - Select all Izberi vse - Icon View Prikaz ikon - Detailed View Prikaz podrobnosti - Remove actions Odstrani dejanja - Remove action '%1' Odstrani dejanje »%1« - Used In Uporabljeno v - Configure Action Editor Nastavi urejevalnik dejanj @@ -4032,32 +3368,26 @@ qdesigner_internal::ActionModel - Name Ime - Used Uporabljeno - Text Besedilo - Shortcut Bližnjica - Checkable Stikalo - ToolTip Namig @@ -4065,27 +3395,22 @@ qdesigner_internal::BrushManagerProxy - The element '%1' is missing the required attribute '%2'. Elementu »%1« manjka obvezna lastnost »%2«. - Empty brush name encountered. Doseženo je bilo prazno ime čopiča. - An unexpected element '%1' was encountered. Dosežen je bil nepričakovan element »%1«. - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 Prišlo je do napake pri branju datoteke z definicijo čopiča »%1«, v vrstici %2 in stolpcu %3: %4 - An error occurred when reading the resource file '%1' at line %2, column %3: %4 Prišlo je do napake pri branju datoteke z viri »%1«, v vrstici %2 in stolpcu %3: %4 @@ -4093,17 +3418,14 @@ qdesigner_internal::BuddyEditor - Add buddy Dodaj kolega - Remove buddies Odstrani kolege - Remove %n buddies Odstrani %n kolega @@ -4113,7 +3435,6 @@ - Add %n buddies Dodaj %n kolega @@ -4123,7 +3444,6 @@ - Set automatically Nastavi samodejno @@ -4131,7 +3451,6 @@ qdesigner_internal::BuddyEditorPlugin - Edit Buddies Urejanje kolegov @@ -4139,7 +3458,6 @@ qdesigner_internal::BuddyEditorTool - Edit Buddies Urejanje kolegov @@ -4147,12 +3465,10 @@ qdesigner_internal::ButtonGroupMenu - Select members Izberi člane - Break Razbij @@ -4160,32 +3476,26 @@ qdesigner_internal::ButtonTaskMenu - Assign to button group Dodeli skupini gumbov - Button group Skupina gumbov - New button group Novi skupini gumbov - Change text... Spremeni besedilo ... - None Nobeni - Button group '%1' Skupina gumbov »%1« @@ -4193,57 +3503,46 @@ qdesigner_internal::CodeDialog - Save... Shrani ... - Copy All Skopiraj vse - &Find in Text... &Najdi v besedilu ... - A temporary form file could not be created in %1. Začasne datoteke obrazca v %1 ni bilo moč ustvariti. - The temporary form file %1 could not be written. V začasno datoteko obrazca %1 ni bilo moč pisati. - %1 - [Code] %1 - [koda] - Save Code Shrani kodo - Header Files (*.%1) Datoteke z glavo (*.%1) - The file %1 could not be opened: %2 Datoteke »%1« ni bilo moč odpreti: %2 - The file %1 could not be written: %2 Datoteke »%1« ni bilo moč zapisati: %2 - %1 - Error %1 - napaka @@ -4251,7 +3550,6 @@ qdesigner_internal::ColorAction - Text Color Barva besedila @@ -4259,12 +3557,10 @@ qdesigner_internal::ComboBoxTaskMenu - Edit Items... Uredi postavke ... - Change Combobox Contents Spreminjanje vsebine spustnega seznama @@ -4272,7 +3568,6 @@ qdesigner_internal::CommandLinkButtonTaskMenu - Change description... Spremeni opis ... @@ -4280,17 +3575,14 @@ qdesigner_internal::ConnectionEdit - Select All Izberi vse - Deselect All Odizberi vse - Delete Zbriši @@ -4298,52 +3590,42 @@ qdesigner_internal::ConnectionModel - Sender Pošiljatelj - Signal Signal - Receiver Prejemnik - Slot Reža - <sender> <pošiljatelj> - <signal> <signal> - <receiver> <prejemnik> - <slot> <reža> - Signal and Slot Editor Urejevalnik signalov in rež - The connection already exists!<br>%1 Povezava že obstaja!<br>%1 @@ -4351,42 +3633,34 @@ qdesigner_internal::ContainerWidgetTaskMenu - Insert Page Before Current Page Vstavi stran pred trenutno stran - Insert Page After Current Page Vstavi stran za trenutno stran - Add Subwindow Dodaj podokno - Delete Zbriši - Insert Vstavi - Subwindow Podokno - Page Stran %1 - Page %1 of %2 Stran %1 od %2 @@ -4394,69 +3668,57 @@ qdesigner_internal::DPI_Chooser - System (%1 x %2) - System resolution + System resolution + Sistemska (%1 x %2) - User defined Uporabniško določena - x - DPI X/Y separator + DPI X/Y separator + x qdesigner_internal::DesignerPropertyManager - - AlignLeft Poravnaj levo - AlignHCenter Poravnaj sredinsko (vodoravno) - AlignRight Poravnaj desno - AlignJustify Poravnaj obojestransko - AlignTop Poravnaj na vrh - - AlignVCenter Poravnaj sredinsko (navpično) - AlignBottom Poravnaj na dno - %1, %2 %1, %2 - Customized (%n roles) Po meri (%n vloga) @@ -4466,75 +3728,58 @@ - Inherited Podedovano - Horizontal Vodoravno - Vertical Navpično - Normal Off Normalna in izključena - Normal On Normalna in vključena - Disabled Off Onemogočena in izključena - Disabled On Onemogočena in vključena - Active Off Aktivna in izključena - Active On Aktivna in vključena - Selected Off Izbrana in izključena - Selected On Izbrana in vključena - - translatable prevedljivo - - disambiguation razločitev - - comment komentar @@ -4542,48 +3787,38 @@ qdesigner_internal::DeviceProfileDialog - Device Profiles (*.%1) Profili naprav (*.%1) - Default Privzeti - Save Profile Shrani profil - Save Profile - Error Shranjevanje profila - napaka - Unable to open the file '%1' for writing: %2 Datoteke »%1« ni moč odpreti za pisanje: %2 - Open profile Odpri profil - - Open Profile - Error Odpiranje profila - napaka - Unable to open the file '%1' for reading: %2 Datoteke »%1« ni moč odpreti za branje: %2 - '%1' is not a valid profile: %2 »%1« ni veljaven profil: %2 @@ -4591,57 +3826,46 @@ qdesigner_internal::Dialog - Dialog PogovornoOkno - StringList SeznamNizov - New String Nov niz - &New &Nov - Delete String Z&briši niz - &Delete &Zbriši - &Value: &Vrednost: - Move String Up Premakni niz gor - Up Gor - Move String Down Premakni niz dol - Down Dol @@ -4649,52 +3873,42 @@ qdesigner_internal::EmbeddedOptionsControl - None Noben - Add a profile Dodaj profil - Edit the selected profile Uredi izbrani profil - Delete the selected profile Zbriši izbrani profil - Add Profile Dodaj profil - New profile Nov profil - Edit Profile Uredi profil - Delete Profile Zbriši profil - Would you like to delete the profile '%1'? Ali želite zbrisati profil »%1«? - Default Privzeti @@ -4702,20 +3916,21 @@ qdesigner_internal::FilterWidget - - <Filter> - <filter> + Filter + Filter + + + Clear text + Počisti besedilo qdesigner_internal::FormEditor - Resource File Changed Datoteka z viri je bila spremenjena - The file "%1" has changed outside Designer. Do you want to reload it? Datoteka »%1« je bila spremenjena izven Qt Designerja. Ali jo želite naložiti znova? @@ -4723,7 +3938,6 @@ qdesigner_internal::FormLayoutMenu - Add form layout row... Dodaj vrstico razporeditve na obrazcu ... @@ -4731,54 +3945,46 @@ qdesigner_internal::FormWindow - Edit contents Uredi vsebino - F2 F2 - Resize Spremeni velikost - - Key Move Premik s tipko - + Key Resize + + + Cannot paste widgets. Designer could not find a container without a layout to paste into. Ni moč prilepiti gradnikov. Qt Designer ni mogel najti vsebnika brez razporeditve, v katerega bi prilepil. - Break the layout of the container you want to paste into, select this container and then paste again. Razbijte razporeditev za vsebnik, v katerega želite prilepiti, nato izberite vsebnik in prilepite znova. - Paste error Napaka prilepljanja - Lay out Razporedi - - Drop widget Spusti gradnik - Paste %n action(s) Prilepi %n dejanje @@ -4788,12 +3994,10 @@ - Insert widget '%1' Vstavi gradnik »%1« - Paste %n widget(s) Prilepi %n gradnik @@ -4803,27 +4007,22 @@ - Paste (%1 widgets, %2 actions) Prilepi (gradnikov: %1, dejanj: %2) - Select Ancestor Izberi predhodnika - A QMainWindow-based form does not contain a central widget. Obrazec temelječ na QMainWindow ne vsebuje osrednjega gradnika. - Raise widgets Dvigni gradnike - Lower widgets Spusti gradnike @@ -4831,12 +4030,10 @@ qdesigner_internal::FormWindowBase - Delete Zbriši - Delete '%1' Zbriši »%1« @@ -4844,200 +4041,159 @@ qdesigner_internal::FormWindowManager - Cu&t &Izreži - Cuts the selected widgets and puts them on the clipboard Izreže izbrane gradnike in jih odloži na odložišče - &Copy S&kopiraj - Copies the selected widgets to the clipboard Skopira izbrane gradnike na odložišče - &Paste Pri&lepi - Pastes the clipboard's contents Prilepi vsebino odložišča - &Delete &Zbriši - Deletes the selected widgets Zbriše izbrane gradnike - Select &All Izberi &vse - Selects all widgets Izbere vse gradnike - Bring to &Front Prinesi v o&spredje - - Raises the selected widgets Dvigne izbrane gradnike - Send to &Back Pošlji v &ozadje - - Lowers the selected widgets Spusti izbrane gradnike - Adjust &Size Prilagodi ve&likost - Adjusts the size of the selected widget Prilagodi velikost izbranega gradnika - Lay Out &Horizontally Razporedi &vodoravno - Lays out the selected widgets horizontally Izbrane gradnike razporedi vodoravno - Lay Out &Vertically Razporedi &navpično - Lays out the selected widgets vertically Izbrane gradnike razporedi navpično - Lay Out in a &Grid Razporedi v &mrežo - Lays out the selected widgets in a grid Razporedi izbrane gradnike v mrežo - Lay Out Horizontally in S&plitter Razporedi vodoravno v ra&zdelilnik - Lays out the selected widgets horizontally in a splitter Izbrane gradnike razporedi vodoravno v razdelilnik - Lay Out Vertically in Sp&litter Razporedi navpično v raz&delilnik - Lays out the selected widgets vertically in a splitter Izbrane gradnike razporedi navpično v razdelilnik - &Break Layout &Razbij razporeditev - Breaks the selected layout Razbij izbrano razporeditev - &Preview... Prikaži &ogled ... - Preview current form Prikaže ogled trenutnega obrazca - Form &Settings... &Nastavi obrazec ... - Break Layout Razbij razporeditev - Adjust Size Prilagodi velikost - Could not create form preview Title of warning message box Ni bilo moč ustvariti ogleda obrazca - Form Settings - %1 Nastavitve obrazca - %1 - Removes empty columns and rows Odstrani prazne stolpce in vrstice - Lay Out in a &Form Layout Razporedi v razporeditev na &obrazcu - Lays out the selected widgets in a form layout Razporedi izbrane gradnike v razporeditev na obrazcu - Si&mplify Grid Layout Po&enostavi razporeditev v mrežo @@ -5045,12 +4201,10 @@ qdesigner_internal::FormWindowSettings - None Noben - Device Profile: %1 Profil naprave: %1 @@ -5058,37 +4212,30 @@ qdesigner_internal::GridPanel - Form Obrazec - Grid Mreža - Visible Vidna - Grid &X Mreža &X - Snap Pripni - Reset Ponastavi - Grid &Y Mreža &Y @@ -5096,7 +4243,6 @@ qdesigner_internal::GroupBoxTaskMenu - Change title... Spremeni naslov ... @@ -5104,7 +4250,6 @@ qdesigner_internal::HtmlTextEdit - Insert HTML entity Vstavi entiteto HTML @@ -5112,92 +4257,74 @@ qdesigner_internal::IconSelector - The pixmap file '%1' cannot be read. Datoteke s sličico »%1« ni moč prebrati. - The file '%1' does not appear to be a valid pixmap file: %2 Kot kaže »%1« ni veljavna datoteka s sličico: %2 - The file '%1' could not be read: %2 Datoteke »%1« ni bilo moč prebrati: %2 - Pixmap Read Error Napaka pri branju sličice - ... ... - Normal Off Normalna in izključena - Normal On Normalna in vključena - Disabled Off Onemogočena in izključena - Disabled On Onemogočena in vključena - Active Off Aktivna in izključena - Active On Aktivna in vključena - Selected Off Izbrana in izključena - Selected On Izbrana in vključena - Choose Resource... Izberi vir ... - Choose File... Izberi datoteko ... - Reset Ponastavi - Reset All Ponastavi vse - Choose a Pixmap Izbiranje sličice @@ -5205,58 +4332,46 @@ qdesigner_internal::ItemListEditor - Properties &<< Lastnosti &<< - - Properties &>> Lastnosti &>> - Items List Seznam postavk - New Item Nova postavka - &New &Nova - Delete Item Zbriši postavko - &Delete &Zbriši - Move Item Up Premakni postavko gor - U G - Move Item Down Premakni postavko dol - D D @@ -5264,12 +4379,10 @@ qdesigner_internal::LabelTaskMenu - Change rich text... Spremeni bogato besedilo ... - Change plain text... Spremeni navadno besedilo ... @@ -5277,7 +4390,6 @@ qdesigner_internal::LanguageResourceDialog - Choose Resource Izberite vir @@ -5285,7 +4397,6 @@ qdesigner_internal::LineEditTaskMenu - Change text... Spremeni besedilo ... @@ -5293,17 +4404,14 @@ qdesigner_internal::ListWidgetEditor - Edit List Widget Urejanje gradnika s seznamom - Edit Combobox Urejanje spustnega seznama - New Item Nova postavka @@ -5311,12 +4419,10 @@ qdesigner_internal::ListWidgetTaskMenu - Edit Items... Uredi postavke ... - Change List Contents Spreminjanje vsebine seznama @@ -5324,22 +4430,18 @@ qdesigner_internal::MdiContainerWidgetTaskMenu - Next Subwindow Naslednje podokno - Previous Subwindow Predhodno podokno - Tile Tlakuj - Cascade V kaskado @@ -5347,7 +4449,6 @@ qdesigner_internal::MenuTaskMenu - Remove Odstrani @@ -5355,7 +4456,6 @@ qdesigner_internal::MorphMenu - Morph into Pretvori v @@ -5363,42 +4463,34 @@ qdesigner_internal::NewActionDialog - New Action... Novo dejanje ... - &Text: &Besedilo: - &Icon: &Ikona: - Shortcut: Bližnjica: - Checkable: Stikalo: - ToolTip: Namig: - ... ... - Object &name: &Ime objekta: @@ -5406,39 +4498,32 @@ qdesigner_internal::NewDynamicPropertyDialog - Set Property Name Nastavi ime lastnosti - The current object already has a property named '%1'. Please select another, unique one. Trenutni objekt že ima lastnost z imenom »%1«.Izberite drugo, edinstveno ime - Create Dynamic Property Ustvari dinamično lastnost - Property Name Ime lastnosti - Property Type Vrsta lastnosti - The '_q_' prefix is reserved for the Qt library. Please select another name. Predpona »_q_« je rezervirana za knjižnico Qt.Izberite drugo ime. - horizontalSpacer vodoravnaPraznina @@ -5446,83 +4531,68 @@ qdesigner_internal::NewFormWidget - Default size Privzeta velikost - QVGA portrait (240x320) QVGA, pokončno (240x320) - QVGA landscape (320x240) QVGA, ležeče (320x240) - VGA portrait (480x640) VGA, pokončno (480x640) - VGA landscape (640x480) VGA, ležeče (640x480) - Widgets - New Form Dialog Categories + New Form Dialog Categories + Gradniki - Custom Widgets Gradniki po meri - None Nobena - Error loading form Napaka pri nalaganju obrazca - Unable to open the form template file '%1': %2 Ni moč odpreti datoteke s predlogo obrazca »%1«: %2 - Internal error: No template selected. Notranja napaka: izbrane ni nobene predloge. - 0 0 - Choose a template for a preview Izberite predlogo za ogled - Embedded Design Vgrajena zasnova - Device: Naprava: - Screen Size: Velikost zaslona @@ -5530,37 +4600,30 @@ qdesigner_internal::NewPromotedClassPanel - Add Dodaj - New Promoted Class Nov povišan razred - Base class name: Ime osnovnega razreda: - Promoted class name: Ime povišanega razreda: - Header file: Datoteka z glavo: - Global include Globalna vključitev - Reset Ponastavi @@ -5568,48 +4631,37 @@ qdesigner_internal::ObjectInspector - + Change Current Page + Spreminjanje trenutne strani + + &Find in Text... &Najdi v besedilu ... - qdesigner_internal::ObjectInspector::ObjectInspectorPrivate - - - Change Current Page - Spreminjanje trenutne strani - - - qdesigner_internal::OrderDialog - Index %1 (%2) Indeks %1 (%2) - Change Page Order Spreminjanje vrstnega reda strani - Page Order Vrstni red strani - Move page up Premakni stran gor - Move page down Premakni stran dol - %1 %2 %1 %2 @@ -5617,47 +4669,38 @@ qdesigner_internal::PaletteEditor - Edit Palette Urejanje palete - Tune Palette Nastavitev palete - Show Details Prikaži podrobnosti - Compute Details izračunaj podrobnosti - Quick Hitro - Preview Ogled - Disabled Onemogočeno - Inactive Neaktivno - Active Aktivno @@ -5665,7 +4708,6 @@ qdesigner_internal::PaletteEditorButton - Change Palette Spremeni paleto @@ -5673,22 +4715,18 @@ qdesigner_internal::PaletteModel - Color Role Vloga barve - Active Aktivno - Inactive Neaktivno - Disabled Onemogočeno @@ -5696,28 +4734,22 @@ qdesigner_internal::PixmapEditor - Copy Path Skopiraj pot - Paste Path Prilepi pot - Choose Resource... Izberi vir ... - Choose File... Izberi datoteko ... - - ... ... @@ -5725,7 +4757,6 @@ qdesigner_internal::PlainTextEditorDialog - Edit text Uredi besedilo @@ -5733,37 +4764,30 @@ qdesigner_internal::PluginDialog - Components Komponente - Plugin Information Podatki o vstavkih - Refresh Osveži - Scan for newly installed custom widget plugins. Preveri razpoložljivost na novo nameščenih vstavkov za gradnike po meri. - Qt Designer couldn't find any plugins Qt Designer ni našel nobenega vstavka - Qt Designer found the following plugins Qt Designer je našel naslednje vstavke - New custom widget plugins have been found. Najdeni so bili vstavki za nove gradnike po meri. @@ -5771,7 +4795,6 @@ qdesigner_internal::PreviewActionGroup - %1 Style Slog %1 @@ -5779,50 +4802,38 @@ qdesigner_internal::PreviewConfigurationWidget - Default Privzeto - None Brez - Browse... Brskaj ... - - - qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate - - + Load Custom Device Skin - Naloži temo za napravo po meri - - - + Naloži temo za napravo po meri + + All QVFB Skins (*.%1) Vse teme za QVFB (*.%1) - %1 - Duplicate Skin %1 - podvojena tema - The skin '%1' already exists. Tema »%1« že obstaja. - %1 - Error %1 - napaka - %1 is not a valid skin directory: %2 %1 ni veljavna mapa s temo: @@ -5832,24 +4843,22 @@ qdesigner_internal::PreviewDeviceSkin - &Portrait &Pokončno - Landscape (&CCW) - Rotate form preview counter-clockwise + Rotate form preview counter-clockwise + L&ežeče (v nasprotni smeri ure) - &Landscape (CW) - Rotate form preview clockwise + Rotate form preview clockwise + &Ležeče (v smeri ure) - &Close &Zapri @@ -5857,7 +4866,6 @@ qdesigner_internal::PreviewManager - %1 - [Preview] %1 - [ogled] @@ -5865,10 +4873,10 @@ qdesigner_internal::PreviewMdiArea - The moose in the noose ate the goose who was loose. - Palette editor background + Palette editor background + Šerif bo za vajo spet skuhal domače žgance. @@ -5876,57 +4884,46 @@ qdesigner_internal::PreviewWidget - Preview Window Okno ogleda - LineEdit UrejevalnaVrstica - ComboBox SpustniSeznam - PushButton Gumb - ButtonGroup2 SkupinaGumbov2 - CheckBox1 PotrditvenoPolje1 - CheckBox2 PotrditvenoPolje2 - ButtonGroup SkupinaGumbov - RadioButton1 IzbirniGumb1 - RadioButton2 IzbirniGumb2 - RadioButton3 IzbirniGumb3 @@ -5934,22 +4931,18 @@ qdesigner_internal::PromotionModel - Name Ime - Header file Datoteka z glavo - Global include Globalna vključitev - Usage Uporaba @@ -5957,27 +4950,22 @@ qdesigner_internal::PromotionTaskMenu - Promoted widgets... Povišani gradniki ... - Promote to ... Povišaj v ... - Promote to Povišaj v - Demote to %1 Ponižaj v %1 - Change signals/slots... Spremeni signale/reže ... @@ -5985,59 +4973,48 @@ qdesigner_internal::PropertyEditor - Add Dynamic Property... Dodaj dinamično lastnost ... - Remove Dynamic Property Odstrani dinamično lastnost - Tree View Drevesni prikaz - Drop Down Button View Gumb s spustim seznamom za prikaz - Object: %1 Class: %2 Objekt: %1 Razred: %2 - Sorting Razvrsti - Color Groups Obarvaj skupine - Configure Property Editor Nastavi urejevalnik lastnosti - String... Niz ... - Bool... Bool ... - Other... Drugo ... @@ -6045,7 +5022,6 @@ qdesigner_internal::PropertyLineEdit - Insert line break Vstavi prelom vrstice @@ -6053,27 +5029,22 @@ qdesigner_internal::QDesignerPromotionDialog - Promoted Widgets Povišani gradniki - Promoted Classes Povišani razredi - Promote Povišaj - %1 - Error %1 - napaka - Change signals/slots... Spremeni signale/reže ... @@ -6081,22 +5052,18 @@ qdesigner_internal::QDesignerResource - Loading qrc file Nalaganje datoteke *.qrc - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> Podane datoteke *.qrc <p><b>%1</b></p><p>ni bilo moč najti. Ali želite posodobiti lokacijo datoteke?</p> - New location for %1 Nova lokacija za %1 - Resource files (*.qrc) Datoteke z viri (*.qrc) @@ -6104,7 +5071,6 @@ qdesigner_internal::QDesignerTaskMenu - Set size constraint on %n widget(s) Nastavi omejitev velikosti za %n gradnik @@ -6114,107 +5080,86 @@ - Change objectName... Spremeni ime objekta ... - Change toolTip... Spremeni namig ... - Change whatsThis... Spremeni KajJeTo ... - Change styleSheet... Spremeni slogovno predlogo ... - Create Menu Bar Ustvari menijsko vrstico - Add Tool Bar Dodaj orodjarno - Create Status Bar Ustvari vrstico stanja - Remove Status Bar Odstrani vrstico stanja - Change script... Spremeni skript ... - Change signals/slots... Spremeni signale/reže ... - Go to slot... Pojdi na režo ... - Size Constraints Omejitve velikosti - Set Minimum Width Nastavi najmanjšo širino - Set Minimum Height Nastavi najmanjšo višino - Set Minimum Size Nastavi najmanjšo velikost - Set Maximum Width Nastavi največjo širino - Set Maximum Height Nastavi največjo višino - Set Maximum Size Nastavi največjo velikost - Edit ToolTip Uredi namig - Edit WhatsThis Uredi KajJeTo - no signals available na voljo ni nobenega signala @@ -6222,13 +5167,10 @@ qdesigner_internal::QDesignerWidgetBox - - Unexpected element <%1> Nepričakovan element <%1> - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 Prišlo je do napake razčlenjevanja v vrstici %1, stolpcu %2 kode XML za gradnik %3: %4 @@ -6236,29 +5178,24 @@ %5 - The XML code specified for the widget %1 does not contain any widget elements. %2 Koda XML za gradnik %1 ne vsebuje nobenega elementa gradnika. %2 - An error has been encountered at line %1 of %2: %3 Prišlo je do napake v vrstici %1 v %2: %3 - Unexpected element <%1> encountered when parsing for <widget> or <ui> Med razčlenjevanjem za <widget> ali <ui> je bil dosežen nepričakovan element <%1>. - Unexpected end of file encountered when parsing widgets. Med razčlenjevanjem gradnikov je bil dosežen nepričakovan konec datoteke. - A widget element could not be found. Ni bilo moč najti elementa gradnika. @@ -6266,73 +5203,58 @@ qdesigner_internal::QtGradientStopsController - H H - S S - V V - - Hue Odtenek - Sat Zasičenost - Val Vrednost - Saturation Zasičenost - Value Vrednost - R R - G G - B B - Red Rdeča - Green Zelena - Blue Modra @@ -6340,27 +5262,22 @@ qdesigner_internal::RichTextEditorDialog - Edit text Uredi besedilo - &OK &V redu - &Cancel &Prekliči - Rich Text Bogato besedilo - Source Izvorna koda @@ -6368,72 +5285,58 @@ qdesigner_internal::RichTextEditorToolBar - Bold Polkrepko - CTRL+B Ctrl+B - Italic Ležeče - CTRL+I CTRL+I - Underline Podčrtano - CTRL+U CTRL+U - Left Align Poravnaj levo - Center Na sredino - Right Align Poravnaj desno - Justify Obojestransko - Superscript Nadpisano - Subscript Podpisano - Insert &Link Vstavi &povezavo - Insert &Image Vstavi &sliko @@ -6441,17 +5344,14 @@ qdesigner_internal::ScriptDialog - Edit script Uredi skript - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>Vnesite delček Qt Scripta, ki bo izveden med nalaganjem obrazca.<br>Gradnik in njegovi podgradniki so dostopni prek spremenljivk <i>widget</i> in <i>childWidgets</i>. - Syntax error Skladenjska napaka @@ -6459,7 +5359,6 @@ qdesigner_internal::ScriptErrorDialog - Script errors Napake v skriptu @@ -6467,23 +5366,18 @@ qdesigner_internal::SignalSlotDialog - There is already a slot with the signature '%1'. Reža z odtisom »%1« že obstaja. - There is already a signal with the signature '%1'. Signal z odtisom »%1« že obstaja. - %1 - Duplicate Signature %1 - podvojen odtis - - Signals/Slots of %1 Signali/reže od %1 @@ -6491,12 +5385,10 @@ qdesigner_internal::SignalSlotEditorPlugin - Edit Signals/Slots Urejanje signalov/rež - F4 F4 @@ -6504,7 +5396,6 @@ qdesigner_internal::SignalSlotEditorTool - Edit Signals/Slots Urejanje signalov/rež @@ -6512,7 +5403,6 @@ qdesigner_internal::StatusBarTaskMenu - Remove Odstrani @@ -6520,7 +5410,6 @@ qdesigner_internal::StringListEditorButton - Change String List Spreminjanje seznama nizov @@ -6528,38 +5417,30 @@ qdesigner_internal::StyleSheetEditorDialog - Edit Style Sheet Urejanje slogovne predloge - - Valid Style Sheet Veljavna slogovna predloga - Add Resource... Dodaj vir ... - Add Gradient... Dodaj preliv ... - Add Color... Dodaj barvo ... - Add Font... Dodaj pisavo ... - Invalid Style Sheet Neveljavna slogovna predloga @@ -6567,27 +5448,22 @@ qdesigner_internal::TabOrderEditor - Start from Here Začni od tu - Restart Začni znova - Tab Order List... Seznam vrstnega reda tabulatorke ... - Tab Order List Seznam vrstnega reda tabulatorke - Tab Order Vrstni red tabulatorke @@ -6595,7 +5471,6 @@ qdesigner_internal::TabOrderEditorPlugin - Edit Tab Order Urejanje vrstnega reda tabulatorke @@ -6603,7 +5478,6 @@ qdesigner_internal::TabOrderEditorTool - Edit Tab Order Urejanja vrstnega reda tabulatorke @@ -6611,48 +5485,38 @@ qdesigner_internal::TableWidgetEditor - New Column Nov stolpec - New Row Nova vrstica - &Columns &Stolpci - &Rows &Vrstice - Properties &<< Lastnosti &<< - - Properties &>> Lastnosti &>> - Edit Table Widget Urejanje gradnika s tabelo - &Items &Postavke - Table Items Postavke v tabeli @@ -6660,7 +5524,6 @@ qdesigner_internal::TableWidgetTaskMenu - Edit Items... Uredi postavke ... @@ -6668,22 +5531,18 @@ qdesigner_internal::TemplateOptionsWidget - Pick a directory to save templates in Izberite mapo za shranjevanje predlog - Form Obrazec - Additional Template Paths Dodatne poti za predloge - ... ... @@ -6691,22 +5550,18 @@ qdesigner_internal::TextEditTaskMenu - Change HTML... Spremeni HTML ... - Edit HTML Urejanje HTML-ja - Edit Text Urejanje besedila - Change Plain Text... Spremeni navadno besedilo ... @@ -6714,22 +5569,18 @@ qdesigner_internal::TextEditor - Choose Resource... Izberi vir ... - Choose File... Izberi datoteko ... - Choose a File Izbiranje datoteke - ... ... @@ -6737,27 +5588,22 @@ qdesigner_internal::ToolBarEventFilter - Insert Separator Vstavi ločitelja - Remove action '%1' Odstrani dejanje »%1« - Remove Toolbar '%1' Odstrani orodjarno »%1« - Insert Separator before '%1' Vstavi ločitelja pred »%1« - Append Separator Dodaj ločitelja @@ -6765,125 +5611,98 @@ qdesigner_internal::TreeWidgetEditor - &Columns &Stolpci - Per column properties Lastnosti za stolpec - Common properties Skupne lastnosti - - New Item Nova postavka - Properties &<< Lastnosti &<< - - Properties &>> Lastnosti &>> - New Column Nov stolpec - Edit Tree Widget Urejanje gradnika z drevesom - &Items &Postavke - Tree Items Postavke v drevesu - - New Subitem Nova podpostavka - New &Subitem Nova &podpostavka - Delete Item Zbriši postavko - Move Item Left (before Parent Item) Premakni postavko levo (pred matično postavko) - L L - Move Item Right (as a First Subitem of the Next Sibling Item) Premakni postavko desno (kot prvo podpostavko sledeče postavke) - R E - Move Item Up Premakni postavko gor - U G - Move Item Down Premakni postavko dol - D D - 1 1 - &New &Nova - &Delete &Zbriši @@ -6891,7 +5710,6 @@ qdesigner_internal::TreeWidgetTaskMenu - Edit Items... Uredi postavke ... @@ -6899,7 +5717,6 @@ qdesigner_internal::WidgetBox - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Opozorilo: ustvarjanje gradnika v podoknu z gradniki ni uspelo. Za to je morda kriv neveljaven XML gradnika po meri. @@ -6907,42 +5724,34 @@ qdesigner_internal::WidgetBoxTreeWidget - Scratchpad Beležnica - Custom Widgets Gradniki po meri - Expand all Razširi vse - Collapse all Skrči vse - List View Prikaz seznama - Icon View Prikaz ikon - Remove Odstrani - Edit name Urejanje imena @@ -6950,7 +5759,6 @@ qdesigner_internal::WidgetDataBase - A custom widget plugin whose class name (%1) matches that of an existing class has been found. Najden je bil vstavek gradnika po meri, katerega ime (%1) je enako imenu obstoječega razreda. @@ -6958,7 +5766,6 @@ qdesigner_internal::WidgetEditorTool - Edit Widgets Urejanje gradnikov @@ -6966,34 +5773,28 @@ qdesigner_internal::WidgetFactory - The custom widget factory registered for widgets of class %1 returned 0. Tovarna gradnikov po meri, ki je registrirana za gradnike razreda %1, je vrnila 0. - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Med ustvarjanjem gradnika z uporabo tovarne gradnikov po meri, ki je registrirana za gradnike razreda %1, je prišlo do neujemanja v imenu razreda. Tovarna je vrnila gradnik razreda %2. - %1 Widget Gradnik %1 - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. Trenutne strani vsebnika »%1« (%2) med dodajanjem razporeda ni bilo moč določiti. To nakazuje na neskladnost v datoteki *.ui. Verjetno je na vsebovalnem gradniku zgrajen razpored. - Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. Poskus dodajanja razporeda gradniku »%1« (%2), ki že ima neupravljan razpored vrste %3. To nakazuje na neskladnost v datoteki *.ui. - Cannot create style '%1'. Ni moč ustvariti sloga »%1«. @@ -7001,12 +5802,10 @@ qdesigner_internal::WizardContainerWidgetTaskMenu - Next Naprej - Back Nazaj @@ -7014,18 +5813,62 @@ qdesigner_internal::ZoomMenu - %1 % - Zoom factor + Zoom factor + %1 % qdesigner_internal::ZoomablePreviewDeviceSkin - &Zoom &Povečava + + + + <Filter> + qdesigner_internal::FilterWidget| + <filter> + + + Change Current Page + qdesigner_internal::ObjectInspector::ObjectInspectorPrivate| + Spreminjanje trenutne strani + + + Load Custom Device Skin + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + Naloži temo za napravo po meri + + + All QVFB Skins (*.%1) + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + Vse teme za QVFB (*.%1) + + + %1 - Duplicate Skin + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + %1 - podvojena tema + + + The skin '%1' already exists. + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + Tema »%1« že obstaja. + + + %1 - Error + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + %1 - napaka + + + %1 is not a valid skin directory: +%2 + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + %1 ni veljavna mapa s temo: +%2 + + diff -r ef0373b55136 -r 758a864f9613 translations/designer_uk.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/designer_uk.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,5838 @@ + + + + + AbstractFindWidget + + &Previous + &Попередній + + + &Next + &Наступний + + + &Case sensitive + Враховувати &регістр + + + Whole &words + Цілі &слова + + + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Пошук з початку + + + + AbstractItemEditor + + Selectable + Можна вибирати + + + Editable + Можна редагувати + + + DragEnabled + Можна тягти + + + DropEnabled + Можна кидати + + + UserCheckable + Користувач може позначати + + + Enabled + Увімкнено + + + Tristate + Три стани + + + Unchecked + Не позначено + + + PartiallyChecked + Частково позначено + + + Checked + Позначено + + + + AddLinkDialog + + Insert Link + Вставити посилання + + + Title: + Заголовок: + + + URL: + URL: + + + + AppFontDialog + + Additional Fonts + Додаткові шрифти + + + + AppFontManager + + '%1' is not a file. + '%1' не є файлом. + + + The font file '%1' does not have read permissions. + Файл шрифту '%1' не доступний для читання. + + + The font file '%1' is already loaded. + Файл шрифти '%1' вже завантажено. + + + The font file '%1' could not be loaded. + Не вдалось завантажити файл шрифт '%1'. + + + '%1' is not a valid font id. + '%1' не є правильним ідентифікатором шрифт. + + + There is no loaded font matching the id '%1'. + Відсутній завантажений шрифт, що відповідає ідентифікатору '%1'. + + + The font '%1' (%2) could not be unloaded. + Не вдалось вивантажити шрифт '%1' (%2). + + + + AppFontWidget + + Fonts + Шрифти + + + Add font files + Додати файли шрифтів + + + Remove current font file + Видалити поточний файл шрифт + + + Remove all font files + Видалити усі файли шрифтів + + + Add Font Files + Додати файли шрифтів + + + Font files (*.ttf) + Файли шрифтів (*.ttf) + + + Error Adding Fonts + Помилка додавання шрифтів + + + Error Removing Fonts + Помилка видалення шрифтів + + + Remove Fonts + Видалити шрифти + + + Would you like to remove all fonts? + Бажаєте видалити усі шрифти? + + + + AppearanceOptionsWidget + + Form + Форма + + + User Interface Mode + Режим інтерфейсу користувача + + + + AssistantClient + + Unable to send request: Assistant is not responding. + Неможливо надіслати запит. Assistant не відповідає. + + + The binary '%1' does not exist. + Виконуваний файл '%1' не існує. + + + Unable to launch assistant (%1). + Неможливо запустити Assistant (%1). + + + + BrushPropertyManager + + No brush + Без пензля + + + Solid + Суцільна + + + Dense 1 + Густина 1 + + + Dense 2 + Густина 2 + + + Dense 3 + Густина 3 + + + Dense 4 + Густина 4 + + + Dense 5 + Густина 5 + + + Dense 6 + Густина 6 + + + Dense 7 + Густина 7 + + + Horizontal + Горизонтальний + + + Vertical + Вертикальний + + + Cross + Хрестоподібний + + + Backward diagonal + Зворотня діагональ + + + Forward diagonal + Пряма діагональ + + + Crossing diagonal + Діагоналі, що перетинаються + + + Style + Стиль + + + Color + Колір + + + [%1, %2] + [%1, %2] + + + + Command + + Add connection + Додати з'єднання + + + Adjust connection + Налаштувати з'єднання + + + Delete connections + Видалити з'єднання + + + Change source + Змінити джерело + + + Change target + Зміни ціль + + + Add '%1' to '%2' + Command description for adding buttons to a QButtonGroup + Додати '%1' до '%2' + + + Morph %1/'%2' into %3 + MorphWidgetCommand description + Перетворити %1/%2 в %3 + + + Insert '%1' + Вставити '%1' + + + Change Z-order of '%1' + Змінити порядок глибина для '%1' + + + Raise '%1' + Підняти '%1' + + + Lower '%1' + Опустити '%1' + + + Delete '%1' + Видалити '%1' + + + Reparent '%1' + Змінити власника '%1' + + + Promote to custom widget + Перетворити на користувацький віджет + + + Demote from custom widget + Перетворити з користувацького віджета + + + Lay out using grid + Розташувати, використовуючи сітку + + + Lay out vertically + Розташувати вертикально + + + Lay out horizontally + Розташувати горизонтально + + + Break layout + Розбити розташування + + + Simplify Grid Layout + Спрощене розташування по сітці + + + Move Page + Пересунути сторінку + + + Delete Page + Видалити сторінку + + + Page + Сторінка + + + Insert Page + Вставити сторінку + + + Change Tab order + Змінити порядок обходу + + + Create Menu Bar + Створити панель меню + + + Delete Menu Bar + Видалити панель меню + + + Create Status Bar + Створити рядок статусу + + + Delete Status Bar + Видалити рядок статусу + + + Add Tool Bar + Додати панель інструментів + + + Add Dock Window + Додати прикріплене вікно + + + Adjust Size of '%1' + Підігнати розмір '%1' + + + Change Form Layout Item Geometry + Змінити геометрію елемента розташування формою + + + Change Layout Item Geometry + Змінити геометрію елемента розташування + + + Delete Subwindow + Видалити підвікно + + + page + сторінка + + + Insert Subwindow + Вставити підвікно + + + subwindow + підвікно + + + Subwindow + Підвікно + + + Change Table Contents + Змінити зміст таблиці + + + Change Tree Contents + Змінити зміст дерева + + + Add action + Додати дію + + + Remove action + Видалити дію + + + Add menu + Додати меню + + + Remove menu + Видалити меню + + + Create submenu + Створити підменю + + + Delete Tool Bar + Видалити панель інструментів + + + Change layout of '%1' from %2 to %3 + Змінити розташування '%1' з %2 на %3 + + + Set action text + Встановити текст дії + + + Insert action + Вставити дію + + + Move action + Пересунути дію + + + Change Title + Змінити заголовок + + + Insert Menu + Вставити меню + + + Changed '%1' of '%2' + Змінено '%1' з '%2' + + + Changed '%1' of %n objects + + Змінено '%1' з '%n' oб'єкта + Змінено '%1' з '%n' oб'єктів + Змінено '%1' з '%n' oб'єктів + + + + Reset '%1' of '%2' + Відновлено '%1' з '%2' + + + Reset '%1' of %n objects + + Відновлено '%1' з %n об'єкта + Відновлено '%1' з %n об'єктів + Відновлено '%1' з %n об'єктів + + + + Add dynamic property '%1' to '%2' + Додати динамічну властивість '%1' до '%2' + + + Add dynamic property '%1' to %n objects + + Додати динамічну властивість '%1' до '%n' об'єкта + Додати динамічну властивість '%1' до '%n' об'єктів + Додати динамічну властивість '%1' до '%n' об'єктів + + + + Remove dynamic property '%1' from '%2' + Видалити динамічну властивість '%1' у '%2' + + + Remove dynamic property '%1' from %n objects + + Видалити динамічну властивість '%1' у '%n' об'єкта + Видалити динамічну властивість '%1' у '%n' об'єктів + Видалити динамічну властивість '%1' у '%n' об'єктів + + + + Change script + Змінити скрипт + + + Change signals/slots + Змінити сигнали/слоти + + + Change signal + Змінити сигнал + + + Change slot + Змінити слот + + + Change signal-slot connection + Змінити з'єднання сигнал-слот + + + Change sender + Змінити відправника + + + Change receiver + Змінити отримувача + + + Create button group + Створити групу кнопок + + + Break button group + Розбити групу кнопок + + + Break button group '%1' + Розбити групу кнопок '%1' + + + Add buttons to group + Додати кнопки до групи + + + Remove buttons from group + Видалити кнопки з групи + + + Remove '%1' from '%2' + Command description for removing buttons from a QButtonGroup + Видалити '%1' з '%2' + + + + ConnectDialog + + Configure Connection + Налаштування з'єднання + + + GroupBox + + + + Edit... + Редагувати... + + + Show signals and slots inherited from QWidget + Показувати сигнали та слоти успадковані від QWidget + + + + ConnectionDelegate + + <object> + <об'єкт> + + + <signal> + <сигнал> + + + <slot> + <слот> + + + + DPI_Chooser + + Standard (96 x 96) + Embedded device standard screen resolution + Стандартна (96 x 96) + + + Greenphone (179 x 185) + Embedded device screen resolution + Greenphone (179 x 185) + + + High (192 x 192) + Embedded device high definition screen resolution + Висока (192 x 192) + + + + Designer + + Unable to launch %1. + Неможливо запустити %1. + + + %1 timed out. + Час очікування %1 вичерпано. + + + Custom Widgets + Віджети користувача + + + Promoted Widgets + Перетворені віджети + + + Qt Designer + Qt Designer + + + This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. + Цей файл містить роздільники верхнього рівня.<br>Вони <b>НЕ</b> будуть збережені в формі. + + + Perhaps you forgot to create a layout? + Можливо, ви забули створити розташування? + + + Invalid UI file: The root element <ui> is missing. + Неправильний файл UI: Кореневий елемент <ui> відсутній. + + + An error has occurred while reading the UI file at line %1, column %2: %3 + Під час читання файлу UI сталася помилка в рядку %1, позиція %2: %3 + + + This file cannot be read because it was created using %1. + Неможливо прочитати файл, бо його було створено з використанням %1. + + + This file was created using Designer from Qt-%1 and cannot be read. + Неможливо прочитати файл, бо його було створено з використанням Designer з Qt-%1. + + + The converted file could not be read. + Не вдалось прочитати конвертований файл. + + + This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. + Цей файл було створено з використанням Designer з Qt-%1.і його буде сконвертовано до нової форми. + + + The old form has not been touched, but you will have to save the form under a new name. + Стара форма не змінилася, але ви маєте зберегти форму під новим іменем. + + + This file was created using Designer from Qt-%1 and could not be read: +%2 + Не вдалось прочитати файл, бо його було створено з використанням Designer з Qt-%1: +%2 + + + Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. + Будь ласка, пропустіть його через <b>uic3&nbsp;-convert</b>, щоб сконвертувати до формату Qt-4. + + + This file cannot be read because the extra info extension failed to load. + Неможливо прочитати цей файл, бо трапився збій при завантаженні розширення додаткової інформації. + + + + DesignerMetaEnum + + %1 is not a valid enumeration value of '%2'. + %1 не є правильним значення для переліку '%2'. + + + '%1' could not be converted to an enumeration value of type '%2'. + Не вдалось сконвертувати '%1'до типу значень переліку '%2'. + + + + DesignerMetaFlags + + '%1' could not be converted to a flag value of type '%2'. + Не вдалось перетворити '%1' прапорця типу '%2'. + + + + DeviceProfile + + '%1' is not a number. + Reading a number for an embedded device profile + '%1' не є числом. + + + An invalid tag <%1> was encountered. + Знайдено неправильний тег <%1>. + + + + DeviceProfileDialog + + &Family + &Сім'я + + + &Point Size + &Розмір точки + + + Style + Стиль + + + Device DPI + DPI пристрою + + + Name + Назва + + + + DeviceSkin + + The image file '%1' could not be loaded. + Не вдалось завантажити файл зображення '%1'. + + + The skin directory '%1' does not contain a configuration file. + Тека обкладинки '%1' не містить файлу налаштувань. + + + The skin configuration file '%1' could not be opened. + Не вдалось відкрити файл налаштувань '%1'. + + + The skin configuration file '%1' could not be read: %2 + Не вдалось прочитати файл налаштувань '%1': %2 + + + Syntax error: %1 + Синтаксична помилка: %1 + + + The skin "up" image file '%1' does not exist. + Зображення обкладинки "вгору" '%1' не існує. + + + The skin "down" image file '%1' does not exist. + Зображення обкладинки "вниз" '%1' не існує. + + + The skin "closed" image file '%1' does not exist. + Зображення обкладинки "закрито" '%1' не існує. + + + The skin cursor image file '%1' does not exist. + Зображення обкладинки для курсору '%1' не існує. + + + Syntax error in area definition: %1 + Синтаксична помилка в описі області: %1 + + + Mismatch in number of areas, expected %1, got %2. + Не збігається кількість областей, очікувалось %1, отримано %2. + + + + EmbeddedOptionsControl + + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> + Format embedded device profile description + <html><table><tr><td><b>Шрифт</b></td><td>%1, %2</td></tr><tr><td><b>Стиль</b></td><td>%3</td></tr><tr><td><b>Роздільна здатність</b></td><td>%4 x %5</td></tr></table></html> + + + + EmbeddedOptionsPage + + Embedded Design + Tab in preferences dialog + Дизайн для портативних пристроїв + + + Device Profiles + EmbeddedOptionsControl group box" + Профілі пристроїв + + + + FontPanel + + Font + Шрифт + + + &Writing system + Система &письма + + + &Family + &Сім'я + + + &Style + Сти&ль + + + &Point size + &Розмір точки + + + + FontPropertyManager + + PreferDefault + Надавати перевагу типовому + + + NoAntialias + Без згладжування + + + PreferAntialias + Надавати перевагу згладжування + + + Antialiasing + Згладжування + + + + FormBuilder + + Invalid stretch value for '%1': '%2' + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values + Неправильне значення розтягування для '%1': '%2' + + + Invalid minimum size for '%1': '%2' + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values + Неправильне значення мінімального розміру для '%1': '%2' + + + + FormEditorOptionsPage + + %1 % + %1 % + + + Preview Zoom + Масштаб попереднього перегляду + + + Default Zoom + Типовий масштаб + + + Forms + Tab in preferences dialog + Форми + + + Default Grid + Типова сітка + + + + FormLayoutRowDialog + + Add Form Layout Row + Додати рядок до розташування формою + + + &Label text: + Текст &мітки: + + + Field &type: + &Тип поля: + + + &Field name: + Назва &поля: + + + &Buddy: + Прив'&язка: + + + &Row: + &Рядок: + + + Label &name: + &Назва мітки: + + + + FormWindow + + Unexpected element <%1> + Неочікуваний елемент <%1> + + + Error while pasting clipboard contents at line %1, column %2: %3 + Помилка під час вставки змісту буферу обміну в рядку %1, позиція %2: %3 + + + + FormWindowSettings + + Form Settings + Налаштування форми + + + Layout &Default + &Типове розташування + + + &Spacing: + &Відступ: + + + &Margin: + &Границя: + + + &Layout Function + Функція р&озташування + + + Ma&rgin: + Г&раниця: + + + Spa&cing: + В&ідступ: + + + &Pixmap Function + Функція растрового &зображення + + + &Include Hints + Включити під&казки + + + Grid + Сітка + + + Embedded Design + Дизайн для портативних пристроїв + + + &Author + &Автор + + + + IconSelector + + All Pixmaps ( + Усі растрові зображення ( + + + + ItemPropertyBrowser + + XX Icon Selected off + Sample string to determinate the width for the first column of the list item property browser + XX Значок Виділено вимк + + + + MainWindowBase + + Main + Not currently used (main tool bar) + Головна + + + File + Файл + + + Edit + Правка + + + Tools + Інструменти + + + Form + Форма + + + Qt Designer + Qt Designer + + + + NewForm + + Show this Dialog on Startup + Показувати цей діалог під час запуску + + + C&reate + &Створити + + + Recent + Нещодавні + + + New Form + Нова форма + + + &Close + З&акрити + + + &Open... + &Відкрити... + + + &Recent Forms + Нещодавні &форми + + + Read error + Помилка читання + + + A temporary form file could not be created in %1. + Не вдалось створити тимчасовий файл форми в %1. + + + The temporary form file %1 could not be written. + Не вдалось записати тимчасовий файл форми %1. + + + + ObjectInspectorModel + + Object + Об'єкт + + + Class + Клас + + + separator + розділювач + + + <noname> + <без назви> + + + + ObjectNameDialog + + Change Object Name + Змінити назву об'єкта + + + Object Name + Назва об'єкта + + + + PluginDialog + + Plugin Information + Інформація про додатки + + + 1 + 1 + + + + PreferencesDialog + + Preferences + Налаштування + + + + PreviewConfigurationWidget + + Form + Форма + + + Print/Preview Configuration + Налаштування друку/попереднього перегляду + + + Style + Стиль + + + Style sheet + Таблиця стилів + + + ... + ... + + + Device skin + Обкладинка пристрою + + + + PromotionModel + + Not used + Usage of promoted widgets + Не використовується + + + + Q3WizardContainer + + Page + Сторінка + + + + QAbstractFormBuilder + + Unexpected element <%1> + Неочікуваний елемент <%1> + + + An error has occurred while reading the UI file at line %1, column %2: %3 + Під час читання файлу UI '%1' сталася помилка в рядку %2, позиція %3 + + + Invalid UI file: The root element <ui> is missing. + Неправильний файл UI: Кореневий елемент <ui> відсутній. + + + The creation of a widget of the class '%1' failed. + Збій створення віджета класу '%1'. + + + Attempt to add child that is not of class QWizardPage to QWizard. + Спроба додати до QWizard нащадка, який не є класом QWizardPage. + + + Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. +This indicates an inconsistency in the ui-file. + Спроба додати розташування для віджета '%1' (%2), який вже має розташування %3. +Це вказує на некоректність в файлі UI. + + + Empty widget item in %1 '%2'. + Пустий елемент віджета в %1 '%2'. + + + Flags property are not supported yet. + Властивості-прапорці ще не підтримуються. + + + While applying tab stops: The widget '%1' could not be found. + Під час застосування позицій табуляції: Не вдалось знайти віджет '%1'. + + + Invalid QButtonGroup reference '%1' referenced by '%2'. + '%2' містить неправильне посилання на QButtonGroup '%1'. + + + This version of the uitools library is linked without script support. + Ця версія бібліотеки uitools зібрана без підтримки скриптів. + + + + QAxWidgetPlugin + + ActiveX control + Елемент керування ActiveX + + + ActiveX control widget + Віджет елемента керування ActiveX + + + + QAxWidgetTaskMenu + + Set Control + Встановити елемент керування + + + Reset Control + Скинути елемент керування + + + Licensed Control + Ліцензований елемент керування + + + The control requires a design-time license + Цей елемент управління вимагає ліцензії для розробки + + + + QCoreApplication + + Exception at line %1: %2 + Виключна ситуація в рядку %1: %2 + + + Unknown error + Невідома помилка + + + An error occurred while running the script for %1: %2 +Script: %3 + Під час виконання скрипту для %1 сталася помилка: %2 +Скрипт: %3 + + + %1 is not a promoted class. + %1 не є перетвореним класом. + + + The base class %1 is invalid. + Неправильний базовий клас %1. + + + The class %1 already exists. + Клас %1 вже існує. + + + Promoted Widgets + Перетворені віджети + + + The class %1 cannot be removed + Неможливо видалити клас %1 + + + The class %1 cannot be removed because it is still referenced. + Неможливо видалити клас %1, оскільки на нього досі є посилання. + + + The class %1 cannot be renamed + Неможливо перейменувати клас %1 + + + The class %1 cannot be renamed to an empty name. + Неможливо дати класу %1 пусте ім'я. + + + There is already a class named %1. + Вже існує клас з іменем %1. + + + Cannot set an empty include file. + Неможливо встановити порожнє ім'я файлу заголовків. + + + + QDesigner + + %1 - warning + %1 - попередження + + + Qt Designer + Qt Designer + + + This application cannot be used for the Console edition of Qt + Ця програма не може бути використана консольною редакцією Qt + + + + QDesignerActions + + Saved %1. + Збережено %1. + + + %1 already exists. +Do you want to replace it? + %1 вже існує. +Бажаєте замінити його? + + + Edit Widgets + Редагувати віджети + + + &New... + &Новий... + + + &Open... + &Відкрити... + + + &Save + &Зберегти + + + Save &As... + Зберегти &як... + + + Save A&ll + Зберегти &усе + + + Save As &Template... + Зберегти як &шаблон... + + + &Close + З&акрити + + + Save &Image... + Зберегти з&ображення... + + + &Print... + &Друк... + + + &Quit + Ви&йти + + + View &Code... + Переглянути &код... + + + &Minimize + &Мінімізувати + + + Bring All to Front + Усе на передній план + + + Preferences... + Налаштування... + + + Additional Fonts... + Додаткові шрифти... + + + ALT+CTRL+S + + + + CTRL+SHIFT+S + + + + CTRL+R + + + + CTRL+M + + + + Qt Designer &Help + &Довідка по Qt Designer + + + Current Widget Help + Довідка по поточному віджету + + + What's New in Qt Designer? + Що нового в Qt Designer? + + + About Plugins + Про додатки + + + About Qt Designer + Про Qt Designer + + + About Qt + Про Qt + + + Clear &Menu + Очистити &меню + + + &Recent Forms + Нещодавні &форми + + + Open Form + Відкрити форму + + + Designer UI files (*.%1);;All Files (*) + UI файли Designer (*.%1);;Всі файли (*) + + + Save Form As + Зберегти форму як + + + Designer + Designer + + + Feature not implemented yet! + Можливість ще не реалізована! + + + Code generation failed + Збій генерації коду + + + Read error + Помилка читання + + + %1 +Do you want to update the file location or generate a new form? + %1 +Бажаєте оновити розташування файлу чи згенерувати нову форму? + + + &Update + &Оновити + + + &New Form + &Нова форма + + + Save Form? + Зберегти форму? + + + Could not open file + Не вдалось відкрити файл + + + The file %1 could not be opened. +Reason: %2 +Would you like to retry or select a different file? + Не вдалось відкрити файл %1. +Причина: %2 +Чи не хотіли б ви спробувати ще раз чи вибрати інший файл? + + + Select New File + Оберіть новий файл + + + Could not write file + Не вдалось записати файл + + + It was not possible to write the entire file %1 to disk. +Reason:%2 +Would you like to retry? + Не вдалось записати цілий файл %1 на диск. +Причина:%2 +Бажаєте спробувати ще раз? + + + Assistant + Assistant + + + &Close Preview + З&акрити попередній перегляд + + + The backup file %1 could not be written. + Не вдалось записати файл резервної копії %1. + + + The backup directory %1 could not be created. + Не вдалось створити теку резервних копій %1. + + + The temporary backup directory %1 could not be created. + Не вдалось створити тимчасову теку резервних копій %1. + + + Preview failed + Збій попереднього перегляду + + + Image files (*.%1) + Файли зображень (*.%1) + + + Save Image + Зберегти зображення + + + Saved image %1. + Збережено зображення %1. + + + The file %1 could not be written. + Не вдалось записати файл %1. + + + Please close all forms to enable the loading of additional fonts. + Будь ласка, закрийте усі форми, щоб дозволити завантаження додаткових шрифтів. + + + Printed %1. + Надруковано %1. + + + + QDesignerAppearanceOptionsPage + + Appearance + Tab in preferences dialog + + + + + QDesignerAppearanceOptionsWidget + + Docked Window + Прикріплені вікна + + + Multiple Top-Level Windows + Декілька вікон верхнього рівня + + + Toolwindow Font + Шрифт інструментальних вікон + + + + QDesignerAxWidget + + Reset control + Скинути елемент керування + + + Set control + Встановити елемент керування + + + Control loaded + Елемент керування завантажено + + + A COM exception occurred when executing a meta call of type %1, index %2 of "%3". + Виникла виключна ситуація COM під час здійснення мета-виклику типу %1, індекс %2 з "%3". + + + + QDesignerFormBuilder + + Script errors occurred: + Трапились помилки скрипту: + + + The preview failed to build. + Збій побудови попереднього перегляду. + + + Designer + Designer + + + + QDesignerFormWindow + + %1 - %2[*] + %1 - %2[*] + + + Save Form? + Зберегти форму? + + + Do you want to save the changes to this document before closing? + Бажаєте зберегти зміни до цього документи перед тим як закрити? + + + If you don't save, your changes will be lost. + Якщо ви не збережете, ваші зміни будуть втрачені. + + + + QDesignerMenu + + Type Here + Набирайте тут + + + Add Separator + Додати розділювач + + + Insert separator + Вставити розділювач + + + Remove separator + Видалити розділювач + + + Remove action '%1' + Видалити дію '%1' + + + Add separator + Додати розділювач + + + Insert action + Вставити дію + + + + QDesignerMenuBar + + Type Here + Набирайте тут + + + Remove Menu '%1' + Видалити меню '%1' + + + Remove Menu Bar + Видалити панель меню + + + Menu + Меню + + + + QDesignerPluginManager + + An XML error was encountered when parsing the XML of the custom widget %1: %2 + Під час розбору XML користувацького віджета %1 сталась помилка XML: %2 + + + A required attribute ('%1') is missing. + Обов'язковий атрибут ('%1') відсутній. + + + An invalid property specification ('%1') was encountered. Supported types: %2 + Знайдено неправильну специфікацію властивості ('%1'). Підтримувані типи: %2 + + + '%1' is not a valid string property specification. + '%1' не є правильною специфікацією рядкової властивості. + + + The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. + XML користувацького віджета %1 не містить жодного з елементів <widget> або <ui>. + + + The class attribute for the class %1 is missing. + Відсутній атрибут для класу %1. + + + The class attribute for the class %1 does not match the class name %2. + Атрибут "клас" для класу %1 не збігається з іменем класу %2. + + + + QDesignerPropertySheet + + Dynamic Properties + Динамічні властивості + + + + QDesignerResource + + The layout type '%1' is not supported, defaulting to grid. + Тип розташування '%1' не підтримується, використовуємо сітку. + + + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. +Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. + Контейнерне розширення '%1' (%2) повернуло віджет, який не може бути керований за допомогою Qt Designer '%3' (%4) під час запиту сторінки №%5. +Сторінки контейнера повинні додаватись лише за допомогою вказування їх в XML, що повертається методом domXml() віджета користувача. + + + Unexpected element <%1> + Parsing clipboard contents + Неочікуваний елемент <%1> + + + Error while pasting clipboard contents at line %1, column %2: %3 + Parsing clipboard contents + Помилка під час вставки змісту буферу обміну в рядку %1, позиція %2: %3 + + + Error while pasting clipboard contents: The root element <ui> is missing. + Parsing clipboard contents + Помилка під час вставки змісту буферу обміну. Кореневий елемент <ui> відсутній. + + + + QDesignerSharedSettings + + The template path %1 could not be created. + Не вдалось створити шлях до шаблону %1. + + + An error has been encountered while parsing device profile XML: %1 + Трапилась помилка під час розбору XML профілю пристрою: %1 + + + + QDesignerToolWindow + + Property Editor + Редактор властивостей + + + Action Editor + Редактор дій + + + Object Inspector + Інспектор об'єктів + + + Resource Browser + Оглядач ресурсів + + + Signal/Slot Editor + Редактор сигналів/слотів + + + Widget Box + Панель віджетів + + + + QDesignerWorkbench + + &File + &Файл + + + Edit + Правка + + + F&orm + Ф&орма + + + Preview in + Попередній перегляд в + + + &View + &Вид + + + &Settings + &Налаштування + + + &Window + В&ікно + + + &Help + &Довідка + + + Toolbars + Панелі інструментів + + + Widget Box + Панель віджетів + + + Save Forms? + Зберегти форми? + + + There are %n forms with unsaved changes. Do you want to review these changes before quitting? + + Є %n форма з незбереженими змінами. Бажаєте переглянути ці зміни перед виходом? + Є %n форми з незбереженими змінами. Бажаєте переглянути ці зміни перед виходом? + Є %n форм з незбереженими змінами. Бажаєте переглянути ці зміни перед виходом? + + + + If you do not review your documents, all your changes will be lost. + Якщо ви не переглянете ваші документи, усі ваші зміну будуть втрачені. + + + Discard Changes + Відхилити зміни + + + Review Changes + Переглянути зміни + + + Backup Information + Інформація про резервні копії + + + The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? + Останній сеанс Qt Designer не був правильно завершений. Залишились резервні копії файлів. Бажаєте їх завантажити? + + + The file <b>%1</b> could not be opened. + Не вдалось відкрити файл <b>%1</b>. + + + The file <b>%1</b> is not a valid Designer UI file. + Файл <b>%1</b> не є правильним файлом UI Qt Designer. + + + + QFormBuilder + + An empty class name was passed on to %1 (object name: '%2'). + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method + До %1 було передане пусте ім'я класу (ім'я об'єкта: '%2'). + + + QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. + QFormBuilder не зміг створити користувацький віджет класу '%1'; було створено базовий клас '%2'. + + + QFormBuilder was unable to create a widget of the class '%1'. + QFormBuilder не зміг створити віджет класу '%1'. + + + The layout type `%1' is not supported. + Тип розташування '%1' не підтримується. + + + The set-type property %1 could not be read. + Не вдалось прочитати властивість %1 типу "множина". + + + The enumeration-type property %1 could not be read. + Не вдалось прочитати властивість %1 типу "перелік". + + + Reading properties of the type %1 is not supported yet. + Читання властивостей типу %1 ще не підтримується. + + + The property %1 could not be written. The type %2 is not supported yet. + Не вдалось записати властивість %1. Тип %2 ще не підтримується. + + + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. + Неправильне значення '%1' для переліку. Натомість, буде використано типове значення '%2'. + + + The flag-value '%1' is invalid. Zero will be used instead. + Неправильне значення '%1' для прапорців. Натомість, буде використано нуль. + + + + QStackedWidgetEventFilter + + Previous Page + Попередня сторінка + + + Next Page + Наступна сторінка + + + Delete + Видалити + + + Before Current Page + Перед поточною сторінкою + + + After Current Page + Після поточною сторінкою + + + Change Page Order... + Змінити порядок сторінок... + + + Change Page Order + Змінити порядок сторінок + + + Page %1 of %2 + Сторінка %1 з %2 + + + Insert Page + Вставити сторінку + + + + QStackedWidgetPreviewEventFilter + + Go to previous page of %1 '%2' (%3/%4). + Перейти до попередньої сторінки з %1 '%2' (%3/%4). + + + Go to next page of %1 '%2' (%3/%4). + Перейти до наступної сторінки з %1 '%2' (%3/%4). + + + + QTabWidgetEventFilter + + Delete + Видалити + + + Before Current Page + Перед поточною сторінкою + + + After Current Page + Після поточної сторінки + + + Page %1 of %2 + Сторінка %1 з %2 + + + Insert Page + Вставити сторінку + + + + QToolBoxHelper + + Delete Page + Видалити сторінку + + + Before Current Page + Перед поточною сторінкою + + + After Current Page + Після поточної сторінки + + + Change Page Order... + Змінити порядок сторінок... + + + Change Page Order + Змінити порядок сторінок + + + Page %1 of %2 + Сторінка %1 з %2 + + + Insert Page + Вставити сторінку + + + + QtBoolEdit + + True + Істинно + + + False + Хибно + + + + QtBoolPropertyManager + + True + Істинно + + + False + Хибно + + + + QtCharEdit + + Clear Char + Стерти символ + + + + QtColorEditWidget + + ... + ... + + + + QtColorPropertyManager + + Red + Червоний + + + Green + Зелений + + + Blue + Блакитний + + + Alpha + Альфа + + + + QtCursorDatabase + + Arrow + Стрілка + + + Up Arrow + Стрілка вгору + + + Cross + Хрест + + + Wait + Очікування + + + IBeam + Текстовий + + + Size Vertical + Вертикальний розмір + + + Size Horizontal + Горизонтальний розмір + + + Size Backslash + Зворотній слеш + + + Size Slash + Слеш + + + Size All + В усі сторони + + + Blank + Пусто + + + Split Vertical + Розділити вертикально + + + Split Horizontal + Розділити вертикально + + + Pointing Hand + Вказівний перст + + + Forbidden + Заборонено + + + Open Hand + Відкрита рука + + + Closed Hand + Закрита рука + + + What's This + Що це + + + Busy + Зайнятий + + + + QtFontEditWidget + + ... + ... + + + Select Font + Оберіть шрифт + + + + QtFontPropertyManager + + Family + Сім'я + + + Point Size + Розмір точки + + + Bold + Жирний + + + Italic + Курсив + + + Underline + Підкреслений + + + Strikeout + Перекреслений + + + Kerning + Кернінг + + + + QtGradientDialog + + Edit Gradient + Редагувати градієнт + + + + QtGradientEditor + + Form + Форма + + + Gradient Editor + Редактор градієнту + + + This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. + В цій області відображається попередній перегляд градієнту, що редагується. Вона також дозволяє за допомогою "drag & drop" редагувати специфічні до типу градієнта параметри, такі як: початкова та кінцева точки, радіус та ін. + + + 1 + 1 + + + 2 + 2 + + + 3 + 3 + + + 4 + 4 + + + 5 + 5 + + + Gradient Stops Editor + Редактор точок градієнту + + + This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. + Ця область дозволяє вам редагувати точки градієнту. Подвійне клацання на існуючій точці створює її дублікат. Подвійне клацання поза межами існуючої точки створює нову точку. Перетягніть точку мишею, щоб змінити її позицію. Використовуйте праву кнопку миші, щоб отримати контекстне меню з додатковими діями. + + + Zoom + Масштаб + + + Reset Zoom + Скинути + + + Position + Положення + + + Hue + Відтінок + + + H + H + + + Saturation + Насиченість + + + S + S + + + Sat + Насиченість + + + Value + Значення + + + V + V + + + Val + Значення + + + Alpha + Альфа + + + A + A + + + Type + Тип + + + Spread + Заливка + + + Color + Колір + + + Current stop's color + Колір поточної точки + + + Show HSV specification + Показати у вигляді HSV + + + HSV + HSV + + + Show RGB specification + Показати у вигляді RGB + + + RGB + RGB + + + Current stop's position + Позиція поточної точки + + + % + % + + + Zoom In + Збільшити + + + Zoom Out + Зменшити + + + Toggle details extension + Показати/приховати деталі + + + > + > + + + Linear Type + Лінійний тип + + + ... + ... + + + Radial Type + Радіальний тип + + + Conical Type + Конічний тип + + + Pad Spread + Рівномірна заливка + + + Repeat Spread + Повторна заливка + + + Reflect Spread + Дзеркальна заливка + + + Start X + X початку + + + Start Y + Y початку + + + Final X + X кінця + + + Final Y + Y кінця + + + Central X + X центру + + + Central Y + Y центру + + + Focal X + X фокусу + + + Focal Y + Y фокусу + + + Radius + Радіус + + + Angle + Кут + + + Linear + Лінійний + + + Radial + Радіальний + + + Conical + Конічний + + + Pad + Рівномірна + + + Repeat + Повторна + + + Reflect + Дзеркальна + + + + QtGradientStopsWidget + + New Stop + Нова точка + + + Delete + Видалити + + + Flip All + Відобразити дзеркально + + + Select All + Виділити все + + + Zoom In + Збільшити + + + Zoom Out + Зменшити + + + Reset Zoom + Скинути + + + + QtGradientView + + Gradient View + Перегляд градієнту + + + New... + Новий... + + + Edit... + Редагувати... + + + Rename + Перейменувати + + + Remove + Видалити + + + Grad + Градієнт + + + Remove Gradient + Видалити градієнт + + + Are you sure you want to remove the selected gradient? + Ви впевнені, що бажаєте видалити виділений градієнт? + + + + QtGradientViewDialog + + Select Gradient + Обрати градієнт + + + + QtKeySequenceEdit + + Clear Shortcut + Видалити поєднання клавіш + + + + QtLocalePropertyManager + + <Invalid> + <Неправильний> + + + %1, %2 + %1, %2 + + + Language + Мова + + + Country + Країна + + + + QtPointFPropertyManager + + (%1, %2) + (%1, %2) + + + X + X + + + Y + Y + + + + QtPointPropertyManager + + (%1, %2) + (%1, %2) + + + X + X + + + Y + Y + + + + QtPropertyBrowserUtils + + [%1, %2, %3] (%4) + [%1, %2, %3] (%4) + + + [%1, %2] + [%1, %2] + + + + QtRectFPropertyManager + + [(%1, %2), %3 x %4] + [(%1, %2), %3 x %4] + + + X + X + + + Y + Y + + + Width + Ширина + + + Height + Висота + + + + QtRectPropertyManager + + [(%1, %2), %3 x %4] + [(%1, %2), %3 x %4] + + + X + X + + + Y + Y + + + Width + Ширина + + + Height + Висота + + + + QtResourceEditorDialog + + Dialog + Діалог + + + New File + Новий файл + + + N + Н + + + Remove File + Видалити файл + + + R + В + + + I + Ф + + + New Resource + Новий ресурс + + + A + Д + + + Remove Resource or File + Видалити ресурс або файл + + + %1 already exists. +Do you want to replace it? + %1 вже існує. +Бажаєте замінити його? + + + The file does not appear to be a resource file; element '%1' was found where '%2' was expected. + Не схоже, що файл є файлом ресурсів, елемент '%1' було знайдено, замість '%2'. + + + %1 [read-only] + %1 [лише для читання] + + + %1 [missing] + %1 [відсутній] + + + <no prefix> + <без префіксу> + + + New Resource File + Новий файл ресурсів + + + Resource files (*.qrc) + Файли ресурсів (*.qrc) + + + Import Resource File + Імпортувати файл ресурсів + + + newPrefix + + + + <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> + <p><b>Попередження:</b> Файл</p><p>%1</p><p>знаходиться поза межами батьківської теки поточного файлу ресурсів.</p> + + + <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> + <p>Щоб вирішити цю проблему, натисніть:</p><table><tr><th align="left">Копіювати</th><td>, щоб скопіювати файл до батьківської теки файлу ресурсів.</td></tr><tr><th align="left">Копіювати як...</th><td>, щоб скопіювати файл в підтеку батьківської теки файлу ресурсів.</td></tr><tr><th align="left">Залишити</th><td>, щоб використовувати поточне розміщення.</td></tr></table> + + + Add Files + Додати файли + + + Incorrect Path + Неправильний шлях + + + Copy + Копіювати + + + Copy As... + Копіювати як... + + + Keep + Залишити + + + Skip + Пропустити + + + Clone Prefix + Префікс клонування + + + Enter the suffix which you want to add to the names of the cloned files. +This could for example be a language extension like "_de". + Введіть суфікс, який ви хочете додавати до імен клонованих файлів. +Це може бути, наприклад, мовне розширення, як "_uk". + + + Copy As + Копіювати як + + + <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> + <p>Обраний файл</p><p>%1</p><p>знаходиться поза межами батьківської теки поточного файлу ресурсів.</p><p>%2</p>Будь ласка, оберіть інший шлях всередині цієї теки.<p><p> + + + Could not overwrite %1. + Не вдалось перезаписати %1. + + + Could not copy +%1 +to +%2 + Не вдалось скопіювати +%1 +до +%2 + + + A parse error occurred at line %1, column %2 of %3: +%4 + Сталась помилка розбору в рядку %1, позиція %2 з %3 +%4 + + + Save Resource File + Зберегти файл ресурсів + + + Could not write %1: %2 + Не вдалось записати %1: %2 + + + Edit Resources + Редагування ресурсів + + + New... + Новий... + + + Open... + Відкрити... + + + Open Resource File + Відкрити файл ресурсів + + + Remove + Видалити + + + Move Up + Пересунути вгору + + + Move Down + Пересунути вниз + + + Add Prefix + Додати префікс + + + Add Files... + Додати файли... + + + Change Prefix + Змінити префікс + + + Change Language + Змінити мову + + + Change Alias + Додати псевдонім + + + Clone Prefix... + Префікс клонування... + + + Prefix / Path + Префікс / Шлях + + + Language / Alias + Мова / Псевдонім + + + <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> + <html><p><b>Попередження:</b> Під час перезавантаження ресурсів виникли проблеми:</p><pre>%1</pre></html> + + + Resource Warning + Попередження про ресурси + + + + QtResourceView + + Size: %1 x %2 +%3 + Розмір: %1 x %2 +%3 + + + Edit Resources... + Редагувати ресурси... + + + Reload + Перезавантажити + + + Copy Path + Копіювати шлях + + + + QtResourceViewDialog + + Select Resource + Оберіть ресурс + + + + QtSizeFPropertyManager + + %1 x %2 + %1 x %2 + + + Width + Ширина + + + Height + Висота + + + + QtSizePolicyPropertyManager + + <Invalid> + <Неправильний> + + + [%1, %2, %3, %4] + [%1, %2, %3, %4] + + + Horizontal Policy + Горизонтальна політика + + + Vertical Policy + Вертикальна політика + + + Horizontal Stretch + Горизонтальне розтягування + + + Vertical Stretch + Вертикальне розтягування + + + + QtSizePropertyManager + + %1 x %2 + %1 x %2 + + + Width + Ширина + + + Height + Висота + + + + QtToolBarDialog + + Customize Toolbars + Налаштувати панелі інструментів + + + 1 + 1 + + + Actions + Дії + + + Toolbars + Панелі інструментів + + + Add new toolbar + Додати нову панель інструментів + + + New + Нова + + + Remove selected toolbar + Видалити виділену панель інструментів + + + Remove + Видалити + + + Rename toolbar + Перейменувати панель інструментів + + + Rename + Перейменувати + + + Move action up + Пересунути дію вгору + + + Up + Вгору + + + Remove action from toolbar + Видалити дію з панелі інструментів + + + <- + <- + + + Add action to toolbar + Додати дію до панелі інструментів + + + -> + -> + + + Move action down + Пересунути дію вниз + + + Down + Вниз + + + Current Toolbar Actions + Поточні дії панелі інструментів + + + Custom Toolbar + Користувацька панель інструментів + + + < S E P A R A T O R > + < Р О З Д І Л Ю В А Ч > + + + + QtTreePropertyBrowser + + Property + Властивість + + + Value + Значення + + + + SaveFormAsTemplate + + Save Form As Template + Зберегти форму як шаблон + + + &Name: + &Назва: + + + &Category: + &Категорія: + + + Add path... + Додати шлях... + + + Template Exists + Шаблон існує + + + A template with the name %1 already exists. +Do you want overwrite the template? + Шаблон з іменем %1 вже існує. +Бажаєте перезаписати його? + + + Overwrite Template + Перезаписати шаблон + + + Open Error + Помилка відкриття + + + There was an error opening template %1 for writing. Reason: %2 + Під час відкриття шаблону %1 для запису сталася помилка. Причина: %2 + + + Write Error + Помилка запису + + + There was an error writing the template %1 to disk. Reason: %2 + Під час запису шаблону %1 на диск сталася помилка. Причина: %2 + + + Pick a directory to save templates in + Виберіть теку для збереження шаблонів + + + + ScriptErrorDialog + + An error occurred while running the scripts for "%1": + + Під час виконання скриптів для "%1" сталася помилка: + + + + + SelectSignalDialog + + Go to slot + Перейти до слота + + + Select signal + Оберіть сигнал + + + signal + сигнал + + + class + клас + + + + SignalSlotConnection + + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) + НАДСИЛАЧ(%1), СИГНАЛ(%2), ОТРИМУВАЧ(%3), СЛОТ(%4) + + + + SignalSlotDialogClass + + Signals and slots + Сигнали та слоти + + + Slots + Слоти + + + Add + Додати + + + ... + ... + + + Delete + Видалити + + + Signals + Сигнали + + + + Spacer + + Horizontal Spacer '%1', %2 x %3 + Горизонтальний роздільник '%1', %2 x %3 + + + Vertical Spacer '%1', %2 x %3 + Вертикальний роздільник '%1', %2 x %3 + + + + TemplateOptionsPage + + Template Paths + Tab in preferences dialog + Шляхи до шаблонів + + + + ToolBarManager + + Configure Toolbars... + Налаштувати панелі інструментів... + + + Window + Вікно + + + Help + Довідка + + + Style + Стиль + + + Dock views + Прикріплюванні панелі + + + File + Файл + + + Edit + Правка + + + Tools + Інструменти + + + Form + Форма + + + Toolbars + Панелі інструментів + + + + VersionDialog + + <h3>%1</h3><br/><br/>Version %2 + <h3>%1</h3><br/><br/>Версія %2 + + + Qt Designer + Qt Designer + + + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> + <br/>Qt Designer - це дизайнер графічного інтерфейсу користувача для програм Qt.<br/> + + + %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + %1<br/>Copyright (C) 2010 Корпорація Nokia та/або її дочірні компанії. + + + + VideoPlayerTaskMenu + + Available Mime Types + Доступні типи MIME + + + Display supported mime types... + Показати підтримувані типи MIME... + + + Load... + Завантажити... + + + Play + Грати + + + Pause + Пауза + + + Stop + Зупинити + + + Choose Video Player Media Source + Оберіть джерело медіа для відеопрогравача + + + An error has occurred in '%1': %2 + Сталась помилка в '%1': %2 + + + Video Player Error + Помилка відеопрогравача + + + + WidgetDataBase + + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. + Цей файл містить користувацький віджет '%1', чий базовий клас (%2) відрізняється від поточного елементу в базі даних віджетів (%3). Базу даних віджетів залишено без змін. + + + + qdesigner_internal::ActionEditor + + New... + Новий... + + + Edit... + Редагувати... + + + Go to slot... + Перейти до слота... + + + Copy + Копіювати + + + Cut + Вирізати + + + Paste + Вставити + + + Select all + Виділити все + + + Delete + Видалити + + + Actions + Дії + + + Configure Action Editor + Налаштувати редактор дій + + + Icon View + Значками + + + Detailed View + Детально + + + New action + Нова дія + + + Edit action + Редагувати дію + + + Remove action '%1' + Видалити дію '%1' + + + Remove actions + Видалити дії + + + Used In + Використовується в + + + + qdesigner_internal::ActionModel + + Name + Назва + + + Used + Використовується + + + Text + Текст + + + Shortcut + Поєднання клавіш + + + Checkable + Прапорець + + + ToolTip + Спливаюча підказка + + + + qdesigner_internal::BrushManagerProxy + + The element '%1' is missing the required attribute '%2'. + У елемента '%1' відсутній обов'язковий атрибут '%2'. + + + Empty brush name encountered. + Знайдено порожня назва пензля. + + + An unexpected element '%1' was encountered. + Знайдено неочікуваний елемент '%1'. + + + An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 + Під час читання файлу опису пензля '%1' сталася помилка в рядку %2, позиція %3: %4 + + + An error occurred when reading the resource file '%1' at line %2, column %3: %4 + Під час читання файлу ресурсів '%1' сталася помилка в рядку %2, позиція %3: %4 + + + + qdesigner_internal::BuddyEditor + + Add buddy + Додати прив'язку + + + Remove buddies + Видалити прив'язки + + + Remove %n buddies + + Видалити %n прив'язку + Видалити %n прив'язки + Видалити %n прив'язок + + + + Add %n buddies + + Додати %n прив'язку + Додати %n прив'язки + Додати %n прив'язок + + + + Set automatically + Встановити автоматично + + + + qdesigner_internal::BuddyEditorPlugin + + Edit Buddies + Редагувати прив'язки + + + + qdesigner_internal::BuddyEditorTool + + Edit Buddies + Редагувати прив'язки + + + + qdesigner_internal::ButtonGroupMenu + + Select members + Обрати членів + + + Break + Розбити + + + + qdesigner_internal::ButtonTaskMenu + + Assign to button group + Призначити до групи кнопок + + + Button group + Група кнопок + + + New button group + Нова група кнопок + + + Change text... + Змінити текст... + + + None + Немає + + + Button group '%1' + Група кнопок '%1' + + + + qdesigner_internal::CodeDialog + + Save... + Зберегти... + + + Copy All + Копіювати все + + + &Find in Text... + &Знайти в тексті... + + + A temporary form file could not be created in %1. + Не вдалось створити тимчасовий файл форми в %1. + + + The temporary form file %1 could not be written. + Не вдалось записати тимчасовий файл форми %1. + + + %1 - [Code] + %1 - [код] + + + Save Code + Зберегти код + + + Header Files (*.%1) + Файли заголовків (*.%1) + + + The file %1 could not be opened: %2 + Не вдалось відкрити файл %1: %2 + + + The file %1 could not be written: %2 + Не вдалось записати файл %1: %2 + + + %1 - Error + %1 - Помилка + + + + qdesigner_internal::ColorAction + + Text Color + Колір тексту + + + + qdesigner_internal::ComboBoxTaskMenu + + Edit Items... + Редагувати елементи... + + + Change Combobox Contents + Змінити зміст випадаючого списку + + + + qdesigner_internal::CommandLinkButtonTaskMenu + + Change description... + Змінити опис... + + + + qdesigner_internal::ConnectionEdit + + Select All + Виділити все + + + Deselect All + Зняти виділення + + + Delete + Видалити + + + + qdesigner_internal::ConnectionModel + + Sender + Надсилач + + + Signal + Сигнал + + + Receiver + Отримувач + + + Slot + Слот + + + <sender> + <надсилач> + + + <signal> + <сигнал> + + + <receiver> + <отримувач> + + + <slot> + <слот> + + + The connection already exists!<br>%1 + З'єднання вже існує!<br>%1 + + + Signal and Slot Editor + Редактор сигналів та слотів + + + + qdesigner_internal::ContainerWidgetTaskMenu + + Delete + Видалити + + + Insert + Вставити + + + Insert Page Before Current Page + Вставити сторінку перед поточною сторінкою + + + Insert Page After Current Page + Вставити сторінку після поточної сторінки + + + Add Subwindow + Додати підвікно + + + Subwindow + Підвікно + + + Page + Сторінка + + + Page %1 of %2 + Сторінка %1 з %2 + + + + qdesigner_internal::DPI_Chooser + + System (%1 x %2) + System resolution + Системна (%1 x %2) + + + User defined + Визначена користувачем + + + x + DPI X/Y separator + x + + + + qdesigner_internal::DesignerPropertyManager + + AlignLeft + Вліво + + + AlignHCenter + По центру + + + AlignRight + Вправо + + + AlignJustify + По ширині + + + AlignTop + Догори + + + AlignVCenter + По центру + + + AlignBottom + Донизу + + + %1, %2 + %1, %2 + + + Customized (%n roles) + + Користувацька (%n роль) + Користувацька (%n ролі) + Користувацька (%n ролей) + + + + Inherited + Успадкована + + + Horizontal + Горизонтальне + + + Vertical + Вертикальне + + + Normal Off + Нормальний, вимк + + + Normal On + Нормальний, увімк + + + Disabled Off + Вимкнений, вимк + + + Disabled On + Вимкнений, увімк + + + Active Off + Активний, вимк + + + Active On + Активний, увімк + + + Selected Off + Обраний, вимк + + + Selected On + Обраний, увімк + + + translatable + перекладати + + + disambiguation + уточнення + + + comment + коментар + + + + qdesigner_internal::DeviceProfileDialog + + Device Profiles (*.%1) + Профілі пристроїв (*.%1) + + + Default + Типовий + + + Save Profile + Зберегти профіль + + + Save Profile - Error + Збереження профілю - Помилка + + + Unable to open the file '%1' for writing: %2 + Неможливо відкрити файл '%1' для запису: %2 + + + Open profile + Відкрити профіль + + + Open Profile - Error + Відкриття профілю - Помилка + + + Unable to open the file '%1' for reading: %2 + Неможливо відкрити файл '%1' для читання: %2 + + + '%1' is not a valid profile: %2 + '%1' не є правильним профілем: %2 + + + + qdesigner_internal::Dialog + + Dialog + Діалог + + + StringList + Список рядків + + + New String + Новий рядок + + + &New + &Новий + + + Delete String + Видалити рядок + + + &Delete + Ви&далити + + + &Value: + &Значення: + + + Move String Up + Пересунути рядок вгору + + + Up + Вгору + + + Move String Down + Пересунути рядок донизу + + + Down + Вниз + + + + qdesigner_internal::EmbeddedOptionsControl + + None + Немає + + + Add a profile + Додати профіль + + + Edit the selected profile + Редагувати виділений профіль + + + Delete the selected profile + Видалити виділений профіль + + + Add Profile + Додати профіль + + + New profile + Новий профіль + + + Edit Profile + Редагувати профіль + + + Delete Profile + Видалити профіль + + + Would you like to delete the profile '%1'? + Бажаєте видалити профіль '%1'? + + + Default + Типовий + + + + qdesigner_internal::FilterWidget + + Filter + Фільтр + + + Clear text + Очистити текст + + + + qdesigner_internal::FormEditor + + Resource File Changed + Файли ресурсів було змінено + + + The file "%1" has changed outside Designer. Do you want to reload it? + Файл "%1" було змінено поза Qt Designer. Бажаєте перезавантажити його? + + + + qdesigner_internal::FormLayoutMenu + + Add form layout row... + Додати рядок до розташування формою... + + + + qdesigner_internal::FormWindow + + Edit contents + Редагувати зміст + + + F2 + + + + Insert widget '%1' + Вставити віджет '%1' + + + Resize + Змінити розмір + + + Key Resize + Зміна розміру клавішею + + + Key Move + Переміщення клавішею + + + Paste %n action(s) + + Вставити %n дію + Вставити %n дії + Вставити %n дій + + + + Paste %n widget(s) + + Вставити %n віджет + Вставити %n віджети + Вставити %n віджетів + + + + Paste (%1 widgets, %2 actions) + Вставити (%1 віджетів, %2 дії) + + + Cannot paste widgets. Designer could not find a container without a layout to paste into. + Неможливо вставити віджети. Qt Designer'у не вдалось знайти контейнер без розташування для вставки. + + + Break the layout of the container you want to paste into, select this container and then paste again. + Розбийте розташування контейнеру, в який ви бажаєте вставити, виділіть цей контейнер та вставте знову. + + + Paste error + Помилка вставки + + + Raise widgets + Підняти віджети + + + Lower widgets + Опустити віджети + + + Select Ancestor + Обрати предка + + + Lay out + Розташування + + + Drop widget + Кинути віджет + + + A QMainWindow-based form does not contain a central widget. + Форма, що базується на QMainWindow не містить центрального віджета. + + + + qdesigner_internal::FormWindowBase + + Delete '%1' + Видалити '%1' + + + Delete + Видалити + + + + qdesigner_internal::FormWindowManager + + Cu&t + Вирі&зати + + + Cuts the selected widgets and puts them on the clipboard + Вирізає виділені віджети та розміщує їх в буфері обміну + + + &Copy + &Копіювати + + + Copies the selected widgets to the clipboard + Копіює виділені віджети до буферу обміну + + + &Paste + &Вставити + + + Pastes the clipboard's contents + Вставляє зміст буферу обміну + + + &Delete + Ви&далити + + + Deletes the selected widgets + Видаляє виділені віджети + + + Select &All + Виділити в&се + + + Selects all widgets + Виділяє усі віджети + + + Bring to &Front + На &передній план + + + Raises the selected widgets + Піднімає виділені віджети + + + Send to &Back + На зад&ній план + + + Lowers the selected widgets + Опускає виділені віджети + + + Adjust &Size + Підігнати &розмір + + + Adjusts the size of the selected widget + Підганяє розмір виділених віджетів + + + Lay Out &Horizontally + Розташувати &горизонтально + + + Lays out the selected widgets horizontally + Розташовує виділені віджети горизонтально + + + Lay Out &Vertically + Розташувати &вертикально + + + Lays out the selected widgets vertically + Розташовує виділені віджети вертикально + + + Lay Out in a &Form Layout + Розташувати по &формі + + + Lays out the selected widgets in a form layout + Розташовує виділені віджети по формі + + + Lay Out in a &Grid + Розташувати, використовуючи &сітку + + + Lays out the selected widgets in a grid + Розташовує виділені віджети по сітці + + + Lay Out Horizontally in S&plitter + Розташувати г&оризонтально з розділювачем + + + Lays out the selected widgets horizontally in a splitter + Розташовує виділені віджети горизонтально з розділювачем + + + Lay Out Vertically in Sp&litter + Розташувати в&ертикально з розділювачем + + + Lays out the selected widgets vertically in a splitter + Розташовує виділені віджети вертикально з розділювачем + + + &Break Layout + Розби&ти розташування + + + Breaks the selected layout + Розбиває виділено розташування + + + Si&mplify Grid Layout + Спро&щене розташування по сітці + + + Removes empty columns and rows + Видаляє пусті рядки та колонки + + + &Preview... + Попередній перегля&д... + + + Preview current form + Попередній перегляд поточної форми + + + Form &Settings... + Нала&штування форми... + + + Break Layout + Розбити розташування + + + Adjust Size + Підігнати розмір + + + Could not create form preview + Title of warning message box + Не вдалось створити попередній перегляд форми + + + Form Settings - %1 + Налаштування форми - %1 + + + + qdesigner_internal::FormWindowSettings + + None + Немає + + + Device Profile: %1 + Профіль пристрою: %1 + + + + qdesigner_internal::GridPanel + + Form + Форма + + + Grid + Сітка + + + Visible + Видима + + + Grid &X + Сітка &X + + + Snap + Прив'язка + + + Reset + Скинути + + + Grid &Y + Сітка &Y + + + + qdesigner_internal::GroupBoxTaskMenu + + Change title... + Змінити заголовок... + + + + qdesigner_internal::HtmlTextEdit + + Insert HTML entity + Вставити елемент HTML + + + + qdesigner_internal::IconSelector + + The pixmap file '%1' cannot be read. + Неможливо прочитати файл растрового зображення '%1'. + + + The file '%1' does not appear to be a valid pixmap file: %2 + Файл '%1' не схожий на правильний файл растрового зображення: %2 + + + The file '%1' could not be read: %2 + Не вдалось прочитати файл '%1': %2 + + + Choose a Pixmap + Оберіть растрове зображення + + + Pixmap Read Error + Помилка читання растрового зображення + + + ... + ... + + + Normal Off + Нормальний, вимк + + + Normal On + Нормальний, увімк + + + Disabled Off + Вимкнений, вимк + + + Disabled On + Вимкнений, увімк + + + Active Off + Активний, вимк + + + Active On + Активний, увімк + + + Selected Off + Обраний, вимк + + + Selected On + Обраний, увімк + + + Choose Resource... + Оберіть ресурс... + + + Choose File... + Оберіть файл... + + + Reset + Скинути + + + Reset All + Скинути все + + + + qdesigner_internal::ItemListEditor + + Items List + Список елементів + + + New Item + Новий елемент + + + &New + &Новий + + + Delete Item + Видалити елемент + + + &Delete + Ви&далити + + + Move Item Up + Пересунути елемент вгору + + + U + В + + + Move Item Down + Пересунути елемент вниз + + + D + Н + + + Properties &>> + Властивост&і >> + + + Properties &<< + Властивост&і << + + + + qdesigner_internal::LabelTaskMenu + + Change rich text... + Змінити форматований текст... + + + Change plain text... + Змінити простий текст... + + + + qdesigner_internal::LanguageResourceDialog + + Choose Resource + Оберіть ресурс + + + + qdesigner_internal::LineEditTaskMenu + + Change text... + Змінити текст... + + + + qdesigner_internal::ListWidgetEditor + + New Item + Новий елемент + + + Edit List Widget + Редагування віджета "Список" + + + Edit Combobox + Редагування віджета "Випадаючий список" + + + + qdesigner_internal::ListWidgetTaskMenu + + Edit Items... + Редагувати елементи... + + + Change List Contents + Змінити зміст списку + + + + qdesigner_internal::MdiContainerWidgetTaskMenu + + Next Subwindow + Наступне підвікно + + + Previous Subwindow + Попереднє підвікно + + + Tile + Плиткою + + + Cascade + Каскадом + + + + qdesigner_internal::MenuTaskMenu + + Remove + Видалити + + + + qdesigner_internal::MorphMenu + + Morph into + Перетворити на + + + + qdesigner_internal::NewActionDialog + + New Action... + Нова дія... + + + &Text: + &Текст: + + + Object &name: + &Ім'я об'єкта: + + + &Icon: + &Значок: + + + Shortcut: + Поєднання клавіш: + + + Checkable: + Прапорець: + + + ToolTip: + Спливаюча підказка: + + + ... + ... + + + + qdesigner_internal::NewDynamicPropertyDialog + + Create Dynamic Property + Створити динамічну властивість + + + Property Name + Ім'я властивості + + + horizontalSpacer + + + + Property Type + Тип властивості + + + Set Property Name + Встановіть ім'я властивості + + + The current object already has a property named '%1'. +Please select another, unique one. + Поточний об'єкт вже має властивість з іменем '%1'. +Будь ласка, оберіть інше, унікальне ім'я. + + + The '_q_' prefix is reserved for the Qt library. +Please select another name. + Префікс '_q_' зарезервовано для бібліотеки Qt. +Будь ласка, оберіть інше ім'я. + + + + qdesigner_internal::NewFormWidget + + 0 + 0 + + + Choose a template for a preview + Оберіть шаблон для попереднього перегляду + + + Embedded Design + Дизайн для портативних пристроїв + + + Device: + Пристрій: + + + Screen Size: + Розмір екрану: + + + Default size + Типовий розмір + + + QVGA portrait (240x320) + QVGA книжкою (240x320) + + + QVGA landscape (320x240) + QVGA альбомом (320x240) + + + VGA portrait (480x640) + VGA книжкою (480x640) + + + VGA landscape (640x480) + VGA альбомом (640x480) + + + Widgets + New Form Dialog Categories + Віджети + + + Custom Widgets + Віджети користувача + + + None + Немає + + + Error loading form + Помилка завантаження форми + + + Unable to open the form template file '%1': %2 + Неможливо відкрити файл шаблону форми '%1': %2 + + + Internal error: No template selected. + Внутрішня помилка. Не обрано шаблон. + + + + qdesigner_internal::NewPromotedClassPanel + + Add + Додати + + + New Promoted Class + Новий перетворений клас + + + Base class name: + Ім'я базового класу: + + + Promoted class name: + Ім'я перетвореного класу: + + + Header file: + Файл заголовків: + + + Global include + Глобальне включення + + + Reset + Скинути + + + + qdesigner_internal::ObjectInspector + + Change Current Page + Змінити поточну сторінку + + + &Find in Text... + &Знайти в тексті... + + + + qdesigner_internal::OrderDialog + + Change Page Order + Змінити порядок сторінок + + + Page Order + Порядок сторінок + + + Move page up + Пересунути сторінку вгору + + + Move page down + Пересунути сторінку вниз + + + Index %1 (%2) + Індекс %1 (%2) + + + %1 %2 + %1 %2 + + + + qdesigner_internal::PaletteEditor + + Edit Palette + Редагувати палітру + + + Tune Palette + Налаштувати палітру + + + Show Details + Показати деталі + + + Compute Details + Розраховувати деталі + + + Quick + Швидко + + + Preview + Попередній перегляд + + + Disabled + Вимкнений + + + Inactive + Неактивний + + + Active + Активний + + + + qdesigner_internal::PaletteEditorButton + + Change Palette + Змінити палітру + + + + qdesigner_internal::PaletteModel + + Color Role + Кольорова роль + + + Active + Активна + + + Inactive + Неактивний + + + Disabled + Вимкнений + + + + qdesigner_internal::PixmapEditor + + Choose Resource... + Оберіть ресурс... + + + Choose File... + Оберіть файл... + + + Copy Path + Копіювати шлях + + + Paste Path + Вставити шлях + + + ... + ... + + + + qdesigner_internal::PlainTextEditorDialog + + Edit text + Редагувати текст + + + + qdesigner_internal::PluginDialog + + Components + Компоненти + + + Plugin Information + Інформація про додаток + + + Refresh + Оновити + + + Scan for newly installed custom widget plugins. + Шукати нові встановлені додатки користувацьких віджетів. + + + Loaded Plugins + Завантажені додатки + + + Failed Plugins + Проблемні додатки + + + Qt Designer couldn't find any plugins + Qt Designer'у не вдалось знайти жодного додатку + + + Qt Designer found the following plugins + Qt Designer знайшов наступні додатки + + + New custom widget plugins have been found. + Були знайдені нові додатки користувацьких віджетів. + + + + qdesigner_internal::PreviewActionGroup + + %1 Style + Стиль %1 + + + + qdesigner_internal::PreviewConfigurationWidget + + Default + Типово + + + None + Немає + + + Browse... + Огляд... + + + Load Custom Device Skin + Завантажити користувацьку обкладинку пристрою + + + All QVFB Skins (*.%1) + Усі обкладинки QVFB (*.%1) + + + %1 - Duplicate Skin + %1 - Обкладинка-дублікат + + + The skin '%1' already exists. + Обкладинка '%1' вже існує. + + + %1 - Error + %1 - Помилка + + + %1 is not a valid skin directory: +%2 + %1 не є правильною текою обкладинки: +%2 + + + + qdesigner_internal::PreviewDeviceSkin + + &Portrait + Книжка + + + Landscape (&CCW) + Rotate form preview counter-clockwise + Альбом (проти ГС) + + + &Landscape (CW) + Rotate form preview clockwise + Альбом (за ГС) + + + &Close + Закрити + + + + qdesigner_internal::PreviewManager + + %1 - [Preview] + %1 - [Перегляд] + + + + qdesigner_internal::PreviewMdiArea + + The moose in the noose +ate the goose who was loose. + Palette editor background + Кричав Архип, Архип охрип, +Не треба Архипу кричати до хрипу. + + + + qdesigner_internal::PreviewWidget + + Preview Window + Вікно попереднього перегляду + + + LineEdit + Поле введення + + + ComboBox + Випадаючий список + + + PushButton + Кнопка + + + ButtonGroup2 + Група кнопок 2 + + + CheckBox1 + Прапорець 1 + + + CheckBox2 + Прапорець 2 + + + ButtonGroup + Група кнопок + + + RadioButton1 + Перемикач 1 + + + RadioButton2 + Перемикач 2 + + + RadioButton3 + Перемикач 3 + + + + qdesigner_internal::PromotionModel + + Name + Назва + + + Header file + Файл заголовків + + + Global include + Глобальне включення + + + Usage + Використання + + + + qdesigner_internal::PromotionTaskMenu + + Promoted widgets... + Перетворені віджети... + + + Promote to ... + Перетворити на... + + + Change signals/slots... + Змінити сигнали/слоти... + + + Promote to + Перетворити на + + + Demote to %1 + Перетворити на %1 + + + + qdesigner_internal::PropertyEditor + + Add Dynamic Property... + Додати динамічну властивість... + + + Remove Dynamic Property + Видалити динамічну властивість + + + Sorting + Сортування + + + Color Groups + Групи кольорів + + + Tree View + Деревом + + + Drop Down Button View + Випадаючим списком + + + String... + Рядки... + + + Bool... + Булева... + + + Other... + Інше... + + + Configure Property Editor + Налаштувати редактор властивостей + + + Object: %1 +Class: %2 + Об'єкт: %1 +Клас: %2 + + + + qdesigner_internal::PropertyLineEdit + + Insert line break + Insert розрив рядка + + + + qdesigner_internal::QDesignerPromotionDialog + + Promoted Widgets + Перетворені віджети + + + Promoted Classes + Перетворені класи + + + Promote + Перетворити + + + Change signals/slots... + Змінити сигнали/слоти... + + + %1 - Error + %1 - Помилка + + + + qdesigner_internal::QDesignerResource + + Loading qrc file + Завантаження файлу qrc + + + The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> + Не вдалось знайти вказаний файл qrc <p><b>%1</b></p><p>. Бажаєте оновити розташування файлу?</p> + + + New location for %1 + Нове розташування для %1 + + + Resource files (*.qrc) + Файли ресурсів (*.qrc) + + + + qdesigner_internal::QDesignerTaskMenu + + Change objectName... + Змінити objectName... + + + Change toolTip... + Змінити toolTip... + + + Change whatsThis... + Змінити whatsThis... + + + Change styleSheet... + Змінити styleSheet... + + + Create Menu Bar + Створити панель меню + + + Add Tool Bar + Додати панель інструментів + + + Create Status Bar + Створити рядок статусу + + + Remove Status Bar + Видалити рядок статусу + + + Change script... + Змінити скрипт... + + + Change signals/slots... + Змінити сигнали/слоти... + + + Go to slot... + Перейти до слота... + + + Size Constraints + Обмеження розміру + + + Set Minimum Width + Встановити мінімальну ширину + + + Set Minimum Height + Встановити мінімальну висоту + + + Set Minimum Size + Встановити мінімальний розмір + + + Set Maximum Width + Встановити максимальну ширину + + + Set Maximum Height + Встановити максимальну висоту + + + Set Maximum Size + Встановити максимальний розмір + + + Edit ToolTip + Редагувати спливаючу підказку + + + Edit WhatsThis + Редагування підказки "Що це?" + + + no signals available + немає доступних сигналів + + + Set size constraint on %n widget(s) + + Встановити обмеження розміру для %n віджета + Встановити обмеження розміру для %n віджетів + Встановити обмеження розміру для %n віджетів + + + + + qdesigner_internal::QDesignerWidgetBox + + Unexpected element <%1> + Неочікуваний елемент <%1> + + + A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 +%5 + Під час розбору XML коду, вказаного для віджета %3, сталась помилка в рядку %1, позиція %2: %4 +%5 + + + The XML code specified for the widget %1 does not contain any widget elements. +%2 + XML код, вказаний для віджета %1, не містить жодного елемента віджета. +%2 + + + An error has been encountered at line %1 of %2: %3 + Сталась помилка в рядку %1 з %2: %3 + + + Unexpected element <%1> encountered when parsing for <widget> or <ui> + Під час розбору <widget> або <ui> було знайдено неочікуваний елемент <%1> + + + Unexpected end of file encountered when parsing widgets. + Під час розбору віджетів несподівано закінчився файл. + + + A widget element could not be found. + Не вдалось знайти елемент віджета. + + + + qdesigner_internal::QtGradientStopsController + + H + H + + + S + S + + + V + V + + + Hue + Відтінок + + + Sat + Насиченість + + + Val + Значення + + + Saturation + Насиченість + + + Value + Значення + + + R + R + + + G + G + + + B + B + + + Red + Червоний + + + Green + Зелений + + + Blue + Блакитний + + + + qdesigner_internal::RichTextEditorDialog + + Edit text + Редагувати текст + + + Rich Text + Форматований текст + + + Source + Код + + + &OK + &OK + + + &Cancel + &Скасувати + + + + qdesigner_internal::RichTextEditorToolBar + + Bold + Жирний + + + CTRL+B + + + + Italic + Курсив + + + CTRL+I + + + + Underline + Підкреслений + + + CTRL+U + + + + Left Align + Вліво + + + Center + По центру + + + Right Align + Вправо + + + Justify + По ширині + + + Superscript + Верхній індекс + + + Subscript + Нижній індекс + + + Insert &Link + Вставити &посилання + + + Insert &Image + Вставити &зображення + + + + qdesigner_internal::ScriptDialog + + Edit script + Редагування скрипту + + + <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. + <html>Введіть фрагмент коду Qt Script, що має виконуватись під час завантаження форми.<br>Віджет та його діти доступні через змінні <i>widget</i> та <i>childWidgets</i>, відповідно. + + + Syntax error + Синтаксична помилка + + + + qdesigner_internal::ScriptErrorDialog + + Script errors + Помилки скрипту + + + + qdesigner_internal::SignalSlotDialog + + There is already a slot with the signature '%1'. + Вже існує слот з сигнатурою '%1'. + + + There is already a signal with the signature '%1'. + Вже існує сигнал з сигнатурою '%1'. + + + %1 - Duplicate Signature + %1 - Повторна сигнатура + + + Signals/Slots of %1 + Сигнали/слоти %1 + + + + qdesigner_internal::SignalSlotEditorPlugin + + Edit Signals/Slots + Редагувати сигнали/слоти + + + F4 + F4 + + + + qdesigner_internal::SignalSlotEditorTool + + Edit Signals/Slots + Редагувати сигнали/слоти + + + + qdesigner_internal::StatusBarTaskMenu + + Remove + Видалити + + + + qdesigner_internal::StringListEditorButton + + Change String List + Змінити список рядків + + + + qdesigner_internal::StyleSheetEditorDialog + + Valid Style Sheet + Коректна таблиця стилів + + + Add Resource... + Додати ресурс... + + + Add Gradient... + Додати градієнт... + + + Add Color... + Додати колір... + + + Add Font... + Додати шрифт... + + + Edit Style Sheet + Редагувати таблицю стилів + + + Invalid Style Sheet + Неправильна таблиця стилів + + + + qdesigner_internal::TabOrderEditor + + Start from Here + Почати звідси + + + Restart + Почати спочатку + + + Tab Order List... + Список порядку обходу... + + + Tab Order List + Список порядку обходу + + + Tab Order + Порядок обходу + + + + qdesigner_internal::TabOrderEditorPlugin + + Edit Tab Order + Редагувати порядок обходу + + + + qdesigner_internal::TabOrderEditorTool + + Edit Tab Order + Редагувати порядок обходу + + + + qdesigner_internal::TableWidgetEditor + + Edit Table Widget + Редагування віджета "Таблиця" + + + &Items + &Елементи + + + Table Items + Елементи таблиці + + + Properties &>> + Властивост&і >> + + + New Column + Новий стовпчик + + + New Row + Новий рядок + + + &Columns + &Стовпці + + + &Rows + &Рядки + + + Properties &<< + Властивост&і << + + + + qdesigner_internal::TableWidgetTaskMenu + + Edit Items... + Редагувати елементи... + + + + qdesigner_internal::TemplateOptionsWidget + + Form + Форма + + + Additional Template Paths + Додаткові шляхи до шаблонів + + + ... + ... + + + Pick a directory to save templates in + Виберіть теку для збереження шаблонів + + + + qdesigner_internal::TextEditTaskMenu + + Edit HTML + Редагувати HTML + + + Change HTML... + Змінити HTML... + + + Edit Text + Редагувати текст + + + Change Plain Text... + Змінити простий текст... + + + + qdesigner_internal::TextEditor + + Choose Resource... + Оберіть ресурс... + + + Choose File... + Оберіть файл... + + + ... + ... + + + Choose a File + Оберіть файл + + + + qdesigner_internal::ToolBarEventFilter + + Insert Separator before '%1' + Вставити розділювач перед %1 + + + Append Separator + Приєднати розділювач + + + Remove action '%1' + Видалити дію '%1' + + + Remove Toolbar '%1' + Видалити панель інструментів '%1' + + + Insert Separator + Вставити розділювач + + + + qdesigner_internal::TreeWidgetEditor + + Edit Tree Widget + Редагування віджета "Дерево" + + + &Items + &Елементи + + + Tree Items + Елементи дерева + + + 1 + 1 + + + New Item + Новий елемент + + + &New + &Новий + + + New Subitem + Новий піделемент + + + New &Subitem + Новий &піделемент + + + Delete Item + Видалити елемент + + + &Delete + Ви&далити + + + Move Item Left (before Parent Item) + Пересунути елемент вліво (перед батьківським) + + + L + Л + + + Move Item Right (as a First Subitem of the Next Sibling Item) + Пересунути елемент вправо (як перший піделемент наступного сусіда) + + + R + П + + + Move Item Up + Пересунути елемент вгору + + + U + В + + + Move Item Down + Пересунути елемент вниз + + + D + Н + + + Properties &>> + Властивост&і >> + + + New Column + Новий стовпчик + + + &Columns + &Стовпці + + + Per column properties + Властивості стовпця + + + Common properties + Загальні властивості + + + Properties &<< + Властивост&і << + + + + qdesigner_internal::TreeWidgetTaskMenu + + Edit Items... + Редагувати елементи... + + + + qdesigner_internal::WidgetBox + + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. + Попередження: Збій створення віджета в панелі віджетів. Причиною цього може бути неправильний XML користувацького віджета. + + + + qdesigner_internal::WidgetBoxTreeWidget + + Scratchpad + Нотатник + + + Custom Widgets + Віджети користувача + + + Expand all + Розгорнути все + + + Collapse all + Згорнути все + + + List View + Списком + + + Icon View + Значками + + + Remove + Видалити + + + Edit name + Редагувати ім'я + + + + qdesigner_internal::WidgetDataBase + + A custom widget plugin whose class name (%1) matches that of an existing class has been found. + Користувацький додаток віджета з іменем класу (%1) збігається з існуючим класом. + + + + qdesigner_internal::WidgetEditorTool + + Edit Widgets + Редагувати віджети + + + + qdesigner_internal::WidgetFactory + + The custom widget factory registered for widgets of class %1 returned 0. + Користувацька фабрика віджетів, що зареєстрована для класу %1, повернула 0. + + + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. + Сталася розбіжність імені класу під час створення віджета, використовуючи користувацьку фабрику віджетів, що зареєстрована для класу %1. Вона повернула віджет класу %2. + + + %1 Widget + Віджет %1 + + + The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. + Не вдалось визначити поточну сторінку контейнера '%1' (%2) під час створення розташування. Це вказує на некоректність файлу UI, можливо, розташування було створене на контейнерному віджеті. + + + Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. +This indicates an inconsistency in the ui-file. + Спроба додати розташування для віджета '%1' (%2), який вже має некероване розташування %3. +Це вказує на некоректність в файлі UI. + + + Cannot create style '%1'. + Неможливо створити стиль '%1'. + + + + qdesigner_internal::WizardContainerWidgetTaskMenu + + Next + Далі + + + Back + Назад + + + + qdesigner_internal::ZoomMenu + + %1 % + Zoom factor + %1 % + + + + qdesigner_internal::ZoomablePreviewDeviceSkin + + &Zoom + Масштаб + + + diff -r ef0373b55136 -r 758a864f9613 translations/linguist_de.ts --- a/translations/linguist_de.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/linguist_de.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,7 +4,6 @@ AboutDialog - Qt Linguist Qt Linguist @@ -12,27 +11,22 @@ BatchTranslationDialog - Batch Translation of '%1' - Qt Linguist Automatische Übersetzung von '%1' - Qt Linguist - Searching, please wait... Suche, bitte warten ... - &Cancel &Abbrechen - Linguist batch translator Automatischer Übersetzer (Linguist) - Batch translated %n entries 1 Eintrag wurde automatisch übersetzt @@ -40,62 +34,50 @@ - Qt Linguist - Batch Translation Qt Linguist - Automatische Übersetzung - Options Optionen - Set translated entries to finished Übersetzung als erledigt markieren - Retranslate entries with existing translation Einträge mit bereits existierender Übersetzung neu übersetzen - Translate also finished entries Erledigte Einträge übersetzen - Phrase book preference Wörterbücher - Move up Nach oben - Move down Nach unten - &Run &Ausführen - Cancel Abbrechen - Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked Geänderte Einträge werden als unerledigt gekennzeichnet, wenn die obige Einstellung 'Übersetzung als erledigt markieren' nicht aktiviert ist - The batch translator will search through the selected phrase books in the order given above Der automatische Übersetzer wird in der angegebenen Reihenfolge durch die ausgewählten Wörterbücher gehen @@ -103,45 +85,36 @@ DataModel - <qt>Duplicate messages found in '%1': <qt>Mehrfach vorhandene Meldungen in '%1': - - <p>[more duplicates omitted] <p>[weitere mehrfach vorhandene Nachrichten weggelassen] - <p>* ID: %1 <p>* ID: %1 - <p>* Context: %1<br>* Source: %2 <p>* Kontext: %1<br>* Quelle: %2 - <br>* Comment: %3 <br>* Kommentar: %3 - Linguist does not know the plural rules for '%1'. Will assume a single universal form. Die Regeln zur Pluralbildung der Sprache '%1' sind in Linguist nicht definiert. Es wird mit einer einfachen Universalform gearbeitet. - Cannot create '%2': %1 '%2' kann nicht erzeugt werden: %1 - Universal Form Universalform @@ -149,37 +122,30 @@ ErrorsView - Accelerator possibly superfluous in translation. Möglicherweise überflüssiger Kurzbefehl im Übersetzungstext. - Accelerator possibly missing in translation. Kurzbefehl fehlt im Übersetzungstext. - Translation does not end with the same punctuation as the source text. Interpunktion am Ende des Übersetzungstextes unterscheidet sich von Interpunktion des Ursprungstextes. - A phrase book suggestion for '%1' was ignored. Ein Vorschlag aus dem Wörterbuch für '%1' wurde nicht berücksichtigt. - Translation does not refer to the same place markers as in the source text. Platzhalter im Übersetzungstext und Ursprungstext unterscheiden sich. - Translation does not contain the necessary %n place marker. Der erforderliche Platzhalter (%n) fehlt in der Übersetzung. - Unknown error Unbekannter Fehler @@ -187,97 +153,78 @@ FindDialog - This window allows you to search for some text in the translation source file. Dieses Fenster erlaubt die Suche in der Übersetzungsdatei. - Type in the text to search for. Geben Sie den Text ein, nach dem gesucht werden soll. - Options Optionen - Source texts are searched when checked. Wenn aktiviert, wird in den Ursprungstexten gesucht. - Translations are searched when checked. Wenn ausgewählt, wird in den Übersetzungen gesucht. - Texts such as 'TeX' and 'tex' are considered as different when checked. Wenn aktiviert, werden Texte wie 'TeX' und 'tex' als unterschiedlich betrachtet. - Comments and contexts are searched when checked. Wenn ausgewählt, werden Kommentare und Kontextnamen durchsucht. - Find Suchen - &Find what: &Suchmuster: - &Source texts &Ursprungstexte - &Translations &Übersetzungen - &Match case &Groß-/Kleinschreibung beachten - &Comments &Kommentare - Ignore &accelerators Tastenkürzel &ignorieren - Click here to find the next occurrence of the text you typed in. Klicken Sie hier, um zum nächsten Vorkommen des Suchtextes zu springen. - Find Next Weitersuchen - Click here to close this window. Klicken Sie hier, um das Fenster zu schließen. - Cancel Abbrechen - Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog @@ -286,30 +233,25 @@ FormMultiWidget - Alt+Delete translate, but don't change Alt+Delete - Shift+Alt+Insert translate, but don't change Shift+Alt+Insert - Alt+Insert translate, but don't change Alt+Insert - Confirmation - Qt Linguist Bestätigung - Qt Linguist - Delete non-empty length variant? Soll die ausgefüllte Längenvariante gelöscht werden? @@ -317,7 +259,6 @@ LRelease - Dropped %n message(s) which had no ID. Es wurde ein Eintrag ohne Bezeichner gelöscht. @@ -325,7 +266,6 @@ - Excess context/disambiguation dropped from %n message(s). Es wurde überflüssiger Kontext beziehungsweise überflüssige Infomation zur Unterscheidung bei einem Eintrag entfernt. @@ -333,10 +273,23 @@ - + Generated %n translation(s) (%1 finished and %2 unfinished) + + Eine Übersetzung wurde erzeugt (%1 abgeschlossen und %2 nicht abgeschlossen) + %n Übersetzungen wurden erzeugt (%1 abgeschlossen und %2 nicht abgeschlossen) + + + + Ignored %n untranslated source text(s) + + Ein nicht übersetzter Text wurde ignoriert + %n nicht übersetzte Texte wurden ignoriert + + + Generated %n translation(s) (%1 finished and %2 unfinished) - + Eine Übersetzung wurde erzeugt (%1 abgeschlossen und %2 nicht abgeschlossen) %n Übersetzungen wurden erzeugt (%1 abgeschlossene und %2 nicht abgeschlossene) @@ -344,10 +297,9 @@ - Ignored %n untranslated source text(s) - + Ein nicht übersetzter Text wurde ignoriert %n nicht übersetzte Texte wurden ignoriert @@ -358,628 +310,496 @@ MainWindow - MainWindow Hauptfenster - &Phrases &Wörterbuch - &Close Phrase Book Wörterbuch &Schließen - &Edit Phrase Book Wörterbuch &bearbeiten - &Print Phrase Book Wörterbuch &drucken - V&alidation V&alidierung - &View &Ansicht - Vie&ws &Ansichten - &Toolbars &Werkzeugleisten - &Help &Hilfe - &Translation &Übersetzung - &File &Datei - &Edit &Bearbeiten - &Open... Ö&ffnen ... - Open a Qt translation source file (TS file) for editing Qt-Übersetzungsdatei (TS-Datei) zum Bearbeiten öffnen - Ctrl+O Ctrl+O - E&xit &Beenden - Close this window and exit. Dieses Fenster schließen und das Programm beenden. - Ctrl+Q Ctrl+Q - - &Save &Speichern - Save changes made to this Qt translation source file Änderungen an der Qt-Übersetzungsdatei speichern - Move to the previous unfinished item. Zum vorherigen unerledigten Eintrag gehen. - Move to the next unfinished item. Zum nächsten unerledigten Eintrag gehen. - Move to the previous item. Zum vorigen Eintrag gehen. - Move to the next item. Zum nächsten Eintrag gehen. - Mark this item as done and move to the next unfinished item. Diesen Eintrag als erledigt markieren und zum nächsten unerledigten Eintrag gehen. - Copy from source text Ursprungstext übernehmen - Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. Die Prüfung der Tastenkürzel, das heißt, die Übereinstimmung der kaufmännischen Und-Zeichen in Quelle und Übersetzung ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. Die Prüfung der Satzendezeichen am Ende des Textes ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. Die Prüfung der Verwendung der Wörterbuchvorschläge ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. Die Prüfung der Platzhalter, das heißt, ob %1, %2 usw. in Ursprungstext und Übersetzung übereinstimmend verwendet werden, ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Open Read-O&nly... Schr&eibgeschützt öffnen ... - &Save All &Alle speichern - Ctrl+S Ctrl+S - - - Save &As... Speichern &unter... - Save As... Speichern unter ... - Save changes made to this Qt translation source file into a new file. Änderungen an dieser Qt-Übersetzungsdatei in einer neuen Datei speichern. - &Release &Freigeben - Create a Qt message file suitable for released applications from the current message file. Qt-Nachrichtendatei (QM-Datei) aus der aktuellen Übersetzungsdatei erzeugen. - &Print... &Drucken ... - Ctrl+P Ctrl+P - &Undo &Rückgängig - Recently Opened &Files Zu&letzt bearbeitete Dateien - Save Speichern - Print a list of all the translation units in the current translation source file. Liste aller Übersetzungseinheiten in der aktuellen Übersetzungsdatei drucken. - Undo the last editing operation performed on the current translation. Die letzte Änderung an der Übersetzung rückgängig machen. - Ctrl+Z Ctrl+Z - &Redo &Wiederherstellen - Redo an undone editing operation performed on the translation. Die letzte rückgängig gemachte Änderung wieder herstellen. - Ctrl+Y Ctrl+Y - Cu&t &Ausschneiden - Copy the selected translation text to the clipboard and deletes it. Den ausgewählten Übersetzungstext in die Zwischenablage kopieren und löschen. - Ctrl+X Ctrl+X - &Copy &Kopieren - Copy the selected translation text to the clipboard. Den ausgewählten Übersetzungstext in die Zwischenablage kopieren. - Ctrl+C Ctrl+C - &Paste &Einfügen - Paste the clipboard text into the translation. Text aus der Zwischenablage in die Übersetzung einfügen. - Ctrl+V Ctrl+V - Select &All Alles &markieren - Select the whole translation text. Den gesamten Übersetzungstext auswählen. - Ctrl+A Ctrl+A - &Find... &Suchen ... - Search for some text in the translation source file. In der Übersetzungsdatei nach Text suchen. - Ctrl+F Ctrl+F - Find &Next &Weitersuchen - Continue the search where it was left. Die Suche fortsetzen. - F3 F3 - &Prev Unfinished &Vorheriger Unerledigter - Close Schließen - &Close All A&lle schließen - Ctrl+W Ctrl+W - Ctrl+K Ctrl+K - &Next Unfinished &Nächster Unerledigter - P&rev V&orheriger - Ctrl+Shift+K Ctrl+Shift+K - Ne&xt Nä&chster - &Done and Next &Fertig und Nächster - Copies the source text into the translation field. Kopiert den Ursprungstext in das Übersetzungsfeld. - Ctrl+B Ctrl+B - &Accelerators &Kurzbefehle - &Ending Punctuation &Punktierung am Ende - &Phrase matches &Wörterbuch - Place &Marker Matches Platz&halter - &New Phrase Book... &Neues Wörterbuch ... - Create a new phrase book. Ein neues Wörterbuch erzeugen. - Ctrl+N Ctrl+N - &Open Phrase Book... &Wörterbuch öffnen ... - Open a phrase book to assist translation. Ein Wörterbuch zur Unterstützung bei der Übersetzung öffnen. - Ctrl+H Ctrl+H - &Reset Sorting &Sortierung zurücksetzen - Sort the items back in the same order as in the message file. Die Einträge in der gleichen Reihenfolge wie in der ursprünglichen Übersetzungsdatei sortieren. - &Display guesses &Vorschläge anzeigen - Set whether or not to display translation guesses. Darstellung von Übersetzungsvorschlägen aktivieren/deaktivieren. - &Statistics S&tatistik - Display translation statistics. Zeige Übersetzungsstatistik an. - &Manual &Handbuch - F1 F1 - About Qt Linguist Über Qt Linguist - About Qt Über Qt - &What's This? &Direkthilfe - What's This? Direkthilfe - Enter What's This? mode. Direkthilfe-Modus aktivieren. - Shift+F1 Shift+F1 - &Search And Translate... Suchen und &übersetzen ... - Replace the translation on all entries that matches the search source text. Die Übersetzung aller Einträge ersetzen, die dem Suchtext entsprechen. - - &Batch Translation... &Automatische Übersetzung ... - Batch translate all entries using the information in the phrase books. Alle Einträge automatisch mit Hilfe des Wörterbuchs übersetzen. - - - Release As... Freigeben unter ... - This is the application's main window. - Source text Ursprungstext - - Index Index - - Context Kontext - Items Einträge - This panel lists the source contexts. Dieser Bereich zeigt die Kontexte an. - Strings Zeichenketten - Phrases and guesses Wörterbuch und Vorschläge - Sources and Forms Quelldateien und Formulare - Warnings Hinweise - MOD status bar: file(s) modified Geändert - Loading... Lade ... - - Loading File - Qt Linguist Laden - Qt Linguist - The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -988,7 +808,6 @@ Sollen die bereits geöffneten Dateien vorher geschlossen werden? - The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -997,7 +816,6 @@ Soll die erstgenannte Datei übersprungen werden? - %n translation unit(s) loaded. Eine Übersetzungseinheit geladen. @@ -1005,124 +823,84 @@ - Related files (%1);; Verwandte Dateien (%1);; - Open Translation Files Übersetzungsdateien öffnen - - File saved. Datei gespeichert. - - - Release Freigeben - Qt message files for released applications (*.qm) All files (*) Qt-Nachrichtendateien (*.qm) Alle Dateien (*) - - File created. Datei erzeugt. - - Printing... Drucke ... - Context: %1 Kontext: %1 - finished erledigt - unresolved ungelöst - obsolete veraltet - - Printing... (page %1) Drucke ... (Seite %1) - - Printing completed Drucken beendet - - Printing aborted Drucken abgebrochen - Search wrapped. Suche beginnt von oben. - - - - - - - - - - Qt Linguist Qt Linguist - - Cannot find the string '%1'. Kann Zeichenkette '%1' nicht finden. - Search And Translate in '%1' - Qt Linguist Suchen und übersetzen in '%1' - Qt Linguist - - - Translate - Qt Linguist Übersetzung - Qt Linguist - Translated %n entry(s) Ein Eintrag übersetzt @@ -1130,39 +908,32 @@ - No more occurrences of '%1'. Start over? Keine weiteren Vorkommen von '%1'. Von vorne beginnen? - Create New Phrase Book Erzeugen eines neuen Wörterbuchs - Qt phrase books (*.qph) All files (*) Qt-Wörterbücher (*.qph) Alle Dateien (*) - Phrase book created. Wörterbuch erzeugt. - Open Phrase Book Wörterbuch öffnen - Qt phrase books (*.qph);;All files (*) Qt-Wörterbücher (*.qph);;Alle Dateien (*) - %n phrase(s) loaded. Ein Wörterbucheintrag geladen. @@ -1170,328 +941,254 @@ - - - Add to phrase book Hinzufügen zum Wörterbuch - No appropriate phrasebook found. Es kann kein geeignetes Wörterbuch gefunden werden. - Adding entry to phrasebook %1 Eintrag zu Wörterbuch %1 hinzufügen - Select phrase book to add to Zu welchem Wörterbuch soll der Eintrag hinzugefügt werden? - Unable to launch Qt Assistant (%1) Qt Assistant kann nicht gestartet werden (%1) - Version %1 Version %1 - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). - Do you want to save the modified files? Möchten Sie die geänderten Dateien speichern? - Do you want to save '%1'? Möchten Sie '%1' speichern? - Qt Linguist[*] Qt Linguist[*] - %1[*] - Qt Linguist %1[*] - Qt Linguist - - No untranslated translation units left. Es wurden alle Übersetzungseinheiten abgearbeitet. - &Window &Fenster - Minimize Minimieren - Ctrl+M Ctrl+M - Display the manual for %1. Handbuch zu %1 anzeigen. - Display information about %1. Informationen über %1 anzeigen. - &Save '%1' '%1' &speichern - Save '%1' &As... '%1' speichern &unter ... - Release '%1' '%1' freigeben - Release '%1' As... '%1' freigeben unter ... - &Close '%1' '%1' &schließen - - &Close &Schließen - Save All Alles speichern - - &Release All Alles f&reigeben - Close All Alle schließen - Translation File &Settings for '%1'... Einstellungen der Übersetzungs&datei für '%1' ... - &Batch Translation of '%1'... &Automatische Übersetzung von '%1' ... - Search And &Translate in '%1'... Suchen und &übersetzen in '%1' ... - Search And &Translate... Suchen und &übersetzen ... - - File Datei - - Edit Bearbeiten - - Translation Übersetzung - - Validation Validierung - - Help Hilfe - Cannot read from phrase book '%1'. Wörterbuch '%1' kann nicht gelesen werden. - Close this phrase book. Dieses Wörterbuch schließen. - Enables you to add, modify, or delete entries in this phrase book. Erlaubt das Hinzufügen, Ändern und Entfernen von Wörterbuch-Einträgen. - Print the entries in this phrase book. Die Einträge des Wörterbuchs drucken. - Cannot create phrase book '%1'. Wörterbuch '%1' kann nicht erzeugt werden. - Do you want to save phrase book '%1'? Möchten Sie das Wörterbuch '%1' speichern? - All Alle - Open/Refresh Form &Preview &Vorschau öffnen/aktualisieren - Form Preview Tool Vorschau für Eingabemasken - F5 F5 - - Translation File &Settings... E&instellungen ... - &Add to Phrase Book Zum Wörterbuch &hinzufügen - Ctrl+T Ctrl+T - Ctrl+J Ctrl+J - Ctrl+Shift+J Ctrl+Shift+J - Previous unfinished item Vorheriger unerledigter Eintrag - Next unfinished item Nächster unerledigter Eintrag - Move to previous item Zum vorigen Eintrag gehen - Next item Nächster Eintrag - Mark item as done and move to the next unfinished item Eintrag als erledigt markieren und zum nächsten unerledigten Eintrag gehen - Copies the source text into the translation field Kopiert den Ursprungstext in das Übersetzungsfeld - Toggle the validity check of accelerators Prüfung der Tastenkürzel ein- bzw. ausschalten - Toggle the validity check of ending punctuation Prüfung der Satzendezeichen am Ende des Textes ein- bzw. ausschalten - Toggle checking that phrase suggestions are used Überprüfung, ob Wörterbucheinträge benutzt werden, aktivieren/deaktivieren - Toggle the validity check of place markers Prüfung der Platzhalter ein- bzw. ausschalten' - Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. Eine Qt-Nachrichtendatei aus der aktuellen Übersetzungsdatei erzeugen. Der Dateiname wird automatisch aus dem Namen der TS-Datei abgeleitet. - Length Variants Längenvarianten - Display information about the Qt toolkit by Nokia. Zeigt Informationen über das Qt-Toolkit von Nokia an. @@ -1499,103 +1196,83 @@ MessageEditor - This is the right panel of the main window. - Russian Russisch - German Deutsch - Japanese Japanisch - French Französisch - Polish Polnisch - Chinese Chinesisch - This whole panel allows you to view and edit the translation of some source text. Dieser Bereich erlaubt die Darstellung und Änderung der Übersetzung eines Textes. - Source text Ursprungstext - This area shows the source text. Dieser Bereich zeigt den Ursprungstext. - Source text (Plural) Ursprungstext (Plural) - This area shows the plural form of the source text. Dieser Bereich zeigt die Pluralform des Ursprungstexts. - Developer comments Hinweise des Entwicklers - This area shows a comment that may guide you, and the context in which the text occurs. Dieser Bereich zeigt eventuelle Kommentare und den Kontext, in dem der Text auftritt. - Here you can enter comments for your own use. They have no effect on the translated applications. Hier können Sie Hinweise für den eigenen Gebrauch eintragen. Diese haben keinen Einflusse auf die Übersetzung. - %1 translation (%2) Übersetzung %1 (%2) - This is where you can enter or modify the translation of the above source text. Hier können Sie die Übersetzung des Ursprungstextes eingeben bzw. ändern. - %1 translation Übersetzung %1 - %1 translator comments %1 Hinweise des Übersetzers - '%1' Line: %2 '%1' @@ -1605,22 +1282,18 @@ MessageModel - Completion status for %1 Bearbeitungsstand von %1 - <file header> <Dateikopf> - <context comment> <Kontexthinweis> - <unnamed context> <unbenannter Kontext> @@ -1628,7 +1301,6 @@ MsgEdit - This is the right panel of the main window. @@ -1637,113 +1309,91 @@ PhraseBookBox - Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - (New Entry) (Neuer Eintrag) - %1[*] - Qt Linguist %1[*] - Qt Linguist - Qt Linguist Qt Linguist - Cannot save phrase book '%1'. Wörterbuch '%1' kann nicht gespeichert werden. - Edit Phrase Book Wörterbuch bearbeiten - This window allows you to add, modify, or delete entries in a phrase book. Dieses Fenster erlaubt das Hinzufügen, Ändern und Entfernen von Wörterbuch-Einträgen. - &Translation: &Übersetzung: - This is the phrase in the target language corresponding to the source phrase. Dies ist der Text, der in der Zielsprache dem Ursprungstext entspricht. - S&ource phrase: &Ursprungstext: - This is a definition for the source phrase. Dies ist die Definition des Ursprungstextes. - This is the phrase in the source language. Dies ist der Text der Ursprungssprache. - &Definition: &Definition: - Click here to add the phrase to the phrase book. Einen neuen Eintrag ins Wörterbuch einfügen. - &New Entry &Neuer Eintrag - Click here to remove the entry from the phrase book. Den Eintrag aus dem Wörterbuch entfernen. - &Remove Entry &Eintrag entfernen - Settin&gs... &Einstellungen ... - Click here to save the changes made. Änderungen speichern. - &Save &Speichern - Click here to close this window. Klicken Sie hier, um das Fenster zu schließen. - Close Schließen @@ -1751,17 +1401,14 @@ PhraseModel - Source phrase Ursprungstext - Translation Übersetzung - Definition Definition @@ -1769,22 +1416,18 @@ PhraseView - Insert Einfügen - Edit Bearbeiten - Guess (%1) Vorschlag (%1) - Guess Vorschlag @@ -1792,63 +1435,46 @@ QObject - Compiled Qt translations Kompilierte Qt-Übersetzungen - Translation files (%1);; Übersetzungsdateien (%1);; - All files (*) Alle Dateien (*) - - - - - - - Qt Linguist Qt Linguist - GNU Gettext localization files GNU-Gettext-Übersetzungsdateien - GNU Gettext localization template files Vorlagen für GNU-Gettext-Übersetzungsdateien - Qt translation sources (format 1.1) Qt-Übersetzungsdateien (Formatversion 1.1) - Qt translation sources (format 2.0) Qt-Übersetzungsdateien (Formatversion 2.0) - Qt translation sources (latest format) Qt-Übersetzungsdateien (aktuelles Format) - XLIFF localization files XLIFF-Übersetzungsdateien - Qt Linguist 'Phrase Book' Qt-Linguist-Wörterbuch @@ -1856,17 +1482,14 @@ SourceCodeView - <i>Source code not available</i> <i>Quelltext nicht verfügbar</i> - <i>File %1 not available</i> <i>Datei %1 nicht vorhanden</i> - <i>File %1 not readable</i> <i>Datei %1 nicht lesbar</i> @@ -1874,42 +1497,34 @@ Statistics - Statistics Statistiken - Translation Übersetzung - Source Quelle - 0 0 - Words: Wörter: - Characters: Zeichen: - Characters (with spaces): Zeichen (mit Leerzeichen): - Close Schließen @@ -1917,72 +1532,58 @@ TranslateDialog - This window allows you to search for some text in the translation source file. Dieses Fenster erlaubt die Suche in der Übersetzungsdatei. - Type in the text to search for. Geben Sie den Text ein, nach dem gesucht werden soll. - Find &source text: &Ursprungstext: - &Translate to: &Übersetzung: - Search options Sucheinstellungen - Texts such as 'TeX' and 'tex' are considered as different when checked. Wenn aktiviert, werden Texte wie 'TeX' und 'tex' als unterschiedlich betrachtet. - Match &case &Groß-/Kleinschreibung beachten - Mark new translation as &finished Neue Übersetzung als &erledigt markieren - Click here to find the next occurrence of the text you typed in. Klicken Sie hier, um zum nächsten Vorkommen des Suchtextes zu springen. - Find Next Weitersuchen - Translate Übersetzen - Translate All Alle übersetzen - Click here to close this window. Klicken Sie hier, um das Fenster zu schließen. - Cancel Abbrechen @@ -1990,33 +1591,26 @@ TranslationSettingsDialog - Any Country Land - - Settings for '%1' - Qt Linguist Einstellungen für '%1' - Qt Linguist - Source language Ursprungssprache - Language Sprache - Country/Region Land/Region - Target language Zielsprache diff -r ef0373b55136 -r 758a864f9613 translations/linguist_fr.ts --- a/translations/linguist_fr.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/linguist_fr.ts Mon Oct 04 01:19:32 2010 +0300 @@ -2,17 +2,9 @@ - - - - (New Entry) - - - - AboutDialog - + Qt Linguist @@ -68,11 +60,6 @@ - Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked. - - - - Translate also finished entries @@ -93,11 +80,6 @@ - The batch translator will search through the selected phrase books in the order given above. - - - - &Run @@ -106,6 +88,16 @@ Cancel + + + Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked + + + + + The batch translator will search through the selected phrase books in the order given above + + DataModel @@ -116,11 +108,17 @@ + <p>[more duplicates omitted] - + + <p>* ID: %1 + + + + <p>* Context: %1<br>* Source: %2 @@ -130,7 +128,7 @@ - + Linguist does not know the plural rules for '%1'. Will assume a single universal form. @@ -284,19 +282,62 @@ + FormMultiWidget + + + Alt+Delete + translate, but don't change + + + + + Shift+Alt+Insert + translate, but don't change + + + + + Alt+Insert + translate, but don't change + + + + + Confirmation - Qt Linguist + + + + + Delete non-empty length variant? + + + + LRelease - - Generated %n translation(s) (%1 finished and %2 unfinished) - + + Dropped %n message(s) which had no ID. - Ignored %n untranslated source text(s) - + Excess context/disambiguation dropped from %n message(s). + + + + + + + Generated %n translation(s) (%1 finished and %2 unfinished) + + + + + + + Ignored %n untranslated source text(s) @@ -400,7 +441,7 @@ - + &Save @@ -412,51 +453,26 @@ - Previous unfinished item. - - - - Move to the previous unfinished item. - Next unfinished item. - - - - Move to the next unfinished item. - Move to previous item. - - - - Move to the previous item. - Next item. - - - - Move to the next item. - Mark item as done and move to the next unfinished item. - - - - Mark this item as done and move to the next unfinished item. @@ -467,21 +483,11 @@ - Toggle the validity check of accelerators. - - - - Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. - Toggle the validity check of ending punctuation. - - - - Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. @@ -492,11 +498,6 @@ - Toggle the validity check of place markers. - - - - Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. @@ -516,14 +517,14 @@ + - Save &As... - + Save As... @@ -764,11 +765,6 @@ - Toggle checking that phrase suggestions are used. - - - - Place &Marker Matches @@ -854,11 +850,6 @@ - Display information about the Qt toolkit by Trolltech. - - - - &What's This? @@ -888,36 +879,31 @@ + - &Batch Translation... - + Batch translate all entries using the information in the phrase books. + - Release As... - - Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file. - - - - + This is the application's main window. - + Source text @@ -929,27 +915,27 @@ - + Context - + Items - + This panel lists the source contexts. - + Strings - + Phrases and guesses @@ -970,7 +956,7 @@ - + Loading... @@ -1002,7 +988,7 @@ - + Related files (%1);; @@ -1018,14 +1004,14 @@ - - + + Release - + Qt message files for released applications (*.qm) All files (*) @@ -1037,7 +1023,7 @@ - + Printing... @@ -1088,10 +1074,10 @@ - + - + @@ -1100,7 +1086,7 @@ - + Cannot find the string '%1'. @@ -1195,12 +1181,12 @@ - - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> + + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). - + Do you want to save the modified files? @@ -1226,7 +1212,7 @@ - + &Window @@ -1287,13 +1273,13 @@ - + &Release All - + Close All @@ -1318,37 +1304,37 @@ - + File - - + + Edit - - + + Translation - - + + Validation - - + + Help - + Cannot read from phrase book '%1'. @@ -1378,7 +1364,7 @@ - + All @@ -1398,13 +1384,13 @@ - - + + Translation File &Settings... - + &Add to Phrase Book @@ -1423,11 +1409,87 @@ Ctrl+Shift+J + + + Previous unfinished item + + + + + Next unfinished item + + + + + Move to previous item + + + + + Next item + + + + + Mark item as done and move to the next unfinished item + + + + + Copies the source text into the translation field + + + + + Toggle the validity check of accelerators + + + + + Toggle the validity check of ending punctuation + + + + + Toggle checking that phrase suggestions are used + + + + + Toggle the validity check of place markers + + + + + Display information about the Qt toolkit by Nokia. + + + + + Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. + + + + + Length Variants + + MessageEditor - + + + This is the right panel of the main window. + + + + + Russian + + + + German @@ -1452,12 +1514,12 @@ - + This whole panel allows you to view and edit the translation of some source text. - + Source text @@ -1467,7 +1529,7 @@ - + Source text (Plural) @@ -1477,7 +1539,7 @@ - + Developer comments @@ -1492,12 +1554,12 @@ - + %1 translation (%2) - + This is where you can enter or modify the translation of the above source text. @@ -1512,7 +1574,7 @@ - + '%1' Line: %2 @@ -1521,7 +1583,7 @@ MessageModel - + Completion status for %1 @@ -1544,7 +1606,7 @@ MsgEdit - + This is the right panel of the main window. @@ -1553,13 +1615,18 @@ PhraseBookBox - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - + + (New Entry) + + + + %1[*] - Qt Linguist @@ -1680,7 +1747,7 @@ PhraseView - + Insert @@ -1708,7 +1775,7 @@ - + Translation files (%1);; @@ -1718,8 +1785,8 @@ - - + + @@ -1729,23 +1796,13 @@ - - C++ source files - - - - - Java source files - - - - + GNU Gettext localization files - - Qt Script source files + + GNU Gettext localization template files @@ -1764,22 +1821,12 @@ - - Qt Designer form files - - - - - Qt Jambi form files - - - - + XLIFF localization files - + Qt Linguist 'Phrase Book' @@ -1930,12 +1977,12 @@ TranslationSettingsDialog - + Any Country - + Settings for '%1' - Qt Linguist diff -r ef0373b55136 -r 758a864f9613 translations/linguist_ja.ts --- a/translations/linguist_ja.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/linguist_ja.ts Mon Oct 04 01:19:32 2010 +0300 @@ -2,24 +2,8 @@ - - - - (New Entry) - (新しい項目) - - - - @default - - (New Phrase) - (新しいフレーズ) - - - AboutDialog - Qt Linguist Qt Linguist @@ -27,209 +11,140 @@ BatchTranslationDialog - Batch translated %1 entries - %1 項目が一括翻訳されました - - - &Cancel キャンセル(&C) - Linguist batch translator Linguist の一括翻訳 - Searching, please wait... 検索しています、お待ちください... - Batch Translation of '%1' - Qt Linguist '%1' の一括翻訳 - Qt Linguist - Batch translated %n entries %n 項目が一括翻訳されました - Qt Linguist - Batch Translation Qt Linguist - 一括翻訳 - Options オプション - Set translated entries to finished 翻訳された項目を完了にする - Retranslate entries with existing translation 訳語がある項目を再度翻訳する - - Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked. - 注意:'翻訳された項目を完了にする'にチェックがついていない場合、翻訳された項目は未完了になります. - - - Translate also finished entries 完了している項目も翻訳する - Phrase book preference フレーズブックの設定 - Move up 上に移動 - Move down 下に移動 - - The batch translator will search through the selected phrase books in the order given above. - 一括翻訳機能は、上記で選択された順にフレーズブックを検索します。 - - - &Run 実行(&R) - Cancel キャンセル - - - ContextModel - Context - コンテキスト + Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked + 注意:「翻訳された項目を完了にする」にチェックがついていない場合、翻訳された項目は未完了になります - Done - 完了 - - - Items - 項目数 + The batch translator will search through the selected phrase books in the order given above + 一括翻訳機能は、上記で選択された順にフレーズブックを検索します DataModel - <qt>Duplicate messages found in '%1': <qt>'%1' に重複したメッセージが見つかりました: - <p>[more duplicates omitted] <p>[さらに重複している部分は省略されました] - + <p>* ID: %1 + <p> *.ID: %1 + + <p>* Context: %1<br>* Source: %2 <p>* コンテキスト: %1<br>* ソーステキスト: %2 - <br>* Comment: %3 <br>* コメント: %3 - Linguist does not know the plural rules for '%1'. Will assume a single universal form. Linguist は'%1'の複数のルールを知りません。 単一の共通形式とみなします。 - Cannot create '%2': %1 '%2' を作成できません: %1 - Universal Form 共通形式 - EditorPage - - Source text - ソーステキスト - - - Translation (%1) - 訳 (%1) - - - This area shows the source text. - この領域はソーステキストを表示します。 - - - This area shows a comment that may guide you, and the context in which the text occurs. - この領域は、手助けとなるコメントと、テキストが出てくるコンテキストを表示します。 - - - This is where you can enter or modify the translation of some source text. - ソーステキストの訳を入力したり変更したりできるところです。 - - - ErrorsView - Accelerator possibly superfluous in translation. 訳に余分なアクセラレータがついています。 - Accelerator possibly missing in translation. 訳にアクセラレータが欠けています。 - Translation does not end with the same punctuation as the source text. 訳がソーステキストと同じ句読点で終わっていません。 - A phrase book suggestion for '%1' was ignored. '%1' についてのフレーズブックの示唆を無視しています。 - Translation does not refer to the same place markers as in the source text. 訳語にはソーステキストと同じ数の "%" がありません。 - Translation does not contain the necessary %n place marker. - 訳語に必要な %n 個のプレースマーカー "%" がありません。 + 訳語に必要なプレースマーカー "%" が %n 個足りません。 - Unknown error 未知のエラー @@ -237,691 +152,473 @@ FindDialog - Cancel キャンセル - Click here to close this window. このウィンドウを閉じるにはここをクリックします。 - Find 検索 - &Find what: 検索する文字列(&F): - &Source texts ソーステキスト(&S) - &Translations 訳語(&T) - &Match case 大/小文字の区別(&M) - &Comments コメント(&C) - Ignore &accelerators アクセラレータを無視(&A) - Click here to find the next occurrence of the text you typed in. 入力したテキストが次に出てくる箇所を見つけるにはここをクリックします。 - Comments - コメント - - - Comments and contexts are searched when checked. 選択するとコメントとコンテキストが検索されます。 - Find Next 次を検索 - Find what: - 検索対象: - - - Match case - 大文字・小文字の区別 - - - Options オプション - Qt Linguist - Qt Linguist - - - Source texts - ソーステキスト - - - Source texts are searched when checked. 選択するとソーステキストが検索されます。 - Texts such as 'TeX' and 'tex' are considered as different when checked. 選択すると、たとえば 'TeX' と 'tex' は異なるものと見なされます。 - This window allows you to search for some text in the translation source file. このウィンドウで翻訳ソースファイル内のテキストを検索できます。 - Translations - 訳 - - - Translations are searched when checked. 選択すると訳が検索されます。 - Type in the text to search for. 検索するテキストを入力してください。 - Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog - FormHolder + FormMultiWidget - Preview Form - フォームをプレビュー + Alt+Delete + translate, but don't change + Alt+Delete - - - FormatTextEdit - &Copy - コピー(&C) + Shift+Alt+Insert + translate, but don't change + Shift+Alt+Insert - Ctrl+C - Ctrl+C + Alt+Insert + translate, but don't change + Alt+Insert - Select &All - すべてを選択(&A) + Confirmation - Qt Linguist + 確認 - Qt Linguist - Ctrl+A - Ctrl+A + Delete non-empty length variant? + 空ではない単数形・複数形を削除しますか? LRelease - - Generated %n translation(s) (%1 finished and %2 unfinished) - + Dropped %n message(s) which had no ID. - %n 件の訳語 (%1 件が完了、 %2 件が未完了) を生成しました - + ID のない %n 件のメッセージを無視しました。 - - Ignored %n untranslated source text(s) - + Excess context/disambiguation dropped from %n message(s). - %n 件の未翻訳のソーステキストを無視しました - + 不要な文脈やあいまいさ回避のコメントを %n 件のメッセージで無視しました。 - - - LanguagesDialog - - File - ファイル + + Generated %n translation(s) (%1 finished and %2 unfinished) + + %n 件のメッセージを翻訳しました(完了 %1 件、未完了 %2 件) + + + + Ignored %n untranslated source text(s) + + %n 件の未翻訳のソーステキストを無視しました + MainWindow - About Qt Qt について - About Qt Linguist Qt Linguist について - &Accelerators アクセラレータの確認(&A) - Batch translate all entries using the information in the phrase books. フレーズブックにある情報を用いて、全項目を一括翻訳します。 - &Batch Translation - 一括翻訳(&B) - - - &Begin from source - ソーステキストを元に翻訳(&B) - - - &Close Phrase Book フレーズブックを閉じる(&C) - Close this window and exit. このウィンドウを閉じて終了します。 - Continue the search where it was left. 残りの部分の検索を続けます。 - Copies the source text into the translation field. ソーステキストを訳の欄へコピーします。 - &Copy コピー(&C) - Copy the selected translation text to the clipboard and deletes it. 選択された訳のテキストをクリップボードにコピーして削除します。 - Copy the selected translation text to the clipboard. 選択された訳のテキストをクリップボードにコピーします。 - Create a new phrase book. 新しいフレーズブックを作成します。 - Create a Qt message file suitable for released applications from the current message file. リリースされたアプリケーションに合う Qt メッセージファイルを、現在のメッセージファイルから作成します。 - - Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file. - リリースされたアプリケーションにふさわしい Qt メッセージファイルを現在のメッセージファイルから作成します。ファイル名は、.ts ファイルの名前から自動的に決められます。 - - - Ctrl+A Ctrl+A - Ctrl+B Ctrl+B - Ctrl+C Ctrl+C - Ctrl+F Ctrl+F - Ctrl+H Ctrl+H - Ctrl+K Ctrl+K - Ctrl+L - Ctrl+L - - - Ctrl+N Ctrl+N - Ctrl+O Ctrl+O - Ctrl+P Ctrl+P - Ctrl+Q Ctrl+Q - Open Read-O&nly... 読取専用で開く(&N)... - &Save All 全て保存(&S) - Ctrl+S Ctrl+S - Ctrl+Shift+K Ctrl+Shift+K - Ctrl+Shift+L - Ctrl+Shift+L - - - Ctrl+V Ctrl+V - Ctrl+X Ctrl+X - Ctrl+Y Ctrl+Y - Recently Opened &Files 最近使ったファイル(&F) - Ctrl+Z Ctrl+Z - Cu&t 切り取り(&T) - &Display guesses 推測を表示(&D) - - Display information about the Qt toolkit by Trolltech. - Trolltech の Qt ツールキットについての情報を表示します。 - - - &Done and Next 完了にして次へ(&N) - &Edit 編集(&E) - - Edit 編集 - &Edit Phrase Book フレーズブックを編集(&E) - &Ending Punctuation 末尾の句読点(&E) - Enter What's This? mode. ヒントモードに入ります。 - E&xit 終了(&X) - F1 F1 - F3 F3 - F5 F5 - &File ファイル(&F) - - File ファイル - &Find - 検索(&F)... - - - Find &Next 次を検索(&N) - Form Preview Tool フォームプレビューツール - - Help ヘルプ - &Help ヘルプ(&H) - MainWindow MainWindow - &Manual マニュアル(&M) - Marks this item as done and moves to the next unfinished item. - この項目に完了のマークをつけ、次の未訳の項目へ移動します。 - - - Moves to the next item. - 次の項目へ移動します。 - - - Moves to the next unfinished item. - 次の未訳の項目へ移動します。 - - - Moves to the previous item. - 前の項目へ移動します。 - - - Moves to the previous unfinished item. - 前の未訳の項目へ移動します。 - - - &New - 新規(&N) - - - &New Phrase Book - 新しいフレーズブック(&N) - - - Ne&xt 次へ(&X) - &Next Unfinished - 次の未訳へ(&N) + 次の未完了へ(&N) - &Open - オープン(&O)... - - - Open a phrase book to assist translation. 翻訳の参考にするためにフレーズブックを開きます。 - Open a Qt translation source file (TS file) for editing Qt 翻訳ソースファイル (TS ファイル) を編集用に開きます - &Open Phrase Book - フレーズブックを開く(&O)... - - - Open/Refresh Form &Preview フォームプレビューを開く／更新する(&P) - &Paste 貼り付け(&P) - Paste the clipboard text into the translation. クリップボードのテキストを訳に貼り付けます。 - &Phrase matches フレーズの一致(&P) - &Phrases フレーズ(&P) - Place &Marker Matches "%" の数や数字の一致(&M) - P&rev 前へ(&R) - &Prev Unfinished 前の未訳へ(&P) - &Print - 印刷(&P)... - - - Print a list of all the phrases in the current Qt translation source file. - 現在の Qt 翻訳ソースファイルの全てのフレーズ一覧を印刷します。 - - - &Print Phrase Book フレーズブックを印刷(&P) - Re&cently opened files - 最近開いたファイル(&C) - - - &Redo やり直す(&R) - Redo an undone editing operation performed on the translation. 取り消された編集操作をやり直します。 - &Release リリース(&R) - - - Release As... 名前を付けてリリース... - Replace the translation on all entries that matches the search source text. 検索対象のソーステキストに該当する全項目の訳語を置換します。 - &Revert Sorting - ソート順序を初期状態に(&R) - - - This is the application's main window. - Source text ソーステキスト - - Index インデックス - - Context コンテキスト - Items 項目数 - This panel lists the source contexts. このパネルではソースのコンテキストを一覧表示しています。 - Strings 文字列 - Phrases and guesses フレーズと推測 - Sources and Forms ソースとフォーム - Warnings 警告 - MOD status bar: file(s) modified MOD - Loading... ロードしています... - - Loading File - Qt Linguist ロードしています - Qt Linguist - The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -930,7 +627,6 @@ 先に開いたファイルを閉じますか? - The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -939,873 +635,616 @@ ファイルのロードをスキップしますか? - %n translation unit(s) loaded. %n 件の翻訳項目をロードしました。 - Related files (%1);; %1 に関連したファイル;; - Open Translation Files 翻訳ファイルを開く - - File saved. ファイルが保存されました。 - - - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist は、Qt アプリケーションの翻訳を行うツールです。</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + + Release リリース - Qt message files for released applications (*.qm) All files (*) リリースされたアプリケーション用の Qt メッセージファイル (*.qm) すべてのファイル (*) - - File created. ファイルが作成されました。 - - Printing... 印刷中... - Context: %1 コンテキスト: %1 - finished 完了 - unresolved 未解決 - obsolete このバージョンでは使われていない - - Printing... (page %1) 印刷中... (%1 ページ) - - Printing completed 印刷完了 - - Printing aborted 印刷中止 - Search wrapped. 検索が一通り終わりました。 - - - - - - - - - - Qt Linguist Qt Linguist - - Cannot find the string '%1'. 文字列 '%1' が見つかりません。 - Translate - 翻訳 - - - Translated %n entries to '%1' - - %n 項目を '%1' に翻訳しました - - - - Search And Translate in '%1' - Qt Linguist '%1' 内で検索して翻訳 - Qt Linguist - - - Translate - Qt Linguist 翻訳 - Qt Linguist - Translated %n entry(s) %n 項目が翻訳済みです - No more occurrences of '%1'. Start over? '%1' は、これ以上見つかりません。先頭に戻りますか? - Create New Phrase Book 新しいフレーズブックを作成 - Qt phrase books (*.qph) All files (*) Qt フレーズブック (*.qph) 全てのファイル (*) - Phrase book created. フレーズブックが作成されました。 - Open Phrase Book フレーズブックを開く - Qt phrase books (*.qph);;All files (*) Qt フレーズブック (*.qph);;すべてのファイル (*) - %n phrase(s) loaded. %n 項目のフレーズがロードされました。 - - - Add to phrase book フレーズブックに追加 - No appropriate phrasebook found. 適切なフレーズブックが見つかりません。 - Adding entry to phrasebook %1 フレーズブック %1 に項目を追加 - Select phrase book to add to 追加先のフレーズブックを選択してください - Unable to launch Qt Assistant (%1) Qt Assistant (%1) を起動できません - Version %1 バージョン %1 - Open Source Edition - オープンソース版 - - - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qt.nokia.com/company/model.html</tt> for an overview of Qt licensing. - このバージョンの Qt Linguist は、 オープンソースアプリケーションを開発するための Qt オープンソース版の一部です。Qt は、クロスプラットフォームなアプリケーションを開発するための包括的な C++ のフレームワークです。<br/><br/>独占的な（ソースが隠された）アプリケーションを開発するには、Qt の商用ライセンスが必要です。Qt のライセンスの概要については <tt>http://qt.nokia.com/company/model.html</tt> をご覧ください。 - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - このプログラムは、Qt 商用ライセンス契約書の定める条件の下であなたの利用が認められています。詳細は、ソフトウェアと一緒に配布される LICENSE ファイルを参照してください。 - - - - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist は、Qt アプリケーションの翻訳を行うツールです。</p><p>%2</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 全ての権利は保護されています。</p><p>このプログラムは、「設計」、「市場性」および「特定の目的への適合性」も含む、あらゆる種類の「保証がなく」、「そのままで」提供されます。</p> - - - Do you want to save the modified files? 変更されたファイルを保存しますか? - Do you want to save '%1'? '%1' を保存しますか? - Qt Linguist[*] Qt Linguist[*] - %1[*] - Qt Linguist %1[*] - Qt Linguist - - No untranslated translation units left. 未訳項目は残っていません。 - &Window ウィンドウ(&W) - Minimize 最小化 - Ctrl+M Ctrl+M - Display the manual for %1. %1 のマニュアルを表示します。 - Display information about %1. %1 についての情報を表示します。 - &Save '%1' '%1' を保存する(&S) - Save '%1' &As... '%1' を名前を付けて保存(&A)... - Release '%1' '%1' をリリース - Release '%1' As... '%1' を名前を付けてリリース... - &Close '%1' '%1' を閉じる(&C) - - &Save 保存(&S) - - - Save &As... 名前を付けて保存(&A)... - - &Close 閉じる(&C) - Save All 全て保存 - - &Release All 全てリリース(&R) - Close All すべて閉じる - Translation File &Settings for '%1'... '%1' の翻訳ファイルの設定(&S)... - &Batch Translation of '%1'... '%1' の一括翻訳(&B)... - Search And &Translate in '%1'... '%1' 内を検索して翻訳(&T)... - Search And &Translate... 検索して訳語を置換(&T)... - Cannot read from phrase book '%1'. フレーズブック '%1' から読み出せません。 - Close this phrase book. このフレーズブックを閉じます。 - Enables you to add, modify, or delete entries in this phrase book. このフレーズブックで項目の追加、変更、削除ができます。 - Print the entries in this phrase book. このフレーズブックの項目を印刷します。 - Cannot create phrase book '%1'. フレーズブック '%1' を作成できません。 - Do you want to save phrase book '%1'? フレーズブック '%1' を保存しますか? - All すべて - Save As... 名前を付けて保存... - Save changes made to this Qt translation source file この Qt 翻訳ソースファイルに対して行われた変更を保存します。 - Save changes made to this Qt translation source file into a new file. Qt の翻訳ソースファイルで行われた変更を新しいファイルに保存します。 - &Search And Translate - 検索して訳語を置換(&S) - - - Search for some text in the translation source file. 翻訳ソースファイルからテキストを検索します。 - Select &All すべてを選択(&A) - Select the whole translation text. 訳のテキスト全部を選択します。 - Set whether or not to display translation guesses. 訳の推測を表示するかどうかを設定します。 - Set whether or not to display translation statistics. - 翻訳の統計を表示します。 - - - Shift+F1 Shift+F1 - Sort the items back in the same order as in the message file. 項目のソートの順序をメッセージファイルと同じものに戻します。 - &Statistics 統計(&S) - - Toggle checking that phrase suggestions are used. - フレーズの示唆を使うかどうかのチェックを切り替えます。 - - - Toggle validity checks of accelerators. - アクセラレータのチェックを有効にするかどうかを切り替えます。 - - - Toggle validity checks of ending punctuation. - 末尾の句読点のチェックを有効にするかどうかを切り替えます。 - - - Toggle validity checks of place markers. - "%" の数や番号のチェックを行うかどうかを切り替えます。 - - - &Toolbars ツールバー(&T) - Too&ls - ツール(&L) - - - - Translation 翻訳 - &Translation 翻訳(&T) - Translation File &Settings - 翻訳ファイルの設定(&S) - - - &Undo 元に戻す(&U) - Undo the last editing operation performed on the translation. - 最後に行った編集操作を取り消します。 - - - - Validation 検証 - V&alidation 検証(&A) - &View 表示(&V) - Vie&ws 表示(&W) - &What's This? ヒント(&W) - What's This? ヒント - &Open... 開く(&O)... - Save 保存 - &Print... 印刷(&P)... - Print a list of all the translation units in the current translation source file. 現在の Qt 翻訳ソースファイルの全ての訳語の一覧を印刷します。 - Undo the last editing operation performed on the current translation. 現在の翻訳ファイルで最後に行った編集操作を取り消します。 - &Find... 検索(&F)... - - Previous unfinished item. - 前の未訳の項目へ移動します。 - - - Move to the previous unfinished item. 前の未完了の項目へ移動します。 - - Next unfinished item. - 次の未訳の項目へ移動します。 - - - Move to the next unfinished item. 次の未完了の項目へ移動します。 - - Move to previous item. - 前の項目へ移動します。 - - - Move to the previous item. 前の項目へ移動します。 - - Next item. - 次の項目へ移動します。 - - - Move to the next item. 次の項目へ移動します。 - - Mark item as done and move to the next unfinished item. - この項目に完了のマークをつけ、次の未完了の項目へ移動します。 - - - Mark this item as done and move to the next unfinished item. この項目に完了のマークをつけ、次の未完了の項目へ移動します。 - Copy from source text ソーステキストからコピー - - Toggle the validity check of accelerators. - アクセラレータのチェックを有効にするかどうかを切り替えます。 - - - Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. ソーステキストと訳語のアクセラレータの個数が同じか否かのチェックを有効にするかどうかを切り替えます。チェックが無効になっていても、警告ウィンドウにメッセージは表示されます。 - - Toggle the validity check of ending punctuation. - 末尾の句読点のチェックを有効にするかどうかを切り替えます。 - - - Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. 末尾の句読点のチェックを有効にするかどうかを切り替えます。チェックが無効になっていても、警告ウィンドウにメッセージが表示されます。 - Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. フレーズの示唆を使うかどうかのチェックを切り替えます。チェックが無効になっていても、警告ウィンドウにメッセージが表示されます。 - - Toggle the validity check of place markers. - "%" の数や番号のチェックを行うかどうかを切り替えます。 - - - Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. ソーステキストと訳語の"%1"や"%2"等のプレースマーカーの整合が取れているか否かのチェックを行うかどうかを切り替えます。チェックが無効になっていても、警告ウィンドウにメッセージは表示されます。 - &New Phrase Book... 新しいフレーズブック(&N)... - &Open Phrase Book... フレーズブックを開く(&O)... - &Reset Sorting ソート順序をリセット(&R) - Display translation statistics. 翻訳の統計を表示します。 - &Search And Translate... 検索して訳語を置換(&S)... - Close 閉じる - &Close All 全て閉じる(&C) - Ctrl+W Ctrl+W - - &Batch Translation... 一括翻訳(&B)... - - Translation File &Settings... 翻訳ファイルの設定(&S)... - &Add to Phrase Book フレーズブックに追加(&A) - Ctrl+T Ctrl+T - Ctrl+J Ctrl+J - Ctrl+Shift+J Ctrl+Shift+J + + Previous unfinished item + 前の未完了の項目 + + + Next unfinished item + 次の未訳の項目 + + + Move to previous item + 前の項目へ移動 + + + Next item + 次の項目 + + + Mark item as done and move to the next unfinished item + この項目に完了のマークをつけ、次の未訳の項目へ移動します + + + Copies the source text into the translation field + ソーステキストを訳の欄へコピーします + + + Toggle the validity check of accelerators + アクセラレータのチェックを有効にするかどうかを切り替えます + + + Toggle the validity check of ending punctuation + 末尾の句読点のチェックを有効にするかどうかを切り替えます + + + Toggle checking that phrase suggestions are used + フレーズの示唆を使うかどうかのチェックを切り替えます + + + Toggle the validity check of place markers + "%" の数や番号のチェックを行うかどうかを切り替えます + + + Display information about the Qt toolkit by Nokia. + Nokia の Qt ツールキットについての情報を表示します。 + + + Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. + リリースされたアプリケーションにふさわしい Qt メッセージファイルを現在のメッセージファイルから作成します。ファイル名は、TS ファイルの名前から自動的に決められます。 + + + Length Variants + 単数形・複数形 + MessageEditor - backspace - バックスペース - - - bell - ベル - - - carriage return - 行頭復帰 + + This is the right panel of the main window. + - Guess - 推測 - - - Guess (%1) - 推測(%1) + Russian + ロシア語 - new line - 改行 - - - new page - 改ページ - - - Phrases - フレーズ + German + ドイツ語 - Phrases and guesses: - フレーズと推測: - - - sp) - スペース) + Japanese + 日本語 - tab - タブ - - - - German - German + French + フランス語 - - Japanese - Japanese - - - - French - French + Polish + ポーランド語 - - Polish - Polish + Chinese + 中国語 - - Chinese - Chinese - - - Source text ソーステキスト - Source text (Plural) ソーステキスト(複数) - This area shows the plural form of the source text. この領域は複数のソーステキストを表示します。 - Developer comments 開発者のコメント - This area shows a comment that may guide you, and the context in which the text occurs. この領域は、手助けとなるコメントと、テキストが出てくるコンテキストを表示します。 - Here you can enter comments for your own use. They have no effect on the translated applications. ここはあなたが自分自身の為にコメントを入力できます。翻訳されたアプリケーションには何の影響も与えません。 - %1 translation (%2) %1 翻訳 (%2) - This is where you can enter or modify the translation of the above source text. ソーステキストの訳を入力したり変更したりできるところです。 - %1 translation %1 訳 - %1 translator comments %1 翻訳者のコメント - This area shows the source text. この領域はソーステキストを表示します。 - This is where you can enter or modify the translation of some source text. - ソーステキストの訳を入力したり変更したりできるところです。 - - - This whole panel allows you to view and edit the translation of some source text. このパネル全体でソーステキストの訳を見たり編集したりすることができます。 - Translation (%1) - 訳 (%1) - - - '%1' Line: %2 '%1' @@ -1815,185 +1254,117 @@ MessageModel - Context - コンテキスト - - - Done - 完了 - - - Items - 項目数 - - - Completion status for %1 %1 の翻訳完了状況 - <file header> <ファイル ヘッダー> - <context comment> <コンテキスト コメント> - <unnamed context> <無名のコンテキスト> - MessagesTreeView - - Done - 完了 - - - MsgEdit - This is the right panel of the main window. - PageCurl + PhraseBookBox - Next unfinished phrase - 次の未訳のフレーズ + (New Entry) + (新しい項目) - Previous unfinished phrase - 前の未訳のフレーズ - - - - PhraseBookBox - - %1[*] - Qt Linguist %1[*] - Qt Linguist - Cannot save phrase book '%1'. フレーズブック '%1' を保存できません。 - Click here to add the phrase to the phrase book. フレーズブックにフレーズを追加するにはここをクリックしてください。 - &New Entry 新しい項目(&N) - Click here to remove the entry from the phrase book. フレーズブックからフレーズを消去するにはここをクリックしてください。 - &Remove Entry 項目を削除(&R) - Settin&gs... 設定(&G)... - Click here to close this window. このウィンドウを閉じるにはここをクリックします。 - Click here to remove the phrase from the phrase book. - フレーズブックからフレーズを消去するにはここをクリックしてください。 - - - Click here to save the changes made. 変更を保存するにはここをクリックしてください。 - Close 閉じる - &Definition: 定義(&D): - Edit Phrase Book フレーズブックを編集 - &New Phrase - 新しいフレーズ(&N) - - - Qt Linguist Qt Linguist - &Remove Phrase - フレーズを消去(&R) - - - &Save 保存(&S) - S&ource phrase: ソースフレーズ(&S): - This window allows you to add, modify, or delete entries in a phrase book. このウィンドウでフレーズブックにフレーズを追加、変更、削除できます。 - This is a definition for the source phrase. ソースフレーズの定義です。 - This is the phrase in the source language. ソースの言語のフレーズです。 - This is the phrase in the target language corresponding to the source phrase. ソースフレーズに対応する翻訳先言語のフレーズです。 - This window allows you to add, modify, or delete phrases in a phrase book. - このウィンドウでフレーズブックにフレーズを追加、変更、削除できます。 - - - &Translation: 訳(&T): - Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. @@ -2002,17 +1373,14 @@ PhraseModel - Definition 定義 - Source phrase ソースフレーズ - Translation 翻訳 @@ -2020,22 +1388,18 @@ PhraseView - Insert 挿入 - Edit 編集 - Guess (%1) 推測(%1) - Guess 推測 @@ -2043,573 +1407,103 @@ QObject - Compiled Qt translations コンパイル済み Qt 翻訳ファイル - Translation files (%1);; 翻訳ファイル (%1);; - All files (*) すべてのファイル (*) - - - - - - - Qt Linguist Qt Linguist - - C++ source files - C++ ソースファイル - - - - Java source files - Java ソースファイル - - - GNU Gettext localization files GNU Gettext 日本語化ファイル - - Qt Script source files - Qt スクリプト ソースファイル + GNU Gettext localization template files + GNU Gettext 日本語化テンプレートファイル - Qt translation sources (format 1.1) Qt 翻訳ソース (1.1形式) - Qt translation sources (format 2.0) Qt 翻訳ソース (2.0形式) - Qt translation sources (latest format) Qt 翻訳ソース (最新の形式) - - Qt Designer form files - Qt デザイナ フォームファイル - - - - Qt Jambi form files - Qt Jambi フォームファイル - - - XLIFF localization files XLIFF 日本語化ファイル - Qt Linguist 'Phrase Book' Qt Linguist 'フレーズ ブック' - QtWindowListMenu - - Cascade - カスケード - - - Close - 閉じる - - - Close All - すべて閉じる - - - Tile - タイル - - - - SortedMessagesModel - - Source text - ソーステキスト - - - SourceCodeView - <i>Source code not available</i> <i>ソース コードは使用できません</i> - <i>File %1 not available</i> <i>ファイル %1 が使用できません</i> - <i>File %1 not readable</i> <i>ファイル %1 が読み込めません</i> - SourceTextEdit - - &Copy - コピー(&C) - - - Ctrl+A - Ctrl+A - - - Ctrl+C - Ctrl+C - - - Select &All - すべてを選択(&A) - - - Statistics - 0 0 - Characters (with spaces): 文字(スペースつき): - Characters: 文字: - &Close - 閉じる(&C) - - - Source ソース - Statistics 統計 - Translation 翻訳 - Words: 語: - Close 閉じる - TrPreviewTool - - <No Translation> - <翻訳ファイルなし> - - - About - について - - - Could not load form file(s): - - フォームファイルをロードできませんでした: - - - - Could not load translation file: - - 翻訳ファイルをロードできませんでした: - - - - Could not reload translation file(s): - - 翻訳ファイルをリロードできませんでした: - - - - File - ファイル - - - Load Translation - 翻訳ファイルをロード - - - Open Forms - フォームを開く - - - Qt Translation Preview Tool: Warning - Qt 翻訳プレビューツール: 警告 - - - Translation files (*.qm);;All files (*.*) - 翻訳ファイル (*.qm);;全てのファイル (*.*) - - - User interface form files (*.ui);;All files (*.*) - ユーザインタフェースファイル (*.ui);;全てのファイル (*.*) - - - Windows - ウィンドウ - - - - TrPreviewToolClass - - About - について - - - About Qt - Qt について - - - &Close - 閉じる(&C) - - - F5 - F5 - - - &File - ファイル(&F) - - - Forms - フォーム - - - &Help - ヘルプ(&H) - - - &Load Translation... - 翻訳ファイルをロード(&L)... - - - &Open Form... - フォームを開く(&O)... - - - Qt Translation Preview Tool - Qt 翻訳プレビューツール - - - &Reload Translations - 翻訳ファイルをリロード(&R) - - - &View - 表示(&V) - - - &Views - 表示(&V) - - - TrWindow - Open Source Edition - オープンソース版 - - - %1 - %2 - %1 - %2 - - - %1 - %2%3 - %1 - %2%3 - - - %n phrase(s) loaded. - - %n 項目のフレーズがロードされました。 - - - - %n source phrase(s) loaded. - - %n 個のソースフレーズがロードされました。 - - - - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist は、Qt アプリケーションの翻訳を行うツールです。</p><p>%2</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 全ての権利は保護されています。</p><p>このプログラムは、「設計」、「市場性」および「特定の目的への適合性」も含む、あらゆる種類の「保証がなく」、「そのままで」提供されます。</p> - - - A file called '%1' already exists. Please choose another name. - '%1' というファイルはすでに存在します。別の名前を選んでください。 - - - A phrase book suggestion for '%1' was ignored. - '%1' についてのフレーズブックの示唆を無視しています。 - - - Accelerator possibly missing in translation. - 訳にアクセラレータが欠けています。 - - - Accelerator possibly superfluous in translation. - 訳に余分なアクセラレータがついています。 - - - Allow you to add, modify, or delete phrases of this phrase book. - フレーズブックにフレーズを追加、変更、削除できます。 - - - Cannot create phrase book '%1'. - フレーズブック '%1' を作成できません。 - - - Cannot find the string '%1'. - 文字列 '%1' が見つかりません。 - - - Cannot open '%1'. - '%1' をオープンできません。 - - - Cannot read from phrase book '%1'. - フレーズブック '%1' から読み出せません。 - - - Cannot save '%1'. - '%1' を保存できません。 - - - Close this phrase book. - このフレーズブックを閉じます。 - - - Context - コンテキスト - - - Context: %1 - コンテキスト: %1 - - - Create New Phrase Book - 新しいフレーズブックを作成 - - - Ctrl+M - Ctrl+M - - - Display information about %1. - %1 についての情報を表示します。 - - - Display the manual for %1. - %1 のマニュアルを表示します。 - - - Do you want to save '%1'? - '%1' を保存しますか? - - - Edit - 編集 - - - File - ファイル - - - File created. - ファイルが作成されました。 - - - File saved. - ファイルが保存されました。 - - - finished - 完了 - - - Help - ヘルプ - - - Loading... - ロードしています... - - - Minimize - 最小化 - - - MOD - 変更されています - - - No untranslated phrases left. - 未訳のフレーズは残っていません。 - - - obsolete - このバージョンでは使われていない - - - Open Phrase Book - フレーズブックを開く - - - Phrase book created. - フレーズブックが作成されました。 - - - Print the entries of the phrase book. - フレーズブックの見出し語を印刷します。 - - - Printing aborted - 印刷中止 - - - Printing completed - 印刷完了 - - - Printing... - 印刷中... - - - Printing... (page %1) - 印刷中... (%1 ページ) - - - Qt Linguist - Qt Linguist - - - Qt Linguist by Trolltech - Trolltech の Qt Linguist - - - Qt message files for released applications (*.qm) -All files (*) - リリースされたアプリケーション用の Qt メッセージファイル (*.qm) -すべてのファイル (*) - - - Qt phrase books (*.qph) -All files (*) - Qt フレーズブック (*.qph) -すべてのファイル (*) - - - Qt translation source (*.ts) -All files (*) - Qt 翻訳ソースファイル (*.ts) -すべてのファイル (*) - - - Release - リリース - - - Search wrapped. - 検索が一通り終わりました。 - - - There was a problem in the preparation of form preview. - フォームのプレビューの準備中に問題が発生しました。 - - - This panel lists the source contexts. - このパネルではソースのコンテキストを一覧表示しています。 - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - このプログラムは、Qt 商用ライセンス契約書の定める条件の下であなたの利用が認められています。詳細は、ソフトウェアと一緒に配布される LICENSE ファイルを参照してください。 - - - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qt.nokia.com/company/model.html</tt> for an overview of Qt licensing. - このバージョンの Qt Linguist は、 オープンソースアプリケーションを開発するための Qt オープンソース版の一部です。Qt は、クロスプラットフォームなアプリケーションを開発するための包括的な C++ のフレームワークです。<br/><br/>独占的な（ソースが隠された）アプリケーションを開発するには、Qt の商用ライセンスが必要です。Qt のライセンスの概要については <tt>http://qt.nokia.com/company/model.html</tt> をご覧ください。 - - - Translate - 翻訳 - - - Translated %n entries to '%1' - - %n 項目を '%1' に翻訳しました - - - - Translation - 訳 - - - Translation does not end with the same punctuation as the source text. - 訳がソーステキストと同じ句読点で終わっていません。 - - - Translation does not refer to the same place markers as in the source text. - 訳語にはソーステキストと同じ数の "%" がありません。 - - - unresolved - 未解決 - - - Validation - 検証 - - - Version %1 - バージョン %1 - - - &Window - ウィンドウ(&W) - - - This is the application's main window. @@ -2618,174 +1512,87 @@ TranslateDialog - Cancel キャンセル - Click here to close this window. このウィンドウを閉じるにはここをクリックします。 - Click here to find the next occurrence of the text you typed in. 入力したテキストが次に出てくる箇所を見つけるにはここをクリックします。 - Find Next 次を検索 - Find &source text: ソーステキストを検索(&S): - Mark new translation as &finished 新しく翻訳した項目を完了にする(&F) - Match &case 大文字・小文字の区別(&C) - Qt Linguist - Qt Linguist - - - Search options 検索オプション - Texts such as 'TeX' and 'tex' are considered as different when checked. 選択すると、たとえば 'TeX' と 'tex' は異なるものと見なされます。 - This window allows you to search for some text in the translation source file. このウィンドウで翻訳ソースファイル内のテキストを検索できます。 - Translate 翻訳 - Translate All すべて翻訳 - &Translate to: 訳語(&T): - Type in the text to search for. 検索するテキストを入力してください。 - TranslationSettings - - Country - 国 - - - Language - 言語 - - - Qt Linguist - Translation file settings - Qt Linguist - 翻訳ファイルの設定 - - - Target language - 翻訳先の言語 - - - TranslationSettingsDialog - Any Country 指定しない - - Settings for '%1' - Qt Linguist '%1' の設定 - Qt Linguist - Source language 翻訳元の言語 - Language 言語 - Country/Region 国/地域 - Target language 翻訳先の言語 - - databaseTranslationDialog - - &Cancel - キャンセル(&C) - - - Move down - 下に移動 - - - Move up - 上に移動 - - - Only translate entries with no translation - 訳語がない項目だけを翻訳する - - - Options - オプション - - - Phrase book preference - フレーズブックの優先度 - - - Qt Linguist - Batch Translation - Qt Linguist - 一括翻訳 - - - &Run - 実行(&R) - - - Set translated entries to finished - 翻訳された項目を完了にする - - - The batch translator will search through the selected phrasebooks in the order given above. - 一括翻訳機能は、上記で指定された順にフレーズブックを検索します。 - - diff -r ef0373b55136 -r 758a864f9613 translations/linguist_ru.ts --- a/translations/linguist_ru.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/linguist_ru.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,7 +4,6 @@ AboutDialog - Qt Linguist Qt Linguist @@ -12,77 +11,62 @@ BatchTranslationDialog - Qt Linguist - Batch Translation Qt Linguist - Пакетный перевод - Options Параметры - Set translated entries to finished Помечать переведенные записи как завершённые - Retranslate entries with existing translation Переводить записи, уже имеющие перевод - Translate also finished entries Также переводить записи с завершёнными переводами - Phrase book preference Предпочитаемые глоссарии - Move up Поднять - Move down Опустить - &Run &Выполнить - Cancel Отмена - Batch Translation of '%1' - Qt Linguist Пакетный перевод '%1' - Qt Linguist - Searching, please wait... Идёт поиск, ожидайте... - &Cancel От&мена - Linguist batch translator Пакетный переводчик Qt Linguist - Batch translated %n entries Автоматически переведена %n запись @@ -91,12 +75,10 @@ - Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked Имейте в виду, что изменённые записи будут отмечены как незавершённые, если не включен параметр "Помечать переведенные записи как завершённые" - The batch translator will search through the selected phrase books in the order given above Пакетный переводчик будет искать в выбранных глоссариях в указанном выше порядке @@ -104,45 +86,36 @@ DataModel - <qt>Duplicate messages found in '%1': <qt>В '%1' обнаружены повторяющиеся сообщения: - - <p>[more duplicates omitted] <p>[остальные повторы не указаны] - <p>* ID: %1 <p>* ID: %1 - <p>* Context: %1<br>* Source: %2 <p>* Контекст: %1<br>* Источник: %2 - <br>* Comment: %3 <br>* Комментарий: %3 - Linguist does not know the plural rules for '%1'. Will assume a single universal form. Qt Linguist не знает правила множественных форм для '%1'. Будет использована универсальная единичная форма. - Cannot create '%2': %1 Не удалось создать '%2': %1 - Universal Form Универсальная форма @@ -150,37 +123,30 @@ ErrorsView - Accelerator possibly superfluous in translation. Возможно, лишний акселератор в переводе. - Accelerator possibly missing in translation. Возможно, пропущен акселератор в переводе. - Translation does not end with the same punctuation as the source text. Перевод не заканчивается тем же знаком препинания, что и исходный текст. - A phrase book suggestion for '%1' was ignored. Предложение глоссария для '%1' пропущено. - Translation does not refer to the same place markers as in the source text. Перевод не содержит тех же маркеров форматирования, что и исходный текст. - Translation does not contain the necessary %n place marker. Перевод не содержит необходимого маркера форматирования %n. - Unknown error Неизвестная ошибка @@ -188,98 +154,79 @@ FindDialog - Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog - Find Поиск - This window allows you to search for some text in the translation source file. Данное окно позволяет искать текст в файле перевода. - &Find what: &Искать: - Type in the text to search for. Введите искомый текст. - Options Параметры - Source texts are searched when checked. Если отмечено, поиск будет вестись в исходных текстах. - &Source texts &Исходные тексты - Translations are searched when checked. Если отмечено, поиск будет вестись в переведённых текстах. - &Translations &Переводы - Texts such as 'TeX' and 'tex' are considered as different when checked. Если отмечено, строки "ПрИмЕр" и "пример" будет считаться разными. - &Match case С учётом &регистра - Comments and contexts are searched when checked. Если отмечено, поиск будет вестись по контекстам и комментариям. - &Comments &Комментарии - Ignore &accelerators Пропускать &акселераторы - Click here to find the next occurrence of the text you typed in. Найти следующее совпадение для введённого текста. - Find Next Найти далее - Click here to close this window. Закрыть окно. - Cancel Отмена @@ -287,30 +234,25 @@ FormMultiWidget - Alt+Delete translate, but don't change - Shift+Alt+Insert translate, but don't change - Alt+Insert translate, but don't change - Confirmation - Qt Linguist Подтверждение - Qt Linguist - Delete non-empty length variant? Удалить вариант перевода? @@ -318,7 +260,6 @@ LRelease - Dropped %n message(s) which had no ID. Удалено %n сообщение, у которого не было ID. @@ -327,7 +268,6 @@ - Excess context/disambiguation dropped from %n message(s). Удалён лишний контекст из %n сообщения. @@ -336,107 +276,80 @@ - - Generated %n translation(s) (%1 finished and %2 unfinished) - + Generated %n translation(s) (%1 finished and %2 unfinished) - Создан %n перевод (%1 завершённых и %2 незавершённых) - - Создано %n перевода (%1 завершённых и %2 незавершённых) - - Создано %n переводов (%1 завершённых и %2 незавершённых) - + Создан %n перевод (%1 завершённых и %2 незавершённых) + Создано %n перевода (%1 завершённых и %2 незавершённых) + Создано %n переводов (%1 завершённых и %2 незавершённых) - - Ignored %n untranslated source text(s) - + Ignored %n untranslated source text(s) - Пропущен %n непереведённый исходный текст - - Пропущено %n непереведённых исходных текста - - Пропущено %n непереведённых исходных текстов - + Пропущен %n непереведённый исходный текст + Пропущено %n непереведённых исходных текста + Пропущено %n непереведённых исходных текстов MainWindow - This is the application's main window. Основное окно программы. - Source text Исходный текст - - Index Индекс - - Context Контекст - Items Записи - This panel lists the source contexts. В данной панели перечислены исходные контексты. - Strings Строки - Phrases and guesses Фразы и похожие переводы - Sources and Forms Исходники и формы - Warnings Предупреждения - MOD status bar: file(s) modified ИЗМ - Loading... Загрузка... - - Loading File - Qt Linguist Загрузка файла - Qt Linguist - The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -445,7 +358,6 @@ Закрыть открытые файлы? - The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -454,7 +366,6 @@ Пропустить загрузку файла? - %n translation unit(s) loaded. Загружена %n запись. @@ -463,124 +374,84 @@ - Related files (%1);; Связанные файлы (%1);; - Open Translation Files Открыть файлы перевода - - File saved. Файл сохранён. - - - Release Скомпилировать - Qt message files for released applications (*.qm) All files (*) Скомпилированные файлы перевода для приложений Qt (*.qm) Все файлы (*) - - File created. Файл создан. - - Printing... Печать... - Context: %1 Контекст: %1 - finished завершён - unresolved неразрешённый - obsolete устаревший - - Printing... (page %1) Печать... (страница %1) - - Printing completed Печать завершена - - Printing aborted Печать прервана - Search wrapped. Поиск с начала. - - - - - - - - - - Qt Linguist Qt Linguist - - Cannot find the string '%1'. Не удалось найти строку '%1'. - Search And Translate in '%1' - Qt Linguist Поиск и перевод '%1' - Qt Linguist - - - Translate - Qt Linguist Перевод - Qt Linguist - Translated %n entry(s) Переведена %n запись @@ -589,39 +460,32 @@ - No more occurrences of '%1'. Start over? Нет больше совпадений с '%1'. Начать заново? - Create New Phrase Book Создать глоссарий - Qt phrase books (*.qph) All files (*) Глоссарии Qt (*.qph) Все файлы (*) - Phrase book created. Глоссарий создан. - Open Phrase Book Открыть глоссарий - Qt phrase books (*.qph);;All files (*) Глоссарии Qt (*.qph);;Все файлы (*) - %n phrase(s) loaded. Загружена %n фраза. @@ -630,879 +494,690 @@ - - - Add to phrase book Добавить в глоссарий - No appropriate phrasebook found. Подходящий глоссарий не найден. - Adding entry to phrasebook %1 Добавление записи в глоссарий %1 - Select phrase book to add to Выберите глоссарий, в который желаете добавить фразу - Unable to launch Qt Assistant (%1) Не удалось запустить Qt Assistant (%1) - Version %1 Версия %1 - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist - инструмент для добавления переводов в приложения на основе Qt.</p><p>Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения. - Do you want to save the modified files? Желаете сохранить изменённые файлы? - Do you want to save '%1'? Желаете сохранить '%1'? - Qt Linguist[*] Qt Linguist[*] - %1[*] - Qt Linguist %1[*] - Qt Linguist - - No untranslated translation units left. Непереведённых записей не осталось. - &Window &Окно - Minimize Свернуть - Ctrl+M - Display the manual for %1. Показать руководство для %1. - Display information about %1. Показать информацию о %1. - &Save '%1' &Сохранить'%1' - Save '%1' &As... Сохранить'%1' &как... - Release '%1' Скомпилировать '%1' - Release '%1' As... Скомпилировать '%1' как... - &Close '%1' &Закрыть '%1' - - &Save &Сохранить - - - Save &As... Сохранить &как... - - - Release As... Скомпилировать как... - - &Close &Закрыть - Save All Сохранить все - - &Release All С&компилировать все - Close All Закрыть все - &Release С&компилировать - Translation File &Settings for '%1'... &Параметры файла перевода для '%1'... - &Batch Translation of '%1'... Пак&етный перевод '%1'... - Search And &Translate in '%1'... &Найти и перевести в '%1'... - - Translation File &Settings... &Параметры файла перевода... - - &Batch Translation... Пак&етный перевод... - Search And &Translate... &Найти и перевести... - - File Файл - - Edit Правка - - Translation Перевод - - Validation Проверка - - Help Справка - Cannot read from phrase book '%1'. Не удалось прочитать из глоссария '%1'. - Close this phrase book. Закрыть глоссарий. - Enables you to add, modify, or delete entries in this phrase book. Позволяет добавлять, изменять и удалять записи в глоссарии. - Print the entries in this phrase book. Печать записей фраз глоссария. - Cannot create phrase book '%1'. Не удалось создать глоссарий '%1'. - Do you want to save phrase book '%1'? Желаете сохранить глоссарий '%1'? - All Все - MainWindow Главное окно - &Phrases Фра&зы - &Close Phrase Book &Закрыть глоссарий - &Edit Phrase Book &Редактироваь глоссарий - &Print Phrase Book &Печатать глоссарий - V&alidation П&роверка - &View &Вид - Vie&ws Вид&ы - &Toolbars Пан&ели инструментов - &Help &Справка - &Translation П&еревод - &File &Файл - Recently Opened &Files Недавно открытые &файлы - &Edit &Правка - &Open... &Открыть... - Open a Qt translation source file (TS file) for editing Открыть исходный файл переводов Qt (файл TS) для изменения - Ctrl+O - E&xit В&ыход - Close this window and exit. Закрыть окно и выйти. - Ctrl+Q - Save Сохранить - Save changes made to this Qt translation source file Сохранить изменения в данном исходном файле перевода Qt - Save As... Сохранить как... - Save changes made to this Qt translation source file into a new file. Сохранить изменения в данном исходном файле перевода Qt в новый файл. - Create a Qt message file suitable for released applications from the current message file. Скомпилировать файл перевода Qt из текущего файла. - &Print... &Печать... - Print a list of all the translation units in the current translation source file. Печать списка всех записей перевода из текущего файла. - Ctrl+P - &Undo &Отменить - Undo the last editing operation performed on the current translation. Отменить последнее изменение текущего перевода. - Ctrl+Z - &Redo &Повторить - Redo an undone editing operation performed on the translation. Повторить отменённую правку перевода. - Ctrl+Y - Cu&t Выр&езать - Copy the selected translation text to the clipboard and deletes it. Скопировать отмеченный текст в буфер обмена и удалить его из оригинала. - Ctrl+X - &Copy &Копировать - Copy the selected translation text to the clipboard. Скопировать отмеченный текст в буфер обмена. - Ctrl+C - &Paste &Вставить - Paste the clipboard text into the translation. Вставить текст из буфера обмена в перевод. - Ctrl+V - Select &All В&ыделить всё - Select the whole translation text. Выделить весь текст перевода. - Ctrl+A - &Find... &Найти... - Search for some text in the translation source file. Найти текст в исходном файле перевода. - Ctrl+F - Find &Next Найти д&алее - Continue the search where it was left. Продолжить поиск с места, где он был остановлен. - F3 - &Prev Unfinished &Предыдущий незавершённый - Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. Создание готового файла перевода Qt из текущего файла. Имя файла будет автоматически определено из имени .ts файла. - Length Variants Варианты перевода - Move to the previous unfinished item. Перейти к предыдущему незавершённому переводу. - Ctrl+K - &Next Unfinished &Следующий незавершённый - Move to the next unfinished item. Перейти к следующему незавершённому переводу. - Ctrl+J - P&rev Пр&едыдущий - Move to the previous item. Перейти к предыдущему переводу. - Ctrl+Shift+K - Ne&xt С&ледующий - Move to the next item. Перейти к следующему переводу. - Ctrl+Shift+J - &Done and Next &Готово и далее - Mark this item as done and move to the next unfinished item. Пометить перевод как завершённый и перейти к следующему незавершённому. - Copy from source text Скопировать из исходного текста - Copies the source text into the translation field. Скопировать исходный текст в поле перевода. - Ctrl+B - &Accelerators &Акселераторы - Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. Переключение проверки акселераторов, т.е. совпадает ли количество амперсандов в исходном и переведённом текстах. Если выявлено несовпадение, будет показано сообщение в окне предупреждений. - &Ending Punctuation &Знаки препинания - Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. Переключение проверки знаков препинания в конце текста. Если выявлено несовпадение, будет показано сообщение в окне предупреждений. - &Phrase matches Совпадение &фраз - Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. Переключение проверки использования предложений для фраз. Если выявлено несовпадение, будет показано сообщение в окне предупреждений. - Place &Marker Matches Совпадение &маркеров - Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. Переключение проверки маркеров форматирования, т.е. все ли маркеры (%1, %2, ...) исходного текста присутствуют в переведённом. Если выявлено несовпадение, будет показано сообщение в окне предупреждений. - &New Phrase Book... &Новый глоссарий... - Create a new phrase book. Создать глоссарий. - Ctrl+N - &Open Phrase Book... &Открыть глоссарий... - Open a phrase book to assist translation. Открыть глоссарий для помощи в переводе. - Ctrl+H - &Reset Sorting &Сброс сортировки - Sort the items back in the same order as in the message file. Упорядочить элементы в той последовательности, в которой они находятся в файле. - &Display guesses &Предлагать похожие - Set whether or not to display translation guesses. Определяет необходимо или нет отображать похожие переводы. - &Statistics &Статистика - Display translation statistics. Показать статистику перевода. - &Manual &Руководство - F1 - About Qt Linguist О Qt Linguist - About Qt О Qt - &What's This? &Что это? - What's This? Что это? - Enter What's This? mode. Переход в режим "Что это?". - Shift+F1 - &Search And Translate... &Найти и перевести... - Replace the translation on all entries that matches the search source text. Заменить перевод всех записей, которые совпадают с искомым исходным текстом. - Batch translate all entries using the information in the phrase books. Перевести все записи в пакетном режиме, используя информацию из глоссария. - Open/Refresh Form &Preview Открыть/обновить предпрос&мотр формы - Form Preview Tool Инструмент предпросмотра форм - F5 - &Add to Phrase Book &Добавить в глоссарий - Ctrl+T - Open Read-O&nly... Открыть только для &чтения... - &Save All &Сохранить все - Ctrl+S - Close Закрыть - &Close All &Закрыть все - Ctrl+W - Previous unfinished item Предыдущий незавершённый перевод - Next unfinished item Следующий незавершённый перевод - Move to previous item Перейти к предыдущему переводу - Next item Следующий перевод - Mark item as done and move to the next unfinished item Пометить перевод как завершённый и перейти к следующему незавершённому - Copies the source text into the translation field Скопировать исходный текст в поле перевода - Toggle the validity check of accelerators Переключение проверки акселераторов - Toggle the validity check of ending punctuation Переключение проверки знаков препинания в конце текста - Toggle checking that phrase suggestions are used Переключение проверки использования предложений для фраз - Toggle the validity check of place markers Переключение проверки маркеров форматирования - Display information about the Qt toolkit by Nokia. Показать информацию об инструментарии Qt от Nokia. @@ -1510,104 +1185,84 @@ MessageEditor - This is the right panel of the main window. Правая панель основного окна - Russian Русский - German Немецкий - Japanese Японский - French Французский - Polish Польский - Chinese Китайский - This whole panel allows you to view and edit the translation of some source text. Данная панель позволяет просматривать и редактировать перевод исходного текста. - Source text Исходный текст - This area shows the source text. В данной области отображается исходный текст. - Source text (Plural) Исходный текст (множественная форма) - This area shows the plural form of the source text. В данной области отображается исходный текст во множественной форме. - Developer comments Комментарий разработчика - This area shows a comment that may guide you, and the context in which the text occurs. В данной области отображается комментарий, который поможет определить в каком контексте встречается переводимый текст. - Here you can enter comments for your own use. They have no effect on the translated applications. Здесь вы можете оставить комментарий для собственного использования. Комментарии не влияют на перевод приложений. - %1 translation (%2) %1 перевод (%2) - This is where you can enter or modify the translation of the above source text. Здесь вы можете ввести или изменить перевод текста, представленного выше. - %1 translation %1 перевод - %1 translator comments %1 перевод: комментарий переводчика - '%1' Line: %2 '%1' @@ -1617,22 +1272,18 @@ MessageModel - Completion status for %1 Состояние завершённости для %1 - <file header> <заголовок файла> - <context comment> <контекстный комментарий> - <unnamed context> <безымянный контекст> @@ -1640,113 +1291,91 @@ PhraseBookBox - Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - (New Entry) (Новая запись) - %1[*] - Qt Linguist %1[*] - Qt Linguist - Qt Linguist Qt Linguist - Cannot save phrase book '%1'. Не удалось сохранить глоссарий '%1'. - Edit Phrase Book Правка глоссария - This window allows you to add, modify, or delete entries in a phrase book. Данное окно позволяет добавлять, изменять и удалять записи в глоссарии. - &Translation: &Перевод: - This is the phrase in the target language corresponding to the source phrase. Перевод, соответствующий исходной фразе. - S&ource phrase: &Исходная фраза: - This is a definition for the source phrase. Определение исходной фразы. - This is the phrase in the source language. Фраза на исходном языке. - &Definition: &Определение: - Click here to add the phrase to the phrase book. Добавить фразу в глоссарий. - &New Entry Новая &запись - Click here to remove the entry from the phrase book. Удалить фразу из глоссария. - &Remove Entry &Удалить - Settin&gs... &Настройки... - Click here to save the changes made. Сохранить изменения. - &Save &Сохранить - Click here to close this window. Закрыть окно. - Close Закрыть @@ -1754,17 +1383,14 @@ PhraseModel - Source phrase Исходная фраза - Translation Перевод - Definition Определение @@ -1772,22 +1398,18 @@ PhraseView - Insert Вставить - Edit Правка - Guess (%1) Похожая (%1) - Guess Похожая @@ -1795,63 +1417,46 @@ QObject - Translation files (%1);; Файлы перевода (%1);; - All files (*) Все файлы (*) - - - - - - - Qt Linguist Qt Linguist - GNU Gettext localization files Файлы локализации GNU Gettext - GNU Gettext localization template files Файлы шаблонов локализации GNU Gettext - Compiled Qt translations Скомпилированные переводы Qt - Qt Linguist 'Phrase Book' 'Глоссарий' Qt Linguist - Qt translation sources (format 1.1) Исходные файлы перевода Qt (формат 1.1) - Qt translation sources (format 2.0) Исходные файлы перевода Qt (формат 2.0) - Qt translation sources (latest format) Исходные файлы перевода Qt (последний формат) - XLIFF localization files Файлы локализации XLIFF @@ -1859,17 +1464,14 @@ SourceCodeView - <i>Source code not available</i> <i>Исходный код недоступен</i> - <i>File %1 not available</i> <i>Файл %1 недоступен</i> - <i>File %1 not readable</i> <i>Невозможно прочитать файл %1</i> @@ -1877,42 +1479,34 @@ Statistics - Statistics Статистика - Close Закрыть - Translation Перевод - Source Источник - 0 0 - Words: Слов: - Characters: Символов: - Characters (with spaces): Символов (с пробелами): @@ -1920,72 +1514,58 @@ TranslateDialog - This window allows you to search for some text in the translation source file. Данное окно позволяет искать текст в файле перевода. - Type in the text to search for. Введите искомый текст. - Find &source text: &Найти текст: - &Translate to: &Перевести как: - Search options Параметры поиска - Texts such as 'TeX' and 'tex' are considered as different when checked. Если отмечено, строки "ПрИмЕр" и "пример" будет считаться разными. - Match &case С учётом &регистра - Mark new translation as &finished Помечать перевод как завер&шённый - Click here to find the next occurrence of the text you typed in. Найти следующее совпадение для введённого текста. - Find Next Найти далее - Translate Перевести - Translate All Перевести все - Click here to close this window. Закрыть окно. - Cancel Отмена @@ -1993,33 +1573,26 @@ TranslationSettingsDialog - Source language Исходный язык - Language Язык - Country/Region Страна/Регион - Target language Язык перевода - Any Country Любая страна - - Settings for '%1' - Qt Linguist Настройки для '%1' - Qt Linguist diff -r ef0373b55136 -r 758a864f9613 translations/linguist_sl.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/linguist_sl.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,1596 @@ + + + + 2010-08-28 18:45+0200 + MIME-Version,Content-Type,Content-Transfer-Encoding,Plural-Forms,X-Language,X-Qt-Contexts,Last-Translator,PO-Revision-Date,Project-Id-Version,Language-Team,X-Generator + Lokalize 1.1 + Slovenian <lugos-slo@lugos.si> + + # Jure Repinc <jlp@holodeck1.com>, 2010. + Jure Repinc <jlp@holodeck1.com> + + AboutDialog + + Qt Linguist + Qt Linguist + + + + BatchTranslationDialog + + Qt Linguist - Batch Translation + Qt Linguist – paketno prevajanje + + + Options + Možnosti + + + Set translated entries to finished + Označi prevedene vnose kot zaključene + + + Retranslate entries with existing translation + Znova prevedi vnose z obstoječimi prevodi + + + Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked + Vedite, da bodo spremenjeni vnosi ponastavljeni na nezaključeno, če možnost »Označi prevedene vnose kot zaključene« ni omogočena. + + + Translate also finished entries + Prevedi tudi zaključene vnose + + + Phrase book preference + Prednostni seznam knjig z izrazi + + + Move up + Premakni gor + + + Move down + Premakni dol + + + The batch translator will search through the selected phrase books in the order given above + Paketni prevajalnik bo izbrane knjige z izrazi preiskal v zgoraj navedenem vrstnem redu + + + &Run + &Zaženi + + + Cancel + Prekliči + + + Batch Translation of '%1' - Qt Linguist + Paketno prevajanje »%1« – Qt Linguist + + + Searching, please wait... + Iskanje, prosimo počakajte ... + + + &Cancel + &Prekliči + + + Linguist batch translator + Paketni prevajalnik + + + Batch translated %n entries + + Paketno preveden %n vnos + Paketno prevedena %n vnosa + Paketno prevedeni %n vnosi + Paketno prevedenih %n vnosov + + + + + DataModel + + <qt>Duplicate messages found in '%1': + <qt>V »%1« so bila najdena podvojena sporočila. + + + <p>[more duplicates omitted] + <p>[več izpuščenih podvojitev] + + + <p>* ID: %1 + <p>* ID: %1 + + + <p>* Context: %1<br>* Source: %2 + <p>* Kontekst: %1<br>* Vir: %2 + + + <br>* Comment: %3 + <br>* Komentar: %3 + + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + Qt Linguist ne pozna pravil za množinske oblike za »%1«. +Privzeta bo edninska univerzalna oblika. + + + Cannot create '%2': %1 + Ni moč ustvariti »%2«: %1 + + + Universal Form + Univerzalna oblika + + + + ErrorsView + + Accelerator possibly superfluous in translation. + V prevodu je morda odvečen pospeševalnik. + + + Accelerator possibly missing in translation. + V prevodu morda manjka pospeševalnik. + + + Translation does not end with the same punctuation as the source text. + Prevod se ne zaključi z istim ločilom kot izvorno besedilo. + + + A phrase book suggestion for '%1' was ignored. + Predlog za »%1« is knjige izrazov je bil prezrt. + + + Translation does not refer to the same place markers as in the source text. + Prevod ne navaja enakih oznak vsebnikov kot izvorno besedilo. + + + Translation does not contain the necessary %n place marker. + Prevod ne vsebuje potrebne oznake %n za vsebnik. + + + Unknown error + Neznana napaka + + + + FindDialog + + Find + Najdi + + + This window allows you to search for some text in the translation source file. + To okno omogoča iskanje besedila v izvorni datoteki s prevodom. + + + &Find what: + &Najdi: + + + Type in the text to search for. + Vnesite iskano besedilo. + + + Options + Možnosti + + + Source texts are searched when checked. + Ko je omogočeno, se preišče izvorna besedila. + + + &Source texts + &Izvorna besedila + + + Translations are searched when checked. + Ko je omogočeno, se preišče prevode. + + + &Translations + &Prevodi + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + Ko je omogočeno, se razlikuje med besedili kot sta »KDE« in »kde«. + + + &Match case + Ujemanje &velikosti črk + + + Comments and contexts are searched when checked. + Ko je omogočeno, se preišče kontekste in komentarje. + + + &Comments + &Komentarji + + + Ignore &accelerators + Prezri p&ospeševalnike + + + Click here to find the next occurrence of the text you typed in. + Kliknite, da poiščete naslednjo pojavitev vnešenega besedila. + + + Find Next + Najdi naslednje + + + Click here to close this window. + Kliknite, da zaprete to okno. + + + Cancel + Prekliči + + + + FormMultiWidget + + Alt+Delete + translate, but don't change + + Alt+Izbriši + + + Shift+Alt+Insert + translate, but don't change + + Shift+Alt+Vstavi + + + Alt+Insert + translate, but don't change + + Alt+Vstavi + + + Confirmation - Qt Linguist + Potrditev – Qt Linguist + + + Delete non-empty length variant? + Ali izbrišem ne-prazno dolžinsko inačico? + + + + LRelease + + Dropped %n message(s) which had no ID. + + Opustil %n sporočilo, ki ni imelo ID-ja. + Opustil %n sporočili, ki nista imeli ID-ja. + Opustil %n sporočila, ki niso imela ID-ja. + Opustil %n sporočil, ki niso imeli ID-ja. + + + + Excess context/disambiguation dropped from %n message(s). + + Odvečen kontekst/razločitev opuščen iz %n sporočila. + Odvečen kontekst/razločitev opuščen iz %n sporočil. + Odvečen kontekst/razločitev opuščen iz %n sporočil. + Odvečen kontekst/razločitev opuščen iz %n sporočil. + + + + Generated %n translation(s) (%1 finished and %2 unfinished) + + Ustvaril %n prevod (%1 zaključenih in %2 nezaključenih) + Ustvaril %n prevoda (%1 zaključenih in %2 nezaključenih) + Ustvaril %n prevode (%1 zaključenih in %2 nezaključenih) + Ustvaril %n prevodov (%1 zaključenih in %2 nezaključenih) + + + + Ignored %n untranslated source text(s) + + Prezrl %n neprevedeno izvorno besedilo + Prezrl %n neprevedeni izvorni besedili + Prezrl %n neprevedena izvorna besedila + Prezrl %n neprevedenih izvornih besedil + + + + + MainWindow + + MainWindow + GlavnoOkno + + + &Phrases + &Izrazi + + + &Close Phrase Book + &Zapri knjigo izrazov + + + &Edit Phrase Book + &Uredi knjigo izrazov + + + &Print Phrase Book + &Natisni knjigo izrazov + + + V&alidation + P&otrjevanje + + + &View + &Videz + + + Vie&ws + &Prikazi + + + &Toolbars + O&rodjarne + + + &Help + &Pomoč + + + &Translation + P&revajanje + + + &File + &Datoteka + + + Recently Opened &Files + Nedavno odprte &datoteke + + + &Edit + &Urejanje + + + &Open... + &Odpri ... + + + Open a Qt translation source file (TS file) for editing + Odpre izvorno datoteko s prevodi za Qt (*.ts) za urejanje + + + Ctrl+O + Ctrl+O + + + E&xit + Konča&j + + + Close this window and exit. + Zapre to okno in konča. + + + Ctrl+Q + Ctrl+Q + + + Save + Shrani + + + Save changes made to this Qt translation source file + Shrani spremembe te izvorne datoteke s prevodi za Qt + + + Save &As... + Shrani &kot ... + + + Save As... + Shrani kot ... + + + Save changes made to this Qt translation source file into a new file. + Shrani spremembe te izvorne datoteke s prevodi za Qt v novo datoteko. + + + Release + Izdaj + + + Create a Qt message file suitable for released applications from the current message file. + Iz trenutne datoteke s sporočili ustvari datoteko, ki je primerna za izdane programe. + + + &Print... + Na&tisni ... + + + Print a list of all the translation units in the current translation source file. + Natisne seznam vseh prevajalskih enot iz trenutne izvorne datoteke s prevodi. + + + Ctrl+P + Ctrl+P + + + &Undo + &Razveljavi + + + Undo the last editing operation performed on the current translation. + Razveljavi zadnje dejanje urejanja trenutnega prevoda. + + + Ctrl+Z + Ctrl+Z + + + &Redo + &Uveljavi + + + Redo an undone editing operation performed on the translation. + Uveljavi razveljavljeno dejanje urejanja prevoda. + + + Ctrl+Y + Ctrl+Y + + + Cu&t + &Izreži + + + Copy the selected translation text to the clipboard and deletes it. + Skopira izbrano besedilo prevoda na odložišče in ga izbriše. + + + Ctrl+X + Ctrl+X + + + &Copy + S&kopiraj + + + Copy the selected translation text to the clipboard. + Skopira izbrano besedilo prevoda na odložišče. + + + Ctrl+C + Ctrl+C + + + &Paste + Pri&lepi + + + Paste the clipboard text into the translation. + Prilepi besedilo z odložišča v prevod. + + + Ctrl+V + Ctrl+V + + + Select &All + Izberi &vse + + + Select the whole translation text. + Izbere celotno besedilo prevoda. + + + Ctrl+A + Ctrl+A + + + &Find... + &Najdi ... + + + Search for some text in the translation source file. + Poišče dano besedilo v izvorni datoteki s prevodi. + + + Ctrl+F + Ctrl+F + + + Find &Next + Najdi na&slednje + + + Continue the search where it was left. + Nadaljuje z iskanjem od zadnjega mesta. + + + F3 + F3 + + + &Prev Unfinished + &Predhodni nezaključen + + + Previous unfinished item + Predhodni nezaključen prevod + + + Move to the previous unfinished item. + Premakne se na predhodni nezaključen prevod. + + + Ctrl+K + Ctrl+K + + + &Next Unfinished + &Naslednji nezaključen + + + Next unfinished item + Naslednji nezaključen prevod + + + Move to the next unfinished item. + Premakne se na naslednji nezaključen prevod. + + + Ctrl+J + Ctrl+J + + + P&rev + &Predhodni + + + Move to previous item + Predhodni prevod + + + Move to the previous item. + Premakne se na predhodni prevod. + + + Ctrl+Shift+K + Ctrl+Shift+K + + + Ne&xt + N&aslednji + + + Next item + Naslednji prevod + + + Move to the next item. + Premakne se na naslednji prevod. + + + Ctrl+Shift+J + Ctrl+Shift+J + + + &Done and Next + &Zaključi in naslednji + + + Mark item as done and move to the next unfinished item + Označi prevod kot zaključen in na naslednji nezaključen + + + Mark this item as done and move to the next unfinished item. + Označi prevod kot zaključen in se premakni na naslednji nezaključen prevod. + + + Copy from source text + Skopiraj izvorno besedilo + + + Copies the source text into the translation field + Skopira izvorno besedilo v prevod + + + Copies the source text into the translation field. + Skopira izvorno besedilo v polje za vnos prevoda. + + + Ctrl+B + Ctrl+B + + + &Accelerators + &Pospeševalniki + + + Toggle the validity check of accelerators + Preklopi preverjanje pospeševalnikov + + + Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. + Preklopi preverjanje pospeševalnikov, t.j. ali je število znakov »&&« v izvornem besedilu enako kot v prevodu. Če preizkus ne uspe, bo v podoknu z opozorili prikazano sporočilo. + + + &Ending Punctuation + &Končna ločila + + + Toggle the validity check of ending punctuation + Preklopi preverjanje končnih ločil + + + Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. + Preklopi preverjanje končnih ločil. Če preizkus ne uspe, bo v podoknu z opozorili prikazano sporočilo. + + + &Phrase matches + &Ujemanje z izrazi + + + Toggle checking that phrase suggestions are used + Preklopi preverjanje uporabe predlogov izrazov + + + Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. + Preklopi preverjanje uporabe predlogov izrazov. Če preizkus ne uspe, bo v podoknu z opozorili prikazano sporočilo. + + + Place &Marker Matches + Ujemanje &oznak vsebnikov + + + Toggle the validity check of place markers + Preklopi preverjanje oznak vsebnikov + + + Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. + Preklopi preverjanje oznak vsebnikov, tj. ali so %1, %2, itd. v izvornem besedilu in prevodu konsistenčni. Če preizkus ne uspe, bo v podoknu z opozorili prikazano sporočilo. + + + &New Phrase Book... + &Nova knjiga z izrazi ... + + + Create a new phrase book. + Ustvari novo knjigo izrazov + + + Ctrl+N + Ctrl+N + + + &Open Phrase Book... + &Odpri knjigo izrazov ... + + + Open a phrase book to assist translation. + Odpre knjigo izrazov za pomoč pri prevajanju. + + + Ctrl+H + Ctrl+H + + + &Reset Sorting + &Ponastavi razvrščanje + + + Sort the items back in the same order as in the message file. + Prevajalske enote bodo razvrščene kot v datoteki s sporočili. + + + &Display guesses + Prikaži &ugibanja + + + Set whether or not to display translation guesses. + Ali naj bodo prikazana ugibanja prevodov. + + + &Statistics + &Statistika + + + Display translation statistics. + Prikaže statistiko prevodov. + + + &Manual + &Priročnik + + + F1 + F1 + + + About Qt Linguist + O Qt Linguist + + + About Qt + O Qt + + + Display information about the Qt toolkit by Nokia. + Prikaže podatke o ogrodju Qt. + + + &What's This? + &Kaj je to? + + + What's This? + Kaj je to? + + + Enter What's This? mode. + Vstop v način Kaj je to? + + + Shift+F1 + Shift+F1 + + + &Search And Translate... + &Najdi in prevedi ... + + + Replace the translation on all entries that matches the search source text. + Zamenja prevode vseh enot, kjer se izvorno besedilo ujema z iskanim. + + + &Batch Translation... + &Paketno prevajanje ... + + + Batch translate all entries using the information in the phrase books. + Paketno prevede vse enote in pri tem uporabi podatke iz knjig z izrazi. + + + Release As... + Izdaj kot ... + + + Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. + Iz trenutne datoteke s sporočili ustvari datoteko, ki je primerna za izdane programe. Ime datoteke bo izbrano sampdejno glede na ime datoteke *.ts. + + + File + Datoteka + + + Edit + Urejanje + + + Translation + Prevajanje + + + Validation + Potrjevanje + + + Help + Pomoč + + + Open/Refresh Form &Preview + Odpri/osveži &ogled obrazca + + + Form Preview Tool + Orodje za ogled obrazca + + + F5 + F5 + + + Translation File &Settings... + &Nastavitve datoteke s prevodi ... + + + &Add to Phrase Book + &Dodaj v knjigo izrazov + + + Ctrl+T + Ctrl+T + + + Open Read-O&nly... + Odpri samo za &branje ... + + + &Save All + &Shrani vse + + + Ctrl+S + Ctrl+S + + + &Release All + &Izdaj vse + + + Close + Zapri + + + &Close All + &Zapri vse + + + Ctrl+W + Ctrl+W + + + Length Variants + Dolžinske inačice + + + Source text + Izvorno besedilo + + + Index + Kazalo + + + Context + Kontekst + + + Items + Postavke + + + This panel lists the source contexts. + To podokno prikazuje seznam kontekstov iz izvorne kode. + + + Strings + Nizi + + + Phrases and guesses + Izrazi in ugibanja + + + Sources and Forms + Izvorna koda in obrazci + + + Warnings + Opozorila + + + MOD + status bar: file(s) modified + SPR + + + Loading... + Nalaganje ... + + + Loading File - Qt Linguist + Nalaganje datoteke – Qt Linguist + + + The file '%1' does not seem to be related to the currently open file(s) '%2'. + +Close the open file(s) first? + Kot kaže datoteka »%1« ni povezana s trenutno odprtimi datotekami »%2«. + +Ali želite najprej zapreti odprte datoteke? + + + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. + +Skip loading the first named file? + Kot kaže datoteka »%1« ni povezana z datoteko »%2«, ki se ravno tako nalaga. + +Ali želite preskočiti nalaganje prve datoteke? + + + %n translation unit(s) loaded. + + Naložena %n prevajalska enota. + Naloženi %n prevajalski enoti. + Naložene %n prevajalske enote. + Naloženih %n prevajalskih enot. + + + + Related files (%1);; + Povezane datoteke (%1);; + + + Open Translation Files + Odpri datoteke za prevajanje + + + File saved. + Datoteka je shranjena. + + + Qt message files for released applications (*.qm) +All files (*) + Datoteke s sporočili za izdane programe (*.qm) +Vse datoteke (*) + + + File created. + Datoteka ustvarjena. + + + Printing... + Tiskanje ... + + + Context: %1 + Kontekst: %1 + + + finished + zaključen + + + unresolved + nerazrešen + + + obsolete + zastarel + + + Printing... (page %1) + Tiskanje (%1. stran) ... + + + Printing completed + Tiskanje zaključeno + + + Printing aborted + Tiskanje preklicano + + + Search wrapped. + Iskanje na drugem koncu + + + Qt Linguist + Qt Linguist + + + Cannot find the string '%1'. + Ni moč najti niza »%1«. + + + Search And Translate in '%1' - Qt Linguist + Najdi in prevedi v »%1« – Qt Linguist + + + Translate - Qt Linguist + Prevajanje – Qt Linguist + + + Translated %n entry(s) + + Prevedel %n vnos + Prevedel %n vnosa + Prevedel %n vnose + Prevedel %n vnosov + + + + No more occurrences of '%1'. Start over? + Pojavitev »%1« ni več. Ali začnem znova? + + + Create New Phrase Book + Ustvari novo knjigo izrazov + + + Qt phrase books (*.qph) +All files (*) + Knjiga z izrazi za Qt (*.qph) +Vse datoteke (*) + + + Phrase book created. + Knjiga izrazov ustvarjena. + + + Open Phrase Book + Odpri knjigo izrazov + + + Qt phrase books (*.qph);;All files (*) + Knjiga z izrazi za Qt (*.qph);;Vse datoteke (*) + + + %n phrase(s) loaded. + + Naložil %n izrazov. + Naložil %n izraz. + Naložil %n izraza. + Naložil %n izraze. + + + + Add to phrase book + Dodaj v knjigo izrazov + + + No appropriate phrasebook found. + Najdene ni bilo nobene ustrezne knjige izrazov. + + + Adding entry to phrasebook %1 + Dodajam vnos v knjigo izrazov %1 + + + Select phrase book to add to + Izberite knjigo izrazov za dodajanje vanjo + + + Unable to launch Qt Assistant (%1) + Ni moč zagnati Qt Assistanta (%1) + + + Version %1 + Različica %1 + + + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist je orodje za dodajanje prevodov programom Qt..</p><p>Avtorske pravice © 2010 Nokia Corporation in/ali njene podružnice.</p><p>Prevedel: <a href="mailto:jlp@holodeck1.com">Jure Repinc</a>, <a href="http://www.lugos.si/">LUGOS</a></p> + + + Do you want to save the modified files? + Ali želite shraniti spremenjene datoteke? + + + Do you want to save '%1'? + Ali želite shraniti »%1«? + + + Qt Linguist[*] + Qt Linguist[*] + + + %1[*] - Qt Linguist + %1[*] – Qt Linguist + + + No untranslated translation units left. + Preostale ni nobene neprevedene prevajalske enote. + + + &Window + &Okno + + + Minimize + Pomanjšaj + + + Ctrl+M + Ctrl+M + + + Display the manual for %1. + Prikaži priročnik za %1. + + + Display information about %1. + Prikaži podatke o %1. + + + &Save '%1' + &Shrani »%1« + + + Save '%1' &As... + Shrani »%1« &kot ... + + + Release '%1' + Izdaj »%1« + + + Release '%1' As... + Izdaj »%1« kot ... + + + &Close '%1' + &Zapri »%1« + + + &Save + &Shrani + + + &Close + &Zapri + + + Save All + Shrani vse + + + Close All + Zapri vse + + + &Release + &Izdaj + + + Translation File &Settings for '%1'... + &Nastavitve datoteke s prevodi za »%1« ... + + + &Batch Translation of '%1'... + &Paketno prevajanje »%1« ... + + + Search And &Translate in '%1'... + &Najdi in prevedi v »%1« ... + + + Search And &Translate... + &Najdi in prevedi ... + + + Cannot read from phrase book '%1'. + Ni moč brati iz knjige izrazov »%1«. + + + Close this phrase book. + Zapri to knjigo izrazov. + + + Enables you to add, modify, or delete entries in this phrase book. + Omogoča dodajanje, spreminjanje in brisanje vnosov v knjigi izrazov. + + + Print the entries in this phrase book. + Natisne vnose iz te knjige izrazov. + + + Cannot create phrase book '%1'. + Ni moč ustvariti knjige izrazov »%1«. + + + Do you want to save phrase book '%1'? + Ali želite shraniti knjigo izrazov »%1«? + + + All + Vse + + + + MessageEditor + + Russian + Ruščina + + + German + Nemščina + + + Japanese + Japonščina + + + French + Francoščina + + + Polish + Poljščina + + + Chinese + Kitajščina + + + This whole panel allows you to view and edit the translation of some source text. + To podokno vam omogoča ogled in urejanje prevoda izvornega besedila. + + + Source text + Izvorno besedilo + + + This area shows the source text. + To področje prikazuje izvorno besedilo. + + + Source text (Plural) + Izvorno besedilo (množina) + + + This area shows the plural form of the source text. + To področje prikazuje množinsko obliko izvornega besedila. + + + Developer comments + Komentarji razvijalcev + + + This area shows a comment that may guide you, and the context in which the text occurs. + To področje prikazuje komentar, ki vas lahko vodi, in kontekst v katerem se besedilo pojavi. + + + Here you can enter comments for your own use. They have no effect on the translated applications. + Sem lahko vnesete komentarje za lastne potrebe. Na prevedene programe ne vplivajo. + + + %1 translation (%2) + %1 prevod (%2) + + + This is where you can enter or modify the translation of the above source text. + Sem lahko vnesete ali pa tu spremenite prevod gornjega izvornega besedila. + + + %1 translation + %1 prevod + + + %1 translator comments + %1 prevajalski komentarji + + + '%1' +Line: %2 + »%1« +Vrstica: %2 + + + + MessageModel + + Completion status for %1 + Stanje za %1 + + + <file header> + <glava datoteke> + + + <context comment> + <komentar konteksta> + + + <unnamed context> + <neimenovan kontekst> + + + + PhraseBookBox + + Edit Phrase Book + Uredi knjigo izrazov + + + This window allows you to add, modify, or delete entries in a phrase book. + To okno omogoča dodajanje, spreminjanje in brisanje vnosov v knjigi izrazov. + + + &Translation: + &Prevod: + + + This is the phrase in the target language corresponding to the source phrase. + To je izraz v ciljnem jeziku, ki ustreza izvornemu izrazu. + + + S&ource phrase: + &Izvorni izraz: + + + This is a definition for the source phrase. + To je definicija za izvorni izraz. + + + This is the phrase in the source language. + To je izraz v izvornem jeziku. + + + &Definition: + &Definicija: + + + Click here to add the phrase to the phrase book. + Kliknite, da dodate izraz v knjigo izrazov. + + + &New Entry + &Nov vnos + + + Click here to remove the entry from the phrase book. + Kliknite, da odstranite vnos iz knjige izrazov. + + + &Remove Entry + &Odstrani vnos + + + Settin&gs... + &Nastavitve ... + + + Click here to save the changes made. + Kliknite za shranitev opravljenih sprememb. + + + &Save + &Shrani + + + Click here to close this window. + Kliknite, da zaprete to okno. + + + Close + Zapri + + + (New Entry) + (Nov vnos) + + + %1[*] - Qt Linguist + %1[*] – Qt Linguist + + + Qt Linguist + Qt Linguist + + + Cannot save phrase book '%1'. + Ni moč shraniti knjige izrazov »%1«. + + + + PhraseModel + + Source phrase + Izvorni izraz + + + Translation + Prevod + + + Definition + Definicija + + + + PhraseView + + Insert + Vstavi + + + Edit + Uredi + + + Guess (%1) + Ugibanje (%1) + + + Guess + Ugibanje + + + + QObject + + Translation files (%1);; + Prevajalske datoteke (%1);; + + + All files (*) + Vse datoteke (*) + + + Qt Linguist + Qt Linguist + + + GNU Gettext localization files + Prevajalske datoteke GNU Gettext + + + GNU Gettext localization template files + Predloge prevajalskih datotek GNU Gettext + + + Compiled Qt translations + Prevedeni prevodi za Qt + + + Qt Linguist 'Phrase Book' + Knjiga izrazov za Qt Linguist + + + Qt translation sources (format 1.1) + Prevajalski viri za Qt (različica 1.1) + + + Qt translation sources (format 2.0) + Prevajalski viri za Qt (različica 2.0) + + + Qt translation sources (latest format) + Prevajalski viri za Qt (najnovejša različica) + + + XLIFF localization files + Prevajalske datoteke XLIFF + + + + SourceCodeView + + <i>Source code not available</i> + <i>Izvorna koda ni na voljo</i> + + + <i>File %1 not available</i> + <i>Datoteka %1 ni na voljo</i> + + + <i>File %1 not readable</i> + <i>Datoteka %1 ni berljiva</i> + + + + Statistics + + Statistics + Statistika + + + Close + Zapri + + + Translation + Prevod + + + Source + Vir + + + 0 + 0 + + + Words: + Besede: + + + Characters: + Znaki: + + + Characters (with spaces): + Znaki (s presledki): + + + + TranslateDialog + + This window allows you to search for some text in the translation source file. + To okno omogoča iskanje besedila v izvorni datoteki s prevodom. + + + Type in the text to search for. + Vnesite iskano besedilo. + + + Find &source text: + Najdi &izvorno besedilo: + + + &Translate to: + &Prevedi v: + + + Search options + Možnosti iskanja + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + Ko je omogočeno, se razlikuje med besedili kot sta »KDE« in »kde«. + + + Match &case + Ujemanje &velikosti črk + + + Mark new translation as &finished + Nove prevode označi kot &zaključene + + + Click here to find the next occurrence of the text you typed in. + Kliknite, da poiščete naslednjo pojavitev vnešenega besedila. + + + Find Next + Najdi naslednje + + + Translate + Prevedi + + + Translate All + Prevedi vse + + + Click here to close this window. + Kliknite, da zaprete to okno. + + + Cancel + Prekliči + + + + TranslationSettingsDialog + + Source language + Izvorni jezik + + + Language + Jezik + + + Country/Region + Država/regija: + + + Target language + Ciljni jezik + + + Settings for '%1' - Qt Linguist + Nastavitve za »%1« – Qt Linguist + + + Any Country + Katerakoli država + + + diff -r ef0373b55136 -r 758a864f9613 translations/linguist_uk.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/linguist_uk.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,2547 @@ + + + + + AboutDialog + + Qt Linguist + Qt Linguist + + + + BatchTranslationDialog + + Qt Linguist - Batch Translation + Qt Linguist - Пакетний переклад + + + Options + Опції + + + Set translated entries to finished + Помічати перекладені елементи як завершені + + + Retranslate entries with existing translation + Повторно перекласти елементи, що вже мають переклад + + + Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked + Майте на увазі, що модифіковані елементи будуть помічені як незавершені, якщо параметр 'Помічати перекладені елементи як завершені' вимкнено + + + Translate also finished entries + Перекладати також завершені елементи + + + Phrase book preference + Використання глосарію + + + Move up + Вгору + + + Move down + Вниз + + + The batch translator will search through the selected phrase books in the order given above + Пакетний перекладач буде шукати серед обраних глосаріїв у вказаному вище порядку + + + &Run + &Запустити + + + Cancel + Скасувати + + + Batch Translation of '%1' - Qt Linguist + Пакетний переклад '%1' - Qt Linguist + + + Searching, please wait... + Здійснюється пошук, будь ласка, зачекайте... + + + &Cancel + &Скасувати + + + Linguist batch translator + Пакетний переклад Linguist'а + + + Batch translated %n entries + + Пакетно перекладено %n елемент + Пакетно перекладено %n елементи + Пакетно перекладено %n елементів + + + + + DataModel + + <qt>Duplicate messages found in '%1': + <qt>Повідомлення-дублікати знайдено в '%1': + + + <p>[more duplicates omitted] + <p>[решта дублікатів пропущено] + + + <p>* ID: %1 + <p>* ID: %1 + + + <p>* Context: %1<br>* Source: %2 + <p>* Контекст: %1<br>* Оригінал: %2 + + + <br>* Comment: %3 + <br>* Коментар: %3 + + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + Linguist не знає правил множини для '%1'. +Буде застосована універсальна форма однини. + + + Cannot create '%2': %1 + Неможливо створити '%2': %1 + + + Universal Form + Універсальна форма + + + + ErrorsView + + Accelerator possibly superfluous in translation. + В перекладі, можливо, пропущено акселератор. + + + Accelerator possibly missing in translation. + В перекладі, можливо, пропущено акселератор. + + + Translation does not end with the same punctuation as the source text. + Переклад не закінчується тим самим знаком пунктуації, що й оригінал. + + + A phrase book suggestion for '%1' was ignored. + Пропозицію глосарію для '%1' було проігноровано. + + + Translation does not refer to the same place markers as in the source text. + Переклад не містить тих самих маркерів позиції, що й оригінал. + + + Translation does not contain the necessary %n place marker. + Переклад не містить необхідних маркерів позиції %n. + + + Unknown error + Невідома помилка + + + + FindDialog + + Find + Знайти + + + This window allows you to search for some text in the translation source file. + Це вікно дозволяє вам шукати текст в файлі перекладу. + + + &Find what: + &Шукати: + + + Type in the text to search for. + Введіть текст для пошуку. + + + Options + Опції + + + Source texts are searched when checked. + Якщо відмічено, то пошук здійснюватиметься серед оригінальних текстів. + + + &Source texts + &Оригінальні тексти + + + Translations are searched when checked. + Якщо відмічено, то пошук здійснюватиметься серед перекладів. + + + &Translations + &Переклади + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + Якщо відмічено, то рядки 'приклад' та 'прИкЛад' будуть вважатись різними. + + + &Match case + Враховувати &регістр + + + Comments and contexts are searched when checked. + Якщо відмічено, то пошук здійснюватиметься серед коментарів та контекстів. + + + &Comments + &Коментарі + + + Ignore &accelerators + Ігнорувати &акселератори + + + Click here to find the next occurrence of the text you typed in. + Клацніть тут, щоб знайти наступний збіг для введеного вами тексту. + + + Find Next + Знайти наступний + + + Click here to close this window. + Клацніть тут щоб закрити вікно. + + + Cancel + Скасувати + + + + Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog + Виберіть Правка|Пошук з головного меню чи натисніть Ctrl+F, щоб відкрити діалог пошуку + + + + + FormMultiWidget + + Alt+Delete + translate, but don't change + + + + Shift+Alt+Insert + translate, but don't change + + + + Alt+Insert + translate, but don't change + + + + Confirmation - Qt Linguist + Підтвердження - Qt Linguist + + + Delete non-empty length variant? + Видалити непустий варіант перекладу? + + + + LConvert + + +Usage: + lconvert [options] <infile> [<infile>...] + +lconvert is part of Qt's Linguist tool chain. It can be used as a +stand-alone tool to convert and filter translation data files. +The following file formats are supported: + +%1 +If multiple input files are specified, they are merged with +translations from later files taking precedence. + +Options: + -h + --help Display this information and exit. + + -i <infile> + --input-file <infile> + Specify input file. Use if <infile> might start with a dash. + This option can be used several times to merge inputs. + May be '-' (standard input) for use in a pipe. + + -o <outfile> + --output-file <outfile> + Specify output file. Default is '-' (standard output). + + -if <informat> + --input-format <format> + Specify input format for subsequent <infile>s. + The format is auto-detected from the file name and defaults to 'ts'. + + -of <outformat> + --output-format <outformat> + Specify output format. See -if. + + --input-codec <codec> + Specify encoding for QM and PO input files. Default is 'Latin1' + for QM and 'UTF-8' for PO files. UTF-8 is always tried as well for + QM, corresponding to the possible use of the trUtf8() function. + + --output-codec <codec> + Specify encoding for PO output files. Default is 'UTF-8'. + + --drop-tags <regexp> + Drop named extra tags when writing TS or XLIFF files. + May be specified repeatedly. + + --drop-translations + Drop existing translations and reset the status to 'unfinished'. + Note: this implies --no-obsolete. + + --source-language <language>[_<region>] + Specify/override the language of the source strings. Defaults to + POSIX if not specified and the file does not name it yet. + + --target-language <language>[_<region>] + Specify/override the language of the translation. + The target language is guessed from the file name if this option + is not specified and the file contents name no language yet. + + --no-obsolete + Drop obsolete messages. + + --no-finished + Drop finished messages. + + --sort-contexts + Sort contexts in output TS file alphabetically. + + --locations {absolute|relative|none} + Override how source code references are saved in TS files. + Default is absolute. + + --no-ui-lines + Drop line numbers from references to UI files. + + --verbose + be a bit more verbose + +Long options can be specified with only one leading dash, too. + +Return value: + 0 on success + 1 on command line parse failures + 2 on read failures + 3 on write failures + + +Використання: + lconvert [опції] <вхідний_файл> [<вхідний_файл>...] + +lconvert - це частина набору програм Qt Linguist. Вона може використовуватись, +як окремий інструмент, для конвертування та фільтрування файлів перекладу. +Підтримуються наступні формати файлів: + +%1 +Якщо вказано декілька вхідних файлів, то вони об'єднується з перекладами з +попередньо вказаних файлів з урахуванням порядку задання. + +Опції: + -h + --help Показати цю інформацію та вийти. + + -i <вхідний_файл> + --input-file <вхідний_файл> + Вказати вхідний файл. Використовуйте, якщо <вхідний_файл> + починається з дефіса. Ця опція може бути використана декілька + раз, щоб об'єднати вхідні дані. + Може бути '-' (стандартний вхід) для використання в конвеєрі. + + -o <вихідний_файл> + --output-file <вихідний_файл> + Вказати вихідний файл. Типово - '-' (стандартний вихід). + + -if <формат> + --input-format <формат> + Вказати вхідний формат для наступних <вхідних_файлів>. + Формат автоматично визначається з імені файлу. Типово - 'ts'. + + -of <формат> + --output-format <формат> + Вказати вихідний формат. Дивіться -if. + + --input-codec <кодек> + Вказати кодування для вхідних файлів QM та PO. Типово - 'Latin1' + для QM та 'UTF-8' файлів PO. Для QM також здійснюється спроба + використати UTF-8, відповідно до можливого застосування функції trUtf8(). + + --output-codec <кодек> + Вказати кодування для вихідних файлів PO. Типово - 'UTF-8'. + + --drop-tags <регулярний_вираз> + Видалити вказані додаткові теги під час запису файлів TS чи XLIFF. + Може вказуватись декілька раз. + + --drop-translations + Видаляти існуючі переклади та скидати статус в 'незавершений'. + Примітка: це включає --no-obsolete. + + --source-language <мова>[_<регіон>] + Вказати/замінити мову оригінальних рядків. Типово - POSIX, + якщо не вказано та не встановлено в файлі. + + --target-language <мова>[_<регіон>] + Вказати/замінити мову перекладу. + Якщо ця опція не вказана і у вмісті файлу мова не задана, то + мова перекладу вгадується з імені файлу. + + --no-obsolete + Відкинути застарілі повідомлення. + + --no-finished + Відкинути завершені повідомлення. + + --sort-contexts + Сортувати контексти в вихідному файлі TS за абеткою. + + --locations {absolute|relative|none} + Замінити як посилання на код зберігаються в файлі TS. + Типово - абсолютно. + + --no-ui-lines + Видалити номери рядків з посилань на файли UI. + + --verbose + бути трохи більш детальним + +Довгі опції також можуть вказуватись лише з одним дефісом. + +Коди повернення: + 0 при успіху + 1 при помилці розбору командного рядка + 2 при помилках читання + 3 при помилках запису + + + + + LRelease + + Dropped %n message(s) which had no ID. + + Видалено %n повідомлення, яке не має ID. + Видалено %n повідомлення, які не мають ID. + Видалено %n повідомлень, які не мають ID. + + + + Excess context/disambiguation dropped from %n message(s). + + Видалено зайвий контекст/неоднозначність з %n повідомлення. + Видалено зайвий контекст/неоднозначність з %n повідомлень. + Видалено зайвий контекст/неоднозначність з %n повідомлень. + + + + Generated %n translation(s) (%1 finished and %2 unfinished) + + Згенеровано %n переклад (%1 завершено та %2 незавершено) + Згенеровано %n переклади (%1 завершено та %2 незавершено) + Згенеровано %n перекладів (%1 завершено та %2 незавершено) + + + + Ignored %n untranslated source text(s) + + Зігноровано %n неперекладений оригінальний текст + Зігноровано %n неперекладені оригінальні тексти + Зігноровано %n неперекладених оригінальних текстів + + + + Usage: + lrelease [options] project-file + lrelease [options] ts-files [-qm qm-file] + +lrelease is part of Qt's Linguist tool chain. It can be used as a +stand-alone tool to convert XML-based translations files in the TS +format into the 'compiled' QM format used by QTranslator objects. + +Options: + -help Display this information and exit + -idbased + Use IDs instead of source strings for message keying + -compress + Compress the QM files + -nounfinished + Do not include unfinished translations + -removeidentical + If the translated text is the same as + the source text, do not include the message + -markuntranslated <prefix> + If a message has no real translation, use the source text + prefixed with the given string instead + -silent + Do not explain what is being done + -version + Display the version of lrelease and exit + + Використання: + lrelease [опції] файл-проект + lrelease [опції] файли-ts [-qm файл-qm] + +lrelease - це частина набору програм Qt Linguist. Вона може використовуватися +як окремий засіб для перетворення файлів перекладу на базі XML в форматі TS +до 'скомпільованого' формату QM, що використовується об'єктами QTranslator. + +Опції: + -help Показати цю інформацію та вийти + -idbased + Використовувати ID замість рядків оригіналу як ключі повідомлень + -compress + Стискати файли QM + -nounfinished + Не включати незавершені переклади + -removeidentical + Якщо перекладений текст однаковий з оригіналом, то + не включати повідомлення + -markuntranslated <prefix> + If a message has no real translation, use the source text + prefixed with the given string instead + -silent + Не пояснювати, що відбувається + -version + Показати версію lrelease та вийти + + + + lrelease error: %1 + помилка lrelease: %1 + + + Updating '%1'... + + Оновлюю '%1'... + + + + Removing translations equal to source text in '%1'... + + Видалення перекладів однакових з оригінальним текстом в '%1'... + + + + lrelease error: cannot create '%1': %2 + + помилка lrelease: неможливо створити '%1': %2 + + + + lrelease error: cannot save '%1': %2 + помилка lrelease: неможливо зберегти '%1': %2 + + + + lrelease version %1 + + lrelease версії %1 + + + + lrelease error: cannot read project file '%1'. + + помилка lrelease: неможливо прочитати файл проекту '%1'. + + + + lrelease error: cannot process project file '%1'. + + помилка lrelease: неможливо обробити файл проекту '%1'. + + + + lrelease warning: Met no 'TRANSLATIONS' entry in project file '%1' + + попередження lrelease: в файлу проекту '%1' не знайдено елементу 'TRANSLATIONS' + + + + + LUpdate + + Usage: + lupdate [options] [project-file]... + lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file + +lupdate is part of Qt's Linguist tool chain. It extracts translatable +messages from Qt UI files, C++, Java and JavaScript/QtScript source code. +Extracted messages are stored in textual translation source files (typically +Qt TS XML). New and modified messages can be merged into existing TS files. + +Options: + -help Display this information and exit. + -no-obsolete + Drop all obsolete strings. + -extensions <ext>[,<ext>]... + Process files with the given extensions only. + The extension list must be separated with commas, not with whitespace. + Default: '%1'. + -pluralonly + Only include plural form messages. + -silent + Do not explain what is being done. + -no-sort + Do not sort contexts in TS files. + -no-recursive + Do not recursively scan the following directories. + -recursive + Recursively scan the following directories (default). + -I <includepath> or -I<includepath> + Additional location to look for include files. + May be specified multiple times. + -locations {absolute|relative|none} + Specify/override how source code references are saved in TS files. + Default is absolute. + -no-ui-lines + Do not record line numbers in references to UI files. + -disable-heuristic {sametext|similartext|number} + Disable the named merge heuristic. Can be specified multiple times. + -pro <filename> + Name of a .pro file. Useful for files with .pro file syntax but + different file suffix. Projects are recursed into and merged. + -source-language <language>[_<region>] + Specify the language of the source strings for new files. + Defaults to POSIX if not specified. + -target-language <language>[_<region>] + Specify the language of the translations for new files. + Guessed from the file name if not specified. + -ts <ts-file>... + Specify the output file(s). This will override the TRANSLATIONS + and nullify the CODECFORTR from possibly specified project files. + -codecfortr <codec> + Specify the codec assumed for tr() calls. Effective only with -ts. + -version + Display the version of lupdate and exit. + @lst-file + Read additional file names (one per line) from lst-file. + + Використання: + lupdate [опції] [файл-проект]... + lupdate [опції] [вхідний-файл|шлях|@файл-список]... -ts ts-файли|@файл-список + +lupdate - це частина набору програм Qt Linguist. Вона It витягає придатні для перекладу +повідомлення з файлів Qt UI, коду C++, Java та JavaScript/QtScript. Витягнуті повідомлення +зберігаються в текстовому файлі перекладу (типово Qt TS XML). Нові та модифіковані +повідомлення можуть бути об'єднанні з існуючими файлами TS. + +Опції: + -help Показати цю інформацію та вийти. + -no-obsolete + Видалити всі застарілі рядки. + -extensions <розширення>[,<розширення>]... + Обробляти файли лише з вказаними розширеннями. + Список розширень має розділюватись комами, а не пропусками. + Типово: '%1'. + -pluralonly + Включати лише повідомлення з формою множини. + -silent + Не пояснювати, що відбувається. + -no-sort + Не сортувати контексти в файлах TS. + -no-recursive + Не сканувати рекурсивно наступні теки. + -recursive + Рекурсивно сканувати наступні теки (типово). + -I <шлях-включення> або -I<шлях-включення> + Додаткові місця для пошуку файлів включення. + Може бути вказано декілька разів. + -locations {absolute|relative|none} + Вказати/замістити як посилання на код зберігаються в файлі TS. + Типово - абсолютно. + -no-ui-lines + Не записувати номери рядків в посиланнях на файли UI. + -disable-heuristic {sametext|similartext|number} + Вимкнути вказану евристику об'єдання. Може бути вказано декілька разів. + -pro <ім'я-файлу> + Ім'я .pro файлу. Корисно для файлів із синтаксисом фалів .pro, але з + іншим розширенням. Projects are recursed into and merged. + -source-language <мова>[_<регіон>] + Вказати мову оригінальних рядків для нових файлів. + Типово, якщо не вказано - POSIX. + -target-language <мова>[_<регіон>] + Вказати мову перекладу для нових файлів. + Вгадується з імені файла, якщо не вказано. + -ts <файл-ts>... + Вказати вихідний файл(и). Це замістить TRANSLATIONS + та скине CODECFORTR з, можливо, вказаних файлів проекту. + -codecfortr <кодек> + Вказати кодек, що Specify the codec вживається для викликів tr(). Ефективно лише з -ts. + -version + Показати версію lupdate та вийти. + @файл-список + Читати додаткові імена файлів (одне на рядок) з файла-списку. + + + + lupdate warning: Codec for tr() '%1' disagrees with existing file's codec '%2'. Expect trouble. + + попередження lupdate: Кодек для tr() '%1' не узгоджується з існуючим кодеком файлу '%2'. Очікуйте неприємностей. + + + + lupdate warning: Specified target language '%1' disagrees with existing file's language '%2'. Ignoring. + + попередження lupdate: Вказана мова перекладу '%1' не узгоджується з існуючою мовою файлу '%2'. Ігнорую. + + + + lupdate warning: Specified source language '%1' disagrees with existing file's language '%2'. Ignoring. + + попередження lupdate: Вказана мова оригіналу '%1' не узгоджується з існуючою мовою файлу '%2'. Ігнорую. + + + + Updating '%1'... + + Оновлюю '%1'... + + + + Stripping non plural forms in '%1'... + + Видалення не множинних форм в '%1'... + + + + lupdate warning: Codec for source '%1' is invalid. Falling back to codec for tr(). + + попередження lupdate: Кодек для джерела '%1' неправильний. Повертаємось до використання кодеку для tr(). + + + + lupdate warning: TS files from command line will override TRANSLATIONS in %1. + + попередження lupdate: файл-TS з командного рядка замінять TRANSLATIONS в %1. + + + + lupdate warning: TS files from command line prevent recursing into %1. + + попередження lupdate: файли TS з командного рядка перешкоджають рекурсивному проходу %1. + + + + lupdate warning: no TS files specified. Only diagnostics will be produced for '%1'. + + попередження lupdate: не вказано файлів TS. Здійснюватиметься лише діагностика для '%1'. + + + + The option -target-language requires a parameter. + + Опція -target-language вимагає параметра. + + + + The option -source-language requires a parameter. + + Опція -source-language вимагає параметра. + + + + The option -disable-heuristic requires a parameter. + + Опція -disable-heuristic вимагає параметра. + + + + Invalid heuristic name passed to -disable-heuristic. + + Неправильна назва евристики для -disable-heuristic. + + + + The option -locations requires a parameter. + + Опція -locations вимагає параметра. + + + + Invalid parameter passed to -locations. + + Неправильний параметр для -locations. + + + + The -codecfortr option should be followed by a codec name. + + За опцією -codecfortr має слідувати назва кодека. + + + + The -extensions option should be followed by an extension list. + + За опцією -extensions має слідувати список розширень. + + + + The -pro option should be followed by a filename of .pro file. + + За опцією -pro має слідувати ім'я .pro файлу. + + + + The -I option should be followed by a path. + + За опцією -l має слідувати шлях. + + + + Unrecognized option '%1'. + + Нерозпізнана опція '%1'. + + + + lupdate error: List file '%1' is not readable. + + помилка lupdate: Неможливо прочитати файл списку '%1'. + + + + lupdate warning: For some reason, '%1' is not writable. + + попередження lupdate: З певних причин в '%1' не можливо записати. + + + + lupdate error: File '%1' has no recognized extension. + + помилка lupdate: Файл '%1' має невідоме розширення. + + + + lupdate error: File '%1' does not exist. + + помилка lupdate: Файл '%1' не існує. + + + + Scanning directory '%1'... + + Сканування теки '%1'... + + + + lupdate warning: -target-language usually only makes sense with exactly one TS file. + + попередження lupdate: Використання -target-language, зазвичай, має сенс лише з одним файлом TS. + + + + lupdate warning: -codecfortr has no effect without -ts. + + попередження lupdate: -codecfortr не дає ефекту без -ts. + + + + lupdate warning: no TS files specified. Only diagnostics will be produced. + + попередження lupdate: не вказано файлів TS. Здійснюватиметься лише діагностика. + + + + lupdate error: Both project and source files / include paths specified. + + помилка lupdate: Одночасно вказані файл проекту та вхідні файли / шляхи для включення. + + + + Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch + + Круглі/квадратні/фігурні дужки не збігаються між гілками #if та #else, використовую гілку #if + + + + Parenthesis/brace mismatch between #if and #else branches; using #if branch + + Круглі/фігурні дужки не збігаються між гілками #if та #else, використовую гілку #if + + + + Unterminated C++ comment + + Незавершений коментар C++ + + + + Unterminated C++ string + + Незавершений рядок C++ + + + + Excess closing brace in C++ code (or abuse of the C++ preprocessor) + + Забагато закриваючих фігурних дужок в коді C++ (або неправильне застосування препроцесора C++) + + + + Excess closing parenthesis in C++ code (or abuse of the C++ preprocessor) + + Забагато закриваючих круглих дужок в коді C++ (або неправильне застосування препроцесора C++) + + + + Excess closing bracket in C++ code (or abuse of the C++ preprocessor) + + Забагато закриваючих квадратних дужок в коді C++ (або неправильне застосування препроцесора C++) + + + + Cannot open %1: %2 + Неможливо відкрити %1: %2 + + + //% cannot be used with tr() / QT_TR_NOOP(). Ignoring + + //% не може бути використаний разом з tr() / QT_TR_NOOP(). Ігнорую + + + + circular inclusion of %1 + + циклічне вкладення %1 + + + + Cannot open %1: %2 + + Неможливо відкрити %1: %2 + + + + Qualifying with unknown namespace/class %1::%2 + + Задаю з невідомим простором імен/класом %1::%2 + + + + tr() cannot be called without context + + tr() не можна викликати без контексту + + + + Class '%1' lacks Q_OBJECT macro + + У класу '%1' не вистачає макросу Q_OBJECT + + + + It is not recommended to call tr() from within a constructor '%1::%2' + + Не рекомендовано викликати tr() з конструктора '%1::%2' + + + + //% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring + + //% не може бути використаний разом з translate() / QT_TRANSLATE_NOOP(). Ігнорую + + + + //= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring + + //= не може бути використаний разом з qtTrId() / QT_TRID_NOOP(). Ігнорую + + + + Unexpected character in meta string + + Неочікуваний символ в мета-рядку + + + + Unterminated meta string + + Незавершений мета-рядок + + + + Cannot invoke tr() like this + + Неможливо викликати tr() подібним чином + + + + Discarding unconsumed meta data + + Відкидаю невжиті мета-дані + + + + Unbalanced opening brace in C++ code (or abuse of the C++ preprocessor) + + Незбалансовані відкриваючі фігурні дужки в коді C++ (або неправильне застосування препроцесора C++) + + + + Unbalanced opening parenthesis in C++ code (or abuse of the C++ preprocessor) + + Незбалансовані відкриваючі круглі дужки в коді C++ (або неправильне застосування препроцесора C++) + + + + Unbalanced opening bracket in C++ code (or abuse of the C++ preprocessor) + + Незбалансовані відкриваючі квадратні дужки в коді C++ (або неправильне застосування препроцесора C++) + + + + Unterminated Java comment. + + Незавершений коментар Java. + + + + Invalid Unicode value. + + Неправильне значення Unicode. + + + + Unterminated string. + + Незавершений рядок. + + + + String used in translation can contain only literals concatenated with other literals, not expressions or numbers. + + Рядки, що використовуються в перекладі, можуть містити лише літерали об'єднані з іншими літералами, а не вирази або числа. + + + + 'class' must be followed by a class name. + + Після 'class' повинна слідувати назва класу. + + + + Excess closing brace. + + Забагато закриваючих фігурних дужок. + + + 'package' must be followed by package name. + + Після 'package' повинна слідувати назва пакунку. + + + + Unbalanced opening brace. + + Незбалансовані відкриваючі фігурні дужки. + + + + Unbalanced opening parenthesis. + + Незбалансовані відкриваючі круглі дужки. + + + + Found %n source text(s) (%1 new and %2 already existing) + + + Знайдено %n оригінальний текст (%1 новий та %2 вже існує) + + Знайдено %n оригінальних тексти (%1 нових та %2 вже існує) + + Знайдено %n оригінальних текстів (%1 нових та %2 вже існує) + + + + + Removed %n obsolete entries + + + Видалено %n застарілий елемент + + Видалено %n застарілих елементи + + Видалено %n застарілих елементів + + + + + Kept %n obsolete entries + + + Залишено %n застарілий елемент + + Залишено %n застарілих елементи + + Залишено %n застарілих елементів + + + + + Number heuristic provided %n translation(s) + + + Числова евристика надала %n переклад + + Числова евристика надала %n переклади + + Числова евристика надала %n перекладів + + + + + Same-text heuristic provided %n translation(s) + + + Евристика "однаковий текст" надала %n переклад + + Евристика "однаковий текст" надала %n переклади + + Евристика "однаковий текст" надала %n перекладів + + + + + Similar-text heuristic provided %n translation(s) + + + Евристика "схожий текст" надала %n переклад + + Евристика "схожий текст" надала %n переклади + + Евристика "схожий текст" надала %n перекладів + + + + + Illegal character + Неприпустимий символ + + + Unclosed string at end of line + Незакритий рядок в кінці файлу + + + Illegal escape squence + Неприпустима керуюча послідовність + + + Illegal unicode escape sequence + Неприпустима керуюча послідовність Unicode + + + Unclosed comment at end of file + Незакритий коментар в кінці файлу + + + Illegal syntax for exponential number + Неприпустимий синтаксис для експоненційного числа + + + Identifier cannot start with numeric literal + Ідентифікатор не може починатись з числового літералу + + + Unterminated regular expression literal + Незавершений літерал регулярного виразу + + + //% cannot be used with %1(). Ignoring + + //% не може бути використаний разом з %1(). Ігнорую + + + + %1() requires at least two arguments. + + %1() вимагає щонайменше двох аргументів. + + + + %1(): both arguments must be literal strings. + + %1(): обидва аргументи повинні бути рядковими літералами. + + + + %1() requires at least one argument. + + %1() вимагає щонайменше одного аргументу. + + + + %1(): text to translate must be a literal string. + + %1(): текст для перекладу повинен бути рядковим літералом. + + + + //= cannot be used with %1(). Ignoring + + //= не може бути використаний разом з %1(). Ігнорую + + + + %1(): identifier must be a literal string. + + %1(): ідентифікатор повинен бути рядковим літералом. + + + + Expected + Beginning of the string that contains comma-separated list of expected tokens + Очікувалось + + + XML error: Parse error at line %1, column %2 (%3). + Помилка XML: Помилка розбору в рядку %1, позиція %2 (%3). + + + Parse error in UI file + Помилка розбору файлу UI + + + + MainWindow + + MainWindow + Головне вікно + + + &Phrases + Фра&зи + + + &Close Phrase Book + &Закрити глосарій + + + &Edit Phrase Book + &Редагувати глосарій + + + &Print Phrase Book + &Друк глосарію + + + V&alidation + Перев&ірка + + + &View + &Вид + + + Vie&ws + &Види + + + &Toolbars + Панелі &інструментів + + + &Help + &Довідка + + + &Translation + Пере&клад + + + &File + &Файл + + + Recently Opened &Files + &Нещодавно відкриті файли + + + &Edit + &Правка + + + &Open... + &Відкрити... + + + Open a Qt translation source file (TS file) for editing + Відкрити файл перекладу Qt (файл TS) для редагування + + + Ctrl+O + + + + E&xit + Ви&йти + + + Close this window and exit. + Закрити вікно та вийти. + + + Ctrl+Q + + + + Save + Зберегти + + + Save changes made to this Qt translation source file + Зберегти зміни зроблені до цього файлу перекладу Qt + + + Save &As... + Зберегти &як... + + + Save As... + Зберегти як... + + + Save changes made to this Qt translation source file into a new file. + Зберегти зміни зроблені до цього файлу перекладу Qt до нового файлу. + + + Release + Скомпілювати + + + Create a Qt message file suitable for released applications from the current message file. + Створити файл повідомлень Qt придатний для використання програмами з поточного файлу повідомлень. + + + &Print... + &Друк... + + + Print a list of all the translation units in the current translation source file. + Друкувати список усіх елементів перекладу з поточного файлу перекладу. + + + Ctrl+P + + + + &Undo + &Повернути + + + Undo the last editing operation performed on the current translation. + Скасувати останню операцію редагування здійснену над поточним перекладом. + + + Ctrl+Z + + + + &Redo + П&овторити + + + Redo an undone editing operation performed on the translation. + Повторити скасовану операцію редагування здійснену над поточним перекладом. + + + Ctrl+Y + + + + Cu&t + Ви&різати + + + Copy the selected translation text to the clipboard and deletes it. + Копіювати виділений текст перекладу в буфер обміну та видалити його. + + + Ctrl+X + + + + &Copy + &Копіювати + + + Copy the selected translation text to the clipboard. + Копіювати виділений текст перекладу до буферу обміну. + + + Ctrl+C + + + + &Paste + &Вставити + + + Paste the clipboard text into the translation. + Вставити текст з буферу обміну до перекладу. + + + Ctrl+V + + + + Select &All + Виділити в&се + + + Select the whole translation text. + Виділити все текст перекладу. + + + Ctrl+A + + + + &Find... + &Знайти... + + + Search for some text in the translation source file. + Шукати деякий текст в файлі перекладу. + + + Ctrl+F + + + + Find &Next + Знайти &наступне + + + Continue the search where it was left. + Продовжити пошук з місця, де він був зупинений. + + + F3 + + + + &Prev Unfinished + &Попередній незавершений + + + Previous unfinished item + Попередній незавершений елемент + + + Move to the previous unfinished item. + Перейти до попереднього незавершеного елементу. + + + Ctrl+K + + + + &Next Unfinished + &Наступний незавершений + + + Next unfinished item + Наступний незавершений елемент + + + Move to the next unfinished item. + Перейти до наступного незавершеного елементу. + + + Ctrl+J + + + + P&rev + П&опередній + + + Move to previous item + Перейти до попереднього елементу + + + Move to the previous item. + Перейти до попереднього елементу. + + + Ctrl+Shift+K + + + + Ne&xt + Н&аступний + + + Next item + Наступний елемент + + + Move to the next item. + Перейти до наступного елементу. + + + Ctrl+Shift+J + + + + &Done and Next + &Готово і наступний + + + Mark item as done and move to the next unfinished item + Помітити елемент як завершений та перейти до наступного незавершеного елементу + + + Mark this item as done and move to the next unfinished item. + Помітити цей елемент як завершений та перейти до наступного незавершеного елементу. + + + Copy from source text + Копіювати з оригінального тексту + + + Copies the source text into the translation field + Копіює оригінальний текст в поле перекладу + + + Copies the source text into the translation field. + Копіює оригінальний текст в поле перекладу. + + + Ctrl+B + + + + &Accelerators + &Акселератори + + + Toggle the validity check of accelerators + Перемикання перевірки правильності акселераторів + + + Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. + Перемикання перевірки акселераторів, тобто чи збігається кількість амперсандів в оригінальному та перекладеному тексті. Якщо буде виявлено розбіжність, то у вікні попереджень буде показано повідомлення. + + + &Ending Punctuation + &Кінцева пунктуація + + + Toggle the validity check of ending punctuation + Перемикання перевірки правильності кінцевої пунктуації + + + Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. + Перемикання перевірки кінцевої пунктуації. Якщо буде виявлено розбіжність, то у вікні попереджень буде показано повідомлення. + + + &Phrase matches + Збіги &фраз + + + Toggle checking that phrase suggestions are used + Перемикання перевірки, що пропозиції фраз були застосовані + + + Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. + Перемикання перевірки про використання запропонованих фраз. Якщо буде виявлено розбіжність, то у вікні попереджень буде показано повідомлення. + + + Place &Marker Matches + Збіги &маркерів положення + + + Toggle the validity check of place markers + Перемикання перевірки правильності маркерів розташування + + + Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. + Перемикання перевірки правильності маркерів розташування, тобто чи усі %1, %2, ... збігаються в оригінальному та перекладеному тексті. Якщо буде виявлено розбіжність, то у вікні попереджень буде показано повідомлення. + + + &New Phrase Book... + &Новий глосарій... + + + Create a new phrase book. + Створити новий глосарій. + + + Ctrl+N + + + + &Open Phrase Book... + &Відкрити глосарій... + + + Open a phrase book to assist translation. + Відкрити глосарій для допомоги в перекладі. + + + Ctrl+H + + + + &Reset Sorting + С&кинути сортування + + + Sort the items back in the same order as in the message file. + Сортувати елементи в тому ж порядку, що й в файлі повідомлень. + + + &Display guesses + &Показувати підказки + + + Set whether or not to display translation guesses. + Встановлює показувати чи ні підказки перекладу. + + + &Statistics + &Статистика + + + Display translation statistics. + Показати статистку перекладу. + + + &Manual + &Посібник + + + F1 + + + + About Qt Linguist + Про Qt Linguist + + + About Qt + Про Qt + + + Display information about the Qt toolkit by Nokia. + Показати інформацію про інструментарій Qt від Nokia. + + + &What's This? + &Що це? + + + What's This? + Що це? + + + Enter What's This? mode. + Перехід в режим "Що це?". + + + Shift+F1 + Shift+F1 + + + &Search And Translate... + Знайти &та перекласти... + + + Replace the translation on all entries that matches the search source text. + Замінити переклад усіх елементів, що збігаються з оригінальним текстом, що шукається. + + + &Batch Translation... + Пакетний перекла&д... + + + Batch translate all entries using the information in the phrase books. + Пакетно перекласти усі елементи використовуючи інформацію з глосаріїв. + + + Release As... + Скомпілювати як... + + + Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. + Створення файла повідомлень Qt придатного для використання програмами з поточного файлу повідомлень. Ім'я файла буде автоматично визначено з імені файлу TS. + + + File + Файл + + + Edit + Правка + + + Translation + Переклад + + + Validation + Перевірка + + + Help + Довідка + + + Open/Refresh Form &Preview + &Відкрити/оновити попередній перегляд форм + + + Form Preview Tool + Засіб попереднього перегляду форм + + + F5 + + + + Translation File &Settings... + Налаштування &файлу перекладу... + + + &Add to Phrase Book + Дод&ати до глосарію + + + Ctrl+T + + + + Open Read-O&nly... + Відкрити лише для &читання... + + + &Save All + &Зберегти усе + + + Ctrl+S + + + + &Release All + &Скомпілювати все + + + Close + Закрити + + + &Close All + З&акрити усе + + + Ctrl+W + + + + Length Variants + Варіанти перекладу + + + + This is the application's main window. + Це головне вікно програми. + + + + Source text + Оригінальний текст + + + Index + Індекс + + + Context + Контекст + + + Items + Елементи + + + This panel lists the source contexts. + В цій панелі перераховані оригінальні контексти. + + + Strings + Рядки + + + Phrases and guesses + Фрази та підказки + + + Sources and Forms + Коди та форми + + + Warnings + Попередження + + + MOD + status bar: file(s) modified + ЗМІ + + + Loading... + Завантажується... + + + Loading File - Qt Linguist + Завантаження файлу - Qt Linguist + + + The file '%1' does not seem to be related to the currently open file(s) '%2'. + +Close the open file(s) first? + Не схоже, що файл '%1' пов'язаний з жодним з відкритим зараз файлом '%2'. + +Закрити спочатку відкриті файли? + + + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. + +Skip loading the first named file? + Не схоже, що файл '%1' пов'язаний з файлом '%2', що також завантажується. + +Пропустити завантаження першого вказаного файлу? + + + %n translation unit(s) loaded. + + %n одиниця перекладу завантажена. + %n одиниці перекладу завантажені. + %n одиниць перекладу завантажено. + + + + Related files (%1);; + Пов'язані файли (%1);; + + + Open Translation Files + Відкрити файли перекладу + + + File saved. + Файл збережено. + + + Qt message files for released applications (*.qm) +All files (*) + Файли повідомлень Qt для готовий програм (*.qm) +Всі файли (*) + + + File created. + Файл створено. + + + Printing... + Друкується... + + + Context: %1 + Контекст: %1 + + + finished + завершено + + + unresolved + нерозв'язаний + + + obsolete + застарілий + + + Printing... (page %1) + Друк... (сторінка %1) + + + Printing completed + Друк завершено + + + Printing aborted + Друк перервано + + + Search wrapped. + Пошук з початку. + + + Qt Linguist + Qt Linguist + + + Cannot find the string '%1'. + Неможливо знайти рядок '%1. + + + Search And Translate in '%1' - Qt Linguist + Пошук та переклад і '%1' - Qt Linguist + + + Translate - Qt Linguist + Переклад - Qt Linguist + + + Translated %n entry(s) + + Перекладено %n елемент + Перекладено %n елементи + Перекладено %n елементів + + + + No more occurrences of '%1'. Start over? + Більше збігів '%1' немає. Почати спочатку? + + + Create New Phrase Book + Створити новий глосарій + + + Qt phrase books (*.qph) +All files (*) + Глосарії Q (*.qph) +Всі файли (*) + + + Phrase book created. + Глосарій створено. + + + Open Phrase Book + Відкрити глосарій + + + Qt phrase books (*.qph);;All files (*) + Глосарії Q (*.qph);;Всі файли (*) + + + %n phrase(s) loaded. + + %n фразу завантажено. + %n фрази завантажено. + %n фраз завантажено. + + + + Add to phrase book + Додати до глосарію + + + No appropriate phrasebook found. + Не знайдено відповідного глосарію. + + + Adding entry to phrasebook %1 + Додавання елементу до глосарію %1 + + + Select phrase book to add to + Оберіть глосарій, в який бажаєте додати + + + Unable to launch Qt Assistant (%1) + Неможливо запустити Qt Assistant (%1) + + + Version %1 + Версія %1 + + + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist - це засіб для додавання перекладів до програм на Qt.</p><p>Copyright (C) 2010 Корпорація Nokia та/або її дочірні компанії. + + + Do you want to save the modified files? + Бажаєте зберегти модифіковані файли? + + + Do you want to save '%1'? + Бажаєте зберегти '%1'? + + + Qt Linguist[*] + Qt Linguist[*] + + + %1[*] - Qt Linguist + %1[*] - Qt Linguist + + + No untranslated translation units left. + Неперекладених одиниць не залишилось. + + + &Window + Вікн&о + + + Minimize + Мінімізувати + + + Ctrl+M + + + + Display the manual for %1. + Показати посібник для %1. + + + Display information about %1. + Показати інформацію про %1. + + + &Save '%1' + &Зберегти '%1' + + + Save '%1' &As... + Зберегти '%1' &як... + + + Release '%1' + Скомпілювати '%1' + + + Release '%1' As... + Скомпілювати '%1' як... + + + &Close '%1' + З&акрити '%1' + + + &Save + &Зберегти + + + &Close + З&акрити + + + Save All + Зберегти усе + + + Close All + Закрити усе + + + &Release + &Скомпілювати + + + Translation File &Settings for '%1'... + Налаштування &файлу перекладу для '%1'... + + + &Batch Translation of '%1'... + Пакетний перекла&д '%1'... + + + Search And &Translate in '%1'... + Знайти &та переклад '%1'... + + + Search And &Translate... + Знайти &та перекласти... + + + Cannot read from phrase book '%1'. + Неможливо прочитати з глосарію '%1'. + + + Close this phrase book. + Закрити цей глосарій. + + + Enables you to add, modify, or delete entries in this phrase book. + Дозволяє вам додавати, модифікувати та видаляти елементи глосарію. + + + Print the entries in this phrase book. + Друку елементів цього глосарію. + + + Cannot create phrase book '%1'. + Неможливо створити глосарій '%1'. + + + Do you want to save phrase book '%1'? + Бажаєте зберегти глосарій '%1'? + + + All + Усе + + + + MessageEditor + + + This is the right panel of the main window. + Це права панель основного вікна. + + + + Russian + Російська + + + German + Німецька + + + Japanese + Японська + + + French + Французька + + + Polish + Польська + + + Chinese + Китайська + + + This whole panel allows you to view and edit the translation of some source text. + Ця панель дозволяє вам переглядати та редагувати переклад деякого оригінального тексту. + + + Source text + Оригінальний текст + + + This area shows the source text. + В цій області відображається оригінальний текст. + + + Source text (Plural) + Оригінальний текст (множина) + + + This area shows the plural form of the source text. + В цій області відображається множина оригінального тексту. + + + Developer comments + Коментарі розробника + + + This area shows a comment that may guide you, and the context in which the text occurs. + В цій області відображається коментар, який може допомогти вам та контекст, в якому зустрічається текст. + + + Here you can enter comments for your own use. They have no effect on the translated applications. + Тут ви можете вводити коментарі для власного вжитку. Вони не впливають на перекладені програми. + + + %1 translation (%2) + %1 переклад (%2) + + + This is where you can enter or modify the translation of the above source text. + Тут ви можете чи змінювати переклад оригінального тексту, наведеного вище. + + + %1 translation + %1 переклад + + + %1 translator comments + %1 коментар перекладача + + + '%1' +Line: %2 + '%1' +Рядок: %2 + + + + MessageModel + + Completion status for %1 + Статус завершеності для %1 + + + <file header> + <заголовок файлу> + + + <context comment> + <контекстний коментар> + + + <unnamed context> + <контекст без назви> + + + + PhraseBook + + Parse error at line %1, column %2 (%3). + Помилка розбору в рядку %1, позиція %2 (%3). + + + + PhraseBookBox + + Edit Phrase Book + Редагування глосарію + + + This window allows you to add, modify, or delete entries in a phrase book. + Це вікно дозволяє вам додавати, модифікувати та видаляти елементи глосарію. + + + &Translation: + &Переклад: + + + This is the phrase in the target language corresponding to the source phrase. + Це фраза на мові перекладу, що відповідає оригінальній фразі. + + + S&ource phrase: + &Оригінальна фраза: + + + This is a definition for the source phrase. + Це визначення оригінальної фрази. + + + This is the phrase in the source language. + Це фраза мовою оригіналу. + + + &Definition: + &Визначення: + + + Click here to add the phrase to the phrase book. + Клацніть тут, щоб додати фразу до глосарію. + + + &New Entry + &Новий запис + + + Click here to remove the entry from the phrase book. + Клацніть тут, щоб видалити фразу з глосарію. + + + &Remove Entry + Ви&далити запис + + + Settin&gs... + Нала&штування... + + + Click here to save the changes made. + Клацніть тут, щоб зберегти зроблені зміни. + + + &Save + &Зберегти + + + Click here to close this window. + Клацніть тут щоб закрити вікно. + + + Close + Закрити + + + + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. + Йдіть в Фрази > Редагувати глосарій... З'явиться діалог PhraseBookBox. + + + + (New Entry) + (Новий запис) + + + %1[*] - Qt Linguist + %1[*] - Qt Linguist + + + Qt Linguist + Qt Linguist + + + Cannot save phrase book '%1'. + Неможливо зберегти глосарій '%1'. + + + + PhraseModel + + Source phrase + Оригінальна фраза + + + Translation + Переклад + + + Definition + Визначення + + + + PhraseView + + Insert + Вставити + + + Edit + Редагувати + + + Guess (%1) + Підказка (%1) + + + Guess + Підказка + + + + QObject + + Translation files (%1);; + Файли перекладу (%1);; + + + All files (*) + Всі файли (*) + + + Qt Linguist + Qt Linguist + + + GNU Gettext localization files + Файли локалізації GNU Gettext + + + GNU Gettext localization template files + Файли шаблонів локалізації GNU Gettext + + + Compiled Qt translations + Скомпільовані переклади Qt + + + Qt Linguist 'Phrase Book' + 'Глосарій' Qt Linguist + + + Qt translation sources (format 1.1) + Файли перекладу Qt (формат 1.1) + + + Qt translation sources (format 2.0) + Файли перекладу Qt (формат 2.0) + + + Qt translation sources (latest format) + Файли перекладу Qt (останній формат) + + + XLIFF localization files + Файли локалізації XLIFF + + + lupdate version %1 + + lupdate версії %1 + + + + + SourceCodeView + + <i>Source code not available</i> + <i>Код недоступний</i> + + + <i>File %1 not available</i> + <i>Файл %1 не доступний</i> + + + <i>File %1 not readable</i> + <i>Неможливо прочитати файл %1</i> + + + + Statistics + + Statistics + Статистика + + + Close + Закрити + + + Translation + Переклад + + + Source + Оригінал + + + 0 + 0 + + + Words: + Слів: + + + Characters: + Символів: + + + Characters (with spaces): + Символів (з пропусками): + + + + TranslateDialog + + This window allows you to search for some text in the translation source file. + Це вікно дозволяє вам шукати текст в файлі перекладу. + + + Type in the text to search for. + Введіть текст для пошуку. + + + Find &source text: + &Знайти оригінальний текст: + + + &Translate to: + &Перекласти як: + + + Search options + Опції пошуку + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + Якщо відмічено, то рядки 'приклад' та 'прИкЛад' будуть вважатись різними. + + + Match &case + Враховувати &регістр + + + Mark new translation as &finished + Позначати нові переклади &як завершені + + + Click here to find the next occurrence of the text you typed in. + Клацніть тут, щоб знайти наступний збіг для введеного вами тексту. + + + Find Next + Знайти наступний + + + Translate + Перекласти + + + Translate All + Перекласти усе + + + Click here to close this window. + Клацніть тут щоб закрити вікно. + + + Cancel + Скасувати + + + + TranslationSettingsDialog + + Source language + Мова оригіналу + + + Language + Мова + + + Country/Region + Країна/регіон + + + Target language + Мова перекладу + + + Settings for '%1' - Qt Linguist + Налаштування для '%1' - Qt Linguist + + + Any Country + Будь-яка країна + + + diff -r ef0373b55136 -r 758a864f9613 translations/qt_de.ts --- a/translations/qt_de.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qt_de.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,7 +4,6 @@ CloseButton - Close Tab Schließen @@ -12,12 +11,10 @@ FakeReply - Fake error ! Fake error ! - Invalid URL Ungültige URL @@ -25,37 +22,30 @@ MAC_APPLICATION_MENU - Services Dienste - Hide %1 %1 ausblenden - Hide Others Andere ausblenden - Show All Alle anzeigen - Preferences... Einstellungen... - Quit %1 %1 beenden - About %1 Über %1 @@ -63,32 +53,26 @@ Phonon:: - Notifications Benachrichtigungen - Music Musik - Video Video - Communication Kommunikation - Games Spiele - Accessibility Eingabehilfen @@ -96,24 +80,18 @@ Phonon::AudioOutput - - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Das Audiogerät <b>%1</b> funktioniert nicht.<br/>Es wird stattdessen <b>%2</b> verwendet.</html> - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> <html>Das Audiogerät <b>%1</b> wurde aktiviert,<br/>da es gerade verfügbar und höher priorisiert ist.</html> - - Revert back to device '%1' Zurückschalten zum Gerät '%1' - <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> <html>Es wird zum Audiogerät <b>%1</b> geschaltet, <br/>da es höher priorisiert ist oder spezifisch für diesen Stream konfiguriert wurde.</html> @@ -121,14 +99,12 @@ Phonon::Gstreamer::Backend - Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. Achtung: Das Paket gstreamer0.10-plugins-good ist nicht installiert. Einige Video-Funktionen stehen nicht zur Verfügung. - Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled Achtung: Die grundlegenden GStreamer-Plugins sind nicht installiert. @@ -138,7 +114,6 @@ Phonon::Gstreamer::MediaObject - Cannot start playback. Check your GStreamer installation and make sure you @@ -148,49 +123,34 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass das Paket libgstreamer-plugins-base installiert ist. - Missing codec helper script assistant. Der Skript-Hilfsassistent des Codecs fehlt. - Plugin codec installation failed for codec: %0 Die Installation des Codec-Plugins schlug fehl für: %0 - A required codec is missing. You need to install the following codec(s) to play this content: %0 Es sind nicht alle erforderlichen Codecs installiert. Um diesen Inhalt abzuspielen, muss der folgende Codec installiert werden: %0 - - - - - - - - Could not open media source. Die Medienquelle konnte nicht geöffnet werden. - Invalid source type. Ungültiger Typ der Medienquelle. - Could not locate media source. Die Medienquelle konnte nicht gefunden werden. - Could not open audio device. The device is already in use. Das Audiogerät konnte nicht geöffnet werden, da es bereits in Benutzung ist. - Could not decode media source. Die Medienquelle konnte nicht gefunden werden. @@ -198,162 +158,130 @@ Phonon::MMF - Audio Output Audio-Ausgabe - The audio output device Audio-Ausgabegerät - No error Kein Fehler - Not found Nicht gefunden - Out of memory Es ist kein Speicher mehr verfügbar - Not supported Nicht unterstützt - Overflow Überlauf - Underflow Unterlauf - Already exists Existiert bereits - Path not found Pfad konnte nicht gefunden werden - In use Bereits in Verwendung - Not ready Nicht bereit - Access denied Zugriff verweigert - Could not connect Es konnte keine Verbindung hergestellt werden - Disconnected Getrennt - Permission denied Zugriff verweigert - Insufficient bandwidth Unzureichende Bandweite - Network unavailable Netzwerk nicht verfügbar - Network communication error Fehler bei der Kommunikation über das Netzwerk - Streaming not supported Streaming nicht unterstützt - Server alert Server alert - Invalid protocol Ungültiges Protokoll - Invalid URL Ungültige URL - Multicast error Multicast-Fehler - Proxy server error Fehler bei Proxy-Server-Kommunikation - Proxy server not supported Proxy-Server nicht unterstützt - Audio output error Fehler bei Audio-Ausgabe - Video output error Fehler bei Video-Ausgabe - Decoder error Fehler im Decoder - Audio or video components could not be played Audio- oder Videokomponenten konnten nicht abgespielt werden - DRM error DRM-Fehler - Unknown error (%1) Unbekannter Fehler (%1) @@ -361,33 +289,34 @@ Phonon::MMF::AbstractMediaPlayer - Not ready to play Das Abspielen ist im Grundzustand nicht möglich - - Error opening file Die Datei konnte nicht geöffnet werden - Error opening URL Der URL konnte nicht geöffnet werden - + Error opening resource + Die Ressource konnte nicht geöffnet werden + + + Error opening source: resource not opened + Die Quelle konnte nicht geöffnet werden: Ressource nicht geöffnet + + Setting volume failed Die Lautstärke konnte nicht eingestellt werden - Loading clip failed Das Laden des Clips schlug fehl - Playback complete Abspielen beendet @@ -395,22 +324,18 @@ Phonon::MMF::AbstractVideoPlayer - Pause failed Fehler bei Pause-Funktion - Seek failed Suchoperation fehlgeschlagen - Getting position failed Die Position konnte nicht bestimmt werden - Opening clip failed Der Clip konnte nicht geöffnet werden @@ -418,7 +343,6 @@ Phonon::MMF::AudioEqualizer - %1 Hz %1 Hz @@ -426,7 +350,6 @@ Phonon::MMF::AudioPlayer - Getting position failed Die Position konnte nicht bestimmt werden @@ -434,11 +357,6 @@ Phonon::MMF::DsaVideoPlayer - - - - - Video display error Fehler bei der Video-Anzeige @@ -446,7 +364,6 @@ Phonon::MMF::EffectFactory - Enabled Aktiviert @@ -454,61 +371,51 @@ Phonon::MMF::EnvironmentalReverb - Decay HF ratio (%) DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. Hochfrequenz-Abklingverhältnis (%) - Decay time (ms) DecayTime: Time over which reverberation is diminished. Abklingzeit (ms) - Density (%) Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. Dichte (%) - Diffusion (%) Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. Diffusion (%) - Reflections delay (ms) ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. Verzögerung des Echos (ms) - Reflections level (mB) ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. Stärke des Echos (mB) - Reverb delay (ms) ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. Verzögerung des Nachhalls (ms) - Reverb level (mB) ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. Stärke des Nachhalls (mB) - Room HF level RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. Hochfrequenz-Pegel des Raums - Room level (mB) RoomLevel: Master volume control for all reflected sound. Pegel des Raums (mB) @@ -517,12 +424,18 @@ Phonon::MMF::MediaObject - Error opening source: type not supported Die Quelle konnte nicht geöffnet werden: Dieser Typ wird nicht unterstützt - + Error opening source: resource is compressed + Die Quelle konnte nicht geöffnet werden: Die Ressource ist komprimiert + + + Error opening source: resource not valid + Die Quelle konnte nicht geöffnet werden: Ungültige Ressource + + Error opening source: media type could not be determined Die Quelle konnte nicht geöffnet werden: Der Medientyp konnte nicht bestimmt werden @@ -530,7 +443,6 @@ Phonon::MMF::StereoWidening - Level (%) Stärke (%) @@ -538,8 +450,6 @@ Phonon::MMF::SurfaceVideoPlayer - - Video display error Fehler bei der Video-Anzeige @@ -547,22 +457,14 @@ Phonon::VolumeSlider - - - - Volume: %1% Lautstärke: %1% - - - Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% Mit diesem Regler stellen Sie die Lautstärke ein. Die Position links entspricht 0%; die Position rechts entspricht %1% - Muted Stummschaltung @@ -570,12 +472,10 @@ Q3Accel - %1, %2 not defined %1, %2 sind nicht definiert - Ambiguous %1 not handled Mehrdeutige %1 können nicht verarbeitet werden @@ -583,27 +483,22 @@ Q3DataTable - True Wahr - False Falsch - Insert Einfügen - Update Aktualisieren - Delete Löschen @@ -611,313 +506,238 @@ Q3FileDialog - Copy or Move a File Datei kopieren oder verschieben - Read: %1 Lesen: %1 - - Write: %1 Schreiben: %1 - - Cancel Abbrechen - - - - All Files (*) Alle Dateien (*) - Name Name - Size Größe - Type Typ - Date Datum - Attributes Attribute - - &OK &OK - Look &in: Su&chen in: - - - File &name: Datei&name: - File &type: Datei&typ: - Back Zurück - One directory up Ein Verzeichnis zurück - Create New Folder Neuen Ordner erstellen - List View Liste - Detail View Ausführlich - Preview File Info Vorschau der Datei-Informationen - Preview File Contents Vorschau des Datei-Inhalts - Read-write Lesen/Schreiben - Read-only Nur Lesen - Write-only Nur Schreiben - Inaccessible Gesperrt - Symlink to File Verknüpfung mit Datei - Symlink to Directory Verknüpfung mit Verzeichnis - Symlink to Special Verknüpfung mit Spezialdatei - File Datei - Dir Verzeichnis - Special Spezialattribut - - - Open Öffnen - - Save As Speichern unter - - - &Open &Öffnen - - &Save S&peichern - &Rename &Umbenennen - &Delete &Löschen - R&eload Erne&ut laden - Sort by &Name Nach &Namen sortieren - Sort by &Size Nach &Größe sortieren - Sort by &Date Nach &Datum sortieren - &Unsorted &Unsortiert - Sort Sortieren - Show &hidden files &Versteckte Dateien anzeigen - the file die Datei - the directory das Verzeichnis - the symlink die Verknüpfung - Delete %1 %1 löschen - <qt>Are you sure you wish to delete %1 "%2"?</qt> <qt>Sind Sie sicher, dass Sie %1 "%2" löschen möchten?</qt> - &Yes &Ja - &No &Nein - New Folder 1 Neues Verzeichnis 1 - New Folder Neues Verzeichnis - New Folder %1 Neues Verzeichnis %1 - Find Directory Verzeichnis suchen - - Directories Verzeichnisse - Directory: Verzeichnis: - - Error Fehler - %1 File not found. Check path and filename. @@ -926,17 +746,14 @@ Überprüfen Sie Pfad und Dateinamen. - All Files (*.*) Alle Dateien (*.*) - Open Öffnen - Select a Directory Wählen Sie ein Verzeichnis @@ -944,29 +761,24 @@ Q3LocalFs - - Could not read directory %1 Konnte Verzeichnis nicht lesen %1 - Could not create directory %1 Konnte Verzeichnis nicht erstellen %1 - Could not remove file or directory %1 Konnte Datei oder Verzeichnis nicht löschen %1 - Could not rename %1 to @@ -977,14 +789,12 @@ %2 - Could not open %1 Konnte nicht geöffnet werden: %1 - Could not write %1 Konnte nicht geschrieben werden: @@ -994,12 +804,10 @@ Q3MainWindow - Line up Ausrichten - Customize... Anpassen... @@ -1007,7 +815,6 @@ Q3NetworkProtocol - Operation stopped by the user Operation von Benutzer angehalten @@ -1015,8 +822,6 @@ Q3ProgressDialog - - Cancel Abbrechen @@ -1024,28 +829,22 @@ Q3TabDialog - - OK OK - Apply Anwenden - Help Hilfe - Defaults Voreinstellungen - Cancel Abbrechen @@ -1053,38 +852,30 @@ Q3TextEdit - &Undo &Rückgängig - &Redo Wieder&herstellen - Cu&t &Ausschneiden - &Copy &Kopieren - &Paste Einf&ügen - Clear Löschen - - Select All Alles auswählen @@ -1092,67 +883,54 @@ Q3TitleBar - System System - Restore up Wiederherstellen - Minimize Minimieren - Restore down Wiederherstellen - Maximize Maximieren - Close Schließen - Contains commands to manipulate the window Enthält Befehle zum Ändern der Fenstergröße - Puts a minimized window back to normal Stellt ein minimiertes Fenster wieder her - Moves the window out of the way Minimiert das Fenster - Puts a maximized window back to normal Stellt ein maximiertes Fenster wieder her - Makes the window full screen Vollbildmodus - Closes the window Schließt das Fenster - Displays the name of the window and contains controls to manipulate it Zeigt den Namen des Fensters und enthält Befehle zum Ändern @@ -1160,7 +938,6 @@ Q3ToolBar - More... Mehr... @@ -1168,51 +945,38 @@ Q3UrlOperator - - - The protocol `%1' is not supported Das Protokoll `%1' wird nicht unterstützt - The protocol `%1' does not support listing directories Das Protokoll `%1' unterstützt nicht das Auflisten von Verzeichnissen - The protocol `%1' does not support creating new directories Das Protokoll `%1' unterstützt nicht das Anlegen neuer Verzeichnisse - The protocol `%1' does not support removing files or directories Das Protokoll `%1' unterstützt nicht das Löschen von Dateien oder Verzeichnissen - The protocol `%1' does not support renaming files or directories Das Protokoll `%1' unterstützt nicht das Umbenennen von Dateien oder Verzeichnissen - The protocol `%1' does not support getting files Das Protokoll `%1' unterstützt nicht das Laden von Dateien - The protocol `%1' does not support putting files Das Protokoll `%1' unterstützt nicht das Speichern von Dateien - - The protocol `%1' does not support copying or moving files or directories Das Protokoll `%1' unterstützt nicht das Kopieren oder Verschieben von Dateien oder Verzeichnissen - - (unknown) (unbekannt) @@ -1220,27 +984,22 @@ Q3Wizard - &Cancel &Abbrechen - < &Back < &Zurück - &Next > &Weiter > - &Finish Ab&schließen - &Help &Hilfe @@ -1248,45 +1007,30 @@ QAbstractSocket - - - - Host not found Rechner konnte nicht gefunden werden - - - Connection refused Verbindung verweigert - Connection timed out Das Zeitlimit für die Verbindung wurde überschritten - - - Operation on socket is not supported Diese Socket-Operation wird nicht unterstützt - - Socket operation timed out Das Zeitlimit für die Operation wurde überschritten - Socket is not connected Nicht verbunden - Network unreachable Das Netzwerk ist nicht erreichbar @@ -1294,17 +1038,14 @@ QAbstractSpinBox - &Step up &Inkrementieren - Step &down &Dekrementieren - &Select All &Alles auswählen @@ -1312,7 +1053,6 @@ QAccessibleButton - Press Drücken @@ -1320,28 +1060,23 @@ QApplication - QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - Executable '%1' requires Qt %2, found Qt %3. Die Anwendung '%1' benötigt Qt %2; es wurde aber Qt %3 gefunden. - Incompatible Qt Library Error Die Qt-Bibliothek ist inkompatibel - Activate Aktivieren - Activates the program's main window Aktiviert das Hauptfenster der Anwendung @@ -1349,22 +1084,18 @@ QAxSelect - Select ActiveX Control ActiveX-Element auswählen - OK OK - &Cancel &Abbrechen - COM &Object: COM-&Objekt: @@ -1372,17 +1103,14 @@ QCheckBox - Uncheck Löschen - Check Ankreuzen - Toggle Umschalten @@ -1390,57 +1118,46 @@ QColorDialog - Hu&e: Farb&ton: - &Sat: &Sättigung: - &Val: &Helligkeit: - &Red: &Rot: - &Green: &Grün: - Bl&ue: Bla&u: - A&lpha channel: A&lphakanal: - Select Color Farbauswahl - &Basic colors Grundfar&ben - &Custom colors &Benutzerdefinierte Farben - &Add to Custom Colors Zu benutzerdefinierten Farben &hinzufügen @@ -1448,23 +1165,18 @@ QComboBox - - Open Öffnen - False Falsch - True Wahr - Close Schließen @@ -1472,43 +1184,36 @@ QCoreApplication - %1: key is empty QSystemSemaphore %1: Ungültige Schlüsselangabe (leer) - %1: unable to make key QSystemSemaphore %1: Es kann kein Schlüssel erzeugt werden - %1: ftok failed QSystemSemaphore %1: ftok-Aufruf schlug fehl - %1: already exists QSystemSemaphore %1: existiert bereits - %1: does not exist QSystemSemaphore %1: Nicht existent - %1: out of resources QSystemSemaphore %1: Keine Ressourcen mehr verfügbar - %1: unknown error %2 QSystemSemaphore %1: Unbekannter Fehler %2 @@ -1517,22 +1222,18 @@ QDB2Driver - Unable to connect Es kann keine Verbindung aufgebaut werden - Unable to commit transaction Die Transaktion kann nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion kann nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) - Unable to set autocommit 'autocommit' kann nicht aktiviert werden @@ -1540,33 +1241,26 @@ QDB2Result - - Unable to execute statement Der Befehl kann nicht ausgeführt werden - Unable to prepare statement Der Befehl kann nicht initialisiert werden - Unable to bind variable Die Variable kann nicht gebunden werden - Unable to fetch record %1 Der Datensatz %1 kann nicht abgeholt werden - Unable to fetch next Der nächste Datensatz kann nicht abgeholt werden - Unable to fetch first Der erste Datensatz kann nicht abgeholt werden @@ -1574,22 +1268,18 @@ QDateTimeEdit - AM AM - am am - PM PM - pm pm @@ -1597,17 +1287,14 @@ QDeclarativeAbstractAnimation - Cannot animate non-existent property "%1" Die Eigenschaft '%1" existiert nicht und kann daher nicht animiert werden - Cannot animate read-only property "%1" Die Eigenschaft '%1" ist schreibgeschützt und kann daher nicht animiert werden - Animation is an abstract class Die Klasse Animation ist abstrakt @@ -1615,7 +1302,6 @@ QDeclarativeAnchorAnimation - Cannot set a duration of < 0 Es kann keine Zeitdauer <0 gesetzt werden @@ -1623,67 +1309,50 @@ QDeclarativeAnchors - Possible anchor loop detected on fill. Bei der Fülloperation wurde eine potentielle Endlosschleife der Anker festgestellt. - Possible anchor loop detected on centerIn. Bei der Operation 'centerIn' wurde eine potentielle Endlosschleife der Anker festgestellt. - - - - Cannot anchor to an item that isn't a parent or sibling. Das Ziel eines Anker muss ein Elternelement oder Element der gleichen Ebene sein. - Possible anchor loop detected on vertical anchor. Bei einem vertikalen Anker wurde eine potentielle Endlosschleife der Anker festgestellt. - Possible anchor loop detected on horizontal anchor. Bei einem horizontalen Anker wurde eine potentielle Endlosschleife der Anker festgestellt. - Cannot specify left, right, and hcenter anchors. Ankerangaben für links, rechts und horizontal zentriert dürfen nicht zusammen auftreten. - - Cannot anchor to a null item. Es kann kein Anker zu einem Null-Element angegeben werden. - Cannot anchor a horizontal edge to a vertical edge. Es kann kein Anker zu einer horizontalen oder vertikalen Kante angegeben werden. - - Cannot anchor item to self. Ein Element kann keinen Anker zu sich selbst haben. - Cannot specify top, bottom, and vcenter anchors. Ankerangaben für oben, unten und vertikal zentriert dürfen nicht zusammen auftreten. - Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. Ein Baseline-Anker darf nicht mit zusammen mit weiteren Ankerangaben für oben, unten und vertikal zentriert verwendet werden. - Cannot anchor a vertical edge to a horizontal edge. Vertikale und horizontale Kanten können nicht mit Ankern verbunden werden. @@ -1691,7 +1360,6 @@ QDeclarativeAnimatedImage - Qt was built without support for QMovie Diese Version der Qt-Bibliothek wurde ohne Unterstützung für die Klasse QMovie erstellt @@ -1699,7 +1367,6 @@ QDeclarativeBehavior - Cannot change the animation assigned to a Behavior. Die zu einem Behavior-Element gehörende Animation kann nicht geändert werden. @@ -1707,7 +1374,6 @@ QDeclarativeBinding - Binding loop detected for property "%1" Bei der für die Eigenschaft "%1" angegebenen Bindung wurde eine Endlosschleife festgestellt @@ -1715,7 +1381,6 @@ QDeclarativeCompiledBindings - Binding loop detected for property "%1" Bei der für die Eigenschaft "%1" angegebenen Bindung wurde eine Endlosschleife festgestellt @@ -1723,390 +1388,310 @@ QDeclarativeCompiler - - - - - - Invalid property assignment: "%1" is a read-only property Ungültige Zuweisung bei Eigenschaft: "%1" ist schreibgeschützt - Invalid property assignment: unknown enumeration Ungültige Zuweisung bei Eigenschaft: Ungültiger Aufzählungswert - Invalid property assignment: string expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Zeichenkette erwartet - Invalid property assignment: url expected Ungültige Zuweisung bei Eigenschaft: Es wird eine URL erwartet - Invalid property assignment: unsigned int expected Ungültige Zuweisung bei Eigenschaft: Es wird eine vorzeichenloser Ganzzahlwert erwartet - Invalid property assignment: int expected Ungültige Zuweisung bei Eigenschaft: Es wird ein Ganzzahlwert erwartet - Invalid property assignment: float expected - Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl erwartet - - - + Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl erwartet + + Invalid property assignment: double expected - Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl (double) erwartet - - - + Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl (double) erwartet + + Invalid property assignment: color expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Farbspezifikation erwartet - Invalid property assignment: date expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Datumsangabe erwartet - Invalid property assignment: time expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Zeitangabe erwartet - Invalid property assignment: datetime expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Datumsangabe erwartet - Invalid property assignment: point expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Koordinatenangabe für einen Punkt erwartet - Invalid property assignment: size expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Größenangabe erwartet - Invalid property assignment: rect expected Ungültige Zuweisung bei Eigenschaft: Es werden Parameter für ein Rechteck erwartet - Invalid property assignment: boolean expected Ungültige Zuweisung bei Eigenschaft: Es wird ein Boolescher Wert erwartet - Invalid property assignment: 3D vector expected Ungültige Zuweisung bei Eigenschaft: Es wird ein dreidimensionaler Vektor erwartet - Invalid property assignment: unsupported type "%1" Ungültige Zuweisung bei Eigenschaft: Der Typ "%1" ist nicht unterstützt - Element is not creatable. Das Element kann nicht erzeugt werden. - Component elements may not contain properties other than id Komponenten dürfen außer id keine weiteren Eigenschaften enthalten. - Invalid component id specification Ungültige Komponentenspezifikation - - id is not unique ID-Wert nicht eindeutig - Invalid component body specification Inhalt der Komponente ungültig - Cannot create empty component specification Es kann keine leere Komponentenangabe erzeugt werden - Empty signal assignment Leere Signalzuweisung - Empty property assignment Leere Eigenschaftszuweisung - Attached properties cannot be used here An dieser Stelle können keine Eigenschaften des Typs 'attached' verwendet werden - - Non-existent attached object Es existiert kein Bezugselement für die Eigenschaft - - Invalid attached object assignment Ungültige Zuweisung des Bezugselements - Cannot assign to non-existent default property Es kann keine Zuweisung erfolgen, da keine Vorgabe-Eigenschaft existiert - - Cannot assign to non-existent property "%1" Es kann keine Zuweisung erfolgen, da keine Eigenschaft des Namens '%1" existiert - Invalid use of namespace Ungültige Verwendung eines Namensraums - Not an attached property name Kein gültiger Name einer Eigenschaft des Typs 'attached' - Invalid use of id property Ungültige Verwendung einer Eigenschaft des Typs 'Id' - Incorrectly specified signal assignment - + Invalid property assignment: number expected + Ungültige Zuweisung bei Eigenschaft: Es wird eine Zahl erwartet + + Component objects cannot declare new properties. Komponentenobjekte können keine neuen Eigenschaften deklarieren. - Component objects cannot declare new signals. Komponentenobjekte können keine neuen Signale deklarieren. - Component objects cannot declare new functions. Komponentenobjekte können keine neuen Funktionen deklarieren. - Cannot assign a value to a signal (expecting a script to be run) Einem Signal können keine Werte zugewiesen werden (es wird ein Skript erwartet) - - Property has already been assigned a value Der Eigenschaft wurde bereits ein Wert zugewiesen - - Invalid grouped property access Falsche Gruppierung bei Zugriff auf Eigenschaft - Cannot assign a value directly to a grouped property Bei einer Eigenschaft, die Teil einer Gruppierung ist, ist keine direkte Wertzuweisung zulässig - Invalid property use Ungültige Verwendung von Eigenschaften - Property assignment expected Zuweisung an Eigenschaft erwartet - Single property assignment expected Einzelne Zuweisung an Eigenschaft erwartet - Unexpected object assignment Zuweisung des Objekts nicht zulässig - Cannot assign object to list Zuweisung eines Objekts an eine Liste nicht zulässig - Can only assign one binding to lists Listen kann nur eine einzige Bindung zugewiesen werden - Cannot assign primitives to lists Zuweisung eines einfachen Werts (primitive) an eine Liste nicht zulässig - Cannot assign multiple values to a script property Eine Zuweisung mehrerer Werte an eine Skript-Eigenschaft ist nicht zulässig - Invalid property assignment: script expected Ungültige Zuweisung bei Eigenschaft: Es wird ein Skript erwartet - Cannot assign object to property Zuweisung eines Objekts an eine Eigenschaft nicht zulässig - "%1" cannot operate on "%2" "%1" kann nicht auf "%2" angewandt werden - Duplicate default property Mehrfaches Auftreten der Vorgabe-Eigenschaft - Duplicate property name Mehrfaches Auftreten eines Eigenschaftsnamens - Property names cannot begin with an upper case letter Eigenschaftsnamen dürfen nicht mit einem Großbuchstaben beginnen - + Illegal property name + Ungültiger Name der Eigenschaft + + Duplicate signal name Mehrfaches Auftreten eines Signalnamens - Signal names cannot begin with an upper case letter Signalnamen dürfen nicht mit einem Großbuchstaben beginnen - Illegal signal name Ungültiger Name für Signal - Duplicate method name Mehrfaches Auftreten eines Methodennamens - Method names cannot begin with an upper case letter Methodennamen dürfen nicht mit einem Großbuchstaben beginnen - Illegal method name Ungültiger Name für Methode - Property value set multiple times Mehrfache Zuweisung eines Wertes an eine Eigenschaft - Invalid property nesting Ungültige Schachtelung von Eigenschaften - Cannot override FINAL property Eine als 'FINAL' ausgewiesene Eigenschaft kann nicht überschrieben werden - Invalid property type Ungültiger Typ der Eigenschaft - Invalid empty ID Ungültiger (leerer) Id-Wert - IDs cannot start with an uppercase letter Id-Werte dürfen nicht mit einem Großbuchstaben beginnen - IDs must start with a letter or underscore Id-Werte müssen mit einem Buchstaben oder dem Zeichen '_' beginnen - IDs must contain only letters, numbers, and underscores Id-Werte dürfen nur Buchstaben oder Unterstriche enthalten - ID illegally masks global JavaScript property Der Id-Wert überdeckt eine globale Eigenschaft aus JavaScript - - No property alias location Alias-Eigenschaft ohne Quellangabe - - Invalid alias location Ungültige Quellangabe bei Alias-Eigenschaft - Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> Ungültige Referenzierung einer Alias-Eigenschaft. Die Referenz muss in der Form <id> oder <id>.<property> angegeben werden - Invalid alias reference. Unable to find id "%1" Ungültige Referenzierung einer Alias-Eigenschaft. Der Id-Wert "%1" konnte nicht gefunden werden @@ -2114,7 +1699,6 @@ QDeclarativeComponent - Invalid empty URL Ungültige (leere) URL @@ -2122,23 +1706,18 @@ QDeclarativeCompositeTypeManager - - Resource %1 unavailable Auf die Ressource %1 konnte nicht zugegriffen werden - Namespace %1 cannot be used as a type Der Namensraum %1 kann nicht als Typangabe verwendet werden - %1 %2 %1 %2 - Type %1 unavailable Der Typ %1 ist nicht verfügbar @@ -2146,23 +1725,18 @@ QDeclarativeConnections - - Cannot assign to non-existent property "%1" Es kann keine Zuweisung erfolgen, da keine Eigenschaft des Namens '%1" existiert - Connections: nested objects not allowed Verbindungen: Verschachtelte Objekte sind nicht zulässig - Connections: syntax error Verbindungen: Syntaxfehler - Connections: script expected Verbindungen: Skript erwartet @@ -2170,33 +1744,26 @@ QDeclarativeEngine - executeSql called outside transaction() 'executeSql' wurde außerhalb von 'transaction()' aufgerufen - Read-only Transaction Schreibgeschützte Transaktion - Version mismatch: expected %1, found %2 Die Version %2 kann nicht verwendet werden; es wird %1 benötigt - SQL transaction failed Die SQL-Transaktion schlug fehl - transaction: missing callback callback fehlt bei Transaktion - - SQL: database version mismatch SQL: Die Version der Datenbank entspricht nicht der erwarteten Version @@ -2204,12 +1771,10 @@ QDeclarativeFlipable - front is a write-once property 'front' kann nur einmal zugewiesen werden - back is a write-once property 'back' kann nur einmal zugewiesen werden @@ -2217,75 +1782,58 @@ QDeclarativeImportDatabase - module "%1" definition "%2" not readable Modul "%1" Definition "%2" kann nicht gelesen werden - plugin cannot be loaded for module "%1": %2 Das Plugin des Moduls "%1" konnte nicht geladen werden: %2 - module "%1" plugin "%2" not found Modul "%1" Plugin "%2" konnte nicht gefunden werden - - module "%1" version %2.%3 is not installed Modul "%1" Version %2.%3 ist nicht installiert - module "%1" is not installed Modul "%1" ist nicht installiert - - "%1": no such directory Das Verzeichnis "%1" existiert nicht - import "%1" has no qmldir and no namespace "qmldir" und Namensraum fehlen bei dem Import "%1" - - %1 is not a namespace - %1 ist kein gültiger Namensraum - - nested namespaces not allowed - geschachtelte Namensräume sind nicht zulässig - - local directory Lokales Verzeichnis' - is ambiguous. Found in %1 and in %2 ist mehrdeutig. Es kommt in %1 und in %2 vor - is ambiguous. Found in %1 in version %2.%3 and %4.%5 ist mehrdeutig. Es kommt in %1 in den Version %2.%3 und %4.%5 vor - is instantiated recursively wird rekursiv instanziiert - is not a type ist kein Typ @@ -2293,7 +1841,6 @@ QDeclarativeKeyNavigationAttached - KeyNavigation is only available via attached properties Tastennavigation ist nur über Eigenschaften des Typs 'attached' verfügbar @@ -2301,7 +1848,6 @@ QDeclarativeKeysAttached - Keys is only available via attached properties Die Unterstützung für Tasten ist nur über Eigenschaften des Typs 'attached' verfügbar @@ -2309,59 +1855,46 @@ QDeclarativeListModel - remove: index %1 out of range remove: Der Index %1 ist außerhalb des gültigen Bereichs - insert: value is not an object insert: Der Wert ist kein Objekt - insert: index %1 out of range insert: Der Index %1 ist außerhalb des gültigen Bereichs - move: out of range move: Außerhalb des gültigen Bereichs - append: value is not an object append: Der Wert ist kein Objekt - set: value is not an object set: Der Wert ist kein Objekt - - set: index %1 out of range set: Der Index %1 ist außerhalb des gültigen Bereichs - - ListElement: cannot contain nested elements ListElement kann keine geschachtelten Elemente enthalten - ListElement: cannot use reserved "id" property ListElement: Die "id"-Eigenschaft kann nicht verwendet werden - ListElement: cannot use script for property value ListElement: Es kann kein Skript für den Wert der Eigenschaft verwendet werden - ListModel: undefined property '%1' ListModel: Die Eigenschaft '%1' ist nicht definiert @@ -2369,7 +1902,6 @@ QDeclarativeLoader - Loader does not support loading non-visual elements. Das Laden nicht-visueller Elemente ist nicht unterstützt. @@ -2377,18 +1909,14 @@ QDeclarativeParentAnimation - Unable to preserve appearance under complex transform Das Erscheinungsbild kann bei einer komplexen Transformation nicht beibehalten werden - - Unable to preserve appearance under non-uniform scale Das Erscheinungsbild kann bei einer nicht-uniformen Skalierung nicht beibehalten werden - Unable to preserve appearance under scale of 0 Das Erscheinungsbild kann bei einer Skalierung mit 0 nicht beibehalten werden @@ -2396,18 +1924,14 @@ QDeclarativeParentChange - Unable to preserve appearance under complex transform Das Erscheinungsbild kann bei einer komplexen Transformation nicht beibehalten werden - - Unable to preserve appearance under non-uniform scale Das Erscheinungsbild kann bei einer nicht-uniformen Skalierung nicht beibehalten werden - Unable to preserve appearance under scale of 0 Das Erscheinungsbild kann bei einer Skalierung mit 0 nicht beibehalten werden @@ -2415,144 +1939,110 @@ QDeclarativeParser - Illegal character Ungültiges Zeichen - Unclosed string at end of line Zeichenkette am Zeilenende nicht abgeschlossen - Illegal escape squence Ungültiges Escape-Sequenz - - - Illegal unicode escape sequence Ungültige Unicode-Escape-Sequenz - Unclosed comment at end of file Kommentar am Dateiende nicht abgeschlossen - Illegal syntax for exponential number Ungültige Syntax des Exponenten - Identifier cannot start with numeric literal Ein Bezeichner darf nicht mit einem numerischen Literal beginnen - Unterminated regular expression literal Regulärer Ausdruck nicht abgeschlossen - Invalid regular expression flag '%0' Ungültiger Modifikator '%0' bei regulärem Ausdruck - - Unterminated regular expression backslash sequence Regulärer Ausdruck nicht abgeschlossen - Unterminated regular expression class Klasse im regulären Ausdruck nicht abgeschlossen - - Syntax error Syntaxfehler - Unexpected token `%1' Unerwartetes Element '%1' - - Expected token `%1' Es wird das Element '%1' erwartet - - - Property value set multiple times Mehrfache Zuweisung eines Wertes an eine Eigenschaft - Expected type name Es wird ein Typname erwartet - Invalid import qualifier ID Ungültige Id-Angabe bei Import - Reserved name "Qt" cannot be used as an qualifier Der reservierte Name "Qt" kann nicht als Bezeichner verwendet werden - Script import qualifiers must be unique. Der für den Skript-Import angegebene Qualifizierer muss eindeutig sein. - Script import requires a qualifier Der Skript-Import erfordert die Angabe eines Qualifizierers. - Library import requires a version Der Import einer Bibliothek erfordert eine Versionsangabe - Expected parameter type Es wird eine Typangabe für den Parameter erwartet - Invalid property type modifier Ungültiger Modifikator für den Typ der Eigenschaft - Unexpected property type modifier Modifikator für den Typ der Eigenschaft an dieser Stelle nicht zulässig - Expected property type Typangabe für Eigenschaft erwartet - Readonly not yet supported 'read-only' wird an dieser Stelle noch nicht unterstützt - JavaScript declaration outside Script element Eine JavaScript-Deklaration ist außerhalb eines Skriptelementes nicht zulässig @@ -2560,39 +2050,47 @@ QDeclarativePauseAnimation - Cannot set a duration of < 0 Es kann keine Zeitdauer <0 gesetzt werden + QDeclarativePixmap + + Error decoding: %1: %2 + Fehler beim Decodieren: %1: %2 + + + Failed to get image from provider: %1 + Bilddaten konnten nicht erhalten werden: %1 + + + Cannot open: %1 + Fehlschlag beim Öffnen: %1 + + + QDeclarativePixmapCache - Error decoding: %1: %2 - Fehler beim Decodieren: %1: %2 - - - + Fehler beim Decodieren: %1: %2 + + Failed to get image from provider: %1 - Bilddaten konnten nicht erhalten werden: %1 - - - - + Bilddaten konnten nicht erhalten werden: %1 + + Cannot open: %1 - Fehlschlag beim Öffnen: %1 - - - + Fehlschlag beim Öffnen: %1 + + Unknown Error loading %1 - Unbekannter Fehler beim Laden von %1 + Unbekannter Fehler beim Laden von %1 QDeclarativePropertyAnimation - Cannot set a duration of < 0 Es kann keine Zeitdauer <0 gesetzt werden @@ -2600,17 +2098,14 @@ QDeclarativePropertyChanges - PropertyChanges does not support creating state-specific objects. Die Erzeugung von Objekten, die einem Zustand zugeordnet sind, wird von PropertyChanges nicht unterstützt. - Cannot assign to non-existent property "%1" Es kann keine Zuweisung erfolgen, da keine Eigenschaft des Namens '%1" existiert - Cannot assign to read-only property "%1" Die Eigenschaft '%1" ist schreibgeschützt und kann daher nicht zugewiesen werden @@ -2618,13 +2113,10 @@ QDeclarativeTextInput - - Could not load cursor delegate Cursor-Delegate konnte nicht geladen werden - Could not instantiate cursor delegate Cursor-Delegate konnte angelegt werden @@ -2632,47 +2124,38 @@ QDeclarativeVME - Unable to create object of type %1 Es konnte kein Objekt des Typs %1 erzeugt werden - Cannot assign value %1 to property %2 Der Wert '%1' kann nicht der Eigenschaft %2 zugewiesen werden - Cannot assign object type %1 with no default method Der Objekttyp %1 kann nicht zugewiesen werden, da keine Vorgabe-Methode existiert - Cannot connect mismatched signal/slot %1 %vs. %2 Es kann keine Verbindung zwischen dem Signal %1 und dem Slot %2 hergestellt werden, da sie nicht zusammenpassen - Cannot assign an object to signal property %1 Der Signal-Eigenschaft %1 kann kein Objekt zugewiesen werden - Cannot assign object to list Zuweisung eines Objekts an eine Liste nicht zulässig - Cannot assign object to interface property Der Eigenschaft der Schnittstelle kann kein Objekt zugewiesen werden - Unable to create attached object Es konnte kein 'attached'-Objekt erzeugt werden - Cannot set properties on %1 as it is null Es können keine Eigenschaften auf %1 gesetzt werden, da es 'null' ist @@ -2680,7 +2163,6 @@ QDeclarativeVisualDataModel - Delegate component must be Item type. Delegate-Komponente muss vom Typ 'Item' sein @@ -2688,8 +2170,6 @@ QDeclarativeXmlListModel - - Qt was built without support for xmlpatterns Diese Version der Qt-Bibliothek wurde ohne Unterstützung für xmlpatterns erstellt @@ -2697,7 +2177,6 @@ QDeclarativeXmlListModelRole - An XmlRole query must not start with '/' Eine XmlRole-Abfrage darf nicht mit '/' beginnen @@ -2705,7 +2184,6 @@ QDeclarativeXmlRoleList - An XmlListModel query must start with '/' or "//" Eine XmlListModel-Abfrage muss mit '/' oder "//" beginnen @@ -2713,17 +2191,14 @@ QDial - QDial QDial - SpeedoMeter Tachometer - SliderHandle Schieberegler @@ -2731,12 +2206,10 @@ QDialog - What's This? Direkthilfe - Done Fertig @@ -2744,124 +2217,98 @@ QDialogButtonBox - - - OK OK - Save Speichern - &Save S&peichern - Open Öffnen - Cancel Abbrechen - &Cancel &Abbrechen - Close Schließen - &Close Schl&ießen - Apply Anwenden - Reset Zurücksetzen - Help Hilfe - Don't Save Nicht speichern - Discard Verwerfen - &Yes &Ja - Yes to &All Ja, &alle - &No &Nein - N&o to All N&ein, keine - Save All Alles speichern - Abort Abbrechen - Retry Wiederholen - Ignore Ignorieren - Restore Defaults Voreinstellungen - Close without Saving Schließen ohne Speichern - &OK &OK @@ -2869,29 +2316,24 @@ QDirModel - Name Name - Size Größe - Kind Match OS X Finder Art - Type All other platforms Typ - Date Modified Änderungsdatum @@ -2899,17 +2341,14 @@ QDockWidget - Close Schließen - Dock Andocken - Float Herauslösen @@ -2917,12 +2356,10 @@ QDoubleSpinBox - More Mehr - Less Weniger @@ -2930,27 +2367,22 @@ QErrorMessage - &Show this message again Diese Meldung wieder an&zeigen - &OK &OK - Debug Message: Debug-Ausgabe: - Warning: Achtung: - Fatal Error: Fehler: @@ -2958,38 +2390,30 @@ QFile - - Destination file exists Die Zieldatei existiert bereits - Will not rename sequential file using block copy Eine sequentielle Datei kann nicht durch blockweises Kopieren umbenannt werden - Cannot remove source file Die Quelldatei kann nicht entfernt werden - Cannot open %1 for input %1 kann nicht zum Lesen geöffnet werden - Cannot open for output Das Öffnen zum Schreiben ist fehlgeschlagen - Failure to write block Der Datenblock konnte nicht geschrieben werden - Cannot create %1 for output %1 kann nicht erstellt werden @@ -2997,113 +2421,84 @@ QFileDialog - - All Files (*) Alle Dateien (*) - - Back Zurück - - List View Liste - - Detail View Details - - File Datei - Open Öffnen - Save As Speichern unter - - - &Open &Öffnen - - &Save S&peichern - Recent Places Zuletzt besucht - &Rename &Umbenennen - &Delete &Löschen - Show &hidden files &Versteckte Dateien anzeigen - New Folder Neues Verzeichnis - Find Directory Verzeichnis suchen - Directories Verzeichnisse - All Files (*.*) Alle Dateien (*.*) - - Directory: Verzeichnis: - %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. Soll sie überschrieben werden? - %1 File not found. Please verify the correct file name was given. @@ -3112,25 +2507,18 @@ Stellen Sie sicher, dass der Dateiname richtig ist. - My Computer Mein Computer - - Parent Directory Übergeordnetes Verzeichnis - - Files of type: Dateien des Typs: - - %1 Directory not found. Please verify the correct directory name was given. @@ -3139,128 +2527,100 @@ Stellen Sie sicher, dass der Verzeichnisname richtig ist. - '%1' is write protected. Do you want to delete it anyway? '%1' ist schreibgeschützt. Möchten Sie die Datei trotzdem löschen? - Are sure you want to delete '%1'? Sind Sie sicher, dass Sie '%1' löschen möchten? - Could not delete directory. Konnte Verzeichnis nicht löschen. - Drive Laufwerk - File Folder Match Windows Explorer Ordner - Folder All other platforms Order - Alias Mac OS X Finder Alias - Shortcut All other platforms Symbolischer Link - Unknown Unbekannt - Show Anzeigen - - Forward Vorwärts - &New Folder &Neues Verzeichnis - - &Choose &Auswählen - Remove Löschen - - File &name: Datei&name: - - Look in: Suchen in: - - Create New Folder Neuen Ordner erstellen - Go back Zurück - Go forward Vor - Go to the parent directory Gehe zum übergeordneten Verzeichnis - Create a New Folder Neuen Ordner erstellen - Change to list view mode Wechsle zu Listenansicht - Change to detail view mode Wechsle zu Detailansicht @@ -3268,83 +2628,64 @@ QFileSystemModel - - %1 TB %1 TB - - %1 GB %1 GB - - %1 MB %1 MB - - %1 KB %1 KB - %1 bytes %1 Byte - Invalid filename Ungültiger Dateiname - <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. <b>Der Name "%1" kann nicht verwendet werden.</b><p>Versuchen Sie, die Sonderzeichen zu entfernen oder einen kürzeren Namen zu verwenden. - Name Name - Size Größe - Kind Match OS X Finder Art - Type All other platforms Typ - Date Modified Änderungsdatum - My Computer Mein Computer - Computer Computer - %1 byte(s) %1 byte @@ -3352,221 +2693,170 @@ QFontDatabase - - Normal Normal - - - Bold Fett - - Demi Bold Halbfett - - - Black Schwarz - Demi Semi - - Light Leicht - - Italic Kursiv - - Oblique Schräggestellt - Any Alle - Latin Lateinisch - Greek Griechisch - Cyrillic Kyrillisch - Armenian Armenisch - Hebrew Hebräisch - Arabic Arabisch - Syriac Syrisch - Thaana Thaana - Devanagari Devanagari - Bengali Bengalisch - Gurmukhi Gurmukhi - Gujarati Gujarati - Oriya Oriya - Tamil Tamilisch - Telugu Telugu - Kannada Kannada - Malayalam Malayalam - Sinhala Sinhala - Thai Thailändisch - Lao Laotisch - Tibetan Tibetisch - Myanmar Myanmar - Georgian Georgisch - Khmer Khmer - Simplified Chinese Chinesisch (Kurzzeichen) - Traditional Chinese Chinesisch (Langzeichen) - Japanese Japanisch - Korean Koreanisch - Vietnamese Vietnamesisch - Symbol Symbol - Ogham Ogham - Runic Runen - N'Ko N'Ko @@ -3574,47 +2864,38 @@ QFontDialog - &Font &Schriftart - Font st&yle Schrifts&til - &Size &Größe - Effects Effekte - Stri&keout Durch&gestrichen - &Underline &Unterstrichen - Sample Beispiel - Select Font Schriftart auswählen - Wr&iting System &Schriftsystem @@ -3622,145 +2903,104 @@ QFtp - Host %1 found Rechner %1 gefunden - Host found Rechner gefunden - - - Connected to host %1 Verbunden mit Rechner %1 - Connected to host Verbindung mit Rechner besteht - Connection to %1 closed Verbindung mit %1 beendet - - - Connection closed Verbindung beendet - - Host %1 not found Rechner %1 konnte nicht gefunden werden - - Connection refused to host %1 Verbindung mit %1 verweigert - Connection timed out to host %1 Das Zeitlimit für die Verbindung zu '%1' wurde überschritten - - - - Unknown error Unbekannter Fehler - - Connecting to host failed: %1 Verbindung mit Rechner schlug fehl: %1 - - Login failed: %1 Anmeldung schlug fehl: %1 - - Listing directory failed: %1 Der Inhalt des Verzeichnisses kann nicht angezeigt werden: %1 - - Changing directory failed: %1 Ändern des Verzeichnisses schlug fehl: %1 - - Downloading file failed: %1 Herunterladen der Datei schlug fehl: %1 - - Uploading file failed: %1 Hochladen der Datei schlug fehl: %1 - - Removing file failed: %1 Löschen der Datei schlug fehl: %1 - - Creating directory failed: %1 Erstellen des Verzeichnisses schlug fehl: %1 - - Removing directory failed: %1 Löschen des Verzeichnisses schlug fehl: %1 - - Not connected Keine Verbindung - - Connection refused for data connection Verbindung für die Daten Verbindung verweigert @@ -3768,12 +3008,10 @@ QHostInfo - Unknown error Unbekannter Fehler - No host name given Es wurde kein Hostname angegeben @@ -3781,37 +3019,22 @@ QHostInfoAgent - - - - Host not found Rechner konnte nicht gefunden werden - - - - Unknown address type Unbekannter Adresstyp - - - Unknown error Unbekannter Fehler - - No host name given Es wurde kein Hostname angegeben - - Invalid hostname Ungültiger Rechnername @@ -3819,153 +3042,110 @@ QHttp - - Connection refused Verbindung verweigert - - - Host %1 not found Rechner %1 konnte nicht gefunden werden - - Wrong content length Ungültige Längenangabe - - HTTP request failed HTTP-Anfrage fehlgeschlagen - Host %1 found Rechner %1 gefunden - Host found Rechner gefunden - Connected to host %1 Verbunden mit Rechner %1 - Connected to host Verbindung mit Rechner besteht - Connection to %1 closed Verbindung mit %1 beendet - - Connection closed Verbindung beendet - - - - Unknown error Unbekannter Fehler - - Request aborted Anfrage wurde abgebrochen - - No server set to connect to Für die Verbindung wurde kein Server-Rechner angegeben - - Server closed connection unexpectedly Der Server hat die Verbindung unerwartet geschlossen - - Invalid HTTP response header Der Kopfteil der HTTP-Antwort ist ungültig - Unknown authentication method Unbekannte Authentifizierungsmethode - - - - Invalid HTTP chunked body Der Inhalt (chunked body) der HTTP-Antwort ist ungültig - Error writing response to device Beim Schreiben der Antwort auf das Ausgabegerät ist ein Fehler aufgetreten - Proxy authentication required Proxy-Authentifizierung erforderlich - Authentication required Authentifizierung erforderlich - Proxy requires authentication Der Proxy-Server verlangt eine Authentifizierung - Host requires authentication Der Hostrechner verlangt eine Authentifizierung - Data corrupted Die Daten sind verfälscht - SSL handshake failed Im Ablauf des SSL-Protokolls ist ein Fehler aufgetreten. - Unknown protocol specified Es wurde ein unbekanntes Protokoll angegeben - Connection refused (or timed out) Verbindung verweigert oder Zeitlimit überschritten - HTTPS connection requested but SSL support not compiled in Die angeforderte HTTPS-Verbindung kann nicht aufgebaut werden, da keine SSL-Unterstützung vorhanden ist @@ -3973,47 +3153,38 @@ QHttpSocketEngine - Did not receive HTTP response from proxy Keine HTTP-Antwort vom Proxy-Server - Error parsing authentication request from proxy Fehler beim Auswerten der Authentifizierungsanforderung des Proxy-Servers - Authentication required Authentifizierung erforderlich - Proxy denied connection Der Proxy-Server hat den Aufbau einer Verbindung verweigert - Error communicating with HTTP proxy Fehler bei der Kommunikation mit dem Proxy-Server - Proxy server not found Es konnte kein Proxy-Server gefunden werden - Proxy connection refused Der Proxy-Server hat den Aufbau einer Verbindung verweigert - Proxy server connection timed out Bei der Verbindung mit dem Proxy-Server wurde ein Zeitlimit überschritten - Proxy connection closed prematurely Der Proxy-Server hat die Verbindung vorzeitig beendet @@ -4021,22 +3192,18 @@ QIBaseDriver - Error opening database Die Datenbankverbindung konnte nicht geöffnet werden - Could not start transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -4044,89 +3211,70 @@ QIBaseResult - Unable to create BLOB Es konnte kein BLOB erzeugt werden - Unable to write BLOB Der BLOB konnte nicht geschrieben werden - Unable to open BLOB Der BLOB konnte nicht geöffnet werden - Unable to read BLOB Der BLOB konnte nicht gelesen werden - - Could not find array Das Feld konnte nicht gefunden werden - Could not get array data Die Daten des Feldes konnten nicht gelesen werden - Could not get query info Die erforderlichen Informationen zur Abfrage sind nicht verfügbar - Could not start transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Could not allocate statement Die Allokation des Befehls schlug fehl - Could not prepare statement Der Befehl konnte nicht initialisiert werden - - Could not describe input statement Es konnte keine Beschreibung des Eingabebefehls erhalten werden - Could not describe statement Es konnte keine Beschreibung des Befehls erhalten werden - Unable to close statement Der Befehl konnte nicht geschlossen werden - Unable to execute query Der Befehl konnte nicht ausgeführt werden - Could not fetch next item Das nächste Element konnte nicht abgeholt werden - Could not get statement info Es ist keine Information zum Befehl verfügbar @@ -4134,27 +3282,22 @@ QIODevice - Permission denied Zugriff verweigert - Too many open files Zu viele Dateien geöffnet - No such file or directory Die Datei oder das Verzeichnis konnte nicht gefunden werden - No space left on device Kein freier Speicherplatz auf dem Gerät vorhanden - Unknown error Unbekannter Fehler @@ -4162,32 +3305,26 @@ QInputContext - XIM XIM - FEP FEP - XIM input method XIM-Eingabemethode - Windows input method Windows-Eingabemethode - Mac OS X input method Mac OS X-Eingabemethode - S60 FEP input method S60-FEP-Eingabemethode @@ -4195,7 +3332,6 @@ QInputDialog - Enter a value: Geben Sie einen Wert ein: @@ -4203,67 +3339,50 @@ QLibrary - Could not mmap '%1': %2 Operation mmap fehlgeschlagen für '%1': %2 - Plugin verification data mismatch in '%1' Die Prüfdaten des Plugins '%1' stimmen nicht überein - Could not unmap '%1': %2 Operation unmap fehlgeschlagen für '%1': %2 - The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] Das Plugin '%1' verwendet eine inkompatible Qt-Bibliothek. (%2.%3.%4) [%5] - The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" Das Plugin '%1' verwendet eine inkompatible Qt-Bibliothek. Erforderlicher build-spezifischer Schlüssel "%2", erhalten "%3" - Unknown error Unbekannter Fehler - - - The shared library was not found. Die dynamische Bibliothek konnte nicht gefunden werden. - The file '%1' is not a valid Qt plugin. Die Datei '%1' ist kein gültiges Qt-Plugin. - The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) Das Plugin '%1' verwendet eine inkompatible Qt-Bibliothek. (Im Debug- bzw. Release-Modus erstellte Bibliotheken können nicht zusammen verwendet werden.) - - Cannot load library %1: %2 Die Bibliothek %1 kann nicht geladen werden: %2 - - Cannot unload library %1: %2 Die Bibliothek %1 kann nicht entladen werden: %2 - - Cannot resolve symbol "%1" in %2: %3 Das Symbol "%1" kann in %2 nicht aufgelöst werden: %3 @@ -4271,37 +3390,30 @@ QLineEdit - Select All Alles auswählen - &Undo &Rückgängig - &Redo Wieder&herstellen - Cu&t &Ausschneiden - &Copy &Kopieren - &Paste Einf&ügen - Delete Löschen @@ -4309,23 +3421,18 @@ QLocalServer - - %1: Name error %1: Fehlerhafter Name - %1: Permission denied %1: Zugriff verweigert - %1: Address in use %1: Die Adresse wird bereits verwendet - %1: Unknown error %2 %1: Unbekannter Fehler %2 @@ -4333,70 +3440,46 @@ QLocalSocket - - %1: Connection refused %1: Der Verbindungsaufbau wurde verweigert - - %1: Remote closed %1: Die Verbindung wurde von der Gegenseite geschlossen - - - - %1: Invalid name %1: Ungültiger Name - - %1: Socket access error %1: Fehler beim Zugriff auf den Socket - - %1: Socket resource error %1: Socket-Fehler (Ressourcenproblem) - - %1: Socket operation timed out %1: Zeitüberschreitung bei Socket-Operation - - %1: Datagram too large %1: Das Datagramm ist zu groß - - - %1: Connection error %1: Verbindungsfehler - - %1: The socket operation is not supported %1: Diese Socket-Operation wird nicht unterstützt - %1: Unknown error %1: Unbekannter Fehler - - %1: Unknown error %2 %1: Unbekannter Fehler %2 @@ -4404,27 +3487,22 @@ QMYSQLDriver - Unable to open database ' Die Datenbankverbindung kann nicht geöffnet werden ' - Unable to connect Es kann keine Verbindung aufgebaut werden - Unable to begin transaction Es kann keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion kann nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion kann nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -4432,60 +3510,46 @@ QMYSQLResult - - Unable to fetch data Es konnten keine Daten abgeholt werden - Unable to execute query Die Abfrage konnte nicht ausgeführt werden - Unable to store result Das Ergebnis konnte nicht gespeichert werden - - Unable to prepare statement Der Befehl konnte nicht initialisiert werden - Unable to reset statement Der Befehl konnte nicht zurückgesetzt werden - Unable to bind value Der Wert konnte nicht gebunden werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden - - Unable to bind outvalues Die Ausgabewerte konnten nicht gebunden werden - Unable to store statement results Die Ergebnisse des Befehls konnten nicht gespeichert werden - Unable to execute next query Die folgende Abfrage kann nicht ausgeführt werden - Unable to store next result Das folgende Ergebnis kann nicht gespeichert werden @@ -4493,7 +3557,6 @@ QMdiArea - (Untitled) (Unbenannt) @@ -4501,92 +3564,74 @@ QMdiSubWindow - %1 - [%2] %1 - [%2] - Close Schließen - Minimize Minimieren - Restore Down Wiederherstellen - &Restore Wieder&herstellen - &Move Ver&schieben - &Size Größe ä&ndern - Mi&nimize M&inimieren - Ma&ximize Ma&ximieren - Stay on &Top Im &Vordergrund bleiben - &Close Schl&ießen - Maximize Maximieren - Unshade Herabrollen - Shade Aufrollen - Restore Wiederherstellen - Help Hilfe - Menu Menü - - [%1] - [%1] @@ -4594,21 +3639,14 @@ QMenu - - Close Schließen - - Open Öffnen - - - Execute Ausführen @@ -4616,7 +3654,6 @@ QMenuBar - Actions Optionen @@ -4624,40 +3661,30 @@ QMessageBox - - - - OK OK - <h3>About Qt</h3><p>This program uses Qt version %1.</p> - <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - About Qt Über Qt - Help Hilfe - Show Details... Details einblenden... - Hide Details... Details ausblenden... @@ -4665,7 +3692,6 @@ QMultiInputContext - Select IM Eingabemethode auswählen @@ -4673,12 +3699,10 @@ QMultiInputContextPlugin - Multiple input method switcher Umschalter für Eingabemethoden - Multiple input method switcher that uses the context menu of the text widgets Mehrfachumschalter für Eingabemethoden, der das Kontextmenü des Text-Widgets verwendet @@ -4686,132 +3710,106 @@ QNativeSocketEngine - The remote host closed the connection Der entfernte Rechner hat die Verbindung geschlossen - Network operation timed out Das Zeitlimit für die Operation wurde überschritten - Out of resources Keine Ressourcen verfügbar - Unsupported socket operation Socket-Kommando nicht unterstützt - Protocol type not supported Das Protokoll wird nicht unterstützt - Invalid socket descriptor Ungültiger Socket-Deskriptor - Network unreachable Das Netzwerk ist nicht erreichbar - Permission denied Zugriff verweigert - Connection timed out Das Zeitlimit für die Verbindung wurde überschritten - Connection refused Verbindung verweigert - The bound address is already in use Die angegebene Adresse ist bereits in Gebrauch - The address is not available Die Adresse ist nicht verfügbar - The address is protected Die Adresse ist geschützt - Unable to send a message Die Nachricht konnte nicht gesendet werden - Unable to receive a message Die Nachricht konnte nicht empfangen werden - Unable to write Der Schreibvorgang konnte nicht ausgeführt werden - Network error Netzwerkfehler - Another socket is already listening on the same port Auf diesem Port hört bereits ein anderer Socket - Unable to initialize non-blocking socket Der nichtblockierende Socket konnte nicht initialisiert werden - Unable to initialize broadcast socket Der Broadcast-Socket konnte nicht initialisiert werden - Attempt to use IPv6 socket on a platform with no IPv6 support Es wurde versucht, einen IPv6-Socket auf einem System ohne IPv6-Unterstützung zu verwenden - Host unreachable Der Zielrechner kann nicht erreicht werden - Datagram was too large to send Das Datagram konnte nicht gesendet werden, weil es zu groß ist - Operation on non-socket Operation kann nur auf einen Socket angewandt werden - Unknown error Unbekannter Fehler - The proxy type is invalid for this operation Die Operation kann mit dem Proxy-Typ nicht durchgeführt werden @@ -4819,7 +3817,6 @@ QNetworkAccessCacheBackend - Error opening %1 %1 konnte nicht geöffnet werden @@ -4827,12 +3824,10 @@ QNetworkAccessDataBackend - Operation not supported on %1 Diese Operation wird von %1 nicht unterstützt - Invalid URI: %1 Ungültiger URI: %1 @@ -4840,17 +3835,14 @@ QNetworkAccessDebugPipeBackend - Write error writing to %1: %2 Fehler beim Schreiben zu %1: %2 - Socket error on %1: %2 Socket-Fehler bei %1: %2 - Remote host closed the connection prematurely on %1 Der entfernte Rechner hat die Verbindung zu %1 vorzeitig beendet @@ -4858,30 +3850,22 @@ QNetworkAccessFileBackend - - Request for opening non-local file %1 Anforderung zum Öffnen einer Datei über Netzwerk %1 - - Error opening %1: %2 %1 konnte nicht geöffnet werden: %2 - Write error writing to %1: %2 Fehler beim Schreiben zur Datei %1: %2 - - Cannot open %1: Path is a directory %1 kann nicht geöffnet werden: Der Pfad spezifiziert ein Verzeichnis - Read error reading from %1: %2 Beim Lesen von der Datei %1 trat ein Fehler auf: %2 @@ -4889,27 +3873,22 @@ QNetworkAccessFtpBackend - No suitable proxy found Es konnte kein geeigneter Proxy-Server gefunden werden - Cannot open %1: is a directory %1 kann nicht geöffnet werden: Es handelt sich um ein Verzeichnis - Logging in to %1 failed: authentication required Die Anmeldung bei %1 schlug fehl: Es ist eine Authentifizierung erforderlich - Error while downloading %1: %2 Beim Herunterladen von %1 trat ein Fehler auf: %2 - Error while uploading %1: %2 Beim Hochladen von %1 trat ein Fehler auf: %2 @@ -4917,7 +3896,6 @@ QNetworkAccessHttpBackend - No suitable proxy found Es konnte kein geeigneter Proxy-Server gefunden werden @@ -4925,7 +3903,6 @@ QNetworkAccessManager - Network access is disabled. Der Zugriff auf das Netzwerk ist nicht gestattet. @@ -4933,22 +3910,18 @@ QNetworkReply - Error downloading %1 - server replied: %2 Beim Herunterladen von %1 trat ein Fehler auf - Die Antwort des Servers ist: %2 - Protocol "%1" is unknown Das Protokoll "%1" ist unbekannt - Network session error. Fehler bei Netzwerkverbindung. - Temporary network failure. Das Netzwerk ist zur Zeit ausgefallen. @@ -4956,8 +3929,6 @@ QNetworkReplyImpl - - Operation canceled Operation abgebrochen @@ -4965,7 +3936,6 @@ QNetworkSession - Invalid configuration. Ungültige Konfiguration. @@ -4973,47 +3943,34 @@ QNetworkSessionPrivateImpl - - Unknown session error. Unbekannter Fehler bei Netzwerkverbindung. - - The session was aborted by the user or system. Die Verbindung wurde vom Nutzer oder vom Betriebssystem unterbrochen. - - The requested operation is not supported by the system. Die angeforderte Operation wird vom System nicht unterstützt. - - The specified configuration cannot be used. Die angegebene Konfiguration kann nicht verwendet werden. - - Roaming was aborted or is not possible. Das Roaming wurde abgebrochen oder ist hier nicht möglich. - Roaming error Fehler beim Roaming - Session aborted by user or system Die Verbindung wurde vom Nutzer oder vom Betriebssystem unterbrochen - Unidentified Error Unbekannter Fehler @@ -5021,28 +3978,23 @@ QOCIDriver - Unable to logon Logon-Vorgang fehlgeschlagen - Unable to initialize QOCIDriver Initialisierung fehlgeschlagen - Unable to begin transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -5050,44 +4002,34 @@ QOCIResult - - - Unable to bind column for batch execute Die Spalte konnte nicht für den Stapelverarbeitungs-Befehl gebunden werden - Unable to execute batch statement Der Stapelverarbeitungs-Befehl konnte nicht ausgeführt werden - Unable to goto next Kann nicht zum nächsten Element gehen - Unable to alloc statement Die Allokation des Befehls schlug fehl - Unable to prepare statement Der Befehl konnte nicht initialisiert werden - Unable to get statement type Der Anweisungstyp kann nicht bestimmt werden - Unable to bind value Der Wert konnte nicht gebunden werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -5095,32 +4037,26 @@ QODBCDriver - Unable to connect Es kann keine Verbindung aufgebaut werden - Unable to disable autocommit 'autocommit' konnte nicht deaktiviert werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) - Unable to enable autocommit 'autocommit' konnte nicht aktiviert werden - Unable to connect - Driver doesn't support all functionality required Es kann keine Verbindung aufgebaut werden weil der Treiber die benötigte Funktionalität nicht vollständig unterstützt @@ -5128,51 +4064,38 @@ QODBCResult - - QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: 'SQL_CURSOR_STATIC' konnte nicht als Attribut des Befehls gesetzt werden. Bitte prüfen Sie die Konfiguration Ihres ODBC-Treibers - - Unable to execute statement Der Befehl konnte nicht ausgeführt werden - Unable to fetch next Der nächste Datensatz konnte nicht abgeholt werden - Unable to prepare statement Der Befehl konnte nicht initialisiert werden - Unable to bind variable Die Variable konnte nicht gebunden werden - - - Unable to fetch last Der letzte Datensatz konnte nicht abgeholt werden - Unable to fetch Es konnten keine Daten abgeholt werden - Unable to fetch first Der erste Datensatz konnte nicht abgeholt werden - Unable to fetch previous Der vorangegangene Datensatz kann nicht abgeholt werden @@ -5180,19 +4103,14 @@ QObject - "%1" duplicates a previous role name and will be disabled. "%1" ist bereits als Name einer Rolle vergeben und wird daher deaktiviert. - - invalid query: "%1" Ungültige Abfrage: "%1" - - PulseAudio Sound Server PulseAudio Sound Server @@ -5200,12 +4118,10 @@ QPPDOptionsModel - Name Name - Value Wert @@ -5213,32 +4129,26 @@ QPSQLDriver - Unable to connect Es kann keine Verbindung aufgebaut werden - Could not begin transaction Es konnte keine Transaktion gestartet werden - Could not commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Could not rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) - Unable to subscribe Die Registrierung schlug fehl - Unable to unsubscribe Die Registrierung konnte nicht aufgehoben werden @@ -5246,12 +4156,10 @@ QPSQLResult - Unable to create query Es konnte keine Abfrage erzeugt werden - Unable to prepare statement Der Befehl konnte nicht initialisiert werden @@ -5259,102 +4167,82 @@ QPageSetupWidget - Centimeters (cm) Zentimeter (cm) - Millimeters (mm) Millimeter (mm) - Inches (in) Zoll (in) - Points (pt) Punkte (pt) - Form Formular - Paper Papier - Page size: Seitengröße: - Width: Breite: - Height: Höhe: - Paper source: Papierquelle: - Orientation Ausrichtung - Portrait Hochformat - Landscape Querformat - Reverse landscape Umgekehrtes Querformat - Reverse portrait Umgekehrtes Hochformat - Margins Ränder - top margin Oberer Rand - left margin Linker Rand - right margin Rechter Rand - bottom margin Unterer Rand @@ -5362,12 +4250,10 @@ QPluginLoader - Unknown error Unbekannter Fehler - The plugin was not loaded. Das Plugin wurde nicht geladen. @@ -5375,433 +4261,344 @@ QPrintDialog - locally connected direkt verbunden - - Aliases: %1 Alias: %1 - - unknown unbekannt - OK OK - Print all Alles drucken - Print range Bereich drucken - A0 (841 x 1189 mm) A0 (841 x 1189 mm) - A1 (594 x 841 mm) A1 (594 x 841 mm) - A2 (420 x 594 mm) A2 (420 x 594 mm) - A3 (297 x 420 mm) A3 (297 x 420 mm) - A5 (148 x 210 mm) A5 (148 x 210 mm) - A6 (105 x 148 mm) A6 (105 x 148 mm) - A7 (74 x 105 mm) A7 (74 x 105 mm) - A8 (52 x 74 mm) A8 (52 x 74 mm) - A9 (37 x 52 mm) A9 (37 x 52 mm) - B0 (1000 x 1414 mm) B0 (1000 x 1414 mm) - B1 (707 x 1000 mm) B1 (707 x 1000 mm) - B2 (500 x 707 mm) B2 (500 x 707 mm) - B3 (353 x 500 mm) B3 (353 x 500 mm) - B4 (250 x 353 mm) B4 (250 x 353 mm) - B6 (125 x 176 mm) B6 (125 x 176 mm) - B7 (88 x 125 mm) B7 (88 x 125 mm) - B8 (62 x 88 mm) B8 (62 x 88 mm) - B9 (44 x 62 mm) B9 (44 x 62 mm) - B10 (31 x 44 mm) B10 (31 x 44 mm) - C5E (163 x 229 mm) C5E (163 x 229 mm) - DLE (110 x 220 mm) DLE (110 x 220 mm) - Folio (210 x 330 mm) Folio (210 x 330 mm) - Ledger (432 x 279 mm) Ledger (432 x 279 mm) - Tabloid (279 x 432 mm) Tabloid (279 x 432 mm) - US Common #10 Envelope (105 x 241 mm) US Common #10 Envelope (105 x 241 mm) - Print current page Diese Seite drucken - A4 (210 x 297 mm, 8.26 x 11.7 inches) A4 (210 x 297 mm) - B5 (176 x 250 mm, 6.93 x 9.84 inches) B5 (176 x 250 mm) - Executive (7.5 x 10 inches, 191 x 254 mm) Executive (7,5 x 10 Zoll, 191 x 254 mm) - Legal (8.5 x 14 inches, 216 x 356 mm) Legal (8,5 x 14 Zoll, 216 x 356 mm) - Letter (8.5 x 11 inches, 216 x 279 mm) Letter (8,5 x 11 Zoll, 216 x 279 mm) - Print selection Auswahl drucken - - - Print Drucken - Print To File ... In Datei drucken ... - File %1 is not writable. Please choose a different file name. Die Datei %1 ist schreibgeschützt. Bitte wählen Sie einen anderen Dateinamen. - %1 already exists. Do you want to overwrite it? Die Datei %1 existiert bereits. Soll sie überschrieben werden? - File exists Die Datei existiert bereits - <qt>Do you want to overwrite it?</qt> <qt>Soll sie überschrieben werden?</qt> - %1 is a directory. Please choose a different file name. %1 ist ein Verzeichnis. Bitte wählen Sie einen anderen Dateinamen. - The 'From' value cannot be greater than the 'To' value. Die Angabe für die erste Seite darf nicht größer sein als die für die letzte Seite. - A0 A0 - A1 A1 - A2 A2 - A3 A3 - A4 A4 - A5 A5 - A6 A6 - A7 A7 - A8 A8 - A9 A9 - B0 B0 - B1 B1 - B2 B2 - B3 B3 - B4 B4 - B5 B5 - B6 B6 - B7 B7 - B8 B8 - B9 B9 - B10 B10 - C5E C5E - DLE DLE - Executive Executive - Folio Folio - Ledger Ledger - Legal Legal - Letter Letter - Tabloid Tabloid - US Common #10 Envelope US Common #10 Envelope - Custom Benutzerdefiniert - - &Options >> &Einstellungen >> - &Options << &Einstellungen << - Print to File (PDF) In PDF-Datei drucken - Print to File (Postscript) In Postscript-Datei drucken - Local file Lokale Datei - Write %1 file Schreiben der Datei %1 - &Print &Drucken @@ -5809,108 +4606,86 @@ QPrintPreviewDialog - %1% %1% - Print Preview Druckvorschau - Next page Nächste Seite - Previous page Vorige Seite - First page Erste Seite - Last page Letzte Seite - Fit width Breite anpassen - Fit page Seite anpassen - Zoom in Vergrößern - Zoom out Verkleinern - Portrait Hochformat - Landscape Querformat - Show single page Einzelne Seite anzeigen - Show facing pages Gegenüberliegende Seiten anzeigen - Show overview of all pages Übersicht aller Seiten - Print Drucken - Page setup Seite einrichten - Close Schließen - Export to PDF PDF exportieren - Export to PostScript PostScript exportieren - - Page Setup Seite einrichten @@ -5918,17 +4693,14 @@ QPrintPropertiesWidget - Form Formular - Page Seite - Advanced Erweitert @@ -5936,102 +4708,82 @@ QPrintSettingsOutput - Form Formular - Copies Anzahl Exemplare - Print range Bereich drucken - Print all Alles drucken - Pages from Seiten von - to bis - Selection Auswahl - Output Settings Ausgabeeinstellungen - Copies: Anzahl Exemplare: - Collate Sortieren - Reverse Umgekehrt - Options Optionen - Color Mode Farbmodus - Color Farbe - Grayscale Graustufen - Duplex Printing Duplexdruck - None Kein - Long side Lange Seite - Short side Kurze Seite - Current Page @@ -6039,47 +4791,38 @@ QPrintWidget - Form Formular - Printer Drucker - &Name: &Name: - P&roperties &Eigenschaften - Location: Standort: - Preview Vorschau - Type: Typ: - Output &file: Ausgabe&datei: - ... ... @@ -6087,62 +4830,38 @@ QProcess - - Could not open input redirection for reading Die Eingabeumleitung konnte nicht zum Lesen geöffnet werden - - Could not open output redirection for writing Die Ausgabeumleitung konnte nicht zum Lesen geöffnet werden - Resource error (fork failure): %1 Ressourcenproblem ("fork failure"): %1 - - - - - - - - - Process operation timed out Zeitüberschreitung - - - - Error reading from process Das Lesen vom Prozess schlug fehl - - - Error writing to process Das Schreiben zum Prozess schlug fehl - Process crashed Der Prozess ist abgestürzt - No program defined Es wurde kein Programm angegeben - Process failed to start: %1 Das Starten des Prozesses schlug fehl: %1 @@ -6150,7 +4869,6 @@ QProgressDialog - Cancel Abbrechen @@ -6158,7 +4876,6 @@ QPushButton - Open Öffnen @@ -6166,7 +4883,6 @@ QRadioButton - Check Ankreuzen @@ -6174,57 +4890,46 @@ QRegExp - no error occurred kein Fehler - disabled feature used deaktivierte Eigenschaft wurde benutzt - bad char class syntax falsche Syntax für Zeichenklasse - bad lookahead syntax falsche Syntax für Lookahead - bad repetition syntax falsche Syntax für Wiederholungen - invalid octal value ungültiger Oktal-Wert - missing left delim fehlende linke Begrenzung - unexpected end unerwartetes Ende - met internal limit internes Limit erreicht - invalid interval ungültiges Intervall - invalid category ungültige Kategorie @@ -6232,22 +4937,18 @@ QSQLite2Driver - Error opening database Die Datenbankverbindung konnte nicht geöffnet werden - Unable to begin transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion kann nicht rückgängig gemacht werden @@ -6255,12 +4956,10 @@ QSQLite2Result - Unable to fetch results Das Ergebnis konnte nicht abgeholt werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -6268,27 +4967,22 @@ QSQLiteDriver - Error opening database Die Datenbankverbindung konnte nicht geöffnet werden - Error closing database Die Datenbankverbindung konnte nicht geschlossen werden - Unable to begin transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -6296,34 +4990,26 @@ QSQLiteResult - - - Unable to fetch row Der Datensatz konnte nicht abgeholt werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden - Unable to reset statement Der Befehl konnte nicht zurückgesetzt werden - Unable to bind parameters Die Parameter konnte nicht gebunden werden - Parameter count mismatch Die Anzahl der Parameter ist falsch - No query Kein Abfrage @@ -6331,32 +5017,26 @@ QScriptBreakpointsModel - ID ID - Location Stelle - Condition Bedingung - Ignore-count Auslösen nach - Single-shot Einmal auslösen - Hit-count Ausgelöst @@ -6364,12 +5044,10 @@ QScriptBreakpointsWidget - New Neu - Delete Löschen @@ -6377,143 +5055,114 @@ QScriptDebugger - - Go to Line Gehe zu Zeile - Line: Zeile: - Interrupt Unterbrechen - Shift+F5 Shift+F5 - Continue Weiter - F5 F5 - Step Into Einzelschritt herein - F11 F11 - Step Over Einzelschritt über - F10 F10 - Step Out Einzelschritt heraus - Shift+F11 Shift+F11 - Run to Cursor Bis Cursor ausführen - Ctrl+F10 Ctrl+F10 - Run to New Script Bis zu neuem Skript ausführen - Toggle Breakpoint Haltepunkt umschalten - F9 F9 - Clear Debug Output Debug-Ausgabe löschen - Clear Error Log Fehlerausgabe löschen - Clear Console Konsole löschen - &Find in Script... &Suche im Skript... - Ctrl+F Ctrl+F - Find &Next &Nächste Fundstelle - F3 F3 - Find &Previous Vorhergehende Fundstelle - Shift+F3 Shift+F3 - Ctrl+G Ctrl+G - Debug Debuggen @@ -6521,32 +5170,26 @@ QScriptDebuggerCodeFinderWidget - Close Schließen - Previous Vorige - Next Nächste - Case Sensitive Groß/Kleinschreibung beachten - Whole words Ganze Worte - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Die Suche hat das Ende erreicht @@ -6554,12 +5197,10 @@ QScriptDebuggerLocalsModel - Name Name - Value Wert @@ -6567,17 +5208,14 @@ QScriptDebuggerStackModel - Level Ebene - Name Name - Location Stelle @@ -6585,22 +5223,18 @@ QScriptEdit - Toggle Breakpoint Haltepunkt umschalten - Disable Breakpoint Haltepunkt deaktivieren - Enable Breakpoint Haltepunkt aktivieren - Breakpoint Condition: Bedingung: @@ -6608,52 +5242,42 @@ QScriptEngineDebugger - Loaded Scripts Geladene Skripte - Breakpoints Haltepunkte - Stack Stapel - Locals Lokale Variablen - Console Konsole - Debug Output Debug-Ausgabe - Error Log Fehlerausgabe - Search Suche - View Ansicht - Qt Script Debugger Qt Script Debugger @@ -6661,7 +5285,6 @@ QScriptNewBreakpointWidget - Close Schließen @@ -6669,84 +5292,66 @@ QScrollBar - Scroll here Hierher scrollen - Left edge Linker Rand - Top Anfang - Right edge Rechter Rand - Bottom Ende - Page left Eine Seite nach links - - Page up Eine Seite nach oben - Page right Eine Seite nach rechts - - Page down Eine Seite nach unten - Scroll left Nach links scrollen - Scroll up Nach oben scrollen - Scroll right Nach rechts scrollen - Scroll down Nach unten scrollen - Line up Ausrichten - Position Position - Line down Eine Zeile nach unten @@ -6754,111 +5359,78 @@ QSharedMemory - %1: create size is less then 0 %1: Die Größenangabe für die Erzeugung ist kleiner als Null - - %1: unable to lock %1: Sperrung fehlgeschlagen - %1: unable to unlock %1: Die Sperrung konnte nicht aufgehoben werden - - - %1: permission denied %1: Zugriff verweigert - - - %1: already exists %1: existiert bereits - %1: doesn't exists %1: existiert nicht - - - %1: out of resources %1: Keine Ressourcen mehr verfügbar - - - %1: unknown error %2 %1: Unbekannter Fehler %2 - %1: key is empty %1: Ungültige Schlüsselangabe (leer) - %1: ftok failed %1: ftok-Aufruf schlug fehl - - - %1: unable to make key %1: Es kann kein Schlüssel erzeugt werden - - %1: doesn't exist %1: existiert nicht - %1: UNIX key file doesn't exist %1: Die Unix-Schlüsseldatei existiert nicht - %1: system-imposed size restrictions %1: Ein systembedingtes Limit der Größe wurde erreicht - %1: not attached %1: nicht verbunden - - %1: invalid size %1: Ungültige Größe - - %1: key error %1: Fehlerhafter Schlüssel - %1: size query failed %1: Die Abfrage der Größe schlug fehl - %1: unable to set key on lock %1: Es kann kein Schlüssel für die Sperrung gesetzt werden @@ -6866,1095 +5438,884 @@ QShortcut - Space This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. Leertaste - Esc Esc - Tab Tab - Backtab Rück-Tab - Backspace Rücktaste - Return Return - Enter Enter - Ins Einfg - Del Entf - Pause Pause - Print Druck - SysReq SysReq - Home Pos1 - End Ende - Left Links - Up Hoch - Right Rechts - Down Runter - PgUp Bild aufwärts - PgDown Bild abwärts - CapsLock Feststelltaste - NumLock Zahlen-Feststelltaste - ScrollLock Rollen-Feststelltaste - Menu Menü - Help Hilfe - Back Zurück - Forward Vorwärts - Stop Abbrechen - Refresh Aktualisieren - Volume Down Lautstärke - - Volume Mute Ton aus - Volume Up Lautstärke + - Bass Boost Bass-Boost - Bass Up Bass + - Bass Down Bass - - Treble Up Höhen + - Treble Down Höhen - - Media Play Wiedergabe - Media Stop Stopp - Media Previous Vorheriger - Media Next Nächster - Media Record Aufzeichnen - + Media Pause + Media player pause button + Pause + + + Toggle Media Play/Pause + Media player button to toggle between playing and paused + Pause + + Favorites Favoriten - Search Suchen - Standby Standby - Open URL URL öffnen - Launch Mail Mail starten - Launch Media Medienspieler starten - Launch (0) (0) starten - Launch (1) (1) starten - Launch (2) (2) starten - Launch (3) (3) starten - Launch (4) (4) starten - Launch (5) (5) starten - Launch (6) (6) starten - Launch (7) (7) starten - Launch (8) (8) starten - Launch (9) (9) starten - Launch (A) (A) starten - Launch (B) (B) starten - Launch (C) (C) starten - Launch (D) (D) starten - Launch (E) (E) starten - Launch (F) (F) starten - Monitor Brightness Up Monitor heller - Monitor Brightness Down Monitor dunkler - Keyboard Light On/Off Tastaturbeleuchtung Ein/Aus - Keyboard Brightness Up Tastaturbeleuchtung heller - Keyboard Brightness Down Tastaturbeleuchtung dunkler - Power Off Ausschalten - Wake Up Aufwecken - Eject Auswerfen - Screensaver Bildschirmschoner - WWW Internet - Sleep Schlafmodus - LightBulb Beleuchtung - Shop Shop - History Verlauf - Add Favorite Lesezeichen hinzufügen - Hot Links Empfohlene Verweise - Adjust Brightness Helligkeit einstellen - Finance Finanzen - Community Community - Audio Rewind Audio rückspulen - Back Forward Hinterstes nach vorn - Application Left Anwendung links - Application Right Anwendung rechts - Book Buch - CD CD - Calculator Rechner - Clear Löschen - Clear Grab Zugriff löschen - Close Schließen - Copy Kopieren - Cut Ausschneiden - Display Anzeigen - DOS DOS - Documents Dokumente - Spreadsheet Spreadsheet - Browser Browser - Game Spiel - Go Los - iTouch iTouch - Logoff Logoff - Market Markt - Meeting Versammlung - Keyboard Menu Tastaturmenü - Menu PB Menü PB - My Sites Meine Orte - News Nachrichten - Home Office Home Office - Option Option - Paste Einfügen - Phone Telefon - Reply Antworten - Reload Neu laden - Rotate Windows Fenster rotieren - Rotation PB Rotation PB - Rotation KB Rotation KB - Save Speichern - Send Senden - Spellchecker Rechtschreibprüfung - Split Screen Bildschirm teilen - Support Hilfe - Task Panel Task-Leiste - Terminal Terminal - Tools Werkzeuge - Travel Reise - Video Video - Word Processor Textverarbeitung - XFer XFer - Zoom In Vergrößern - Zoom Out Verkleinern - Away Abwesend - Messenger Messenger - WebCam WebCam - Mail Forward Weiterleitung - Pictures Bilder - Music Musik - Battery Batterie - Bluetooth Bluetooth - Wireless Drahtlos - Ultra Wide Band Ultra Wide Band - Audio Forward Audio vorspulen - Audio Repeat Audio wiederholen - Audio Random Play Audio zufällige Auswahl spielen - Subtitle Untertitel - Audio Cycle Track Audiospur wechseln - Time Zeit - View Ansicht - Top Menu Hauptmenü - Suspend Pause - Hibernate Hibernate - Print Screen Bildschirm drucken - Page Up Bild aufwärts - Page Down Bild abwärts - Caps Lock Feststelltaste - Num Lock Zahlen-Feststelltaste - Number Lock Zahlen-Feststelltaste - Scroll Lock Rollen-Feststelltaste - Insert Einfügen - Delete Löschen - Escape Escape - System Request System Request - - Select Auswählen - Yes Ja - No Nein - Context1 Kontext1 - Context2 Kontext2 - Context3 Kontext3 - Context4 Kontext4 - Call Button to start a call (note: a separate button is used to end the call) Anruf - Hangup Button to end a call (note: a separate button is used to start the call) Auflegen - Toggle Call/Hangup Button that will hang up if we're in call, or make a call if we're not. Anrufen/Aufhängen - Flip Umdrehen - Voice Dial Button to trigger voice dialling Sprachwahl - Last Number Redial Button to redial the last number called Wahlwiederholung - Camera Shutter Button to trigger the camera shutter (take a picture) Auslöser - Camera Focus Button to focus the camera Scharfstellen - Kanji Kanji - Muhenkan Muhenkan - Henkan Henkan - Romaji Romaji - Hiragana Hiragana - Katakana Katakana - Hiragana Katakana Hiragana Katakana - Zenkaku Zenkaku - Hankaku Hankaku - Zenkaku Hankaku Zenkaku Hankaku - Touroku Touroku - Massyo Massyo - Kana Lock Kana Lock - Kana Shift Kana Shift - Eisu Shift Eisu Shift - Eisu toggle Eisu toggle - Code input Code-Eingabe - Multiple Candidate Mehrere Vorschläge - Previous Candidate Vorangegangener Vorschlag - Hangul Hangul - Hangul Start Hangul Anfang - Hangul End Hangul Ende - Hangul Hanja Hangul Hanja - Hangul Jamo Hangul Jamo - Hangul Romaja Hangul Romaja - Hangul Jeonja Hangul Jeonja - Hangul Banja Hangul Banja - Hangul PreHanja Hangul PreHanja - Hangul PostHanja Hangul PostHanja - Hangul Special Hangul Special - - Ctrl Strg - - Shift Umschalt - - Alt Alt - - Meta Meta - + + - F%1 F%1 - Home Page Startseite @@ -7962,27 +6323,22 @@ QSlider - Page left Eine Seite nach links - Page up Eine Seite nach oben - Position Position - Page right Eine Seite nach rechts - Page down Eine Seite nach unten @@ -7990,72 +6346,58 @@ QSocks5SocketEngine - Connection to proxy refused Der Proxy-Server hat den Aufbau einer Verbindung verweigert - Connection to proxy closed prematurely Der Proxy-Server hat die Verbindung vorzeitig beendet - Proxy host not found Der Proxy-Server konnte nicht gefunden werden - Connection to proxy timed out Bei der Verbindung mit dem Proxy-Server wurde ein Zeitlimit überschritten - Proxy authentication failed Die Authentifizierung beim Proxy-Server schlug fehl - Proxy authentication failed: %1 Die Authentifizierung beim Proxy-Server schlug fehl: %1 - SOCKS version 5 protocol error Protokoll-Fehler (SOCKS version 5) - General SOCKSv5 server failure Allgemeiner Fehler bei der Kommunikation mit dem SOCKSv5-Server - Connection not allowed by SOCKSv5 server Der SOCKSv5-Server hat die Verbindung verweigert - TTL expired TTL verstrichen - SOCKSv5 command not supported Dieses SOCKSv5-Kommando wird nicht unterstützt - Address type not supported Dieser Adresstyp wird nicht unterstützt - Unknown SOCKSv5 proxy error code 0x%1 Unbekannten Fehlercode vom SOCKSv5-Proxy-Server erhalten: 0x%1 - Network operation timed out Das Zeitlimit für die Operation wurde überschritten @@ -8063,32 +6405,26 @@ QSoftKeyManager - Ok Ok - Select Auswählen - Done Fertig - Options Optionen - Cancel Abbrechen - Exit Beenden @@ -8096,12 +6432,10 @@ QSpinBox - More Mehr - Less Weniger @@ -8109,56 +6443,42 @@ QSql - Delete Löschen - Delete this record? Diesen Datensatz löschen? - - - Yes Ja - - - No Nein - Insert Einfügen - Update Aktualisieren - Save edits? Änderungen speichern? - Cancel Abbrechen - Confirm Bestätigen - Cancel your edits? Änderungen verwerfen? @@ -8166,177 +6486,142 @@ QSslSocket - Unable to write data: %1 Die Daten konnten nicht geschrieben werden: %1 - Unable to decrypt data: %1 Die Daten konnten nicht entschlüsselt werden: %1 - Error while reading: %1 Beim Lesen ist ein Fehler aufgetreten: %1 - Error during SSL handshake: %1 Im Ablauf des SSL-Protokolls ist ein Fehler aufgetreten: %1 - Error creating SSL context (%1) Es konnte keine SSL-Kontextstruktur erzeugt werden (%1) - Invalid or empty cipher list (%1) Ungültige oder leere Schlüsselliste (%1) - Private key does not certify public key, %1 Der private Schlüssel passt nicht zum öffentlichen Schlüssel, %1 - Error creating SSL session, %1 Es konnte keine SSL-Sitzung erzeugt werden, %1 - Error creating SSL session: %1 Es konnte keine SSL-Sitzung erzeugt werden: %1 - Cannot provide a certificate with no key, %1 Ohne Schlüssel kann kein Zertifikat zur Verfügung gestellt werden, %1 - Error loading local certificate, %1 Das lokale Zertifikat konnte nicht geladen werden, %1 - Error loading private key, %1 Der private Schlüssel konnte nicht geladen werden, %1 - No error Kein Fehler - The issuer certificate could not be found Das Zertifikat des Ausstellers konnte nicht gefunden werden - The certificate signature could not be decrypted Die Signatur des Zertifikats konnte nicht entschlüsselt werden - The public key in the certificate could not be read Der öffentliche Schlüssel konnte nicht gelesen werden - The signature of the certificate is invalid Die Signatur des Zertifikats ist ungültig - The certificate is not yet valid Das Zertifikat ist noch nicht gültig - The certificate has expired Die Gültigkeit des Zertifikats ist abgelaufen - The certificate's notBefore field contains an invalid time Das Feld 'notBefore' des Zertifikats enthält eine ungültige Zeit - The certificate's notAfter field contains an invalid time Das Feld 'notAfter' des Zertifikats enthält eine ungültige Zeit - The certificate is self-signed, and untrusted Das Zertifikat ist selbstsigniert und daher nicht vertrauenswürdig - The root certificate of the certificate chain is self-signed, and untrusted Das oberste Zertifikat der Kette ist selbstsigniert und daher nicht vertrauenswürdig - The issuer certificate of a locally looked up certificate could not be found Das Zertifikat des Ausstellers eines lokal gefundenen Zertifikats konnte nicht gefunden werden - No certificates could be verified Keines der Zertifikate konnte verifiziert werden - One of the CA certificates is invalid Eines der Zertifikate der Zertifizierungsstelle ist ungültig - The basicConstraints path length parameter has been exceeded Die Länge des basicConstraints-Pfades wurde überschritten - The supplied certificate is unsuitable for this purpose Das angegebene Zertifikat kann in diesem Fall nicht verwendet werden - The root CA certificate is not trusted for this purpose Das oberste Zertifikat der Zertifizierungsstelle ist für diesen Fall nicht vertrauenswürdig - The root CA certificate is marked to reject the specified purpose Das oberste Zertifikat der Zertifizierungsstelle weist diesen Fall auf Grund einer speziellen Kennzeichnung zurück - The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate Das Zertifikat des betrachteten Ausstellers wurde zurückgewiesen da sein Subjektname nicht dem Namen des Austellers des aktuellen Zertifikats entspricht - The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate Das Zertifikat des betrachteten Ausstellers wurde zurückgewiesen da Ausstellername und Seriennummer vorhanden sind und nicht dem Bezeichner der Zertifizierungsstelle des aktuellen Zertifikats entsprechen - The peer did not present any certificate Die Gegenstelle hat kein Zertifikat angegeben - The host name did not match any of the valid hosts for this certificate Der Name des Hosts ist keiner aus der Liste der für dieses Zertifikat gültigen Hosts - Unknown error Unbekannter Fehler @@ -8344,22 +6629,18 @@ QStateMachine - Missing initial state in compound state '%1' Der Anfangszustand des zusammengesetzten Zustands '%1' fehlt - Missing default state in history state '%1' Der Anfangszustand im Verlauf bei Zustand '%1' fehlt - No common ancestor for targets and source of transition from state '%1' Die Ziele und die Quelle des Übergangs vom Zustand '%1' haben keinen gemeinsamen Ursprung - Unknown error Unbekannter Fehler @@ -8367,30 +6648,22 @@ QSystemSemaphore - %1: does not exist %1: Nicht existent - - %1: out of resources %1: Keine Ressourcen mehr verfügbar - - %1: permission denied %1: Zugriff verweigert - %1: already exists %1: Existiert bereits - - %1: unknown error %2 %1: Unbekannter Fehler %2 @@ -8398,12 +6671,10 @@ QTDSDriver - Unable to open connection Die Datenbankverbindung kann nicht geöffnet werden - Unable to use database Die Datenbank kann nicht verwendet werden @@ -8411,12 +6682,10 @@ QTabBar - Scroll Left Nach links scrollen - Scroll Right Nach rechts scrollen @@ -8424,7 +6693,6 @@ QTcpServer - Operation on socket is not supported Diese Socket-Operation wird nicht unterstützt @@ -8432,42 +6700,34 @@ QTextControl - &Undo &Rückgängig - &Redo Wieder&herstellen - Cu&t &Ausschneiden - &Copy &Kopieren - Copy &Link Location &Link-Adresse kopieren - &Paste Einf&ügen - Delete Löschen - Select All Alles auswählen @@ -8475,14 +6735,10 @@ QToolButton - - Press Drücken - - Open Öffnen @@ -8490,7 +6746,6 @@ QUdpSocket - This platform does not support IPv6 Diese Plattform unterstützt kein IPv6 @@ -8498,12 +6753,10 @@ QUndoGroup - Undo Rückgängig - Redo Wiederherstellen @@ -8511,7 +6764,6 @@ QUndoModel - <empty> <leer> @@ -8519,12 +6771,10 @@ QUndoStack - Undo Rückgängig - Redo Wiederherstellen @@ -8532,57 +6782,46 @@ QUnicodeControlCharacterMenu - LRM Left-to-right mark LRM Left-to-right mark - RLM Right-to-left mark RLM Right-to-left mark - ZWJ Zero width joiner ZWJ Zero width joiner - ZWNJ Zero width non-joiner ZWNJ Zero width non-joiner - ZWSP Zero width space ZWSP Zero width space - LRE Start of left-to-right embedding LRE Start of left-to-right embedding - RLE Start of right-to-left embedding RLE Start of right-to-left embedding - LRO Start of left-to-right override LRO Start of left-to-right override - RLO Start of right-to-left override RLO Start of right-to-left override - PDF Pop directional formatting PDF Pop directional formatting - Insert Unicode control character Unicode-Kontrollzeichen einfügen @@ -8590,32 +6829,26 @@ QWebFrame - Request cancelled Anfrage wurde abgebrochen - Request blocked Anfrage wurde abgewiesen - Cannot show URL Der URL kann nicht angezeigt werden - Frame load interrupted by policy change Das Laden des Rahmens wurde durch eine Änderung der Richtlinien unterbrochen - Cannot show mimetype Dieser Mime-Typ kann nicht angezeigt werden - File does not exist Die Datei existiert nicht @@ -8623,621 +6856,515 @@ QWebPage - Submit default label for Submit buttons in forms on web pages Senden - Submit Submit (input element) alt text for <input> elements with no alt, title, or value Senden - Reset default label for Reset buttons in forms on web pages Rücksetzen - Choose File title for file button used in HTML forms Durchsuchen - No file selected text to display in file button used in HTML forms when no file is selected Es ist keine Datei ausgewählt - Open in New Window Open in New Window context menu item In neuem Fenster öffnen - Save Link... Download Linked File context menu item Ziel speichern unter... - Copy Link Copy Link context menu item Link-Adresse kopieren - Open Image Open Image in New Window context menu item Grafik in neuem Fenster öffnen - Save Image Download Image context menu item Grafik speichern unter - Copy Image Copy Link context menu item Grafik kopieren - Open Frame Open Frame in New Window context menu item Frame öffnen - Copy Copy context menu item Kopieren - Go Back Back context menu item Zurück - Go Forward Forward context menu item Vor - Stop Stop context menu item Abbrechen - Reload Reload context menu item Neu laden - Cut Cut context menu item Ausschneiden - Paste Paste context menu item Einfügen - No Guesses Found No Guesses Found context menu item Keine Vorschläge gefunden - Ignore Ignore Spelling context menu item Ignorieren - Add To Dictionary Learn Spelling context menu item In Wörterbuch aufnehmen - Search The Web Search The Web context menu item Im Web suchen - Look Up In Dictionary Look Up in Dictionary context menu item Im Wörterbuch nachschauen - Open Link Open Link context menu item Adresse öffnen - Ignore Ignore Grammar context menu item Ignorieren - Spelling Spelling and Grammar context sub-menu item Rechtschreibung - Show Spelling and Grammar menu item title Rechtschreibung und Grammatik anzeigen - Hide Spelling and Grammar menu item title Rechtschreibung und Grammatik nicht anzeigen - Check Spelling Check spelling context menu item Rechtschreibung prüfen - Check Spelling While Typing Check spelling while typing context menu item Rechtschreibung während des Schreibens überprüfen - Check Grammar With Spelling Check grammar with spelling context menu item Grammatik mit Rechtschreibung zusammen überprüfen - Fonts Font context sub-menu item Fonts - Bold Bold context menu item Fett - Italic Italic context menu item Kursiv - Underline Underline context menu item Unterstrichen - Outline Outline context menu item Umriss - Direction Writing direction context sub-menu item Schreibrichtung - Text Direction Text direction context sub-menu item Schreibrichtung - Default Default writing direction context menu item Vorgabe - Left to Right Left to Right context menu item Von links nach rechts - Right to Left Right to Left context menu item Von rechts nach links - Missing Plug-in Label text to be used when a plug-in is missing Fehlendes Plugin - Loading... Media controller status message when the media is loading Lädt... - Live Broadcast Media controller status message when watching a live broadcast Live-Übertragung - Audio Element Media controller element Audio-Element - Video Element Media controller element Video-Element - Mute Button Media controller element Stummschalttaste - Unmute Button Media controller element Abstelltaste für Stummschaltung - Play Button Media controller element Abspielknopf - Pause Button Media controller element Pause-Knopf - Slider Media controller element Schieberegler - Slider Thumb Media controller element Schieberegler-Griff - Rewind Button Media controller element Rückspultaste - Return to Real-time Button Media controller element Kehre zu Echtzeit zurück - Elapsed Time Media controller element Spielzeit - Remaining Time Media controller element Verbleibende Zeit - Status Display Media controller element Statusanzeige - Fullscreen Button Media controller element Vollbild-Taste - Seek Forward Button Media controller element Vorlauftaste - Seek Back Button Media controller element Rücklauftaste - Audio element playback controls and status display Media controller element Audio-Steuerung und Statusanzeige - Video element playback controls and status display Media controller element Video-Steuerung und Statusanzeige - Mute audio tracks Media controller element Schalte Tonspuren stumm - Unmute audio tracks Media controller element Stummschaltung der Tonspuren aufheben - Begin playback Media controller element Abspielen - Pause playback Media controller element Pause - Movie time scrubber Media controller element Abspielzeit - Movie time scrubber thumb Media controller element Griff zur Einstellung der Abspielzeit - Rewind movie Media controller element Film zurückspulen - Return streaming movie to real-time Media controller element Setze Film auf Echtzeit zurück - Current movie time Media controller element Abspielzeit des Films - Remaining movie time Media controller element Verbleibende Zeit des Films - Current movie status Media controller element Status des Films - Play movie in full-screen mode Media controller element Film im Vollbildmodus abspielen - Seek quickly back Media controller element Schnelles Rückwärtssuchen - Seek quickly forward Media controller element Schnelles Vorwärtssuchen - Indefinite time Media time description Unbegrenzte Zeit - %1 days %2 hours %3 minutes %4 seconds Media time description %1 Tage %2 Stunden %3 Minuten %4 Sekunden - %1 hours %2 minutes %3 seconds Media time description %1 Stunden %2 Minuten %3 Sekunden - %1 minutes %2 seconds Media time description %1 Minuten %2 Sekunden - %1 seconds Media time description %1 Sekunden - Inspect Inspect Element context menu item Prüfen - No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed Es existieren noch keine Suchanfragen - Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title Bisherige Suchanfragen - Clear recent searches menu item in Recent Searches menu that empties menu's contents Gespeicherte Suchanfragen löschen - Unknown Unknown filesize FTP directory listing item Unbekannt - Web Inspector - %2 Web Inspector - %2 - %1 (%2x%3 pixels) Title string for images %1 (%2x%3 Pixel) - Redirection limit reached Maximal Anzahl von Weiterleitungen wurde erreicht - Bad HTTP request Ungültige HTTP-Anforderung - This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' Dieser Index verfügt über eine Suchfunktion. Geben Sie einen Suchbegriff ein: - Scroll here Hierher scrollen - Left edge Linker Rand - Top Anfang - Right edge Rechter Rand - Bottom Ende - Page left Eine Seite nach links - Page up Eine Seite nach oben - Page right Eine Seite nach rechts - Page down Eine Seite nach unten - Scroll left Nach links scrollen - Scroll up Nach oben scrollen - Scroll right Nach rechts scrollen - Scroll down Nach unten scrollen - %n file(s) number of chosen file @@ -9246,237 +7373,190 @@ - JavaScript Alert - %1 JavaScript-Hinweis - %1 - JavaScript Confirm - %1 JavaScript-Bestätigung - %1 - JavaScript Prompt - %1 JavaScript-Eingabeaufforderung - %1 - JavaScript Problem - %1 JavaScript-Problem - %1 - The script on this page appears to have a problem. Do you want to stop the script? Das Skript dieser Webseite ist fehlerhaft. Möchten Sie es anhalten? - Move the cursor to the next character Positionsmarke auf folgendes Zeichen setzen - Move the cursor to the previous character Positionsmarke auf vorangehendes Zeichen setzen - Move the cursor to the next word Positionsmarke auf folgendes Wort setzen - Move the cursor to the previous word Positionsmarke auf vorangehendes Wort setzen - Move the cursor to the next line Positionsmarke auf folgende Zeile setzen - Move the cursor to the previous line Positionsmarke auf vorangehende Zeile setzen - Move the cursor to the start of the line Positionsmarke auf Zeilenanfang setzen - Move the cursor to the end of the line Positionsmarke auf Zeilenende setzen - Move the cursor to the start of the block Positionsmarke auf Anfang des Blocks setzen - Move the cursor to the end of the block Positionsmarke auf Ende des Blocks setzen - Move the cursor to the start of the document Positionsmarke auf Anfang des Dokumentes setzen - Move the cursor to the end of the document Positionsmarke auf Ende des Dokumentes setzen - Select all Alles auswählen - Select to the next character Bis zum nächsten Zeichen markieren - Select to the previous character Bis zum vorherigen Zeichen markieren - Select to the next word Bis zum nächsten Wort markieren - Select to the previous word Bis zum vorherigen Wort markieren - Select to the next line Bis zur nächsten Zeile markieren - Select to the previous line Bis zur vorherigen Zeile markieren - Select to the start of the line Bis zum Zeilenanfang markieren - Select to the end of the line Bis zum Zeilenende markieren - Select to the start of the block Bis zum Anfang des Blocks markieren - Select to the end of the block Bis zum Ende des Blocks markieren - Select to the start of the document Bis zum Anfang des Dokuments markieren - Select to the end of the document Bis zum Ende des Dokuments markieren - Delete to the start of the word Bis zum Anfang des Wortes löschen - Delete to the end of the word Bis zum Ende des Wortes löschen - Insert a new paragraph Neuen Abschnitt einfügen - Insert a new line Neue Zeile einfügen - Paste and Match Style Einfügen und dem Stil anpassen - Remove formatting Formatierung entfernen - Strikethrough Durchgestrichen - Subscript Tiefstellung - Superscript Hochstellung - Insert Bulleted List Liste mit Punkten einfügen - Insert Numbered List Nummerierte Liste einfügen - Indent Einrücken - Outdent Einrückung aufheben - Center Zentrieren - Justify Ausrichten - Align Left Linksbündig ausrichten - Align Right Rechtsbündig ausrichten @@ -9484,7 +7564,6 @@ QWhatsThisAction - What's This? Direkthilfe @@ -9492,7 +7571,6 @@ QWidget - * * @@ -9500,57 +7578,46 @@ QWizard - Cancel Abbrechen - Help Hilfe - < &Back < &Zurück - &Finish Ab&schließen - &Help &Hilfe - Go Back Zurück - Continue Weiter - Commit Anwenden - Done Fertig - &Next &Weiter - &Next > &Weiter > @@ -9558,69 +7625,54 @@ QWorkspace - &Restore Wieder&herstellen - &Move Ver&schieben - &Size &Größe ändern - Mi&nimize M&inimieren - Ma&ximize Ma&ximieren - &Close Schl&ießen - Stay on &Top Im &Vordergrund bleiben - Minimize Minimieren - Restore Down Wiederherstellen - Close Schließen - - Sh&ade &Aufrollen - - %1 - [%2] %1 - [%2] - &Unshade &Herabrollen @@ -9628,117 +7680,94 @@ QXml - no error occurred kein Fehler - error triggered by consumer Konsument löste Fehler aus - unexpected end of file unerwartetes Ende der Datei - more than one document type definition mehrere Dokumenttypdefinitionen - error occurred while parsing element Fehler beim Parsen eines Elements - tag mismatch Element-Tags sind nicht richtig geschachtelt - error occurred while parsing content Fehler beim Parsen des Inhalts eines Elements - unexpected character unerwartetes Zeichen - invalid name for processing instruction kein gültiger Name für eine Processing-Instruktion - version expected while reading the XML declaration fehlende Version beim Parsen der XML-Deklaration - wrong value for standalone declaration falscher Wert für die Standalone-Deklaration - error occurred while parsing document type definition Fehler beim Parsen der Dokumenttypdefinition - letter is expected ein Buchstabe ist an dieser Stelle erforderlich - error occurred while parsing comment Fehler beim Parsen eines Kommentars - error occurred while parsing reference Fehler beim Parsen einer Referenz - internal general entity reference not allowed in DTD in einer DTD ist keine interne allgemeine Entity-Referenz erlaubt - external parsed general entity reference not allowed in attribute value in einem Attribut-Wert sind keine externen Entity-Referenzen erlaubt - external parsed general entity reference not allowed in DTD in der DTD sind keine externen Entity-Referenzen erlaubt - unparsed entity reference in wrong context nicht-analysierte Entity-Referenz im falschen Kontext verwendet - recursive entities rekursive Entity - error in the text declaration of an external entity Fehler in der Text-Deklaration einer externen Entity - encoding declaration or standalone declaration expected while reading the XML declaration fehlende Encoding-Deklaration oder Standalone-Deklaration beim Parsen der XML-Deklaration - standalone declaration expected while reading the XML declaration fehlende Standalone-Deklaration beim Parsen der XML Deklaration @@ -9746,27 +7775,22 @@ QXmlPatternistCLI - Warning in %1, at line %2, column %3: %4 Warnung in %1, bei Zeile %2, Spalte %3: %4 - Warning in %1: %2 Warnung in %1: %2 - Unknown location unbekannt - Error %1 in %2, at line %3, column %4: %5 Fehler %1 in %2, bei Zeile %3, Spalte %4: %5 - Error %1 in %2: %3 Fehler %1 in %2: %3 @@ -9774,184 +7798,142 @@ QXmlStream - - Extra content at end of document. Überzähliger Inhalt nach Ende des Dokumentes. - Invalid entity value. Ungültiger Entity-Wert. - Invalid XML character. Ungültiges XML-Zeichen. - Sequence ']]>' not allowed in content. Im Inhalt ist die Zeichenfolge ']]>' nicht erlaubt. - Namespace prefix '%1' not declared Der Namensraum-Präfix '%1' wurde nicht deklariert - Attribute redefined. Redefinition eines Attributes. - Unexpected character '%1' in public id literal. '%1' ist kein gültiges Zeichen in einer public-id-Angabe. - Invalid XML version string. Ungültige XML-Versionsangabe. - Unsupported XML version. Diese XML-Version wird nicht unterstützt. - %1 is an invalid encoding name. %1 ist kein gültiger Name für das Encoding. - Encoding %1 is unsupported Das Encoding %1 wird nicht unterstützt - Standalone accepts only yes or no. Der Wert für das 'Standalone'-Attribut kann nur 'yes' oder 'no' sein. - Invalid attribute in XML declaration. Die XML-Deklaration enthält ein ungültiges Attribut. - Premature end of document. Vorzeitiges Ende des Dokuments. - Invalid document. Ungültiges Dokument. - Expected Es wurde - , but got ' erwartet, stattdessen erhalten ' - Unexpected ' Ungültig an dieser Stelle ' - Expected character data. Es wurden Zeichendaten erwartet. - Recursive entity detected. Es wurde eine rekursive Entity festgestellt. - Start tag expected. Öffnendes Element erwartet. - XML declaration not at start of document. Die XML-Deklaration befindet sich nicht am Anfang des Dokuments. - NDATA in parameter entity declaration. Eine Parameter-Entity-Deklaration darf kein NDATA enthalten. - %1 is an invalid processing instruction name. %1 ist kein gültiger Name für eine Prozessing-Instruktion. - Invalid processing instruction name. Der Name der Prozessing-Instruktion ist ungültig. - - - - Illegal namespace declaration. Ungültige Namensraum-Deklaration. - Invalid XML name. Ungültiger XML-Name. - Opening and ending tag mismatch. Die Anzahl der öffnenden Elemente stimmt nicht mit der Anzahl der schließenden Elemente überein. - Reference to unparsed entity '%1'. Es wurde die ungeparste Entity '%1' referenziert. - - - Entity '%1' not declared. Die Entity '%1' ist nicht deklariert. - Reference to external entity '%1' in attribute value. Im Attributwert wurde die externe Entity '%1' referenziert. - Invalid character reference. Ungültige Zeichenreferenz. - - Encountered incorrectly encoded content. Es wurde Inhalt mit einer ungültigen Kodierung gefunden. - The standalone pseudo attribute must appear after the encoding. Das Standalone-Pseudoattribut muss dem Encoding unmittelbar folgen. - %1 is an invalid PUBLIC identifier. %1 ist keine gültige Angabe für eine PUBLIC-Id. @@ -9959,702 +7941,558 @@ QtXmlPatterns - - At least one component must be present. Es muss mindestens eine Komponente vorhanden sein. - %1 is not a valid value of type %2. %1 ist kein gültiger Wert des Typs %2. - When casting to %1 from %2, the source value cannot be %3. Bei einer "cast"-Operation von %1 zu %2 darf der Wert nicht %3 sein. - Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Der effektive Boolesche Wert einer Sequenz aus zwei oder mehreren atomaren Werten kann nicht berechnet werden. - The data of a processing instruction cannot contain the string %1 Die Daten einer Processing-Anweisung dürfen nicht die Zeichenkette %1 enthalten - - %1 is an invalid %2 %1 ist kein gültiges %2 - %1 is not a valid XML 1.0 character. %1 ist kein gültiges XML 1.0 Zeichen. - %1 was called. %1 wurde gerufen. - In the replacement string, %1 must be followed by at least one digit when not escaped. In der Ersetzung muss auf %1 eine Ziffer folgen, wenn es nicht durch ein Escape-Zeichen geschützt ist. - In the replacement string, %1 can only be used to escape itself or %2, not %3 In der Ersetzung kann %1 nur verwendet werden, um sich selbst oder %2 schützen, nicht jedoch für %3 - %1 matches newline characters Der Ausdruck '%1' schließt Zeilenvorschübe ein - Matches are case insensitive Groß/Kleinschreibung wird nicht beachtet - %1 is an invalid regular expression pattern: %2 %1 ist kein gültiger regulärer Ausdruck: %2 - It will not be possible to retrieve %1. %1 kann nicht bestimmt werden. - The default collection is undefined Für eine Kollektion ist keine Vorgabe definiert - %1 cannot be retrieved %1 kann nicht bestimmt werden - The item %1 did not match the required type %2. Das Element %1 entspricht nicht dem erforderlichen Typ %2. - - %1 is an unknown schema type. %1 ist ein unbekannter Schema-Typ. - A template with name %1 has already been declared. Eine Vorlage des Namens %1 existiert bereits. - Only one %1 declaration can occur in the query prolog. Der Anfrage-Prolog darf nur eine %1-Deklaration enthalten. - The initialization of variable %1 depends on itself Die Initialisierung der Variable %1 hängt von ihrem eigenem Wert ab - The variable %1 is unused Die Variable %1 wird nicht verwendet - Version %1 is not supported. The supported XQuery version is 1.0. Die Version %1 wird nicht unterstützt. Die unterstützte Version von XQuery ist 1.0. - No function with signature %1 is available Es existiert keine Funktion mit der Signatur %1 - It is not possible to redeclare prefix %1. Der Präfix %1 kann nicht redeklariert werden. - Prefix %1 is already declared in the prolog. Der Präfix %1 wurde bereits im Prolog deklariert. - The name of an option must have a prefix. There is no default namespace for options. Der Name einer Option muss einen Präfix haben. Es gibt keine Namensraum-Vorgabe für Optionen. - The Schema Import feature is not supported, and therefore %1 declarations cannot occur. Die Deklaration %1 ist unzulässig, da Schema-Import nicht unterstützt wird. - The target namespace of a %1 cannot be empty. Der Ziel-Namensraum von %1 darf nicht leer sein. - The module import feature is not supported Modul-Import wird nicht unterstützt - The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 Der Namensraum einer nutzerdefinierten Funktion aus einem Bibliotheksmodul muss dem Namensraum des Moduls entsprechen (%1 anstatt %2) - A function already exists with the signature %1. Es existiert bereits eine Funktion mit der Signatur %1. - No external functions are supported. All supported functions can be used directly, without first declaring them as external Externe Funktionen werden nicht unterstützt. Alle unterstützten Funktionen können direkt verwendet werden, ohne sie als extern zu deklarieren - The %1-axis is unsupported in XQuery Die %1-Achse wird in XQuery nicht unterstützt - The namespace URI cannot be the empty string when binding to a prefix, %1. Der Namensraum-URI darf nicht leer sein, wenn er an den Präfix %1 gebunden ist. - %1 is an invalid namespace URI. %1 ist kein gültiger Namensraum-URI. - It is not possible to bind to the prefix %1 Der Präfix %1 kann nicht gebunden werden - Two namespace declaration attributes have the same name: %1. Es wurden zwei Namensraum-Deklarationsattribute gleichen Namens (%1) gefunden. - The namespace URI must be a constant and cannot use enclosed expressions. Ein Namensraum-URI muss eine Konstante sein und darf keine eingebetteten Ausdrücke verwenden. - - %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. %1 befindet sich nicht unter den Attributdeklarationen im Bereich. Schema-Import wird nicht unterstützt. - empty leer - zero or one kein oder ein - exactly one genau ein - one or more ein oder mehrere - zero or more kein oder mehrere - The focus is undefined. Es ist kein Fokus definiert. - An attribute by name %1 has already been created. Es wurde bereits ein Attribut mit dem Namen %1 erzeugt. - Network timeout. Das Zeitlimit der Netzwerkoperation wurde überschritten. - Element %1 can't be serialized because it appears outside the document element. Das Element %1 kann nicht serialisiert werden, da es außerhalb des Dokumentenelements erscheint. - Year %1 is invalid because it begins with %2. %1 ist keine gültige Jahresangabe, da es mit %2 beginnt. - Day %1 is outside the range %2..%3. Die Tagesangabe %1 ist außerhalb des Bereiches %2..%3. - Month %1 is outside the range %2..%3. Die Monatsangabe %1 ist außerhalb des Bereiches %2..%3. - Overflow: Can't represent date %1. Das Datum %1 kann nicht dargestellt werden (Überlauf). - Day %1 is invalid for month %2. Die Tagesangabe %1 ist für den Monat %2 ungültig. - Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; Die Zeitangabe 24:%1:%2.%3 ist ungültig. Bei der Stundenangabe 24 müssen Minuten, Sekunden und Millisekunden 0 sein. - Time %1:%2:%3.%4 is invalid. Die Zeitangabe %1:%2:%3.%4 ist ungültig. - Overflow: Date can't be represented. Das Datum kann nicht dargestellt werden (Überlauf). - At least one time component must appear after the %1-delimiter. Bei Vorhandensein eines %1-Begrenzers muss mindestens eine Komponente vorhanden sein. - - Dividing a value of type %1 by %2 (not-a-number) is not allowed. Die Division eines Werts des Typs %1 durch %2 (kein numerischer Wert) ist nicht zulässig. - Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. Die Division eines Werts des Typs %1 durch %2 oder %3 (positiv oder negativ Null) ist nicht zulässig. - Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. Die Multiplikation eines Werts des Typs %1 mit %2 oder %3 (positiv oder negativ unendlich) ist nicht zulässig. - A value of type %1 cannot have an Effective Boolean Value. Ein Wert des Typs %1 kann keinen effektiven Booleschen Wert haben. - Value %1 of type %2 exceeds maximum (%3). Der Wert %1 des Typs %2 überschreitet das Maximum (%3). - Value %1 of type %2 is below minimum (%3). Der Wert %1 des Typs %2 unterschreitet das Minimum (%3). - A value of type %1 must contain an even number of digits. The value %2 does not. Die Stellenzahl eines Wertes des Typs %1 muss geradzahlig sein. Das ist bei %2 nicht der Fall. - %1 is not valid as a value of type %2. %1 ist kein gültiger Wert des Typs %2. - Operator %1 cannot be used on type %2. Der Operator %1 kann nicht auf den Typ %2 angewandt werden. - Operator %1 cannot be used on atomic values of type %2 and %3. Der Operator %1 kann nicht auf atomare Werte der Typen %2 und %3 angewandt werden. - The namespace URI in the name for a computed attribute cannot be %1. Der Namensraum-URI im Namen eines berechneten Attributes darf nicht %1 sein. - The name for a computed attribute cannot have the namespace URI %1 with the local name %2. Der Name eines berechneten Attributes darf keinen Namensraum-URI %1 mit dem lokalen Namen %2 haben. - Type error in cast, expected %1, received %2. Typfehler bei "cast"-Operation; es wurde %1 erwartet, aber %2 empfangen. - When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. Bei einer "cast"-Operation zum Typ %1 oder abgeleitetenTypen muss der Quellwert ein Zeichenketten-Literal oder ein Wert gleichen Typs sein. Der Typ %2 ist ungültig. - A comment cannot contain %1 Ein Kommentar darf nicht'%1 enthalten - A comment cannot end with a %1. Ein Kommentar darf nicht auf %1 enden. - An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. Ein Attributknoten darf nicht als Kind eines Dokumentknotens erscheinen. Es erschien ein Attributknoten mit dem Namen %1. - A library module cannot be evaluated directly. It must be imported from a main module. Ein Bibliotheksmodul kann nicht direkt ausgewertet werden, er muss von einem Hauptmodul importiert werden. - No template by name %1 exists. Es existiert keine Vorlage mit dem Namen %1. - A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Werte des Typs %1 dürfen keine Prädikate sein. Für Prädikate sind nur numerische oder effektiv Boolesche Typen zulässig. - A positional predicate must evaluate to a single numeric value. Ein positionales Prädikat muss sich als einfacher, numerischer Wert auswerten lassen. - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. Der Zielname einer Processing-Anweisung kann nicht %1 (unabhängig von Groß/Kleinschreibung sein). %2 ist daher ungültig. - %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 ist kein gültiger Zielname einer Processing-Anweisung, es muss ein %2 Wert wie zum Beispiel %3 sein. - The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. Der letzte Schritt eines Pfades kann entweder nur Knoten oder nur atomare Werte enthalten. Sie dürfen nicht zusammen auftreten. - No namespace binding exists for the prefix %1 Es existiert keine Namensraum-Bindung für den Präfix %1 - No namespace binding exists for the prefix %1 in %2 Es existiert keine Namensraum-Bindung für den Präfix %1 in %2 - The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Das erste Argument von %1 darf nicht vom Typ %2 sein; es muss numerisch, xs:yearMonthDuration oder xs:dayTimeDuration sein. - The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Das erste Argument von %1 kann nicht vom Typ %2 sein, es muss einer der Typen %3, %4 oder %5 sein. - The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Das zweite Argument von %1 kann nicht vom Typ %2 sein, es muss einer der Typen %3, %4 oder %5 sein. - If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. Wenn beide Werte mit Zeitzonen angegeben werden, müssen diese übereinstimmen. %1 und %2 sind daher unzulässig. - %1 must be followed by %2 or %3, not at the end of the replacement string. Auf %1 muss %2 oder %3 folgen; es kann nicht am Ende der Ersetzung erscheinen. - %1 and %2 match the start and end of a line. Die Ausdrücke %1 und %2 passen jeweils auf den Anfang oder das Ende einer beliebigen Zeile. - Whitespace characters are removed, except when they appear in character classes Leerzeichen werden entfernt, sofern sie nicht in Zeichenklassen erscheinen - %1 is an invalid flag for regular expressions. Valid flags are: %1 ist kein gültiger Modifikator für reguläre Ausdrücke. Gültige Modifikatoren sind: - If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. Es kann kein Präfix angegeben werden, wenn das erste Argument leer oder eine leere Zeichenkette (kein Namensraum) ist. Es wurde der Präfix %1 angegeben. - The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Die Normalisierungsform %1 wird nicht unterstützt. Die unterstützten Normalisierungsformen sind %2, %3, %4 and %5, und "kein" (eine leere Zeichenkette steht für "keine Normalisierung"). - A zone offset must be in the range %1..%2 inclusive. %3 is out of range. Eine Zeitzonen-Differenz muss im Bereich %1..%2 (einschließlich) liegen. %3 liegt außerhalb des Bereiches. - Required cardinality is %1; got cardinality %2. Die erforderliche Kardinalität ist %1 (gegenwärtig %2). - The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. Die Kodierung %1 ist ungültig; sie darf nur aus lateinischen Buchstaben bestehen und muss dem regulären Ausdruck %2 entsprechen. - The keyword %1 cannot occur with any other mode name. Das Schlüsselwort %1 kann nicht mit einem anderen Modusnamen zusammen verwendet werden. - No variable with name %1 exists Es existiert keine Variable des Namens %1 - The value of attribute %1 must be of type %2, which %3 isn't. Der Wert des Attributs %1 muss vom Typ %2 sein, was bei %3 nicht der Fall ist. - The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. Der Präfix %1 kann nicht gebunden werden. Er ist bereits per Vorgabe an den Namensraum %2 gebunden. - A variable with name %1 has already been declared. Eine Variable des Namens %1 wurde bereits deklariert. - No value is available for the external variable with name %1. Es ist kein Wert für die externe Variable des Namens %1 verfügbar. - A stylesheet function must have a prefixed name. Der Name einer Stylesheet-Funktion muss einen Präfix haben. - The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. Der Namensraum %1 ist reserviert und kann daher von nutzerdefinierten Funktionen nicht verwendet werden (für diesen Zweck gibt es den vordefinierten Präfix %2). - An argument with name %1 has already been declared. Every argument name must be unique. Es wurde bereits ein Argument des Namens %1 deklariert. Argumentnamen müssen eindeutig sein. - When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. Bei der Verwendung der Funktion %1 zur Auswertung innerhalb eines Suchmusters muss das Argument eine Variablenreferenz oder ein Zeichenketten-Literal sein. - In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. Bei einem XSL-T-Suchmuster muss das erste Argument zur Funktion %1 bei der Verwendung zur Suche ein Zeichenketten-Literal sein. - In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. Bei einem XSL-T-Suchmuster muss das erste Argument zur Funktion %1 bei der Verwendung zur Suche ein Literal oder eine Variablenreferenz sein. - In an XSL-T pattern, function %1 cannot have a third argument. Bei einem XSL-T-Suchmuster darf die Funktion %1 kein drittes Argument haben. - In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. Bei einem XSL-T-Suchmuster dürfen nur die Funktionen %1 und %2, nicht jedoch %3 zur Suche verwendet werden. - In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. Bei einem XSL-T-Suchmuster dürfen nur die Achsen %2 oder %3 verwendet werden, nicht jedoch %1. - %1 is an invalid template mode name. %1 ist kein gültiger Name für einen Vorlagenmodus. - The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. Der Name der gebundenen Variablen eines for-Ausdrucks muss sich von dem der Positionsvariable unterscheiden. Die zwei Variablen mit dem Namen %1 stehen im Konflikt. - The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. %1-Ausdrücke können nicht verwendet werden, da Schemavalidierung nicht unterstützt wird. - None of the pragma expressions are supported. Therefore, a fallback expression must be present Es muss ein fallback-Ausdruck vorhanden sein, da keine pragma-Ausdrücke unterstützt werden - Each name of a template parameter must be unique; %1 is duplicated. Die Namen von Vorlagenparametern müssen eindeutig sein, %1 existiert bereits. - No function with name %1 is available. Es ist keine Funktion des Namens %1 verfügbar. - %1 is not a valid numeric literal. %1 ist kein gültiger numerischer Literal. - W3C XML Schema identity constraint selector W3C XML Schema identity constraint selector - W3C XML Schema identity constraint field W3C XML Schema identity constraint field - A construct was encountered which is disallowed in the current language(%1). Es wurde ein Sprachkonstrukt angetroffen, was in der aktuellen Sprache (%1) nicht erlaubt ist. - Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). Der Namensraum %1 kann nur an %2 gebunden werden. Dies ist bereits vordeklariert. - Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). Der Präfix %1 kann nur an %2 gebunden werden. Dies ist bereits vordeklariert. - An attribute with name %1 has already appeared on this element. Das Element hat bereits ein Attribut des Namens %1. - A direct element constructor is not well-formed. %1 is ended with %2. Es wurde ein fehlerhafter direkter Element-Konstruktor gefunden. %1 endet mit %2. - The name %1 does not refer to any schema type. Der Name %1 hat keinen Bezug zu einem Schematyp. - %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. %1 ist ein komplexer Typ. Eine "cast"-Operation zu komplexen Typen ist nicht möglich. Es können allerdings "cast"-Operationen zu atomare Typen wie %2 durchgeführt werden. - %1 is not an atomic type. Casting is only possible to atomic types. %1 ist kein atomarer Typ. "cast"-Operation können nur zu atomaren Typen durchgeführt werden. - %1 is not a valid name for a processing-instruction. %1 ist kein gültiger Name für eine Processing-Instruktion. - The name of an extension expression must be in a namespace. Der Name eines Erweiterungsausdrucks muss sich in einem Namensraum befinden. - Required type is %1, but %2 was found. Der erforderliche Typ ist %1, es wurde aber %2 angegeben. - Promoting %1 to %2 may cause loss of precision. Die Wandlung von %1 zu %2 kann zu einem Verlust an Genauigkeit führen. - It's not possible to add attributes after any other kind of node. Attribute dürfen nicht auf andere Knoten folgen. - Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. Es wird nur Unicode Codepoint Collation unterstützt (%1). %2 wird nicht unterstützt. - Integer division (%1) by zero (%2) is undefined. Die Ganzzahldivision (%1) durch Null (%2) ist nicht definiert. - Division (%1) by zero (%2) is undefined. Die Division (%1) durch Null (%2) ist nicht definiert. - Modulus division (%1) by zero (%2) is undefined. Die Modulo-Division (%1) durch Null (%2) ist nicht definiert. - %1 takes at most %n argument(s). %2 is therefore invalid. %1 hat nur %n Argument; die Angabe %2 ist daher ungültig. @@ -10662,7 +8500,6 @@ - %1 requires at least %n argument(s). %2 is therefore invalid. %1 erfordert mindestens ein Argument; die Angabe %3 ist daher ungültig. @@ -10670,1655 +8507,1258 @@ - The root node of the second argument to function %1 must be a document node. %2 is not a document node. Der übergeordnete Knoten des zweiten Arguments der Funktion %1 muss ein Dokumentknoten sein, was bei %2 nicht der Fall ist. - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) Der Namensraum einer benutzerdefinierten Funktion darf nicht leer sein (für diesen Zweck gibt es den vordefinierten Präfix %1) - - A default namespace declaration must occur before function, variable, and option declarations. Die Deklaration des Default-Namensraums muss vor Funktions-, Variablen- oder Optionsdeklaration erfolgen. - Namespace declarations must occur before function, variable, and option declarations. Namensraums-Deklarationen müssen vor Funktions- Variablen- oder Optionsdeklarationen stehen. - Module imports must occur before function, variable, and option declarations. Modul-Importe müssen vor Funktions-, Variablen- oder Optionsdeklarationen stehen. - %1 is not a whole number of minutes. %1 ist keine ganzzahlige Minutenangabe. - Attribute %1 can't be serialized because it appears at the top level. Das Attributelement %1 kann nicht serialisiert werden, da es auf der höchsten Ebene erscheint. - %1 is an unsupported encoding. Das Encoding %1 wird nicht unterstützt. - %1 contains octets which are disallowed in the requested encoding %2. %1 enthält Oktette, die im Encoding %2 nicht zulässig sind. - The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. Der Code-Punkt %1 aus %2 mit Encoding %3 ist kein gültiges XML-Zeichen. - Ambiguous rule match. Mehrdeutige Regel. - In a namespace constructor, the value for a namespace cannot be an empty string. Im Konstruktor eines Namensraums darf der Wert des Namensraumes keine leere Zeichenkette sein. - The prefix must be a valid %1, which %2 is not. Der Präfix muss ein gültiger %1 sein. Das ist bei %2 nicht der Fall. - The prefix %1 cannot be bound. Der Präfix %1 kann nicht gebunden werden - Only the prefix %1 can be bound to %2 and vice versa. An %2 kann nur der Präfix %1 gebunden werden (und umgekehrt). - The parameter %1 is required, but no corresponding %2 is supplied. Es wurde kein entsprechendes %2 für den erforderlichen Parameter %1 angegeben. - The parameter %1 is passed, but no corresponding %2 exists. Es existiert kein entsprechendes %2 für den übergebenen Parameter %1. - The URI cannot have a fragment Der URI darf kein Fragment enthalten. - Element %1 is not allowed at this location. Das Element %1 darf nicht an dieser Stelle stehen. - Text nodes are not allowed at this location. An dieser Stelle dürfen keine Textknoten stehen. - Parse error: %1 Parse-Fehler: %1 - The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. Der Wert eines XSL-T-Versionsattributes muss vom Typ %1 sein, was bei %2 nicht der Fall ist. - Running an XSL-T 1.0 stylesheet with a 2.0 processor. Es wird ein XSL-T-1.0-Stylesheet mit einem Prozessor der Version 2.0 verarbeitet. - Unknown XSL-T attribute %1. Unbekanntes XSL-T-Attribut: %1. - Attribute %1 and %2 are mutually exclusive. Die Attribute %1 und %2 schließen sich gegenseitig aus. - In a simplified stylesheet module, attribute %1 must be present. In einem vereinfachten Stylesheet-Modul muss das Attribut %1 vorhanden sein. - If element %1 has no attribute %2, it cannot have attribute %3 or %4. Das Element %1 darf keines der Attribute %3 oder %4 haben, solange es nicht das Attribut %2 hat. - Element %1 must have at least one of the attributes %2 or %3. Das Element %1 muss mindestens eines der Attribute %2 oder %3 haben. - At least one mode must be specified in the %1-attribute on element %2. Im %1-Attribut des Elements %2 muss mindestens ein Modus angegeben werden. - Element %1 must come last. Das Element %1 muss zuletzt stehen. - At least one %1-element must occur before %2. Vor %2 muss mindestens ein %1-Element stehen. - Only one %1-element can appear. Es darf nur ein einziges %1-Element stehen. - At least one %1-element must occur inside %2. In %2 muss mindestens ein %1-Element stehen. - When attribute %1 is present on %2, a sequence constructor cannot be used. Es kann kein Sequenzkonstruktor verwendet werden, wenn %2 ein Attribut %1 hat. - Element %1 must have either a %2-attribute or a sequence constructor. Das Element %1 muss entweder ein %2-Attribut haben oder es muss ein Sequenzkonstruktor verwendet werden. - When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. Der Defaultwert eines erforderlichen Parameters kann weder durch ein %1-Attribut noch durch einen Sequenzkonstruktor angegeben werden. - Element %1 cannot have children. Das Element %1 kann keine Kindelemente haben. - Element %1 cannot have a sequence constructor. Das Element %1 kann keinen Sequenzkonstruktor haben. - - The attribute %1 cannot appear on %2, when it is a child of %3. %2 darf nicht das Attribut %1 haben, wenn es ein Kindelement von %3 ist. - A parameter in a function cannot be declared to be a tunnel. Der Parameter einer Funktion kann nicht als Tunnel deklariert werden. - This processor is not Schema-aware and therefore %1 cannot be used. %1 kann nicht verwendet werden, da dieser Prozessor keine Schemas unterstützt. - Top level stylesheet elements must be in a non-null namespace, which %1 isn't. Die zuoberst stehenden Elemente eines Stylesheets dürfen sich nicht im Null-Namensraum befinden, was bei %1 der Fall ist. - The value for attribute %1 on element %2 must either be %3 or %4, not %5. Der Wert des Attributs %1 des Elements %2 kann nur %3 oder %4 sein, nicht jedoch %5. - Attribute %1 cannot have the value %2. Das Attribut %1 darf nicht den Wert %2 haben. - The attribute %1 can only appear on the first %2 element. Nur das erste %2-Element darf das Attribut %1 haben. - At least one %1 element must appear as child of %2. %2 muss mindestens ein %1-Kindelement haben. - %1 has inheritance loop in its base type %2. %1 hat eine zirkuläre Vererbung im Basistyp %2. - - Circular inheritance of base type %1. Zirkuläre Vererbung im Basistyp %1. - Circular inheritance of union %1. Zirkuläre Vererbung bei der Vereinigung %1. - %1 is not allowed to derive from %2 by restriction as the latter defines it as final. %1 darf nicht durch Einschränkung von %2 abgeleitet werden, da letzterer sie als final deklariert. - %1 is not allowed to derive from %2 by extension as the latter defines it as final. %1 darf nicht durch Erweiterung von %2 abgeleitet werden, da letzterer sie als final deklariert. - Base type of simple type %1 cannot be complex type %2. Der komplexe Typ %2 kann nicht Basisklasse des einfachen Typs %1 sein. - Simple type %1 cannot have direct base type %2. Der einfache Typ %1 kann nicht den unmittelbaren Basistyp %2 haben. - - Simple type %1 is not allowed to have base type %2. Der einfache Typ %1 darf nicht den Basistyp %2 haben. - Simple type %1 can only have simple atomic type as base type. Der einfache Typ %1 kann nur einen einfachen. atomaren Basistyp haben. - Simple type %1 cannot derive from %2 as the latter defines restriction as final. %1 darf nicht von %2 abgeleitet werden, da letzterer die Einschränkung als final deklariert. - - Variety of item type of %1 must be either atomic or union. Die Varietät der Typen von %1 muss entweder atomar oder eine Vereinigung sein. - - Variety of member types of %1 must be atomic. Die Varietät der Typen von %1 muss atomar sein. - - %1 is not allowed to derive from %2 by list as the latter defines it as final. %1 darf nicht durch Listen von %2 abgeleitet werden, da letzterer sie als final deklariert. - Simple type %1 is only allowed to have %2 facet. Der einfache Typ %1 darf nur die Facette %2 haben. - Base type of simple type %1 must have variety of type list. Der Basistyp des einfachen Typs %1 muss eine Varietät des Typs Liste haben. - Base type of simple type %1 has defined derivation by restriction as final. Der Basistyp des einfachen Typs %1 definiert Vererbung durch Einschränkung als final. - Item type of base type does not match item type of %1. Der Elementtyp des Basistyps entspricht nicht dem Elementtyp von %1. - - Simple type %1 contains not allowed facet type %2. Der einfache Typ %1 enthält einen nicht erlaubten Facettentyp %2. - - %1 is not allowed to derive from %2 by union as the latter defines it as final. %1 darf nicht durch Vereinigung von %2 abgeleitet werden, da sie letzterer sie als final deklariert. - %1 is not allowed to have any facets. %1 darf keine Facetten haben. - Base type %1 of simple type %2 must have variety of union. Der Basistyp %1 des einfachen Typs %2 muss eine Varietät des Typs Vereinigung haben. - Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. Der Basistyp %1 des einfachen Typs %2 darf keine Einschränkung im %3 Attribut haben. - Member type %1 cannot be derived from member type %2 of %3's base type %4. Der Typ %1 des Mitglieds darf nicht vom Typ %2 des Mitglieds vom Basistyp %4 von %3 sein. - Derivation method of %1 must be extension because the base type %2 is a simple type. Erweiterung muss als Vererbungsmethode für %1 verwendet werden, da der Basistyp %2 ein einfacher Typ ist. - Complex type %1 has duplicated element %2 in its content model. Der komplexe Typ %1 hat ein dupliziertes Element %2 in seinem Inhaltsmodell. - Complex type %1 has non-deterministic content. Der komplexe Typ %1 hat nicht-deterministischen Inhalt. - Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. Die Attribute des komplexen Typs %1 sind keine gültige Erweiterung der Attribute des Basistyps %2: %3. - Content model of complex type %1 is not a valid extension of content model of %2. Das Inhaltsmodell des komplexen Typs %1 ist keine gültige Erweiterung des Inhaltsmodells von %2. - Complex type %1 must have simple content. Der komplexe Typ %1 kann nur einfachen Inhalt haben. - Complex type %1 must have the same simple type as its base class %2. Der komplexe Typ %1 kann nur einen einfachen Typ als Basisklasse %2 haben. - Complex type %1 cannot be derived from base type %2%3. Der komplexe Typ %1 kann nicht vom Basistyp %2 abgeleitet werden%3. - Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. Die Attribute des komplexen Typs %1 sind keine gültige Einschränkung der Attribute des Basistyps %2: %3. - Complex type %1 with simple content cannot be derived from complex base type %2. Der komplexe Typ %1 einfachen Inhalts darf nicht vom komplexen Basistyp %2 abgeleitet werden. - Item type of simple type %1 cannot be a complex type. Der Elementtyp des einfachen Typs %1 kann kein komplexer Typ sein. - Member type of simple type %1 cannot be a complex type. Der Typ eines Mitglieds des einfachen Typs %1 kann kein komplexer Typ sein. - %1 is not allowed to have a member type with the same name as itself. %1 darf keinen Typ eines Mitglieds desselben Namens haben. - - - %1 facet collides with %2 facet. Die Facette %1 steht im Widerspruch zu der Facette %2. - %1 facet must have the same value as %2 facet of base type. Die Facette %1 muss denselben Wert wie die Facette %2 des Basistyps haben. - %1 facet must be equal or greater than %2 facet of base type. Die Facette %1 muss größer oder gleich der Facette %2 des Basistyps sein. - - - - - - - - %1 facet must be less than or equal to %2 facet of base type. Die Facette %1 muss kleiner oder gleich der Facette %2 des Basistyps sein. - %1 facet contains invalid regular expression Die Facette %1 enthält einen ungültigen regulären Ausdruck - Unknown notation %1 used in %2 facet. Die Facette %2 enthält eine ungültige Notation %1. - %1 facet contains invalid value %2: %3. Die Facette %1 enthält einen ungültigen Wert %2: %3. - %1 facet cannot be %2 or %3 if %4 facet of base type is %5. Die Facette %1 kann nicht %2 oder %3 sein, wenn die Facette %4 des Basistyps %5 ist. - %1 facet cannot be %2 if %3 facet of base type is %4. Die Facette %1 kann nicht %2 sein, wenn die Facette %3 des Basistyps %4 ist. - - - %1 facet must be less than or equal to %2 facet. Die Facette %1 muss kleiner oder gleich der Facette %2 sein. - - - %1 facet must be less than %2 facet of base type. Die Facette %1 muss kleiner der Facette %2 des Basistyps sein. - - %1 facet and %2 facet cannot appear together. Die Facetten %1 und %2 können nicht zusammen erscheinen. - - - %1 facet must be greater than %2 facet of base type. Die Facette %1 muss größer als die Facette %2 des Basistyps sein. - - %1 facet must be less than %2 facet. Die Facette %1 muss kleiner als die Facette %2 sein. - - %1 facet must be greater than or equal to %2 facet of base type. Die Facette %1 muss größer oder gleich der Facette %2 des Basistyps sein. - Simple type contains not allowed facet %1. Der einfache Typ enthält eine unzulässige Facette %1. - %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. Die Facetten %1, %2, %3, %4, %5 und %6 sind bei Vererbung durch Listen nicht zulässig. - Only %1 and %2 facets are allowed when derived by union. Bei Vererbung durch Vereinigung sind nur die Facetten %1 und %2 zulässig. - - %1 contains %2 facet with invalid data: %3. %1 enthält eine Facette %2 mit ungültigen Daten: %3. - Attribute group %1 contains attribute %2 twice. Die Attributgruppe %1 enthält das Attribut %2 zweimal. - Attribute group %1 contains two different attributes that both have types derived from %2. Die Attributgruppe %1 enthält zwei verschiedene Attribute mit Typen, die von %2 abgeleitet sind. - Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. Die Attributgruppe %1 enthält ein Attribut %2 mit einer Einschränkung des Werts, dessen Typ aber von %3 abgeleitet ist. - Complex type %1 contains attribute %2 twice. Der komplexe Typ %1 enthält das Attribut %2 doppelt. - Complex type %1 contains two different attributes that both have types derived from %2. Die Attributgruppe %1 enthält zwei verschiedene Attribute mit Typen, die beide von %2 abgeleitet sind. - Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. Der komplexe Typ %1 enthält ein Attribut %2 mit einer Einschränkung des Werts, dessen Typ aber von %3 abgeleitet ist. - Element %1 is not allowed to have a value constraint if its base type is complex. Das Element %1 darf keine Einschränkung des Werts haben, wenn der Basistyp komplex ist. - Element %1 is not allowed to have a value constraint if its type is derived from %2. Das Element %1 darf keine Einschränkung des Werts haben, wenn sein Typ von %2 abgeleitet ist. - - Value constraint of element %1 is not of elements type: %2. Die Einschränkung des Werts des Elements %1 ist nicht vom Typ des Elements: %2. - Element %1 is not allowed to have substitution group affiliation as it is no global element. Das Element %1 kann nicht zu einer Substitutionsgruppe gehören, da es kein globales Element ist. - Type of element %1 cannot be derived from type of substitution group affiliation. Der Typ des Elements %1 kann nicht vom Typ der zugehörigen Substitutionsgruppe abgeleitet werden. - Value constraint of attribute %1 is not of attributes type: %2. Die Einschränkung des Werts des Attributs %1 ist nicht vom Typ des Attributs: %2. - Attribute %1 has value constraint but has type derived from %2. Das Attribut %1 hat eine Einschränkung des Werts, während sein Typ von %2 abgeleitet ist. - %1 attribute in derived complex type must be %2 like in base type. Das Attribut %1 in einem abgeleiteten komplexen Typ muss wie im Basistyp '%2' sein. - Attribute %1 in derived complex type must have %2 value constraint like in base type. Das Attribut %1 in einem abgeleiteten komplexen Typ muss wie der Basistyp eine Einschränkung des Werts (%2) haben. - Attribute %1 in derived complex type must have the same %2 value constraint like in base type. Das Attribut %1 in einem abgeleiteten komplexen Typ muss die gleiche Einschränkung des Werts (%2) wie der Basistyp haben. - Attribute %1 in derived complex type must have %2 value constraint. Das Attribut %1 in einem abgeleiteten komplexen Typ muss die Einschränkung des Werts '%2' haben. - processContent of base wildcard must be weaker than derived wildcard. Das 'processContent'-Attribut des Basissuchmusters muss schwächer sein als das des abgeleiteten Suchmusters. - - Element %1 exists twice with different types. Es existieren zwei Vorkommen verschiedenen Typs des Elements %1. - Particle contains non-deterministic wildcards. Der Partikel enthält nicht-deterministische Suchmuster. - - Base attribute %1 is required but derived attribute is not. Das Basisattribut %1 ist erforderlich, nicht jedoch das abgeleitete Attribut. - Type of derived attribute %1 cannot be validly derived from type of base attribute. Der Typ des abgeleiteten Attributs %1 kann nicht aus Typ des Basisattributs bestimmt werden. - Value constraint of derived attribute %1 does not match value constraint of base attribute. Die Einschränkung des Werts des abgeleiteten Attributs %1 entspricht nicht der Einschränkung des Werts des Basisattributs. - Derived attribute %1 does not exist in the base definition. Das abgeleitete Attribut %1 existiert in der Basisdefinition nicht. - Derived attribute %1 does not match the wildcard in the base definition. Das abgeleitete Attribut %1 entspricht nicht dem Suchmuster in der Basisdefinition. - Base attribute %1 is required but missing in derived definition. Das erforderliche Basisattribut %1 fehlt in der abgeleiteten Definition. - Derived definition contains an %1 element that does not exists in the base definition Die abgeleitete Definition enthält ein Element %1, was in der Basisdefinition nicht existiert - Derived wildcard is not a subset of the base wildcard. Das abgeleitete Suchmuster ist keine Untermenge des Basissuchmusters. - %1 of derived wildcard is not a valid restriction of %2 of base wildcard Das Attribut %1 des abgeleiteten Suchmusters ist keine gültige Einschränkung des Attributs '%2' des Basissuchmusters - Attribute %1 from base type is missing in derived type. Das Attribut %1 des Basistyps fehlt im abgeleiteten Typ. - Type of derived attribute %1 differs from type of base attribute. Der Typ des abgeleiteten Attributs %1 unterscheidet sich vom Basistyp. - Base definition contains an %1 element that is missing in the derived definition Das Element %1 des Basistyps fehlt in der abgeleiteten Definition - %1 references unknown %2 or %3 element %4. %1 verweist auf ein unbekanntes Element %4 ('%2' oder '%3'). - %1 references identity constraint %2 that is no %3 or %4 element. %1 verweist auf eine Identitätseinschränkung %2, die weder ein '%3' noch ein '%4' Element ist. - %1 has a different number of fields from the identity constraint %2 that it references. Bei %1 unterscheidet sich die Anzahl der Felder von der der Identitätseinschränkung %2, auf die es verweist. - Base type %1 of %2 element cannot be resolved. Der Basistyp %1 des Elements %2 kann nicht aufgelöst werden. - Item type %1 of %2 element cannot be resolved. Der Subtyp %1 des Elements %2 kann nicht aufgelöst werden. - Member type %1 of %2 element cannot be resolved. Der Subtyp %1 des Elements %2 kann nicht aufgelöst werden. - - - Type %1 of %2 element cannot be resolved. Der Typ %1 des Elements %2 kann nicht aufgelöst werden. - Base type %1 of complex type cannot be resolved. Der Basistyp %1 des komplexen Typs kann nicht aufgelöst werden. - %1 cannot have complex base type that has a %2. %1 kann keinen komplexen Basistyp haben, der '%2' spezifiziert. - Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. Das Inhaltsmodell des komplexen Typs %1enthält ein Element '%2'; es kann daher nicht durch Erweiterung von einem Typ abgeleitet werden, der nicht leer ist. - Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. Der komplexe Typ %1 kann nicht durch Erweiterung von %2 abgeleitet werden, da letzterer ein '%3'-Element in seinem Inhaltsmodell hat. - Type of %1 element must be a simple type, %2 is not. Der Typ des Elements %1 muss ein einfacher Typ sein, was %2 nicht ist. - Substitution group %1 of %2 element cannot be resolved. Die Substitutionsgruppe %1 des Elements %2 kann nicht aufgelöst werden. - Substitution group %1 has circular definition. Die Substitutionsgruppe %1 hat eine zirkuläre Definition. - - Duplicated element names %1 in %2 element. Der Elementname %1 kommt im Element %2 mehrfach vor. - - - - Reference %1 of %2 element cannot be resolved. Der Verweis %1 des Elements %2 kann nicht aufgelöst werden. - Circular group reference for %1. Zirkulärer Verweis bei %1. - %1 element is not allowed in this scope Das Element %1 ist in diesem Bereich nicht zulässig - %1 element cannot have %2 attribute with value other than %3. Der Wert des Attributs %2 des Elements %1 kann nur %3 sein. - %1 element cannot have %2 attribute with value other than %3 or %4. Der Wert des Attributs %2 des Elements %1 kann nur %3 oder %4 sein. - %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. Das Attribut %1 oder %2 des Verweises %3 entspricht nicht der Attributsdeklaration %4. - Attribute group %1 has circular reference. Die Attributgruppe %1 hat einen zirkulären Verweis. - %1 attribute in %2 must have %3 use like in base type %4. Das Attribut %1 aus %2 muss die Verwendung '%3' spezifizieren, wie im Basistyp %4. - Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. Das Attributssuchmuster %1 ist keine gültige Einschränkung des Attributssuchmuster des Basistyps %2. - %1 has attribute wildcard but its base type %2 has not. %1 hat ein Attributssuchmuster, nicht jedoch sein Basistyp %2. - Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. Die Vereinigung der Attributssuchmuster des Typs %1 und seines Basistyps %2 ergibt keinen gültigen Ausdruck. - Enumeration facet contains invalid content: {%1} is not a value of type %2. Ungültiger Inhalt einer Aufzählungsfacette: {%1} ist kein Wert des Typs %2. - Namespace prefix of qualified name %1 is not defined. Der Namensraum-Präfix des qualifizierten Namens %1 ist nicht definiert. - - %1 element %2 is not a valid restriction of the %3 element it redefines: %4. Das Element %2 (%1) ist keine gültige Einschränkung des überschriebenen Elements (%3): %4. - Empty particle cannot be derived from non-empty particle. Es kann kein leerer Partikel von einem Partikel abgeleitet werden, der nicht leer ist. - Derived particle is missing element %1. Das Element %1 fehlt im abgeleiteten Partikel. - Derived element %1 is missing value constraint as defined in base particle. Im abgeleiteten Element %1 fehlt Einschränkung des Wertes, wie sie im Basispartikel definiert ist. - Derived element %1 has weaker value constraint than base particle. Das abgeleitete Element %1 hat eine schwächere Einschränkung des Wertes als der Basispartikel. - Fixed value constraint of element %1 differs from value constraint in base particle. Die feste Einschränkung des Wertes des Elements %1 unterscheidet sich von der Einschränkung des Wertes des Basispartikels. - Derived element %1 cannot be nillable as base element is not nillable. Das abgeleitete Element %1 kann kein 'nillable'-Attribut haben, da das Basiselement keines spezifiziert. - Block constraints of derived element %1 must not be more weaker than in the base element. Die Blockeinschränkung des abgeleiteten Elements %1 darf nicht schwächer sein als im Basiselement. - Simple type of derived element %1 cannot be validly derived from base element. Der einfache Typ des abgeleiteten Elements %1 kann nicht vom Basiselement abgeleitet werden. - Complex type of derived element %1 cannot be validly derived from base element. Der komplexe Typ des abgeleiteten Elements %1 kann nicht vom Basiselement abgeleitet werden. - Element %1 is missing in derived particle. Das Element %1 fehlt im abgeleiteten Partikel. - Element %1 does not match namespace constraint of wildcard in base particle. Das Element %1 entspricht nicht der Namensraumeinschränkung des Basispartikels. - Wildcard in derived particle is not a valid subset of wildcard in base particle. Das Suchmuster im abgeleiteten Partikel ist keine gültige Untermenge des Suchmusters des Basispartikels. - processContent of wildcard in derived particle is weaker than wildcard in base particle. Das processContent-Attribut des Suchmusters des abgeleiteten Partikels ist schwächer als das Suchmuster des Basispartikels. - Derived particle allows content that is not allowed in the base particle. Der abgeleitete Partikel gestattet Inhalt, der für den Basispartikel nicht zulässig ist. - Can not process unknown element %1, expected elements are: %2. Das unbekannte Element %1 kann nicht verarbeitet werden; zulässig wären: %2. - Element %1 is not allowed in this scope, possible elements are: %2. Das Element %1 ist in diesem Bereich nicht zulässig; möglich wären: %2. - Child element is missing in that scope, possible child elements are: %1. Das Unterelement fehlt im Bereich; mögliche Unterelemente wären: %1. - Document is not a XML schema. Das Dokument ist kein XML-Schema. - %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. Das Attribut %1 des Elements %2 enthält ungültigen Inhalt: {%3} ist kein Wert des Typs %4. - %1 attribute of %2 element contains invalid content: {%3}. Das Attribut %1 des Elements %2 enthält ungültigen Inhalt: {%3}. - Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. Der Zielnamensraum %1 des eingebundenen Schemas unterscheidet sich vom dem von ihm definierten Zielnamensraum %2. - - Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. Der Zielnamensraum %1 des importierten Schemas unterscheidet sich vom dem von ihm definierten Zielnamensraum %2. - %1 element is not allowed to have the same %2 attribute value as the target namespace %3. Das Element %1 kann nicht den Zielnamensraum %3 als Wert des Attributs '%2' spezifizieren. - %1 element without %2 attribute is not allowed inside schema without target namespace. In einem Schema ohne Namensraum muss das Element %1 ein Attribut %2 haben. - - %1 element is not allowed inside %2 element if %3 attribute is present. Wenn das Attribut %3 vorhanden ist, darf das Element %1 nicht im Element %2 vorkommen. - - - %1 element has neither %2 attribute nor %3 child element. Das Element %1 hat weder das Attribut %2 noch ein Unterelement %3. - - - - - - - - - - - - - - %1 element with %2 child element must not have a %3 attribute. Das Element %1 darf kein Attribut %3 haben, wenn das Unterelement %2 vorhanden ist. - %1 attribute of %2 element must be %3 or %4. Das Attribut %1 des Elements %2 kann nur %3 oder %4 sein. - %1 attribute of %2 element must have a value of %3. Das Attribut %1 des Elements %2 muss den Wert %3 haben. - - %1 attribute of %2 element must have a value of %3 or %4. Das Attribut %1 des Elements %2 kann nur einen der Werte %3 oder %4 haben. - - - - - - - - - - - - - - %1 element must not have %2 and %3 attribute together. Die Attribute %2 und %3 können nicht zusammen im Element %1 erscheinen. - - Content of %1 attribute of %2 element must not be from namespace %3. Der Inhalt des Attributs %1 des Elements %2 kann nicht vom Namensraum %3 stammen. - - %1 attribute of %2 element must not be %3. Das Attribut %1 des Elements %2 kann nicht %3 sein. - %1 attribute of %2 element must have the value %3 because the %4 attribute is set. Das Attribut %1 des Elements %2 muss den Wert %3 haben, da das Attribut %4 gesetzt ist. - Specifying use='prohibited' inside an attribute group has no effect. Die Angabe von use='prohibited' in einer Attributgruppe hat keinerlei Auswirkungen. - %1 element must have either %2 or %3 attribute. Das Element %1 muss eines der Attribute %2 oder %3 spezifizieren. - %1 element must have either %2 attribute or %3 or %4 as child element. Das Element %1 muss entweder das Attribut %2 spezifizieren oder über eines der Unterelemente %3 oder %4 verfügen. - %1 element requires either %2 or %3 attribute. Das Element %1 erfordert eines der Attribute %2 oder %3. - Text or entity references not allowed inside %1 element Text- oder Entitätsreferenzen sind innerhalb eines %1-Elements nicht zulässig. - - %1 attribute of %2 element must contain %3, %4 or a list of URIs. Das Attribut %1 des Elements %2 muss %3, %4 oder eine Liste der URIs enthalten. - %1 element is not allowed in this context. Das Element %1 ist in diesem Kontext nicht zulässig. - %1 attribute of %2 element has larger value than %3 attribute. Der Wert des Attributs %1 des Elements %2 ist größer als der des Attributs %3. - Prefix of qualified name %1 is not defined. Der Präfix des qualifizierten Namens %1 ist nicht definiert. - - %1 attribute of %2 element must either contain %3 or the other values. Der Wert des Attributs %1 des Elements %2 muss entweder %3 oder die anderen Werte enthalten. - Component with ID %1 has been defined previously. Es wurde bereits eine Komponente mit der ID %1 definiert. - Element %1 already defined. Das Element %1 ist bereits definiert. - Attribute %1 already defined. Das Attribut %1 ist bereits definiert. - Type %1 already defined. Der Typ %1 ist bereits definiert. - Attribute group %1 already defined. Die Attributgruppe %1 ist bereits definiert. - Element group %1 already defined. Die Elementgruppe %1 ist bereits definiert. - Notation %1 already defined. Die Notation %1 ist bereits definiert. - Identity constraint %1 already defined. Die Identitätseinschränkung %1 ist bereits definiert. - Duplicated facets in simple type %1. Im einfachen Typ %1 kommen Facetten mehrfach vor. - - - %1 is not valid according to %2. %1 ist nach %2 ungültig. - String content does not match the length facet. Der Zeichenketteninhalt entspricht nicht der Längenfacette. - String content does not match the minLength facet. Der Zeichenketteninhalt entspricht nicht der Längenfacette (Minimumangabe). - String content does not match the maxLength facet. Der Zeichenketteninhalt entspricht nicht der Längenfacette (Maximumangabe). - String content does not match pattern facet. Der Zeichenketteninhalt entspricht nicht der Suchmusterfacette. - String content is not listed in the enumeration facet. Der Zeichenketteninhalt ist nicht in der Aufzählungsfacette enthalten. - Signed integer content does not match the maxInclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'maxInclusive'. - Signed integer content does not match the maxExclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'maxExclusive'. - Signed integer content does not match the minInclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'minInclusive'. - Signed integer content does not match the minExclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'minExclusive'. - Signed integer content is not listed in the enumeration facet. Der vorzeichenbehaftete Ganzzahlwert ist nicht in der Aufzählungsfacette enthalten. - Signed integer content does not match pattern facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Suchmusterfacette. - Signed integer content does not match in the totalDigits facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'totalDigits'. - Unsigned integer content does not match the maxInclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'maxInclusive'. - Unsigned integer content does not match the maxExclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'maxExclusive'. - Unsigned integer content does not match the minInclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'minInclusive'. - Unsigned integer content does not match the minExclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'minExclusive'. - Unsigned integer content is not listed in the enumeration facet. Der vorzeichenlose Ganzzahlwert ist nicht in der Aufzählungsfacette enthalten. - Unsigned integer content does not match pattern facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Suchmusterfacette. - Unsigned integer content does not match in the totalDigits facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'totalDigits'. - Double content does not match the maxInclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'maxInclusive'. - Double content does not match the maxExclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'maxExclusive'. - Double content does not match the minInclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'minInclusive'. - Double content does not match the minExclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'minExclusive'. - Double content is not listed in the enumeration facet. Die Gleitkommazahl ist nicht in der Aufzählungsfacette enthalten. - Double content does not match pattern facet. Die Gleitkommazahl entspricht nicht der Suchmusterfacette. - Decimal content does not match in the fractionDigits facet. Die Dezimalzahl entspricht nicht der Facette 'fractionDigit'. - Decimal content does not match in the totalDigits facet. Die Dezimalzahl entspricht nicht der Facette 'totalDigits'. - Date time content does not match the maxInclusive facet. Die Datumsangabe entspricht nicht der Facette 'maxInclusive'. - Date time content does not match the maxExclusive facet. Die Datumsangabe entspricht nicht der Facette 'maxExclusive'. - Date time content does not match the minInclusive facet. Die Datumsangabe entspricht nicht der Facette 'minInclusive'. - Date time content does not match the minExclusive facet. Die Datumsangabe entspricht nicht der Facette 'minExclusive'. - Date time content is not listed in the enumeration facet. Die Datumsangabe ist nicht in der Aufzählungsfacette enthalten. - Date time content does not match pattern facet. Die Datumsangabe entspricht nicht der Suchmusterfacette. - Duration content does not match the maxInclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'maxInclusive'. - Duration content does not match the maxExclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'maxExclusive'. - Duration content does not match the minInclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'minInclusive'. - Duration content does not match the minExclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'minExclusive'. - Duration content is not listed in the enumeration facet. Die Angabe der Zeitdauer ist nicht in der Aufzählungsfacette enthalten. - Duration content does not match pattern facet. Die Angabe der Zeitdauer entspricht nicht der Suchmusterfacette. - Boolean content does not match pattern facet. Der Boolesche Wert entspricht nicht der Suchmusterfacette. - Binary content does not match the length facet. Der binäre Inhalt entspricht nicht der Längenfacette. - Binary content does not match the minLength facet. Der binäre Inhalt entspricht nicht der Facette 'minLength'. - Binary content does not match the maxLength facet. Der binäre Inhalt entspricht nicht der Facette 'maxLength'. - Binary content is not listed in the enumeration facet. Der binäre Inhalt ist nicht in der Aufzählungsfacette enthalten. - Invalid QName content: %1. Der Inhalt des qualifizierten Namens ist ungültig: %1. - QName content is not listed in the enumeration facet. Der Inhalt des qualifizierten Namens ist nicht in der Aufzählungsfacette enthalten. - QName content does not match pattern facet. Der Inhalt des qualifizierten Namens entspricht nicht der Suchmusterfacette. - Notation content is not listed in the enumeration facet. Der Inhalt der Notation ist nicht in der Aufzählungsfacette enthalten. - List content does not match length facet. Der Listeninhalt entspricht nicht der Längenfacette. - List content does not match minLength facet. Der Listeninhalt entspricht nicht der Facette 'minLength'. - List content does not match maxLength facet. Der Listeninhalt entspricht nicht der Facette 'maxLength'. - List content is not listed in the enumeration facet. Der Listeninhalt ist nicht in der Aufzählungsfacette enthalten. - List content does not match pattern facet. Der Listeninhalt entspricht nicht der Suchmusterfacette. - Union content is not listed in the enumeration facet. Der Inhalt der Vereinigung ist nicht in der Aufzählungsfacette enthalten. - Union content does not match pattern facet. Der Inhalt der Vereinigung entspricht nicht der Suchmusterfacette. - Data of type %1 are not allowed to be empty. Daten vom Typ %1 können nicht leer sein. - Element %1 is missing child element. Beim Element %1 fehlt ein Unterelement. - There is one IDREF value with no corresponding ID: %1. Es existiert ein IDREF-Wert, für den keine zugehörige ID vorhanden ist: %1. - Loaded schema file is invalid. Das geladene Schema ist ungültig. - %1 contains invalid data. %1 enthält ungültige Daten. - xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. xsi:schemaLocation namespace %1 wurde im Instanzdokument bereits spezifiziert. - xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. xsi:noNamespaceSchemaLocation kann nicht nach dem ersten Element oder Attribut ohne Namensraum erscheinen. - No schema defined for validation. Es ist kein Schema für die Validierung definiert. - No definition for element %1 available. Für das Element %1 ist keine Definition verfügbar. - - - Specified type %1 is not known to the schema. Der angegebene Typ %1 ist im Schema nicht spezifiziert. - Element %1 is not defined in this scope. Das Element %1 ist in diesem Bereich nicht definiert. - Declaration for element %1 does not exist. Für das Element %1 ist keine Deklaration verfügbar. - Element %1 contains invalid content. Das Element %1 enthält ungültigen Inhalt. - Element %1 is declared as abstract. Das Element %1 ist als abstrakt deklariert. - Element %1 is not nillable. Das Element %1 hat das Attribut 'nillable' nicht spezifiziert. - Attribute %1 contains invalid data: %2 Das Attribut %1 enthält ungültige Daten: %2 - Element contains content although it is nillable. Das Element hat Inhalt, obwohl es 'nillable' spezifiziert. - Fixed value constraint not allowed if element is nillable. Eine Beschränkung auf einen festen Wert ist nicht zulässig, wenn das Element 'nillable' spezifiziert. - Element %1 cannot contain other elements, as it has a fixed content. Das Element %1 kann keine anderen Element enthalten, da sein Inhalt festgelegt ist. - Specified type %1 is not validly substitutable with element type %2. Der angebenene Typ %1 kann nicht durch den Elementtyp %2 substituiert werden. - Complex type %1 is not allowed to be abstract. Der komplexe Typ %1 kann nicht abstrakt sein. - Element %1 contains not allowed attributes. Das Element %1 enthält unzulässige Attribute. - - Element %1 contains not allowed child element. Das Element %1 enthält ein unzulässiges Unterelement. - - Content of element %1 does not match its type definition: %2. Der Inhalt des Elements %1 entspricht nicht seiner Typdefinition: %2. - - - Content of element %1 does not match defined value constraint. Der Inhalt des Elements %1 entspricht nicht der definierten Einschränkung des Werts. - Element %1 contains not allowed child content. Das Element %1 enthält unzulässigen Unterinhalt. - Element %1 contains not allowed text content. Das Element %1 enthält unzulässigen Textinhalt. - Element %1 is missing required attribute %2. Bei dem Element %1 fehlt ein erforderliches Attribut %2. - Attribute %1 does not match the attribute wildcard. Das Attribut %1 entspricht nicht dem Attributssuchmuster. - Declaration for attribute %1 does not exist. Für das Attribut %1 ist keine Deklaration verfügbar. - Element %1 contains two attributes of type %2. Das Element %1 enthält zwei Attribute des Typs %2. - Attribute %1 contains invalid content. Das Attribut %1 enthält ungültigen Inhalt. - Element %1 contains unknown attribute %2. Das Element %1 enthält ein unbekanntes Attribut %2. - - Content of attribute %1 does not match its type definition: %2. Der Inhalt des Attributs %1 entspricht nicht seiner Typdefinition: %2. - - Content of attribute %1 does not match defined value constraint. Der Inhalt des Attributs %1 entspricht nicht der definierten Einschränkung des Werts. - Non-unique value found for constraint %1. Für die Einschränkung %1 wurde ein nicht eindeutiger Wert gefunden. - Key constraint %1 contains absent fields. Die Einschränkung des Schlüssels %1 enthält nicht vorhandene Felder. - Key constraint %1 contains references nillable element %2. Die Einschränkung des Schlüssels %1 verweist auf das Element %2, was 'nillable' spezifiziert. - No referenced value found for key reference %1. Der referenzierte Wert der Schlüsselreferenz %1 konnte nicht gefunden werden. - More than one value found for field %1. Für das Feld %1 wurden mehrere Werte gefunden. - Field %1 has no simple type. Das Feld %1 hat keinen einfachen Typ. - ID value '%1' is not unique. Der ID-Wert '%1' ist nicht eindeutig. - '%1' attribute contains invalid QName content: %2. Das Attribut '%1' enthält einen ungültigen qualifizierten Namen: %2. diff -r ef0373b55136 -r 758a864f9613 translations/qt_fr.ts --- a/translations/qt_fr.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qt_fr.ts Mon Oct 04 01:19:32 2010 +0300 @@ -2,59 +2,18 @@ - MAC_APPLICATION_MENU - - - Services - Services - - - - Hide %1 - Masquer %1 - - - - Hide Others - Masquer les autres - - - - Show All - Tout afficher - - - - Preferences... - Préférences… - - - - Quit %1 - Quitter %1 - - - - About %1 - À propos de %1 - - - AudioOutput - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> - <html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Utilisation de <b>%2</b>.</html> - - - + <html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Utilisation de <b>%2</b>.</html> + + <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> - <html>Utilisation de <b>%1</b><br/>qui vient de devenir disponible et a une plus grande priorité.</html> - - - + <html>Utilisation de <b>%1</b><br/>qui vient de devenir disponible et a une plus grande priorité.</html> + + Revert back to device '%1' - Utilisation de '%1' + Utilisation de '%1' @@ -80,15 +39,15 @@ local audio file: - Fichier audio local: + Fichier audio local : local video file: - Fichier vidéo local: + Fichier vidéo local : remote media URL: - URL distante : + URL distante : run tests @@ -107,6 +66,48 @@ + FakeReply + + Fake error ! + Fausse erreur ! + + + Invalid URL + URL invalide + + + + MAC_APPLICATION_MENU + + Services + Services + + + Hide %1 + Masquer %1 + + + Hide Others + Masquer les autres + + + Show All + Tout afficher + + + Preferences... + Préférences... + + + Quit %1 + Quitter %1 + + + About %1 + À propos de %1 + + + MainWindow Print @@ -114,7 +115,7 @@ Location: - Emplacement: + Emplacement : @@ -200,29 +201,47 @@ + Phonon::AudioOutput + + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> + <html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Repli sur <b>%2</b>.</html> + + + <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> + <html>Basculement vers le périphérique audio <b>%1</b><br/>qui vient juste d'être disponible et dont le niveau de préférence est plus élevé.</html> + + + Revert back to device '%1' + Revenir au périphérique '%1' + + + <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> + <html>Basculement vers le périphérique audio <b>%1</b><br/>dont le niveau de préférence est plus élevé ou qui est spécifiquement configuré pour ce flux.</html> + + + Phonon::Gstreamer::Backend Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. - Attention: Vous n'avez apparemment pas installé le paquet gstreamer0.10-plugins-good. + Attention : Vous n'avez apparemment pas installé le paquet gstreamer0.10-plugins-good. Des fonctionnalités vidéo ont été desactivées. Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled - Attention: Vous n'avez apparemment pas installées les plugins de base de GStreamer. + Attention : Vous n'avez apparemment pas installées les plugins de base de GStreamer. Le support audio et vidéo est désactivé Phonon::Gstreamer::MediaObject - Cannot start playback. Check your Gstreamer installation and make sure you have libgstreamer-plugins-base installed. - Impossible de démarrer la lecture. Verifiez votre installation de Gstreamer et assurez-vous d'avoir installé libgstreamer-plugins-base. + Impossible de démarrer la lecture. Verifiez votre installation de Gstreamer et assurez-vous d'avoir installé libgstreamer-plugins-base. Unknown media format: %1 @@ -257,8 +276,17 @@ Impossible de charger la source + Missing codec helper script assistant. + ??? + Assistant de script d'aide au codec manquant. + + + Plugin codec installation failed for codec: %0 + Échec de l'installation du plugin pour le codec : %0 + + A required codec is missing. You need to install the following codec(s) to play this content: %0 - Un codec requis est manquant. Vous devez installer le codec suivant pour jouer le contenu: %0 + Un codec requis est manquant. Vous devez installer le codec suivant pour jouer le contenu : %0 Could not open media source. @@ -292,10 +320,340 @@ + Phonon::MMF + + Audio Output + Sortie audio + + + The audio output device + Périphérique audio de sortie + + + No error + Aucune erreur + + + Not found + Introuvable + + + Out of memory + Mémoire insuffisante + + + Not supported + Non supporté + + + Overflow + Dépassement + + + Underflow + Soupassement + + + Already exists + Existe déjà + + + Path not found + Chemin introuvable + + + In use + Utilisé + + + Not ready + Pas prêt + + + Access denied + Autorisation refusée + + + Could not connect + Connexion impossible + + + Disconnected + Déconnecté + + + Permission denied + Autorisation refusée + + + Insufficient bandwidth + Bande passante insuffisante + + + Network unavailable + Réseau non disponible + + + Network communication error + Erreur de communication réseau + + + Streaming not supported + Streaming non supporté + + + Server alert + Alerte serveur + + + Invalid protocol + Protocole invalide + + + Invalid URL + URL invalide + + + Multicast error + Erreur multicast + + + Proxy server error + Erreur du serveur proxy + + + Proxy server not supported + Serveur proxy non supporté + + + Audio output error + Erreur de sortie audio + + + Video output error + Erreur de sortie vidéo + + + Decoder error + Erreur du décodeur + + + Audio or video components could not be played + Les composants audio ou vidéo n'ont pas pu être lus + + + DRM error + Erreur GDN + + + Unknown error (%1) + Erreur inconnue (%1) + + + + Phonon::MMF::AbstractMediaPlayer + + Not ready to play + Pas prêt pour lecture + + + Error opening file + Erreur lors de l'ouverture du fichier + + + Error opening URL + Erreur lors de l'ouverture de l'URL + + + Error opening resource + erreur lors de l'ouverture de la ressource + + + Error opening source: resource not opened + erreur lors de l'ouverture de la source : ressource non ouverte + + + Setting volume failed + Le réglage du volume a échoué + + + Loading clip failed + Échec de l'ouverture du clip + + + Playback complete + Lecture terminée + + + + Phonon::MMF::AbstractVideoPlayer + + Pause failed + La mise en pause a échoué + + + Seek failed + La recherche a échoué + + + Getting position failed + L'obtention de la position a échoué + + + Opening clip failed + L'ouverture du clip a échoué + + + + Phonon::MMF::AudioEqualizer + + %1 Hz + %1 Hz + + + + Phonon::MMF::AudioPlayer + + Getting position failed + L'obtention de la position a échoué + + + Opening clip failed + L'ouverture du clip a échoué + + + + Phonon::MMF::DsaVideoPlayer + + Video display error + Erreur de l'affichage vidéo + + + + Phonon::MMF::EffectFactory + + Enabled + Activé + + + + Phonon::MMF::EnvironmentalReverb + + Decay HF ratio (%) + DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. + Ratio HF du déclin (%) + + + Decay time (ms) + DecayTime: Time over which reverberation is diminished. + Temps de déclin (ms) + + + Density (%) + Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. + Densité (%) + + + Diffusion (%) + Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. + Diffusion (%) + + + Reflections delay (ms) + ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. + Délai réflexions (ms) + + + Reflections level (mB) + ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. + Niveau réflexions (mB) + + + Reverb delay (ms) + ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. + Délai de réverbération (ms) + + + Reverb level (mB) + ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. + Niveau de réverbération (mB) + + + Room HF level + RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. + Niveau HF pièce + + + Room level (mB) + RoomLevel: Master volume control for all reflected sound. + Niveau pièce (mB) + + + + Phonon::MMF::MediaObject + + Error opening source: type not supported + Erreur lors de l'ouverture de la source : type non supporté + + + Error opening source: resource is compressed + Erreur lors de l'ouverture de la source : ressource compressée + + + Error opening source: resource not valid + Erreur lors de l'ouverture de la source : ressource invalide + + + Error opening source: media type could not be determined + Erreur lors de l'ouverture de la source : type de média non déterminé + + + + Phonon::MMF::StereoWidening + + Level (%) + Niveau (%) + + + + Phonon::MMF::SurfaceVideoPlayer + + Video display error + Erreur de l'affichage vidéo + + + + Phonon::MMF::VideoPlayer + + Pause failed + La mise en pause a échoué + + + Seek failed + La recherche a échoué + + + Getting position failed + L'obtention de la position a échoué + + + Opening clip failed + L'ouverture du clip a échoué + + + Buffering clip failed + La mise en mémoire tampon du clip a échoué + + + Video display error + Erreur de l'affichage vidéo + + + Phonon::VolumeSlider Volume: %1% - Volume: %1% + Volume : %1% Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% @@ -388,15 +746,15 @@ Look &in: - Chercher &dans : + Chercher &dans : File &name: - &Nom de fichier : + &Nom de fichier : File &type: - &Type de fichier : + &Type de fichier : Back @@ -568,7 +926,7 @@ Directory: - Dossier : + Dossier : Error @@ -580,7 +938,7 @@ Check path and filename. %1 Impossible de trouver le fichier. -Vérifier le chemin et le nom du fichier. +Vérifiez le chemin et le nom du fichier. All Files (*.*) @@ -748,9 +1106,8 @@ Contient des commandes pour manipuler la fenêtre - Puts a minimized back to normal - Rend à une fenêtre minimisée son aspect normal + Rend à une fenêtre minimisée son aspect normal Moves the window out of the way @@ -781,7 +1138,7 @@ Q3ToolBar More... - Reste... + Plus... @@ -893,9 +1250,15 @@ + QAccessibleButton + + Press + Appuyer + + + QApplication - QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -918,7 +1281,7 @@ QT_LAYOUT_DIRECTION - LTR + LTR @@ -937,7 +1300,7 @@ COM &Object: - &Objet COM : + &Objet COM : @@ -959,31 +1322,31 @@ QColorDialog Hu&e: - &Teinte : + &Teinte : &Sat: - &Saturation : + &Saturation : &Val: - &Valeur : + &Valeur : &Red: - &Rouge : + &Rouge : &Green: - &Vert : + &Vert : Bl&ue: - Ble&u : + Ble&u : A&lpha channel: - Canal a&lpha : + Canal a&lpha : Select Color @@ -1042,73 +1405,75 @@ %1: permission denied QSystemSemaphore - %1: permission refusée + %1 : permission refusée %1: already exists QSystemSemaphore - %1: existe déjà + %1 : existe déjà %1: doesn't exists QSystemSemaphore - %1: n'existe pas + %1 : n'existe pas + + + %1: does not exist + QSystemSemaphore + %1 : n'existe pas %1: out of resources QSystemSemaphore - %1: plus de ressources disponibles + %1 : plus de ressources disponibles %1: unknown error %2 QSystemSemaphore - %1: erreur inconnue %2 - - - + %1 : erreur inconnue %2 + + %1: key is empty QSystemSemaphore - %1: clé vide - - - + %1 : clé vide + + %1: unable to make key QSystemSemaphore - %1: impossible de créer la clé - - - + %1 : impossible de créer la clé + + %1: ftok failed QSystemSemaphore - %1: ftok a échoué + %1 : ftok a échoué %1: key is empty - %1: clé vide + %1 : clé vide %1: unable to make key - %1: impossible de créer la clé + %1 : impossible de créer la clé %1: ftok failed - %1: ftok a échoué + %1 : ftok a échoué %1: already exists - %1: existe déjà + %1 : existe déjà %1: does not exist - %1: n'existe pas + %1 : n'existe pas %1: out of resources - %1: plus de ressources disponibles + %1 : plus de ressources disponibles %1: unknown error %2 - %1: erreur inconnue %2 + %1 : erreur inconnue %2 @@ -1138,7 +1503,7 @@ Unable to prepare statement - Impossible de prépare la requête + Impossible de préparer la requête Unable to bind variable @@ -1177,6 +1542,909 @@ + QDeclarativeAbstractAnimation + + Cannot animate non-existent property "%1" + Impossible d'animer la propriété inexistante "%1" + + + Cannot animate read-only property "%1" + Impossible d'animer la propriété en lecture seule "%1" + + + Animation is an abstract class + L'animation est une classe abstraite + + + + QDeclarativeAnchorAnimation + + Cannot set a duration of < 0 + Impossible de sélectionner une durée négative + + + + QDeclarativeAnchors + + Possible anchor loop detected on fill. + Boucle potentielle dans les ancres détectée pour le remplissage. + + + Possible anchor loop detected on centerIn. + Boucle potentielle dans les ancres détectée pour le centrage. + + + Cannot anchor to an item that isn't a parent or sibling. + Impossible d'ancrer à un élément qui n'est pas un parent ou partage le même parent. + + + Possible anchor loop detected on vertical anchor. + Boucle potentielle dans les ancres détectée pour l'ancre verticale. + + + Possible anchor loop detected on horizontal anchor. + Boucle potentielle dans les ancres détectée pour l'ancre horizontale. + + + Cannot specify left, right, and hcenter anchors. + Impossible de spécifier à la fois une ancre gauche, droite et hcenter. + + + Cannot anchor to a null item. + Impossible d'ancrer à un élément nul. + + + Cannot anchor a horizontal edge to a vertical edge. + Impossible d'ancrer un bord horizontal à un bord vertical. + + + Cannot anchor item to self. + Impossible d'ancrer l'élément à lui même. + + + Cannot specify top, bottom, and vcenter anchors. + Impossible de spécifier à la fois une ancre haut, bas et vcenter. + + + Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. + L'ancre baseline ne peut pas etre combinée à l'usage des ancres haut, bas ou vcenter. + + + Cannot anchor a vertical edge to a horizontal edge. + Impossible d'ancrer un bord vertical à un bord horizontal. + + + + QDeclarativeAnimatedImage + + Qt was built without support for QMovie + Qt a été compilé sans support de QMovie + + + + QDeclarativeBehavior + + Cannot change the animation assigned to a Behavior. + Impossible de changer l'animation affectée à un comportement. + + + + QDeclarativeBinding + + Binding loop detected for property "%1" + Boucle détectée dans l'affectation pour la propriété "%1" + + + + QDeclarativeBindings + + Binding loop detected for property "%1" + Boucle détectée dans l'affectation pour la propriété "%1" + + + + QDeclarativeCompiler + + Invalid property assignment: "%1" is a read-only property + Affectation de propriété invalide : "%1"est une propriété en lecture seule + + + Invalid property assignment: unknown enumeration + Affectation de propriété invalide : énumération inconnue + + + Invalid property assignment: string expected + Affectation de propriété invalide : chaîne attendue + + + Invalid property assignment: url expected + Affectation de propriété invalide : url attendue + + + Invalid property assignment: unsigned int expected + Affectation de propriété invalide : unsigned int attendu + + + Invalid property assignment: int expected + Affectation de propriété invalide : int attendu + + + Invalid property assignment: float expected + Affectation de propriété invalide : float attendu + + + Invalid property assignment: double expected + Affectation de propriété invalide : double attendu + + + Invalid property assignment: number expected + Affectation de propriété invalide : nombre attendu + + + Invalid property assignment: color expected + Affectation de propriété invalide : couleur attendue + + + Invalid property assignment: date expected + Affectation de propriété invalide : date attendue + + + Invalid property assignment: time expected + Affectation de propriété invalide : heure attendue + + + Invalid property assignment: datetime expected + Affectation de propriété invalide : date et heure attendues + + + Invalid property assignment: point expected + Affectation de propriété invalide : point attendu + + + Invalid property assignment: size expected + Affectation de propriété invalide : taille attendue + + + Invalid property assignment: rect expected + Affectation de propriété invalide : rectangle attendu + + + Invalid property assignment: boolean expected + Affectation de propriété invalide : booléen attendu + + + Invalid property assignment: 3D vector expected + Affectation de propriété invalide : vecteur 3D attendu + + + Invalid property assignment: unsupported type "%1" + Affectation de propriété invalide : type "%1" non supporté + + + Element is not creatable. + Impossible de créer l'élément. + + + Component elements may not contain properties other than id + Les éléments du composant ne peuvent pas contenir des propriétés autres que id + + + Invalid component id specification + L'id de composant spécifiée n'est pas valide + + + id is not unique + l'id n'est pas unique + + + Invalid component body specification + Le corps de la spécification du composant n'est pas valide + + + Component objects cannot declare new properties. + Les objets composants ne peuvent pas déclarer de nouvelles propriétés. + + + Component objects cannot declare new signals. + Les objets composants ne peuvent pas déclarer de nouveaux signaux. + + + Component objects cannot declare new functions. + Les objets composants ne peuvent pas déclarer de nouvelles fonctions. + + + Cannot create empty component specification + Impossible de créer une spécification du composant vide + + + Incorrectly specified signal assignment + L'affectation du signal est incorrectement spécifiée + + + Cannot assign a value to a signal (expecting a script to be run) + Impossible d'assigner une valeur à un signal (un script à exécuter est attendu) + + + Empty signal assignment + Affectation de signal vide + + + Empty property assignment + Affectation de propriété vide + + + Attached properties cannot be used here + La configuration spécifiée ne peut être utilisée ici. + + + Non-existent attached object + Objet attaché inexistant + + + Invalid attached object assignment + L'affectation de l'objet attaché est invalide + + + Cannot assign to non-existent default property + Impossible d'attacher à une propriété par défaut inexistante + + + Cannot assign to non-existent property "%1" + Impossible d'attacher à une propriété inexistante "%1" + + + Invalid use of namespace + Utilisation invalide d'espace de noms + + + Not an attached property name + Ce n'est pas un nom de propriété attachée + + + Invalid use of id property + Utilisation invalide de la propriété id + + + Property has already been assigned a value + Une valeur a déjà été attribuée à la propriété + + + Invalid grouped property access + Accès invalide à une propriété groupée + + + Cannot assign a value directly to a grouped property + Impossible d'assigner directement une valeur à une propriété groupée + + + Invalid property use + La propriété utilisée est invalide + + + Property assignment expected + Affectation de propriété attendue + + + Single property assignment expected + Une seule affectation de propriété est attendue + + + Unexpected object assignment + Affectation d'objet inattendue + + + Cannot assign object to list + Impossible d'assigner un objet à une liste + + + Can only assign one binding to lists + Un seul lien peut être assigné à des listes + + + Cannot assign primitives to lists + Impossible d'assigner des primitives à des listes + + + Cannot assign multiple values to a script property + Impossible d'assigner plusieurs valeurs à une propriété de script + + + Invalid property assignment: script expected + Affectation de propriété invalide : script attendu + + + Cannot assign object to property + Impossible d'assigner un objet à une propriété + + + "%1" cannot operate on "%2" + "%1" ne peut pas opérer sur "%2" + + + Duplicate default property + Propriété par défaut en double + + + Duplicate property name + Nom de propriété en double + + + Property names cannot begin with an upper case letter + Les noms des propriétés ne peuvent pas commencer par une majuscule + + + Illegal property name + Nom de propriété invalide + + + Duplicate signal name + Nom de signal en double + + + Signal names cannot begin with an upper case letter + Les noms de signaux ne peuvent pas commencer par une majuscule + + + Illegal signal name + Nom de signal invalide + + + Duplicate method name + Nom de méthode en double + + + Method names cannot begin with an upper case letter + Les noms des méthodes ne peuvent pas commencer par une majuscule + + + Illegal method name + Nom de méthode invalide + + + Property value set multiple times + Valeur de propriété attribuée plusieurs fois + + + Invalid property nesting + Imbrication de propriété invalide + + + Cannot override FINAL property + Impossible de remplacer la propriété FINAL + + + Invalid property type + Type de propriété invalide + + + Invalid empty ID + id vide invalide + + + IDs cannot start with an uppercase letter + Les ids ne peuvent pas commencer par une majuscule + + + IDs must start with a letter or underscore + Les ids doivent commencer par une lettre ou un tiret bas + + + IDs must contain only letters, numbers, and underscores + Les ids ne peuvent contenir que des lettres, des nombres ou des tirets bas + + + ID illegally masks global JavaScript property + id masque illégalement la propriété JavaScript globale + + + + L'alias de propriété n'a pas d'emplacement + + + Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> + Référence d'alias invalide. Les références d'alias doivent être spécifiées comme <id> ou <id>.<property> + + + Invalid alias reference. Unable to find id "%1" + Référence d'alias invalide. Impossible de trouver l'id "%1" + + + + QDeclarativeComponent + + Invalid empty URL + URL vide invalide + + + + QDeclarativeCompositeTypeManager + + Resource %1 unavailable + La ressource %1 n'est pas disponible + + + Namespace %1 cannot be used as a type + L'espace de noms %1 ne peut pas être utilisé comme un type + + + %1 %2 + %1 %2 + + + Type %1 unavailable + Le type %1 n'est pas disponible + + + + QDeclarativeConnections + + Cannot assign to non-existent property "%1" + Imposible d'assigner à la propriété inexistante "%1" + + + Connections: nested objects not allowed + Connexions : les éléments imbriqués ne sont pas autorisés + + + Connections: syntax error + Connexions : erreur de syntaxe + + + Connections: script expected + Connexions : script attendu + + + + QDeclarativeEngine + + executeSql called outside transaction() + executeSql a été appelé en dehors de transaction() + + + Read-only Transaction + Transaction en lecture seule + + + Version mismatch: expected %1, found %2 + Version incompatible : %1 attendue, %2 trouvée + + + SQL transaction failed + la transaction SQL a échouée + + + transaction: missing callback + transaction : la fonction de rappel est absente + + + SQL: database version mismatch + SQL : la version de la base de données est incompatible + + + + QDeclarativeFlipable + + front is a write-once property + front est une propriété à écriture unique + + + back is a write-once property + back est une propriété à écriture unique + + + + QDeclarativeImportDatabase + + module "%1" definition "%2" not readable + la définition "%2" du module "%1% n'est pas lisible + + + plugin cannot be loaded for module "%1": %2 + impossible de charger le plugin pour le module "%1" : %2 + + + module "%1" plugin "%2" not found + le plugin "%2" du module "%1" n'a pas été trouvé + + + module "%1" version %2.%3 is not installed + la version %2.%3 du module "%1" n'est pas installée + + + module "%1" is not installed + le module "%1" n'est pas installé + + + "%1": no such directory + "%1" : le répertoire n'existe pas + + + import "%1" has no qmldir and no namespace + l'importation "%1" n'a pas de qmldir ni d'espace de noms + + + - %1 is not a namespace + - %1 n'est pas un espace de noms + + + - nested namespaces not allowed + - les espaces de noms imbriqués ne sont pas autorisés + + + local directory + répertoire local + + + is ambiguous. Found in %1 and in %2 + est ambigu. Trouvé dans %1 et dans %2 + + + is ambiguous. Found in %1 in version %2.%3 and %4.%5 + est ambigu. Trouvé dans %1 dans les versions %2.%3 et %4.%5 + + + is instantiated recursively + est instancié récursivement + + + is not a type + n'est pas un type + + + + QDeclarativeKeyNavigationAttached + + KeyNavigation is only available via attached properties + KeyNavigation est disponible uniquement via les propriétés attachées + + + + QDeclarativeKeysAttached + + Keys is only available via attached properties + Keys, a verifier + Keys est disponible uniquement via les propriétés attachées + + + + QDeclarativeListModel + + remove: index %1 out of range + remove : l'index %1 est hors de la plage de valeurs admissibles + + + insert: value is not an object + insert : une valeur n'est pas un objet + + + insert: index %1 out of range + insert : l'index %1 est hors de la plage de valeurs admissibles + + + move: out of range + move : hors de la plage de valeurs admissibles + + + append: value is not an object + append : une valeur n'est pas un objet + + + set: value is not an object + set : une valeur n'est pas un objet + + + set: index %1 out of range + set : l'index %1 est hors de la plage de valeurs admissible + + + ListElement: cannot contain nested elements + ListElement : ne peut pas contenir des éléments imbriqués + + + ListElement: cannot use reserved "id" property + ListElement : ne peut pas utiliser la propriété réservée "id" + + + ListElement: cannot use script for property value + ListElement : ne peut pas utiliser script comme valeur pour une propriété + + + ListModel: undefined property '%1' + ListModel : propriété indéfinie '%1' + + + + QDeclarativeLoader + + Loader does not support loading non-visual elements. + Le chargeur n'est pas compatible avec le chargement d'éléments non-visuels. + + + + QDeclarativeParentAnimation + + Unable to preserve appearance under complex transform + Impossible de conserver l'aspect lors d'une transformation complexe + + + Unable to preserve appearance under non-uniform scale + Impossible de conserver l'aspect lors d'une mise à l'échelle non uniforme + + + Unable to preserve appearance under scale of 0 + Impossible de conserver l'aspect lors d'une mise à l'échelle égale à 0 + + + + QDeclarativeParentChange + + Unable to preserve appearance under complex transform + Impossible de conserver l'aspect lors d'une transformation complexe + + + Unable to preserve appearance under non-uniform scale + Impossible de conserver l'aspect lors d'une mise à l'échelle non uniforme + + + Unable to preserve appearance under scale of 0 + Impossible de conserver l'aspect lors d'une mise à l'échelle égale à 0 + + + + QDeclarativeParser + + Illegal unicode escape sequence + Séquence d'échappement Unicode illégale + + + Illegal character + Caractère illégal + + + Unclosed string at end of line + Chaîne de caractères non fermée en fin de ligne + + + Illegal escape squence + Séquence d'échappement illégale + + + Unclosed comment at end of file + Commentaire non fermé en fin de ligne + + + Illegal syntax for exponential number + Syntaxe illégale pour un nombre exponentiel + + + Identifier cannot start with numeric literal + Impossible de commencer un identifiant par un chiffre + + + Unterminated regular expression literal + Élément non terminé pour l'expression régulière + + + Invalid regular expression flag '%0' + Drapeau '%0' invalid pour l'expression régulière + + + Unterminated regular expression backslash sequence + Séquence antislash non terminée pour l'expression régulière + + + Unterminated regular expression class + Classe non terminée pour l'expression régulière + + + Syntax error + Erreur de syntaxe + + + Unexpected token `%1' + jeton inattendu '%1' + + + Expected token `%1' + jeton attendu '%1' + + + Property value set multiple times + valeur de propriété attribuée à plusieurs reprises + + + Expected type name + Nom de type attendu + + + Invalid import qualifier ID + qualificatif id d'importation invalide + + + Reserved name "Qt" cannot be used as an qualifier + "Qt" est un nom réservé et ne peut pas être utilisé comme qualificatif + + + Script import qualifiers must be unique. + ?? + Les qualificatifs d'importation de script doivent être uniques. + + + Script import requires a qualifier + L'importation de script exige un qualificatif + + + Library import requires a version + L'importation de bibliothèque exige une version + + + Expected parameter type + Type de paramètre attendu + + + Invalid property type modifier + Modificateur invalide pour le type de propriété + + + Unexpected property type modifier + Modificateur inattendu pour le type de propriété + + + Expected property type + Type de propriété attendu + + + Readonly not yet supported + La lecture seule n'est pas encore implémentée + + + JavaScript declaration outside Script element + Déclaration JavaScript en dehors de l'élément Script + + + + QDeclarativePauseAnimation + + Cannot set a duration of < 0 + Impossible d'attribuer une durée < 0 + + + + QDeclarativePixmap + + Error decoding: %1: %2 + Erreur de décodage : %1 : %2 + + + Failed to get image from provider: %1 + Impossible d'obtenir l'image du fournisseur : %1 + + + Cannot open: %1 + Impossible d'ouvrir : %1 + + + + QDeclarativePixmapCache + + Error decoding: %1: %2 + Erreur de décodage : %1 : %2 + + + Failed to get image from provider: %1 + Impossible d'obtenir l'image du fournisseur : %1 + + + Cannot open: %1 + Impossible d'ouvrir : %1 + + + Unknown Error loading %1 + Erreur de chargement inconnue : %1 + + + + QDeclarativePropertyAnimation + + Cannot set a duration of < 0 + Impossible d'attribuer une durée < 0 + + + + QDeclarativePropertyChanges + + PropertyChanges does not support creating state-specific objects. + PropertyChanges n'est pas compatible avec la création d'objets spécifiques à un état. + + + Cannot assign to non-existent property "%1" + Ne peut pas assigner à la propriété inexistante "%1" + + + Cannot assign to read-only property "%1" + Ne peut pas assigner à la propriété en lecture seule "%1" + + + + QDeclarativeTextInput + + Could not load cursor delegate + Impossible de charger le délégué de curseur + + + Could not instantiate cursor delegate + Impossible d'instancier le délégué de curseur + + + + QDeclarativeVME + + Unable to create object of type %1 + Impossible de créer un objet de type %1 + + + Cannot assign value %1 to property %2 + Impossible d'assigner la valeur %1 à la propriété %2 + + + Cannot assign object type %1 with no default method + Impossible d'assigner un objet de type %1 sans méthode par défaut + + + Cannot connect mismatched signal/slot %1 %vs. %2 + le vs a confirmer + Impossible de connecter le signal/slot %1 %vs. %2 pour cause d'incompatibilité + + + Cannot assign an object to signal property %1 + Impossible d'assigner un objet à la propriété %1 d'un signal + + + Cannot assign object to list + Impossible d'assigner un objet à une liste + + + Cannot assign object to interface property + Impossible d'assigner un objet à la propriété d'une interface + + + Unable to create attached object + Impossible de créer un objet attaché + + + Cannot set properties on %1 as it is null + Impossible d'attribuer les propriétés à %1 car ce dernier est nul + + + + QDeclarativeVisualDataModel + + Delegate component must be Item type. + Un composant délégué doit être de type Item. + + + + QDeclarativeXmlListModel + + Qt was built without support for xmlpatterns + Qt a été compilé sans support pour xmlpatterns + + + + QDeclarativeXmlListModelRole + + An XmlRole query must not start with '/' + Une requête XmlRole ne doit pas commencer par '/' + + + + QDeclarativeXmlRoleList + + An XmlListModel query must start with '/' or "//" + Une requête XmlListModel doit commencer par '/' ou "//" + + + QDial QDial @@ -1188,7 +2456,7 @@ SliderHandle - Poignée + Poignée du slider @@ -1312,13 +2580,11 @@ Taille - Kind Match OS X Finder Type - Type All other platforms Type @@ -1329,11 +2595,11 @@ Kind - Type + Type Type - Type + Type @@ -1374,15 +2640,15 @@ Debug Message: - Message de débogage: + Message de débogage : Warning: - Avertissement: + Avertissement : Fatal Error: - Erreur fatale: + Erreur fatale : @@ -1413,7 +2679,7 @@ Will not rename sequential file using block copy - Ne renommera pas le fichier séquentiel avec la copie bloc + Ne renommera pas le fichier séquentiel avec la copie par blocs @@ -1489,11 +2755,11 @@ Files of type: - Fichiers de type : + Fichiers de type : Directory: - Dossier : + Dossier : @@ -1519,7 +2785,7 @@ Are sure you want to delete '%1'? - Etes-vous sûr de vouloir supprimer '%1' ? + Êtes-vous sûr de vouloir supprimer '%1' ? Could not delete directory. @@ -1542,6 +2808,26 @@ Fichier + File Folder + Match Windows Explorer + Fichier Dossier + + + Folder + All other platforms + Dossier + + + Alias + Mac OS X Finder + Alias + + + Shortcut + All other platforms + Raccourci + + Unknown Inconnu @@ -1551,7 +2837,7 @@ Show - Montrer + Afficher Forward @@ -1575,11 +2861,11 @@ File &name: - &Nom de fichier : + &Nom de fichier : Look in: - Voir dans: + Voir dans : Create New Folder @@ -1587,19 +2873,43 @@ File Folder - Fichier Dossier + Fichier Dossier Folder - Dossier + Dossier Alias - Alias + Alias Shortcut - Raccourci + Raccourci + + + Go back + Précédent + + + Go forward + Suivant + + + Go to the parent directory + Dossier parent + + + Create a New Folder + Créer un nouveau dossier + + + Change to list view mode + Affichage liste + + + Change to detail view mode + Affichage détaillé @@ -1641,13 +2951,11 @@ Taille - Kind Match OS X Finder Type - Type All other platforms Type @@ -1658,7 +2966,7 @@ My Computer - Mon ordinateur + Poste de travail Computer @@ -1666,11 +2974,11 @@ Kind - Type + Type Type - Type + Type %1 byte(s) @@ -1689,11 +2997,11 @@ Demi Bold - Semi Gras + Demi-gras Black - Noir + Extra-gras Demi @@ -1701,7 +3009,7 @@ Light - Léger + Maigre Italic @@ -1745,11 +3053,11 @@ Thaana - Thaana + Thâna Devanagari - Devanagari + Dévanagari Bengali @@ -1769,7 +3077,7 @@ Tamil - Tamil + Tamoul Telugu @@ -1909,11 +3217,11 @@ Connection to %1 closed - Connexion à %1 arrêtée + Connexion à %1 fermée Connection closed - Connexion arrêtée + Connexion fermée Host %1 not found @@ -1940,7 +3248,7 @@ Login failed: %1 - Échec du login: + Échec du login : %1 @@ -1995,11 +3303,22 @@ + QGstreamerPlayerSession + + Unable to play %1 + Impossible de lire %1 + + + QHostInfo Unknown error Erreur inconnue + + No host name given + Aucun nom d'hôte n'a été donné + QHostInfoAgent @@ -2021,7 +3340,7 @@ Invalid hostname - Nom d'hôte non valide + Nom d'hôte invalide @@ -2060,11 +3379,11 @@ Connection to %1 closed - Connexion à %1 arrêtée + Connexion à %1 fermée Connection closed - Connexion arrêtée + Connexion fermée Unknown error @@ -2124,7 +3443,7 @@ SSL handshake failed - le handshake SSL a échoué + La poignée de main SSL a échoué Connection refused (or timed out) @@ -2151,7 +3470,7 @@ Proxy denied connection - Le Proxy a rejeté la connexion + Le proxy a rejeté la connexion Error communicating with HTTP proxy @@ -2268,7 +3587,7 @@ QIODevice Permission denied - Accès refusé + Autorisation refusée Too many open files @@ -2318,22 +3637,22 @@ QInputDialog Enter a value: - Entrer une valeur : + Entrer une valeur : QLibrary QLibrary::load_sys: Cannot load %1 (%2) - QLibrary::load_sys: Impossible de charger %1 (%2) + QLibrary::load_sys : Impossible de charger %1 (%2) QLibrary::unload_sys: Cannot unload %1 (%2) - QLibrary::unload_sys: Impossible de décharger %1 (%2) + QLibrary::unload_sys : Impossible de décharger %1 (%2) QLibrary::resolve_sys: Symbol "%1" undefined in %2 (%3) - QLibrary::resolve_sys: Symbole "%1" non défini dans %2 (%3) + QLibrary::resolve_sys : Symbole "%1" non défini dans %2 (%3) Could not mmap '%1': %2 @@ -2419,58 +3738,58 @@ QLocalServer %1: Name error - %1: Erreur de nom + %1 : Erreur de nom %1: Permission denied - %1: Permission refusée + %1 : Permission refusée %1: Address in use - %1: Address déjà utilisée + %1 : Address déjà utilisée %1: Unknown error %2 - %1: Erreur inconnue %2 + %1 : Erreur inconnue %2 QLocalSocket %1: Connection refused - %1: Connexion refusée + %1 : Connexion refusée %1: Remote closed - %1: Connexion fermée + %1 : Connexion fermée %1: Invalid name - %1: Nom invalide + %1 : Nom invalide %1: Socket access error - %1: Erreur d'accès au socket + %1 : Erreur d'accès au socket %1: Socket resource error - %1: Erreur de ressource du socket + %1 : Erreur de ressource du socket %1: Socket operation timed out - %1: L'opération socket a expiré + %1 : L'opération socket a expiré %1: Datagram too large - %1: Datagramme trop grand + %1 : Datagramme trop grand %1: Connection error - %1: Erreur de connexion + %1 : Erreur de connexion %1: The socket operation is not supported - %1: L'opération n'est pas supportée + %1 : L'opération n'est pas supportée %1: Unknown error @@ -2478,7 +3797,7 @@ %1: Unknown error %2 - %1: Erreur inconnue %2 + %1 : Erreur inconnue %2 @@ -2634,6 +3953,28 @@ + QMediaPlayer + + The QMediaPlayer object does not have a valid service + Pas de service valide pour l'objet QMediaPlayer + + + + QMediaPlaylist + + Could not add items to read only playlist. + Impossible d'ajouter des éléments à une liste de lecture en lecture seule. + + + Playlist format is not supported + Le format de liste de lecture n'est pas supporté + + + The file could not be accessed. + Impossible d'accéder au fichier. + + + QMenu Close @@ -2652,7 +3993,7 @@ QMenuBar About - A propos + À propos Config @@ -2684,7 +4025,7 @@ About %1 - A propos de %1 + À propos de %1 About Qt @@ -2723,7 +4064,7 @@ <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com/</a> for more information.</p> - <h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'applications multi-platformes.</p><p>Qt fournit la portabilité du code source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et toutes les variantes commerciales majeures d'Unix. Qt est aussi disponible pour les systèmes embarqués sous le nom Qtopia Core.</p><p>Qt est un produit de Trolltech. <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> + <h3>À propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'applications multi-platformes.</p><p>Qt fournit la portabilité du code source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et toutes les variantes commerciales majeures d'Unix. Qt est aussi disponible pour les systèmes embarqués sous le nom Qtopia Core.</p><p>Qt est un produit de Trolltech. <a href="http : //qt.nokia.com/">qt.nokia.com</a> for more information.</p> Show Details... @@ -2734,21 +4075,20 @@ Cacher les détails... - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>À propos de Qt</h3><p>Ce programme utilise Qt version %1.</p><p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> + <h3>À propos de Qt</h3><p>Ce programme utilise Qt version %1.</p><p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés comme Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http : //qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>A propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http://qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> + <h3>À propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p> + <p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http : //qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'application multi-plateforme.</p><p>Qt fournit la portabilité de votre source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, toutes les variantes majeures d'Unix. Qt est aussi disponible pour les périphériques embarqués avec Qt Embedded.</p><p>Qt est un produit de Trolltech. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> + <h3>À propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'application multi-plateforme.</p><p>Qt fournit la portabilité de votre source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, toutes les variantes majeures d'Unix. Qt est aussi disponible pour les périphériques embarqués avec Qt Embedded.</p><p>Qt est un produit de Trolltech. Voir <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour plus d'informations.</p> <h3>About Qt</h3><p>This program uses Qt version %1.</p> @@ -2756,7 +4096,7 @@ <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http://qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> + <p>Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.</p><p>Qt fournit une portabilité source unique pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés comme Qt pour Embedded Linux et Qt pour Windows CE.</p><p>Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.</p><p>Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.</p><p>Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.</p><p>Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.</p><p>Veuillez consulter<a href="http : //qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> pour un aperçu des concessions de licences Qt.</p><p>Copyright (C) 2010 Nokia Corporation et/ou ses filiales.</p><p>Qt est un produit Nokia. Voir <a href="http : //qt.nokia.com/">qt.nokia.com</a> pour de plus amples informations.</p> @@ -2809,7 +4149,7 @@ Permission denied - Accès refusé + Autorisation refusée Connection timed out @@ -2892,6 +4232,32 @@ + QNetworkAccessDataBackend + + Operation not supported on %1 + Opération non supportée sur %1 + + + Invalid URI: %1 + URI invalide : %1 + + + + QNetworkAccessDebugPipeBackend + + Write error writing to %1: %2 + Erreur lors de l'écriture dans %1 : %2 + + + Socket error on %1: %2 + Erreur de socket sur %1 : %2 + + + Remote host closed the connection prematurely on %1 + L'hôte distant a fermé sa connexion de façon prématurée sur %1 + + + QNetworkAccessFileBackend Request for opening non-local file %1 @@ -2945,15 +4311,30 @@ + QNetworkAccessManager + + Network access is disabled. + L'accès au réseau est désactivé. + + + QNetworkReply Error downloading %1 - server replied: %2 - Erreur lors du téléchargement de %1 - le serveur a répondu: %2 + Erreur lors du téléchargement de %1 - le serveur a répondu : %2 Protocol "%1" is unknown Le protocole "%1" est inconnu + + Network session error. + Erreur de session réseau. + + + Temporary network failure. + Erreur réseau temporaire. + QNetworkReplyImpl @@ -2963,13 +4344,54 @@ + QNetworkSession + + Invalid configuration. + Configuration invalide. + + + + QNetworkSessionPrivateImpl + + Roaming error + Erreur de roaming + + + Session aborted by user or system + Session annulée par l'utilisateur ou le système + + + Unidentified Error + Erreur inconnue + + + Unknown session error. + Erreur de session inconnue. + + + The session was aborted by the user or system. + la session a été annulée par l'utilisateur ou le système. + + + The requested operation is not supported by the system. + L'opération requise n'est pas suportée par le système. + + + The specified configuration cannot be used. + La configuration spécifiée ne peut être utilisée. + + + Roaming was aborted or is not possible. + Le roaming a été annulé ou est impossible. + + + QOCIDriver Unable to logon Impossible d'ouvrir une session - Unable to initialize QOCIDriver L'initialisation a échoué @@ -2988,7 +4410,7 @@ Unable to initialize - L'initialisation a échoué + L'initialisation a échoué @@ -3037,9 +4459,8 @@ Incapable d'établir une connexion - Unable to connect - Driver doesn't support all needed functionality - Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires + Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires Unable to disable autocommit @@ -3066,7 +4487,7 @@ QODBCResult QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - QODBCResult::reset: Impossible d'utiliser 'SQL_CURSOR_STATIC' comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC + QODBCResult::reset : Impossible d'utiliser 'SQL_CURSOR_STATIC' comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC Unable to execute statement @@ -3104,48 +4525,56 @@ QObject - Home - Début + Début Operation not supported on %1 - Opération non supportée sur %1 + Opération non supportée sur %1 Invalid URI: %1 - URI invalide : %1 - - - + URI invalide : %1 + + Write error writing to %1: %2 - Erreur d'écriture sur %1 : %2 - - - + Erreur d'écriture sur %1 : %2 + + Read error reading from %1: %2 - Erreur de lecture sur %1 : %2 + Erreur de lecture sur %1 : %2 Socket error on %1: %2 - Erreur de socket sur %1 : %2 + Erreur de socket sur %1 : %2 Remote host closed the connection prematurely on %1 - L'hôte distant a fermé sa connexion de façon prématurée sur %1 - - - + L'hôte distant a fermé sa connexion de façon prématurée sur %1 + + Protocol error: packet of size 0 received - Erreur de protocole: paquet de taille 0 reçu + Erreur de protocole : paquet de taille 0 reçu No host name given - Nom d'hôte manquant + Nom d'hôte manquant Invalid hostname - Nom d'hôte non valide + Nom d'hôte invalide + + + PulseAudio Sound Server + Serveur de son PulseAudio + + + "%1" duplicates a previous role name and will be disabled. + "%1" est un doublon d'un nom de role existant et sera désactivé. + + + invalid query: "%1" + Requête invalide : "%1" @@ -3225,19 +4654,19 @@ Page size: - Dimensions : + Dimensions : Width: - Largeur : + Largeur : Height: - Hauteur : + Hauteur : Paper source: - Source du papier : + Source du papier : Orientation @@ -3327,7 +4756,7 @@ Number of copies: - Nombre de copies : + Nombre de copies : Paper format @@ -3442,6 +4871,10 @@ US Common #10 Envelope (105 x 241 mm) + Print current page + Imprimer la page courante + + Aliases: %1 Alias : %1 @@ -3471,19 +4904,19 @@ Page size: - Dimensions : + Dimensions : Orientation: - Orientation : + Orientation : Paper source: - Source du papier : + Source du papier : Print - Impr écran + Imprimer File @@ -3503,7 +4936,7 @@ Size: - Taille : + Taille : Properties @@ -3511,7 +4944,7 @@ Printer info: - Informations sur l'imprimante : + Informations sur l'imprimante : Browse @@ -3796,11 +5229,11 @@ Print - Impr écran + Imprimer Page setup - Configuration de la page + Mise en page Close @@ -3816,7 +5249,7 @@ Page Setup - Configuration de la page + Mise en page @@ -3885,7 +5318,7 @@ Copies: - Copies : + Copies : Collate @@ -3927,6 +5360,10 @@ Short side Côté court + + Current Page + Page courante + QPrintWidget @@ -3940,7 +5377,7 @@ &Name: - &Nom : + &Nom : P&roperties @@ -3948,7 +5385,7 @@ Location: - Emplacement : + Emplacement : Preview @@ -3956,11 +5393,11 @@ Type: - Type : + Type : Output &file: - &Fichier de sortie: + &Fichier de sortie : ... @@ -4002,13 +5439,12 @@ Aucun programme défini - Process failed to start - Le processus n'a pas démarré + Le processus n'a pas démarré Process failed to start: %1 - Le démarrage du processus a échoué: %1 + Le démarrage du processus a échoué : %1 @@ -4072,19 +5508,18 @@ invalid interval - intervalle non valide + intervalle invalide invalid category - catégorie non valide + catégorie invalide QSQLite2Driver - Error to open database - Erreur à l'ouverture de la base de données + Erreur à l'ouverture de la base de données Unable to begin transaction @@ -4095,9 +5530,8 @@ Impossible de soumettre la transaction - Unable to rollback Transaction - Impossible d'annuler la transaction + Impossible d'annuler la transaction Error opening database @@ -4174,6 +5608,281 @@ + QScriptBreakpointsModel + + ID + Identifiant + + + Location + Lieu + + + Condition + Condition + + + Ignore-count + Nombre d'ignorés + + + Single-shot + Un seul coup + + + Hit-count + Nombre de coups + + + + QScriptBreakpointsWidget + + New + Créer + + + Delete + Supprimer + + + + QScriptDebugger + + Go to Line + Aller à la ligne + + + Line: + Ligne : + + + Interrupt + Interrompre + + + Shift+F5 + Shift+F5 + + + Continue + Continuer + + + F5 + F5 + + + Step Into + Pas à pas détaillé + + + F11 + F11 + + + Step Over + Pas à pas principal + + + F10 + F10 + + + Step Out + Pas à pas sortant + + + Shift+F11 + Shift+F11 + + + Run to Cursor + Exécuter au curseur + + + Ctrl+F10 + Ctrl+F10 + + + Run to New Script + Exécuter au nouveau script + + + Toggle Breakpoint + Basculer le point d'arrêt + + + F9 + F9 + + + Clear Debug Output + Effacer les résultats du débogage + + + Clear Error Log + Effacer le journal d'erreurs + + + Clear Console + Effacer la console + + + &Find in Script... + &Chercher dans le script... + + + Ctrl+F + Ctrl+F + + + Find &Next + Résultat &suivant + + + F3 + F3 + + + Find &Previous + Chercher &précédent + + + Shift+F3 + Shift+F3 + + + Ctrl+G + Ctrl+G + + + Debug + Déboguer + + + + QScriptDebuggerCodeFinderWidget + + Close + Fermer + + + Previous + Précédent + + + Next + Suivant + + + Case Sensitive + Sensible à la casse + + + Whole words + Mots complets + + + <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped + <img src=" : /qt/scripttools/debugging/images/wrap.png">&nbsp;La recherche est revenue au début + + + + QScriptDebuggerLocalsModel + + Name + Nom + + + Value + Valeur + + + + QScriptDebuggerStackModel + + Level + Niveau + + + Name + Nom + + + Location + Emplacement + + + + QScriptEdit + + Toggle Breakpoint + Basculer le point d'arrêt + + + Disable Breakpoint + Désactiver le point d'arrêt + + + Enable Breakpoint + Activer le point d'arrêt + + + Breakpoint Condition: + Condition du point d'arrêt : + + + + QScriptEngineDebugger + + Loaded Scripts + Scripts chargés + + + Breakpoints + Points d'arrêt + + + Stack + Pile + + + Locals + Locaux + + + Console + Console + + + Debug Output + Résultats du débogage + + + Error Log + Journal d'erreurs + + + Search + Chercher + + + View + Affichage + + + Qt Script Debugger + Débogueur de script Qt + + + + QScriptNewBreakpointWidget + + Close + Fermer + + + QScrollBar Scroll here @@ -4181,7 +5890,7 @@ Left edge - Extrême gauche + Bord gauche Top @@ -4189,7 +5898,7 @@ Right edge - Extrême droite + Bord droit Bottom @@ -4283,9 +5992,8 @@ %1 : clé vide - %1: unix key file doesn't exists - %1 : le fichier de clé unix n'existe pas + %1 : le fichier de clé unix n'existe pas %1: ftok failed @@ -4317,17 +6025,18 @@ %1: doesn't exist - %1: n'existe pas + %1 : n'existe pas %1: UNIX key file doesn't exist - %1: le fichier de clés UNIX n'existe pas + %1 : le fichier de clés UNIX n'existe pas QShortcut Space + This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. Espace @@ -4368,7 +6077,7 @@ Print - Impr écran + Imprimer SysReq @@ -4436,7 +6145,7 @@ Stop - Stop + Arrêter Refresh @@ -4657,17 +6366,164 @@ Call + Button to start a call (note: a separate button is used to end the call) Appeler Hangup + Button to end a call (note: a separate button is used to start the call) Raccrocher + Toggle Call/Hangup + Button that will hang up if we're in call, or make a call if we're not. + Décrocher/Raccrocher + + Flip Retourner + Voice Dial + Button to trigger voice dialling + Commande vocale + + + Last Number Redial + Button to redial the last number called + Bis + + + Camera Shutter + Button to trigger the camera shutter (take a picture) + Déclencheur appareil photo + + + Camera Focus + Button to focus the camera + Focus appareil photo + + + Kanji + + + + Muhenkan + + + + Henkan + + + + Romaji + + + + Hiragana + + + + Katakana + + + + Hiragana Katakana + + + + Zenkaku + + + + Hankaku + + + + Zenkaku Hankaku + + + + Touroku + + + + Massyo + + + + Kana Lock + + + + Kana Shift + + + + Eisu Shift + + + + Eisu toggle + + + + Code input + + + + Multiple Candidate + Candidat multiple + + + Previous Candidate + Candidat précédent + + + Hangul + + + + Hangul Start + Hangul début + + + Hangul End + Hangul Fin + + + Hangul Hanja + + + + Hangul Jamo + + + + Hangul Romaja + + + + Hangul Jeonja + + + + Hangul Banja + + + + Hangul PreHanja + + + + Hangul PostHanja + + + + Hangul Special + + + Ctrl Ctrl @@ -4696,6 +6552,16 @@ Page d'accueil + Media Pause + Media player pause button + Média pause + + + Toggle Media Play/Pause + Media player button to toggle between playing and paused + Média Lecture/Pause + + Monitor Brightness Up Augmenter la luminosité du moniteur @@ -5037,7 +6903,7 @@ View - Afficher + Affichage Top Menu @@ -5139,6 +7005,33 @@ + QSoftKeyManager + + Ok + OK + + + Select + Sélectionner + + + Done + Terminer + + + Options + Options + + + Cancel + Annuler + + + Exit + Quitter + + + QSpinBox More @@ -5239,13 +7132,12 @@ La clé privée ne certifie pas la clé publique, %1 - Private key does not certificate public key, %1 - La clé privée ne certifie pas la clé publique, %1 + La clé privée ne certifie pas la clé publique, %1 Unable to decrypt data: %1 - Impossible de décrypter les données: %1 + Impossible de décrypter les données : %1 Private key does not certify public key, %1 @@ -5281,11 +7173,11 @@ The certificate's notBefore field contains an invalid time - Le champ pasAvant du certificat inclut une heure non valide + Le champ pasAvant du certificat inclut une heure invalide The certificate's notAfter field contains an invalid time - Le champ pasAprès du certificat inclut une heure non valide + Le champ pasAprès du certificat inclut une heure invalide The certificate is self-signed, and untrusted @@ -5345,14 +7237,33 @@ + QStateMachine + + Missing initial state in compound state '%1' + État initial manquant dans l'état composé '%1' + + + Missing default state in history state '%1' + État par défaut manquant dans l'état de l'historique '%1' + + + No common ancestor for targets and source of transition from state '%1' + Aucun ancêtre commun pour les cibles et la source de transition de l'état '%1' + + + Unknown error + Erreur inconnue + + + QSystemSemaphore %1: out of resources - %1: plus de ressources disponibles + %1 : plus de ressources disponibles %1: permission denied - %1: permission refusée + %1 : permission refusée %1: already exists @@ -5364,7 +7275,7 @@ %1: unknown error %2 - %1: erreur inconnue %2 + %1 : erreur inconnue %2 @@ -5408,7 +7319,7 @@ &Redo - &Répéter + &Rétablir Cu&t @@ -5439,7 +7350,7 @@ QToolButton Press - Presser + Appuyer Open @@ -5461,7 +7372,7 @@ Redo - Répéter + Rétablir @@ -5479,7 +7390,7 @@ Redo - Répéter + Rétablir @@ -5544,9 +7455,8 @@ Impossible d'afficher l'URL - Frame load interruped by policy change - Chargement de la frame interrompu par un changement de configuration + Chargement de la frame interrompu par un changement de configuration Cannot show mimetype @@ -5564,19 +7474,16 @@ QWebPage - Submit default label for Submit buttons in forms on web pages Soumettre - Submit Submit (input element) alt text for <input> elements with no alt, title, or value Soumettre - Reset default label for Reset buttons in forms on web pages Réinitialiser @@ -5587,271 +7494,436 @@ Index recherchable - Choose File title for file button used in HTML forms Choisir le fichier - No file selected text to display in file button used in HTML forms when no file is selected Pas de fichier sélectionné - Open in New Window Open in New Window context menu item Ouvrir dans une Nouvelle Fenêtre - Save Link... Download Linked File context menu item Enregistrer le lien... - Copy Link Copy Link context menu item Copier le lien - Open Image Open Image in New Window context menu item Ouvrir l'image - Save Image Download Image context menu item Enregistrer l'image - Copy Image Copy Link context menu item Copier l'image - Open Frame Open Frame in New Window context menu item Ouvrir le cadre - Copy Copy context menu item Copier - Go Back Back context menu item Précédent - Go Forward Forward context menu item Suivant - Stop Stop context menu item - Stop - - - + Arrêter + + Reload Reload context menu item Recharger - Cut Cut context menu item Couper - Paste Paste context menu item Coller - No Guesses Found No Guesses Found context menu item Pas de candidat trouvés - Ignore Ignore Spelling context menu item Ignorer - Add To Dictionary Learn Spelling context menu item Ajouter au dictionnaire - Search The Web Search The Web context menu item Chercher sur le Web - Look Up In Dictionary Look Up in Dictionary context menu item Chercher dans le dictionnaire - Open Link Open Link context menu item Ouvrir le lien - Ignore Ignore Grammar context menu item Ignorer - Spelling Spelling and Grammar context sub-menu item Orthographe - Show Spelling and Grammar menu item title Afficher Orthographe et Grammaire - Hide Spelling and Grammar menu item title Cacher Orthographe et Grammaire - Check Spelling Check spelling context menu item Vérifier l'orthographe - Check Spelling While Typing Check spelling while typing context menu item Vérifier l'orthographe pendant la saisie - Check Grammar With Spelling Check grammar with spelling context menu item Vérifier la grammaire en même temps que l'orthographe - Fonts Font context sub-menu item Polices - Bold Bold context menu item Gras - Italic Italic context menu item Italique - Underline Underline context menu item Souligné - Outline Outline context menu item Contour - Direction Writing direction context sub-menu item - Text Direction Text direction context sub-menu item Orientation du texte - Default Default writing direction context menu item - Défaut - - - + Par défaut + + + Left to Right + Left to Right context menu item + Gauche à droite + + + Right to Left + Right to Left context menu item + Droite à gauche + + + Loading... + Media controller status message when the media is loading + Chargement... + + + Live Broadcast + Media controller status message when watching a live broadcast + Diffusion en direct + + + Audio Element + Media controller element + Élément audio + + + Video Element + Media controller element + Élément vidéo + + + Mute Button + Media controller element + Bouton de désactivation du son + + + Unmute Button + Media controller element + Bouton de réactivation du son + + + Play Button + Media controller element + Bouton de lecture + + + Pause Button + Media controller element + Bouton de pause + + + Slider + Media controller element + Slider + + + Slider Thumb + Media controller element + Curseur de la barre de défilement + + + Rewind Button + Media controller element + Bouton de retour en arrière + + + Return to Real-time Button + Media controller element + Bouton de retour au temps réel + + + Elapsed Time + Media controller element + Temps écoulé + + + Remaining Time + Media controller element + Durée restante + + + Status Display + Media controller element + Affichage de l'état + + + Fullscreen Button + Media controller element + Bouton de plein écran + + + Seek Forward Button + Media controller element + Bouton de recherche avant + + + Seek Back Button + Media controller element + Bouton de recherche arrière + + + Audio element playback controls and status display + Media controller element + Commandes de lecture et affichage de l'état de l'élément audio + + + Video element playback controls and status display + Media controller element + Commandes de lecture et affichage de l'état de l'élément vidéo + + + Mute audio tracks + Media controller element + Couper le son des pistes audio + + + Unmute audio tracks + Media controller element + Réactiver le son des pistes audio + + + Begin playback + Media controller element + Commencer la lecture + + + Pause playback + Media controller element + Pause lecture + + + Movie time scrubber + Media controller element + Balayeur de durée du film + + + Movie time scrubber thumb + Media controller element + Case de défilement du balayeur de la durée du film + + + Rewind movie + Media controller element + Rembobiner le film + + + Return streaming movie to real-time + Media controller element + Ramener le film en streaming en temps réel + + + Current movie time + Media controller element + Durée du film en cours + + + Remaining movie time + Media controller element + Durée de film restante + + + Current movie status + Media controller element + État du film actuel + + + Play movie in full-screen mode + Media controller element + Regarder le film en mode plein écran + + + Seek quickly back + Media controller element + Recherche rapide arrière + + + Seek quickly forward + Media controller element + Recherche rapide avant + + + Indefinite time + Media time description + Durée indéfinie + + + %1 days %2 hours %3 minutes %4 seconds + Media time description + %1 jours %2 heures %3 minutes %4 secondes + + + %1 hours %2 minutes %3 seconds + Media time description + %1 heures %2 minutes %3 secondes + + + %1 minutes %2 seconds + Media time description + %1 minutes %2 secondes + + + %1 seconds + Media time description + %1 secondes + + LTR Left to Right context menu item - De la gauche vers la droite - - - + De la gauche vers la droite + + RTL Right to Left context menu item - De la droite vers la gauche - - - + De la droite vers la gauche + + Inspect Inspect Element context menu item Inspecter - No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed Pas de recherche récente - Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title Recherches récentes - Clear recent searches menu item in Recent Searches menu that empties menu's contents Effacer les recherches récentes - + Missing Plug-in + Label text to be used when a plug-in is missing + Plug-in manquant + + Unknown Unknown filesize FTP directory listing item Inconnu - %1 (%2x%3 pixels) Title string for images %1 (%2x%3 pixels) @@ -5861,14 +7933,17 @@ Inspecteur Web - %2 + Redirection limit reached + Limite de redirection atteinte + + Bad HTTP request Requête HTTP erronée - This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' - Ceci est un index. Veuillez saisir les mots-clé : + Ceci est un index. Veuillez saisir les mots-clé : Scroll here @@ -5923,7 +7998,6 @@ Défiler vers le bas - %n file(s) number of chosen file @@ -6061,353 +8135,347 @@ Submit - Soumettre + Soumettre Reset - Réinitialiser + Réinitialiser Choose File - Choisir le fichier + Choisir le fichier No file selected - Pas de fichier sélectionné + Pas de fichier sélectionné Open in New Window - Ouvrir dans une Nouvelle Fenêtre + Ouvrir dans une Nouvelle Fenêtre Save Link... - Enregistrer la cible du lien... + Enregistrer la cible du lien... Copy Link - Copier le lien + Copier le lien Open Image - Ouvrir l'image + Ouvrir l'image Save Image - Enregistrer l'image + Enregistrer l'image Copy Image - Copier l'image + Copier l'image Open Frame - Ouvrir le cadre + Ouvrir le cadre Copy - Copier + Copier Go Back - Précédent + Précédent Go Forward - Suivant + Suivant Stop - Stop + Stop Reload - Recharger + Recharger Cut - Couper + Couper Paste - Coller + Coller No Guesses Found - Pas de candidat trouvés + Pas de candidat trouvés Ignore - Ignorer + Ignorer Add To Dictionary - Ajouter au dictionnaire + Ajouter au dictionnaire Search The Web - Chercher sur le Web + Chercher sur le Web Look Up In Dictionary - Chercher dans le dictionnaire + Chercher dans le dictionnaire Open Link - Ouvrir le lien + Ouvrir le lien Spelling - Orthographe + Orthographe Show Spelling and Grammar - Afficher Orthographe et Grammaire + Afficher Orthographe et Grammaire Hide Spelling and Grammar - Cacher Orthographe et Grammaire + Cacher Orthographe et Grammaire Check Spelling - Vérifier l'orthographe + Vérifier l'orthographe Check Spelling While Typing - Vérifier l'orthographe pendant la saisie + Vérifier l'orthographe pendant la saisie Check Grammar With Spelling - Vérifier la grammaire en même temps que l'orthographe + Vérifier la grammaire en même temps que l'orthographe Fonts - Polices + Polices Bold - Gras + Gras Italic - Italique + Italique Underline - Souligné + Souligné Outline - Contour + Contour Direction - Direction + Direction Text Direction - Orientation du texte + Orientation du texte Default - Défaut + Défaut Left to Right - Gauche à droite + Gauche à droite Right to Left - Droite à gauche + Droite à gauche Loading... - Chargement... + Chargement... Live Broadcast - Diffusion en direct + Diffusion en direct Audio Element - Élément audio + Élément audio Video Element - Élément vidéo + Élément vidéo Mute Button - Bouton de désactivation du son + Bouton de désactivation du son Unmute Button - Bouton de réactivation du son + Bouton de réactivation du son Play Button - Bouton de lecture + Bouton de lecture Pause Button - Bouton de pause + Bouton de pause Slider - Barre de défilement + Barre de défilement Slider Thumb - Curseur de la barre de défilement + Curseur de la barre de défilement Rewind Button - Bouton de retour en arrière + Bouton de retour en arrière Return to Real-time Button - Bouton de retour au temps réel + Bouton de retour au temps réel Elapsed Time - Temps écoulé + Temps écoulé Remaining Time - Durée restante + Durée restante Status Display - Affichage de l'état + Affichage de l'état Fullscreen Button - Bouton de plein écran + Bouton de plein écran Seek Forward Button - Bouton de recherche avant + Bouton de recherche avant Seek Back Button - Bouton de recherche arrière + Bouton de recherche arrière Audio element playback controls and status display - Commandes de lecture et affichage de l'état de l'élément audio + Commandes de lecture et affichage de l'état de l'élément audio Video element playback controls and status display - Commandes de lecture et affichage de l'état de l'élément vidéo + Commandes de lecture et affichage de l'état de l'élément vidéo Mute audio tracks - Couper le son des pistes audio + Couper le son des pistes audio Unmute audio tracks - Réactiver le son des pistes audio + Réactiver le son des pistes audio Begin playback - Commencer la lecture + Commencer la lecture Pause playback - Pause lecture + Pause lecture Movie time scrubber - Épurateur de la durée du film + Épurateur de la durée du film Movie time scrubber thumb - Case de défilement de l'épurateur de la durée du film + Case de défilement de l'épurateur de la durée du film Rewind movie - Rembobiner le film + Rembobiner le film Return streaming movie to real-time - Ramener le film en streaming en temps réel + Ramener le film en streaming en temps réel Current movie time - Durée du film actuel + Durée du film actuel Remaining movie time - Durée de film restante + Durée de film restante Current movie status - État du film actuel + État du film actuel Play movie in full-screen mode - Regarder le film en mode plein écran + Regarder le film en mode plein écran Seek quickly back - Recherche rapide arrière + Recherche rapide arrière Seek quickly forward - Recherche rapide avant + Recherche rapide avant Indefinite time - Durée indéfinie + Durée indéfinie %1 days %2 hours %3 minutes %4 seconds - %1 jours %2 heures %3 minutes %4 secondes + %1 jours %2 heures %3 minutes %4 secondes %1 hours %2 minutes %3 seconds - %1 heures %2 minutes %3 secondes + %1 heures %2 minutes %3 secondes %1 minutes %2 seconds - %1 minutes %2 secondes + %1 minutes %2 secondes %1 seconds - %1 secondes + %1 secondes Inspect - Inspecter + Inspecter No recent searches - Pas de recherche récente + Pas de recherche récente Recent searches - Recherches récentes + Recherches récentes Clear recent searches - Effacer les recherches récentes + Effacer les recherches récentes Unknown - Inconnu + Inconnu %1 (%2x%3 pixels) - %1 (%2x%3 pixels) + %1 (%2x%3 pixels) This is a searchable index. Enter search keywords: - Ceci est un index. Veuillez saisir les mots-clé : - - - %n file(s) - - - + Ceci est un index. Veuillez saisir les mots-clé : JavaScript Problem - %1 @@ -6415,7 +8483,7 @@ The script on this page appears to have a problem. Do you want to stop the script? - Le script de cette page semble avoir un problème. Souhaitez-vous arrêter le script? + Le script de cette page semble avoir un problème. Souhaitez-vous arrêter le script ? Paste and Match Style @@ -6599,138 +8667,161 @@ error triggered by consumer - + Erreur déclenchée par le consommateur unexpected end of file - + Fin de fichier inattendue more than one document type definition - + plus d'une définition de type de document error occurred while parsing element - + une erreur s'est produite pendant l'analyse syntaxique de l'élement tag mismatch - + tag incongru error occurred while parsing content - + une erreur s'est produite pendant l'analyse syntaxique du contenu unexpected character - + caractère inattendu invalid name for processing instruction - + nom d'instruction invalide version expected while reading the XML declaration - + une version est attendue dans la déclaration XML wrong value for standalone declaration - + valeur incorrecte pour une déclaration "standalone" error occurred while parsing document type definition - + une erreur s'est produite pendant l'analyse syntaxique de la définition du type de document letter is expected - + une lettre est attendue error occurred while parsing comment - + une erreur s'est produite pendant l'analyse syntaxique du commentaire error occurred while parsing reference - + une erreur s'est produite pendant l'analyse syntaxique d'une référence internal general entity reference not allowed in DTD - + référence à une entité générale interne non autorisée dans la DTD external parsed general entity reference not allowed in attribute value - + référence à une entité générale externe non autorisée dans la valeur d'attribut external parsed general entity reference not allowed in DTD - + référence à une entité générale externe non autorisée dans le DTD unparsed entity reference in wrong context - + référence à une entité non analysée dans le mauvais contexte recursive entities - + entités récursives error in the text declaration of an external entity - + erreur dans la déclaration texte d'une entité externe encoding declaration or standalone declaration expected while reading the XML declaration - + déclaration d'encodage ou déclaration "standalone" attendue lors de la lecture de la déclaration XML standalone declaration expected while reading the XML declaration - + déclaration "standalone" attendue lors de la lecture de la déclaration XML + + + + QXmlPatternistCLI + + Warning in %1, at line %2, column %3: %4 + Avertissement dans %1, à la ligne %2, colonne %3 : %4 + + + Warning in %1: %2 + Avertissement dans %1 : %2 + + + + Lieu inconnu + + + Error %1 in %2, at line %3, column %4: %5 + Erreur %1 dans %2, à la ligne %3, colonne %4 : %5 + + + Error %1 in %2: %3 + Erreur %1 dans %2 : %3 QXmlStream Extra content at end of document. - + Contenu superflu à la fin du document. Invalid entity value. - + Valeur de l'entité invalide. Invalid XML character. - + Caractère XML invalide. Sequence ']]>' not allowed in content. - + séquence ']]>' non autorisée dans le contenu. Namespace prefix '%1' not declared - + Le préfixe d'espace de noms %1 n'a pas été déclaré Attribute redefined. - + Redéfinition d'attribut. Unexpected character '%1' in public id literal. - + Caractère '%1' inattendu pour une valeur d'identifiant public. Invalid XML version string. - + Chaîne de version XML invalide. Unsupported XML version. - + Version XML non supportée. %1 is an invalid encoding name. - + %1 n'est pas un nom d'encodage valide. Encoding %1 is unsupported - + %1 n'est pas un encodage supporté Invalid XML encoding name. @@ -6738,112 +8829,110 @@ Standalone accepts only yes or no. - + Le seules valeurs possibles pour "standalone" sont "yes" ou "no". Invalid attribute in XML declaration. - + Attribut invalide dans une déclaration XML. Premature end of document. - + Fin de document inattendue. Invalid document. - + Document invalide. Expected - + Attendu(e) , but got ' - + , mais trouvé ' Unexpected ' - + Inattendu(e) Expected character data. - + données texte attendues. Recursive entity detected. - + Entité récursive détectée. Start tag expected. - + Tag de départ attendu. XML declaration not at start of document. - + La déclaration XML doit être en début de document. NDATA in parameter entity declaration. - + NDATA dans une déclaration de paramètre d'entité. %1 is an invalid processing instruction name. - + %1 n'est pas un nom d'instruction valide. Invalid processing instruction name. - + nom d'instruction invalide. Illegal namespace declaration. - + Déclaration d'espace de noms non autorisée. Invalid XML name. - + Nom XML invalide. Opening and ending tag mismatch. - + Tags ouvrant et fermants ne correspondent pas. Reference to unparsed entity '%1'. - + Référence à l'entité '%1' non analysée. Entity '%1' not declared. - + Entité '%1' non déclarée. Reference to external entity '%1' in attribute value. - + Référence à l'entité externe '%1' en valeur d'attribut. Invalid character reference. - + Référence à un caractère invalide. Encountered incorrectly encoded content. - + Du contenu avec un encodage incorrect a été rencontré. The standalone pseudo attribute must appear after the encoding. - + Le pseudo-attribut "standalone" doit apparaître après l'encodage. %1 is an invalid PUBLIC identifier. - + %1 n'est pas un identifiant "PUBLIC" valide. QtXmlPatterns - An %1-attribute with value %2 has already been declared. - Un attribute %1 avec la valeur %2 est déjà déclaré. - - - + Un attribute %1 avec la valeur %2 est déjà déclaré. + + An %1-attribute must have a valid %2 as value, which %3 isn't. - Un attribute %1 doit avoir un %2 valide, %3 ne l'a pas. + Un attribute %1 doit avoir un %2 valide, %3 ne l'a pas. Network timeout. @@ -6871,7 +8960,7 @@ Overflow: Can't represent date %1. - Overflow: ne peut pas représenter la date %1. + Overflow : impossible de représenter la date %1. Day %1 is invalid for month %2. @@ -6879,11 +8968,11 @@ Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; - L'heure 24:%1:%2.%3 est invalide. L'heure est 24 mais les minutes, seconndes et millisecondes ne sont pas à 0; + Heure 24 : %1 : %2.%3 est invalide. L'heure est 24 mais les minutes, secondes et millisecondes ne sont pas à 0; Time %1:%2:%3.%4 is invalid. - L'heure %1:%2:%3.%4 est invalide. + L'heure %1 : %2 : %3.%4 est invalide. Overflow: Date can't be represented. @@ -6898,19 +8987,16 @@ Au moins un composant doit apparaître après le délimiteur %1. - No operand in an integer division, %1, can be %2. - Pas d'opérande dans une division entière, %1, peut être %2. - - - + Pas d'opérande dans une division entière, %1, peut être %2. + + The first operand in an integer division, %1, cannot be infinity (%2). - Le premier opérande dans une division entière, %1, ne peut être infini (%2). - - - + Le premier opérande dans une division entière, %1, ne peut être infini (%2). + + The second operand in a division, %1, cannot be zero (%2). - Le second opérande dans une division, %1, ne peut être nul (%2). + Le second opérande dans une division, %1, ne peut être nul (%2). %1 is not a valid value of type %2. @@ -6946,7 +9032,7 @@ A value of type %1 cannot have an Effective Boolean Value. - Une valeur de type %1 ne peut pas avoir une Effective Boolean Value. + Une valeur de type %1 ne peut pas avoir une valeur booléene effective. Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. @@ -6993,29 +9079,24 @@ En castant vers %1 ou des types dérivés, la valeur source doit être du même type ou une chaîne. Le type %2 n'est pas autorisé. - No casting is possible with %1 as the target type. - Aucun cast n'est possible avec %1 comme type de destination. - - - + Aucun cast n'est possible avec %1 comme type de destination. + + It is not possible to cast from %1 to %2. - Il est impossible de caster de %1 en %2. - - - + Il est impossible de caster de %1 en %2. + + Casting to %1 is not possible because it is an abstract type, and can therefore never be instantiated. - Caster vers %1 est impossible parce que c'est un type abstrait qui ne peut donc être instancié. - - - + Caster vers %1 est impossible parce que c'est un type abstrait qui ne peut donc être instancié. + + It's not possible to cast the value %1 of type %2 to %3 - I lest impossible de caster la valeur %1 de type %2 en %3 - - - + I lest impossible de caster la valeur %1 de type %2 en %3 + + Failure when casting from %1 to %2: %3 - Echec en castant de %1 ver %2 : %3 + Echec en castant de %1 ver %2 : %3 A comment cannot contain %1 @@ -7026,14 +9107,12 @@ Un commentaire ne peut pas finir par %1. - No comparisons can be done involving the type %1. - Aucune comparaison ne peut être faite avec le type %1. - - - + Aucune comparaison ne peut être faite avec le type %1. + + Operator %1 is not available between atomic values of type %2 and %3. - L'opérateur %1 n'est pas disponible entre valeurs atomiques de type %2 et %3. + L'opérateur %1 n'est pas disponible entre valeurs atomiques de type %2 et %3. An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. @@ -7056,9 +9135,8 @@ Un prédicat de position doit être évalué en une unique valeur numérique. - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. - Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide. + Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide. %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. @@ -7115,9 +9193,8 @@ %1 n'est pas un caractère XML 1.0 valide. - The first argument to %1 cannot be of type %2. - Le premier argument de %1 ne peut être du type %2. + Le premier argument de %1 ne peut être du type %2. If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. @@ -7157,11 +9234,11 @@ %1 is an invalid regular expression pattern: %2 - %1 est un modèle d'expression régulière invalide: %2 + %1 est un modèle d'expression régulière invalide : %2 %1 is an invalid flag for regular expressions. Valid flags are: - %1 est un flag invalide pour des expressions régulières. Les flags valides sont : + %1 est un flag invalide pour des expressions régulières. Les flags valides sont : If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. @@ -7216,9 +9293,8 @@ L'initialisation de la variable %1 dépend d'elle-même - No variable by name %1 exists - Aucun variable nommée %1 existe + Aucun variable nommée %1 existe The variable %1 is unused @@ -7281,42 +9357,36 @@ Une variable du nom %1 a déjà été déclarée dans le prologue. - No value is available for the external variable by name %1. - Aucune valeur n'est disponible pour la variable externe %1. + Aucune valeur n'est disponible pour la variable externe %1. The namespace for a user defined function cannot be empty(try the predefined prefix %1 which exists for cases like this) Le namespace d'une fonction définie par l'utilisateur ne peut être vide (essayez le préfixe prédéfini %1 qui existe pour ce genre de cas) - A construct was encountered which only is allowed in XQuery. - Construct n'est autorisé que dans XQuery. - - - + Construct n'est autorisé que dans XQuery. + + A template by name %1 has already been declared. - Un template nommé %1 a déjà été déclaré. + Un template nommé %1 a déjà été déclaré. The keyword %1 cannot occur with any other mode name. Le mot-clé %1 ne peut pas apparaître avec un autre nom de mode. - The value of attribute %1 must of type %2, which %3 isn't. - La valeur de l'attribut %1 doit être du type %2, %3 n'en est pas. - - - + La valeur de l'attribut %1 doit être du type %2, %3 n'en est pas. + + The prefix %1 can not be bound. By default, it is already bound to the namespace %2. - Le préfixe %1 ne peut être lié. Par défault, il est déjà lié au namespace %2. - - - + Le préfixe %1 ne peut être lié. Par défault, il est déjà lié au namespace %2. + + A variable by name %1 has already been declared. - Une variable nommée %1 a déjà été déclarée. + Une variable nommée %1 a déjà été déclarée. A stylesheet function must have a prefixed name. @@ -7343,9 +9413,8 @@ Les fonctions externes ne sont pas supportées. Toutes les fonctions supportées peuvent êter utilisées directement sans les déclarer préalablement comme externes - An argument by name %1 has already been declared. Every argument name must be unique. - Un argument nommé %1 a déjà été déclaré. Chaque nom d'argument doit être unique. + Un argument nommé %1 a déjà été déclaré. Chaque nom d'argument doit être unique. When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. @@ -7404,9 +9473,8 @@ %1 n'est pas une valeur numérique valide. - No function by name %1 is available. - La fonction %1 n'est pas disponible. + La fonction %1 n'est pas disponible. The namespace URI cannot be the empty string when binding to a prefix, %1. @@ -7437,9 +9505,8 @@ L'URI de namespace doit être une constante et ne peut contenir d'expressions. - An attribute by name %1 has already appeared on this element. - Un attribute nommé %1 existe déjà pour cet élément. + Un attribute nommé %1 existe déjà pour cet élément. A direct element constructor is not well-formed. %1 is ended with %2. @@ -7558,9 +9625,8 @@ Seul le préfixe %1 peut être lié à %2, et vice versa. - Circularity detected - Circularité détectée + Circularité détectée The parameter %1 is required, but no corresponding %2 is supplied. @@ -7575,16 +9641,12 @@ L'URI ne peut pas avoir de fragments - Element %1 is not allowed at this location. + L'élément %1 n'est pas autorisé à cet emplacement. - Text nodes are not allowed at this location. - Les noeuds de texte ne sont pas autorisés à cet emplacement. - - Parse error: %1 - Erreur: %1 + Erreur : %1 The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. @@ -7619,39 +9681,32 @@ Au moins un mode doit être spécifié dans l'attribut %1 sur l'élément %2. - Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. - L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls les attributs standard le peuvent. - - - + L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls les attributs standard le peuvent. + + Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the standard attributes. - L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 est autorisé, ainsi que les attributs standard. - - - + L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 est autorisé, ainsi que les attributs standard. + + Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the standard attributes. - L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls %3, %4 et les attributs standard le sont. - - - + L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls %3, %4 et les attributs standard le sont. + + Attribute %1 cannot appear on the element %2. Allowed is %3, and the standard attributes. - L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 et les attributs standard le sont. - - - + L'attribut %1 ne peut pas apparaître sur l'élément %2. Seul %3 et les attributs standard le sont. + + XSL-T attributes on XSL-T elements must be in the null namespace, not in the XSL-T namespace which %1 is. - Les attributs XSL-T sur des éléments XSL-T doivent être dans le namespace null, et pas dans %1. - - - + Les attributs XSL-T sur des éléments XSL-T doivent être dans le namespace null, et pas dans %1. + + The attribute %1 must appear on element %2. - L'attribut %1 doit apparaître sur l'élément %2. - - - + L'attribut %1 doit apparaître sur l'élément %2. + + The element with local name %1 does not exist in XSL-T. - L'élément avec le nom local %1 n'existe pas dans XSL-T. + L'élément avec le nom local %1 n'existe pas dans XSL-T. Element %1 must come last. @@ -8849,15 +10904,12 @@ VolumeSlider - Muted - Muet - - - - + Muet + + Volume: %1% - Volume : %1% + Volume : %1% @@ -8915,655 +10967,4 @@ Défiler vers le bas - - FakeReply - - Fake error ! - Fausse erreur! - - - Invalid URL - URL non valide - - - - Phonon::AudioOutput - - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> - <html>Le périphérique audio <b>%1</b> ne fonctionne pas.<br/>Repli sur <b>%2</b>.</html> - - - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> - <html>Basculement vers le périphérique audio <b>%1</b><br/>qui vient juste d'être disponible et dont le niveau de préférence est plus élevé.</html> - - - Revert back to device '%1' - Revenir au périphérique '%1' - - - - Phonon::MMF - - Audio Output - Sortie audio - - - The audio output device - Périphérique audio de sortie - - - No error - Aucune erreur - - - Not found - Introuvable - - - Out of memory - Mémoire insuffisante - - - Not supported - Non supporté - - - Overflow - Dépassement - - - Underflow - Soupassement - - - Already exists - Existe déjà - - - Path not found - Chemin introuvable - - - In use - Utilisé - - - Not ready - Pas prêt - - - Access denied - Accès refusé - - - Could not connect - Connexion impossible - - - Disconnected - Déconnecté - - - Permission denied - Autorisation refusée - - - Insufficient bandwidth - Bande passante insuffisante - - - Network unavailable - Réseau non disponible - - - Network communication error - Erreur de communication réseau - - - Streaming not supported - Streaming non supporté - - - Server alert - Alerte serveur - - - Invalid protocol - Protocole non valide - - - Invalid URL - URL non valide - - - Multicast error - Erreur multicast - - - Proxy server error - Erreur du serveur proxy - - - Proxy server not supported - Serveur proxy non supporté - - - Audio output error - Erreur de sortie audio - - - Video output error - Erreur de sortie vidéo - - - Decoder error - Erreur du décodeur - - - Audio or video components could not be played - Les composants audio ou vidéo n'ont pas pu être lus - - - DRM error - Erreur GDN - - - Unknown error (%1) - Erreur inconnue (%1) - - - - Phonon::MMF::AbstractMediaPlayer - - Not ready to play - Pas prêt pour lecture - - - Error opening file - Erreur lors de l'ouverture du fichier - - - Error opening URL - Erreur lors de l'ouverture de l'URL - - - Setting volume failed - Le réglage du volume a échoué - - - Playback complete - Lecture terminée - - - - Phonon::MMF::AudioEqualizer - - %1 Hz - %1 Hz - - - - Phonon::MMF::AudioPlayer - - Getting position failed - L'obtention de la position a échoué - - - Opening clip failed - L'ouverture du clip a échoué - - - - Phonon::MMF::EffectFactory - - Enabled - Activé - - - - Phonon::MMF::EnvironmentalReverb - - Decay HF ratio (%) - Ratio HF du déclin (%) - - - Decay time (ms) - Temps de déclin (ms) - - - Density (%) - Densité (%) - - - Diffusion (%) - Diffusion (%) - - - Reflections delay (ms) - Délai réflexions (ms) - - - Reflections level (mB) - Niveau réflexions (mB) - - - Reverb delay (ms) - Délai de réverbération (ms) - - - Reverb level (mB) - Niveau de réverbération (mB) - - - Room HF level - Niveau HF pièce - - - Room level (mB) - Niveau pièce (mB) - - - - Phonon::MMF::MediaObject - - Error opening source: type not supported - Erreur lors de l'ouverture de la source: type non supporté - - - Error opening source: media type could not be determined - Erreur lors de l'ouverture de la source: type de média non déterminé - - - - Phonon::MMF::StereoWidening - - Level (%) - Niveau (%) - - - - Phonon::MMF::VideoPlayer - - Pause failed - La mise en pause a échoué - - - Seek failed - La recherche a échoué - - - Getting position failed - L'obtention de la position a échoué - - - Opening clip failed - L'ouverture du clip a échoué - - - Buffering clip failed - La mise en mémoire tampon du clip a échoué - - - Video display error - Erreur de l'affichage vidéo - - - - QAccessibleButton - - Press - Appuyer - - - - QNetworkAccessDebugPipeBackend - - Write error writing to %1: %2 - Erreur lors de l'écriture dans %1: %2 - - - - QScriptBreakpointsModel - - ID - Identifiant - - - Location - Lieu - - - Condition - Condition - - - Ignore-count - Comptes d'ignorés - - - Single-shot - Un seul tir - - - Hit-count - Compte de coups - - - - QScriptBreakpointsWidget - - New - Créer - - - Delete - Supprimer - - - - QScriptDebugger - - Go to Line - Aller à la ligne - - - Line: - Ligne: - - - Interrupt - Interrompre - - - Shift+F5 - Shift+F5 - - - Continue - Continuer - - - F5 - F5 - - - Step Into - Pas à pas détaillé - - - F11 - F11 - - - Step Over - Pas à pas principal - - - F10 - F10 - - - Step Out - Pas à pas sortant - - - Shift+F11 - Shift+F11 - - - Run to Cursor - Exécuter au curseur - - - Ctrl+F10 - Ctrl+F10 - - - Run to New Script - Exécuter au nouveau script - - - Toggle Breakpoint - Basculer le point d'arrêt - - - F9 - F9 - - - Clear Debug Output - Effacer les résultats du débogage - - - Clear Error Log - Effacer le journal d'erreurs - - - Clear Console - Effacer la console - - - &Find in Script... - &Chercher dans le script... - - - Ctrl+F - Ctrl+F - - - Find &Next - Résultat &suivant - - - F3 - F3 - - - Find &Previous - Chercher &précédent - - - Shift+F3 - Shift+F3 - - - Ctrl+G - Ctrl+G - - - Debug - Déboguer - - - - QScriptDebuggerCodeFinderWidget - - Close - Fermer - - - Previous - Précédent - - - Next - Suivant - - - Case Sensitive - Sensible à la casse - - - Whole words - Mots entiers - - - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;La recherche est revenue au début - - - - QScriptDebuggerLocalsModel - - Name - Nom - - - Value - Valeur - - - - QScriptDebuggerStackModel - - Level - Niveau - - - Name - Nom - - - Location - Lieu - - - - QScriptEdit - - Toggle Breakpoint - Basculer le point d'arrêt - - - Disable Breakpoint - Désactiver le point d'arrêt - - - Enable Breakpoint - Activer le point d'arrêt - - - Breakpoint Condition: - Condition du point d'arrêt: - - - - QScriptEngineDebugger - - Loaded Scripts - Scripts chargés - - - Breakpoints - Points d'arrêt - - - Stack - Empiler - - - Locals - Locaux - - - Console - Console - - - Debug Output - Résultats du débogage - - - Error Log - Journal d'erreurs - - - Search - Chercher - - - View - Afficher - - - Qt Script Debugger - Débogueur de script Qt - - - - QScriptNewBreakpointWidget - - Close - Fermer - - - - QSoftKeyManager - - Ok - OK - - - Select - Sélectionner - - - Done - Terminer - - - Options - Options - - - Cancel - Annuler - - - Exit - Quitter - - - - QStateMachine - - Missing initial state in compound state '%1' - État initial manquant dans l'état composé '%1' - - - Missing default state in history state '%1' - État par défaut manquant dans l'état de l'historique '%1' - - - No common ancestor for targets and source of transition from state '%1' - Aucun ancêtre commun pour les cibles et la source de transition de l'état '%1' - - - Unknown error - Erreur inconnue - - - - QXmlPatternistCLI - - Warning in %1, at line %2, column %3: %4 - Avertissement dans %1, à la ligne %2, colonne %3: %4 - - - Warning in %1: %2 - Avertissement dans %1: %2 - - - Unknown location - Lieu inconnu - - - Error %1 in %2, at line %3, column %4: %5 - Erreur %1 dans %2, à la ligne %3, colonne %4: %5 - - - Error %1 in %2: %3 - Erreur %1 dans %2: %3 - - diff -r ef0373b55136 -r 758a864f9613 translations/qt_help_de.ts --- a/translations/qt_help_de.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qt_help_de.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,106 +4,92 @@ QCLuceneResultWidget - Search Results Suchergebnisse - Note: Achtung: - The search results may not be complete since the documentation is still being indexed! Es können nicht alle möglichen Ergebnisse angezeigt werden, da die Dokumentation noch indiziert wird. - Your search did not match any documents. Es wurden keine mit Ihrer Suche übereinstimmenden Dokumente gefunden. - (The reason for this might be that the documentation is still being indexed.) (Ein Grund dafür könnte sein, das die Dokumentation noch nicht vollständig indiziert ist.) + QHelp + + Untitled + + + + QHelpCollectionHandler - The collection file '%1' is not set up yet! Die Katalogdatei '%1' ist noch nicht eingerichtet. - Cannot load sqlite database driver! Der Datenbanktreiber für SQLite kann nicht geladen werden. - - Cannot open collection file: %1 Katalogdatei kann nicht geöffnet werden: %1 - Cannot create tables in file %1! In Datei %1 können keine Tabellen angelegt werden. - The collection file '%1' already exists! Die Katalogdatei '%1' existiert bereits. - Unknown filter '%1'! Unbekannter Filter '%1'. - Invalid documentation file '%1'! Ungültige Dokumentationsdatei '%1'. - Cannot register namespace '%1'! Der Namensraum '%1' kann nicht registriert werden. - Cannot open database '%1' to optimize! Die Datenbank '%1' kann nicht zur Optimierung geöffnet werden. - Cannot create directory: %1 Das Verzeichnis kann nicht angelegt werden: %1 - Cannot copy collection file: %1 Die Katalogdatei kann nicht kopiert werden: %1 - Cannot register filter %1! Der Filter kann nicht registriert werden: %1 - Cannot open documentation file %1! Die Dokumentationsdatei kann nicht geöffnet werden: %1 - The namespace %1 was not registered! Der Namensraum %1 wurde nicht registriert. - Namespace %1 already exists! Der Namensraum %1 existiert bereits. @@ -111,7 +97,6 @@ QHelpDBReader - Cannot open database '%1' '%2': %3 The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string Kann Datenbank nicht öffnen: '%1' '%2': %3 @@ -120,12 +105,10 @@ QHelpEngineCore - Cannot open documentation file %1: %2! Die Dokumentationsdatei %1 kann nicht geöffnet werden: %2! - The specified namespace does not exist! Der angegebene Namensraum existiert nicht. @@ -133,132 +116,106 @@ QHelpGenerator - Invalid help data! Ungültige Hilfe-Daten. - No output file name specified! Für die Ausgabe-Datei wurde kein Name angegeben. - Building up file structure... Dateistruktur wird erzeugt... - The file %1 cannot be overwritten! Die Datei %1 kann nicht überschrieben werden. - Cannot open data base file %1! Die Datenbank-Datei %1 kann nicht geöffnet werden. - Cannot register namespace %1! Der Namensraum %1 kann nicht registriert werden. - Insert custom filters... Benutzerdefinierte Filter einfügen... - Insert help data for filter section (%1 of %2)... Hilfe-Daten für Filter-Sektion (%1 von %2) einfügen... - Documentation successfully generated. Dokumentation erfolgreich generiert. - Some tables already exist! Einige Tabellen existieren bereits. - Cannot create tables! Tabellen können nicht erstellt werden. - Cannot register virtual folder! Virtuelles Verzeichnis nicht registriert werden. - Insert files... Dateien einfügen... - The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. Die referenzierte Datei %1 muss sich im Verzeichnis %2 oder in einem Unterverzeichnis davon befinden. Sie wird übersprungen. - The file %1 does not exist! Skipping it. Die Datei %1 existiert nicht. Wird übersprungen. - Cannot open file %1! Skipping it. Die Datei %1 kann nicht geöffnet werden. Wird übersprungen. - The filter %1 is already registered! Der Filter %1 ist bereits registriert. - Cannot register filter %1! Der Filter %1 kann nicht registriert werden. - Insert indices... Indizes einfügen... - Insert contents... Inhalt einfügen... - Cannot insert contents! Inhalt kann nicht eingefügt werden. - Cannot register contents! Inhalt kann nicht registriert werden. - File '%1' does not exist. Die Datei '%1' existiert nicht. - File '%1' cannot be opened. Die Datei '%1' kann nicht geöffnet werden. - File '%1' contains an invalid link to file '%2' Die Datei '%1' enthält einen ungültigen Verweis auf die Datei '%2' - Invalid links in HTML files. Es wurden ungültige Verweise in HTML-Dateien gefunden. @@ -266,47 +223,38 @@ QHelpProject - Unknown token. Unbekanntes Token. - Unknown token. Expected "QtHelpProject"! Unbekanntes Token. "QtHelpProject" erwartet. - Error in line %1: %2 Fehler in Zeile %1: %2 - Virtual folder has invalid syntax. Ungültige Syntax bei Angabe des virtuellen Verzeichnisses. - Namespace has invalid syntax. Ungültige Syntax der Namensraum-Angabe. - Missing namespace in QtHelpProject. Fehlender Namensraum in QtHelpProject. - Missing virtual folder in QtHelpProject Fehlendes virtuelles Verzeichnis in QtHelpProject. - Missing attribute in keyword at line %1. Fehlendes Attribut in Schlagwort in Zeile %1. - The input file %1 could not be opened! Die Eingabe-Datei %1 kann nicht geöffnet werden. @@ -314,52 +262,42 @@ QHelpSearchQueryWidget - Search for: Suche nach: - Previous search Vorige Suche - Next search Nächste Suche - Search Suche - Advanced search Erweiterte Suche - words <B>similar</B> to: Worte <B>ähnlich</B> zu: - <B>without</B> the words: <B>ohne</B> die Wörter: - with <B>exact phrase</B>: mit der <B>genauen Wortgruppe</B>: - with <B>all</B> of the words: mit <B>allen</B> Wörtern: - with <B>at least one</B> of the words: mit <B>irgendeinem</B> der Wörter: @@ -367,7 +305,6 @@ QHelpSearchResultWidget - %1 - %2 of %n Hits %1 - %2 - Ein Treffer @@ -375,7 +312,6 @@ - 0 - 0 of 0 Hits 0 - 0 von 0 Treffern diff -r ef0373b55136 -r 758a864f9613 translations/qt_help_fr.ts --- a/translations/qt_help_fr.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qt_help_fr.ts Mon Oct 04 01:19:32 2010 +0300 @@ -30,6 +30,14 @@ + QHelp + + + Untitled + Sans titre + + + QHelpCollectionHandler @@ -44,7 +52,7 @@ - + Cannot open collection file: %1 collection ? Impossible d'ouvrir le fichier collection : %1 @@ -65,7 +73,7 @@ Impossible de créer le répertoire : %1 - + Cannot copy collection file: %1 Impossible de copier le fichier collection : %1 @@ -75,7 +83,7 @@ Filtre '%1' inconnu ! - + Cannot register filter %1! Impossible d'enregistrer le filtre %1 ! @@ -122,7 +130,12 @@ QHelpEngineCore - + + Cannot open documentation file %1: %2! + Impossible d'ouvrir le fichier de documentation %1 : %2 ! + + + The specified namespace does not exist! L'espace de noms spécifié n'existe pas ! @@ -130,15 +143,14 @@ QHelpEngineCorePrivate - Cannot open documentation file %1: %2! - Impossible d'ouvrir le fichier de documentation %1 : %2 ! + Impossible d'ouvrir le fichier de documentation %1 : %2 ! QHelpGenerator - + Invalid help data! Données d'aide invalides ! @@ -155,7 +167,7 @@ Building up file structure... - Construction de la structure de fichiers en cours… + Construction de la structure de fichiers en cours... @@ -163,20 +175,20 @@ Impossible d'ouvrir le fichier de base de données %1 ! - + Cannot register namespace %1! Impossible d'enregistrer l'espace de noms %1 ! Insert custom filters... - Insértion des filtres personnalisés… + Insértion des filtres personnalisés... Insert help data for filter section (%1 of %2)... ??? - Insertion des données d'aide pour la section filtre (%1 de %2)… + Insertion des données d'aide pour la section filtre (%1 de %2)... @@ -219,7 +231,7 @@ Impossible d'ouvrir le fichier %1 ! Fichier non pris en compte. - + The filter %1 is already registered! Le filtre %1 est déjà enregistré ! @@ -231,12 +243,12 @@ Insert indices... - Insertion des index… + Insertion des index... - + Insert contents... - insertion du contenu… + insertion du contenu... @@ -248,87 +260,32 @@ Cannot register contents! Impossible de référencer le contenu ! - - - QHelpSearchQueryWidget - - Search for: - Rechercher : - - - - Previous search - Recherche précédente - - - - Next search - Recherche suivante - - - - Search - Recherche + + File '%1' does not exist. + Le fichier '%1' n'existe pas. - - Advanced search - Recherche avancée - - - - words <B>similar</B> to: - mots <B>semblables</B> à : + + File '%1' cannot be opened. + Le fichier '%1' ne peut être ouvert. - - <B>without</B> the words: - <B>sans</B> les mots : + + File '%1' contains an invalid link to file '%2' + Le fichier '%1' contient un lien invalide vers le fichier '%2' - - with <B>exact phrase</B>: - avec la <B>phrase exacte</B> : - - - - with <B>all</B> of the words: - avec <B>tous</B> les mots : - - - - with <B>at least one</B> of the words: - avec <B>au moins un</B> des mots : + + Invalid links in HTML files. + Liens invalides dans les fichiers HTML. - QHelpSearchResultWidget - - - 0 - 0 of 0 Hits - 0 - 0 de 0 résultats - - - - QHelpSearchResultWidgetPrivate + QHelpProject - - %1 - %2 of %3 Hits - %1 - %2 de %3 résultats - - - - QObject - - - Untitled - Sans titre - - - + Unknown token. - contexte peu clair... Identificateur inconnu. @@ -337,39 +294,159 @@ Identificateur inconnu. "QtHelpProject" attendu ! - + Error in line %1: %2 Erreur à la ligne %1 : %2 - - A virtual folder must not contain a '/' character! - Un dossier virtuel ne doit pas contenir le caractère '/' ! + + Virtual folder has invalid syntax. + Syntaxe invalide pour le dossier virtuel. - - A namespace must not contain a '/' character! - Un espace de noms ne doit pas contenir le caractère '/' ! + + Namespace has invalid syntax. + Syntaxe invalide pour l'espace de noms. - + Missing namespace in QtHelpProject. Espace de noms manquant dans QtHelpProject. - + Missing virtual folder in QtHelpProject Dossier virtuel manquant dans QtHelpProject - + Missing attribute in keyword at line %1. Attribut manquant pour le mot clé à la ligne %1. - + The input file %1 could not be opened! Le fichier source %1 n'a pas pu être ouvert ! + + QHelpSearchQueryWidget + + + Search for: + Rechercher : + + + + Previous search + Recherche précédente + + + + Next search + Recherche suivante + + + + Search + Recherche + + + + Advanced search + Recherche avancée + + + + words <B>similar</B> to: + mots <B>semblables</B> à : + + + + <B>without</B> the words: + <B>sans</B> les mots : + + + + with <B>exact phrase</B>: + avec la <B>phrase exacte</B> : + + + + with <B>all</B> of the words: + avec <B>tous</B> les mots : + + + + with <B>at least one</B> of the words: + avec <B>au moins un</B> des mots : + + + + QHelpSearchResultWidget + + + %1 - %2 of %n Hits + + %1 - %2 de %n résultat + %1 - %2 de %n résultats + + + + + 0 - 0 of 0 Hits + 0 - 0 de 0 résultats + + + + QHelpSearchResultWidgetPrivate + + %1 - %2 of %3 Hits + %1 - %2 de %3 résultats + + + + QObject + + Untitled + Sans titre + + + Unknown token. + contexte peu clair... + Identificateur inconnu. + + + Unknown token. Expected "QtHelpProject"! + Identificateur inconnu. "QtHelpProject" attendu ! + + + Error in line %1: %2 + Erreur à la ligne %1 : %2 + + + A virtual folder must not contain a '/' character! + Un dossier virtuel ne doit pas contenir le caractère '/' ! + + + A namespace must not contain a '/' character! + Un espace de noms ne doit pas contenir le caractère '/' ! + + + Missing namespace in QtHelpProject. + Espace de noms manquant dans QtHelpProject. + + + Missing virtual folder in QtHelpProject + Dossier virtuel manquant dans QtHelpProject + + + Missing attribute in keyword at line %1. + Attribut manquant pour le mot clé à la ligne %1. + + + The input file %1 could not be opened! + Le fichier source %1 n'a pas pu être ouvert ! + + diff -r ef0373b55136 -r 758a864f9613 translations/qt_help_ja.ts --- a/translations/qt_help_ja.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qt_help_ja.ts Mon Oct 04 01:19:32 2010 +0300 @@ -1,355 +1,318 @@ - + QCLuceneResultWidget - Search Results - + 検索結果 - Note: - + 注: + + + The search results may not be complete since the documentation is still being indexed! + ドキュメントの索引の作成が終了していないため、検索結果は不完全な可能性があります! - - The search results may not be complete since the documentation is still being indexed! - + Your search did not match any documents. + その語句はどのドキュメントにも見つかりません。 - - Your search did not match any documents. - + (The reason for this might be that the documentation is still being indexed.) + (ドキュメントの索引の作成が終了していないためかもしれません。) + + + QHelp - - (The reason for this might be that the documentation is still being indexed.) - + Untitled + タイトルなし QHelpCollectionHandler - - The collection file is not set up yet! - + The collection file '%1' is not set up yet! + コレクションファイル '%1' がまだ設定されていません! - Cannot load sqlite database driver! - + SQLite データベースドライバがロードできません! - - Cannot open collection file: %1 - + コレクションファイルをオープンできません: %1 - Cannot create tables in file %1! - + ファイル %1 にテーブルを作成できません! - - The specified collection file already exists! - + The collection file '%1' already exists! + コレクションファイル '%1' が既に存在します! - - Cannot create directory: %1 - + Unknown filter '%1'! + 不明なフィルタ '%1'! - - Cannot copy collection file: %1 - + Invalid documentation file '%1'! + 無効なドキュメントファイル '%1'! - - Unknown filter! - + Cannot register namespace '%1'! + ネームスペース '%1' を登録できません! - - Cannot register filter %1! - + Cannot open database '%1' to optimize! + 最適化用にデータベース '%1' をオープンできません! - - Cannot open documentation file %1! - + Cannot create directory: %1 + ディレクトリを作成できません: %1 - - Invalid documentation file! - + Cannot copy collection file: %1 + コレクションファイルをコピーできません: %1 - - The namespace %1 was not registered! - + Cannot register filter %1! + フィルタ %1 を登録できません! - - Namespace %1 already exists! - + Cannot open documentation file %1! + ドキュメントファイル %1 をオープンできません! - - Cannot register namespace! - + The namespace %1 was not registered! + ネームスペース %1 は登録されていません! - - Cannot open database to optimize! - + Namespace %1 already exists! + ネームスペース %1 は既に存在します! QHelpDBReader - Cannot open database '%1' '%2': %3 - + The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string + データベース '%1' '%2' がオープンできません: %3 QHelpEngineCore - - The specified namespace does not exist! - + Cannot open documentation file %1: %2! + ドキュメントファイル %1 をオープンできません: %2! - - - QHelpEngineCorePrivate - - Cannot open documentation file %1: %2! - + The specified namespace does not exist! + そのネームスペースは存在しません! QHelpGenerator - Invalid help data! - + 無効なヘルプデータ! + + + No output file name specified! + 出力ファイル名が指定されていません! + + + Building up file structure... + ファイル構造の構築中... - - No output file name specified! - + The file %1 cannot be overwritten! + ファイル %1 は上書きできません! + + + Cannot open data base file %1! + データベースファイル %1 をオープンできません! - - Building up file structure... - + Cannot register namespace %1! + ネームスペース %1 を登録できません! - - The file %1 cannot be overwritten! - + Insert custom filters... + カスタムフィルターの登録中... + + + Insert help data for filter section (%1 of %2)... + フィルターにヘルプデータを登録中 (%1 / %2)... - - Cannot open data base file %1! - + Documentation successfully generated. + ドキュメントの作成に成功しました。 - - Cannot register namespace %1! - + Some tables already exist! + テーブルが既に存在します! + + + Cannot create tables! + テーブルが作成できません! + + + Cannot register virtual folder! + 仮装フォルダを登録できません! - - Insert custom filters... - + Insert files... + ファイルの挿入... + + + The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. + 参照されるファイル %1 は (%2) のサブディレクトリに存在する必要があります。スキップします。 - - Insert help data for filter section (%1 of %2)... - + The file %1 does not exist! Skipping it. + ファイル %1 が存在しません! スキップします。 - - Documentation successfully generated. - + Cannot open file %1! Skipping it. + ファイル %1 をオープンできません! スキップします。 - - Some tables already exist! - + The filter %1 is already registered! + フィルタ %1 は既に登録されています! - - Cannot create tables! - + Cannot register filter %1! + フィルタ %1 を登録できません! - - Cannot register virtual folder! - + Insert indices... + 索引の挿入... + + + Insert contents... + コンテンツの挿入... - - Insert files... - + Cannot insert contents! + コンテンツを挿入できません! + + + Cannot register contents! + コンテンツを登録できません! - - The file %1 does not exist! Skipping it. - + File '%1' does not exist. + ファイル '%1' が存在しません。 - - Cannot open file %1! Skipping it. - + File '%1' cannot be opened. + ファイル '%1' をオープンできません。 + + + File '%1' contains an invalid link to file '%2' + ファイル '%1' にファイル '%2' への無効なリンクが見つかりました - - The filter %1 is already registered! - + Invalid links in HTML files. + HTML に無効なリンクが見つかりました。 + + + + QHelpProject + + Unknown token. + 不明なトークン。 - - Cannot register filter %1! - + Unknown token. Expected "QtHelpProject"! + "QtHelpProject" があるべき場所に不明なトークン! + + + Error in line %1: %2 + %1 行でエラー: %2 - - Insert indices... - + Virtual folder has invalid syntax. + 仮装フォルダに無効な構文があります。 + + + Namespace has invalid syntax. + ネームスペースに無効な構文があります。 - - Insert contents... - + Missing namespace in QtHelpProject. + QtHelpProject にネームスペースがありません。 - - Cannot insert contents! - + Missing virtual folder in QtHelpProject + QtHelpProject に仮装フォルダがありません - - Cannot register contents! - + Missing attribute in keyword at line %1. + %1 行目のキーワードに属性がありません。 + + + The input file %1 could not be opened! + 入力ファイル %1 がオープンできません! QHelpSearchQueryWidget - Search for: - + 検索キーワード: - - Search - + Previous search + 前の検索結果 - - Advanced search - + Next search + 次の検索結果 + + + Search + 検索 - - words <B>similar</B> to: - + Advanced search + 詳細な検索 - - <B>without</B> the words: - + words <B>similar</B> to: + <b>類似語</b>: - - with <B>exact phrase</B>: - + <B>without</B> the words: + キーワードを<b>含めない</b>: - - with <B>all</B> of the words: - + with <B>exact phrase</B>: + <b>フレーズ</b>を含む: - + with <B>all</B> of the words: + <b>すべての</b>キーワードを含む: + + with <B>at least one</B> of the words: - + <b>いずれか</b>のキーワードを含む: QHelpSearchResultWidget - - - 0 - 0 of 0 Hits - - - - - QHelpSearchResultWidgetPrivate - - - %1 - %2 of %3 Hits - - - - - QObject - - - Untitled - - - - - Unknown token. - - - - - Unknown token. Expected "QtHelpProject"! - + + %1 - %2 of %n Hits + + %1 - %2 / %n 件 + - - Error in line %1: %2 - - - - - A virtual folder must not contain a '/' character! - - - - - A namespace must not contain a '/' character! - - - - - Missing namespace in QtHelpProject. - - - - - Missing virtual folder in QtHelpProject - - - - - Missing attribute in keyword at line %1. - - - - - The input file %1 could not be opened! - + 0 - 0 of 0 Hits + 0 - 0 / 0 件 diff -r ef0373b55136 -r 758a864f9613 translations/qt_help_ru.ts --- a/translations/qt_help_ru.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qt_help_ru.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,106 +4,92 @@ QCLuceneResultWidget - Search Results Результат поиска - Note: Примечание: - The search results may not be complete since the documentation is still being indexed! Результат поиска может быть неполным, так как документация ещё индексируется! - Your search did not match any documents. По вашему запросу не найдено ни одного документа. - (The reason for this might be that the documentation is still being indexed.) (Причиной этого может быть то, что документация ещё индексируется.) + QHelp + + Untitled + Безымянный + + + QHelpCollectionHandler - The collection file '%1' is not set up yet! Файл коллекции справки '%1' ещё не установлен! - Cannot load sqlite database driver! Не удалось загрузить драйвер базы данных sqlite! - - Cannot open collection file: %1 Не удалось открыть файл коллекции справки: %1 - Cannot create tables in file %1! Не удалось создать таблицы в файле %1! - The collection file '%1' already exists! Файл коллекции справки '%1' уже существует! - Unknown filter '%1'! Неизвестный фильтр '%1'! - Invalid documentation file '%1'! Некорректный файл документации '%1'! - Cannot register namespace '%1'! Не удалось зарегистрировать пространство имён %1! - Cannot open database '%1' to optimize! Не удалось открыть базу данных '%1' для оптимизации! - Cannot create directory: %1 Не удалось создать каталог: %1 - Cannot copy collection file: %1 Не удалось скопировать файл коллекции справки: %1 - Cannot register filter %1! Не удалось зарегистрировать фильтр %1! - Cannot open documentation file %1! Не удалось открыть файл документации %1! - The namespace %1 was not registered! Пространство имён %1 не зарегистрировано! - Namespace %1 already exists! Пространство имён %1 уже существует! @@ -111,7 +97,6 @@ QHelpDBReader - Cannot open database '%1' '%2': %3 The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string Не удалось открыть базу данных '%1' '%2': %3 @@ -120,12 +105,10 @@ QHelpEngineCore - Cannot open documentation file %1: %2! Не удалось открыть файл документации %1: %2! - The specified namespace does not exist! Указанное пространство имён не существует! @@ -133,132 +116,106 @@ QHelpGenerator - Invalid help data! Некорректные данные справки! - No output file name specified! Не указано имя результирующего файла! - Building up file structure... Создание структуры файла... - The file %1 cannot be overwritten! Невозможно перезаписать файл %1! - Cannot open data base file %1! Не удалось открыть файл базы данных %1! - Cannot register namespace %1! Не удалось зарегистрировать пространство имён %1! - Insert custom filters... Добавление индивидуальных фильтров... - Insert help data for filter section (%1 of %2)... Добавление данных справки для раздела фильтра (%1 из %2)... - Documentation successfully generated. Документация успешно создана. - Some tables already exist! Некоторые таблицы уже существуют! - Cannot create tables! Не удалось создать таблицы! - Cannot register virtual folder! Не удалось зарегистрировать виртуальный каталог! - Insert files... Добавление файлов... - The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. Файл %1 должен быть в каталоге '%2' или в его подкаталоге. Пропускаем. - The file %1 does not exist! Skipping it. Файл %1 не существует! Пропускаем. - Cannot open file %1! Skipping it. Не удалось открыть файл %1! Пропускаем. - The filter %1 is already registered! Фильтр %1 уже зарегистрирован! - Cannot register filter %1! Не удалось зарегистрировать фильтр %1! - Insert indices... Добавление указателей... - Insert contents... Добавление оглавления... - Cannot insert contents! Не удалось добавить оглавление! - Cannot register contents! Не удалось зарегистрировать оглавление! - File '%1' does not exist. Файл '%1' не существует. - File '%1' cannot be opened. Невозможно открыть файл '%1'. - File '%1' contains an invalid link to file '%2' Файл '%1' содержит некорректную ссылку на файл '%2' - Invalid links in HTML files. В файлах HTML обнаружены некорректные ссылки. @@ -266,47 +223,38 @@ QHelpProject - Unknown token. Неизвестный идентификатор. - Unknown token. Expected "QtHelpProject"! Неизвестный идентификатор. Ожидается "QtHelpProject"! - Error in line %1: %2 Ошибка в строке %1: %2 - Virtual folder has invalid syntax. Виртуальный каталог имеет некорректный синтаксис. - Namespace has invalid syntax. Пространство имён имеет некорректный синтаксис. - Missing namespace in QtHelpProject. В QtHelpProject отсутствует пространство имён. - Missing virtual folder in QtHelpProject В QtHelpProject отсутствует виртуальный каталог - Missing attribute in keyword at line %1. Отсутствует атрибут у ключевого слова в строке %1. - The input file %1 could not be opened! Невозможно открыть исходный файл %1! @@ -314,52 +262,42 @@ QHelpSearchQueryWidget - Search for: Искать: - Previous search Предыдущий запрос - Next search Следующий запрос - Search Поиск - Advanced search Расширенный поиск - words <B>similar</B> to: <B>похожие</B> слова: - <B>without</B> the words: <B>не содержит</B> слов: - with <B>exact phrase</B>: содержит <B>точную фразу</B>: - with <B>all</B> of the words: содержит <B>все</B> слова: - with <B>at least one</B> of the words: содержит <B>хотя бы одно</B> из слов: @@ -367,7 +305,6 @@ QHelpSearchResultWidget - %1 - %2 of %n Hits %1 - %2 из %n совпадения @@ -376,7 +313,6 @@ - 0 - 0 of 0 Hits 0 - 0 из 0 совпадений diff -r ef0373b55136 -r 758a864f9613 translations/qt_help_sl.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/qt_help_sl.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,329 @@ + + + + 2010-08-28 13:32+0200 + MIME-Version,Content-Type,Content-Transfer-Encoding,Plural-Forms,X-Language,X-Qt-Contexts,Last-Translator,PO-Revision-Date,Project-Id-Version,Language-Team,X-Generator + Lokalize 1.1 + Slovenian <lugos-slo@lugos.si> + + # Jure Repinc <jlp@holodeck1.com>, 2010. + Jure Repinc <jlp@holodeck1.com> + + QCLuceneResultWidget + + Search Results + Rezultati iskanja + + + Note: + Opomba: + + + The search results may not be complete since the documentation is still being indexed! + Rezultati iskanja morda niso popolni, saj se dokumentacijo še vedno indeksira. + + + Your search did not match any documents. + Vašemu iskanju ne ustreza noben dokument. + + + (The reason for this might be that the documentation is still being indexed.) + (Razlog je morda to, da se dokumentacijo še vedno indeksira.) + + + + QHelp + + Untitled + Brez naslova + + + + QHelpCollectionHandler + + The collection file '%1' is not set up yet! + Datoteka zbirke »%1« še ni nastavljena. + + + Cannot load sqlite database driver! + Ni moč naložiti gonilnika za podatkovno zbirko SQLite. + + + Cannot open collection file: %1 + Datoteke zbirke ni moč odpreti: %1 + + + Cannot create tables in file %1! + V datoteki %1 ni moč ustvariti tabel. + + + The collection file '%1' already exists! + Datoteka zbirke »%1« že obstaja. + + + Cannot create directory: %1 + Ni moč ustvariti mape: %1 + + + Cannot copy collection file: %1 + Ni moč skopirati datoteke zbirke: %1 + + + Unknown filter '%1'! + Neznan filter »%1«. + + + Cannot register filter %1! + Filtra %1 ni moč registrirati. + + + Cannot open documentation file %1! + Ni moč odpreti datoteke z dokumentacijo %1. + + + Invalid documentation file '%1'! + Neveljavna datoteka z dokumentacijo »%1«. + + + The namespace %1 was not registered! + Imenski prostor %1 ni bil registriran. + + + Namespace %1 already exists! + Imenski prostor %1 že obstaja. + + + Cannot register namespace '%1'! + Imenskega prostora »%1« ni moč registrirati. + + + Cannot open database '%1' to optimize! + Podatkovne zbirke »%1« ni moč odpreti za optimizacijo. + + + + QHelpDBReader + + Cannot open database '%1' '%2': %3 + The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string + + Podatkovne zbirke »%1« »%2« ni moč odpreti: %3 + + + + QHelpEngineCore + + Cannot open documentation file %1: %2! + Ni moč odpreti datoteke z dokumentacijo %1: %2. + + + The specified namespace does not exist! + Navedeni imenski prostor ne obstaja. + + + + QHelpGenerator + + Invalid help data! + Neveljavni podatki s pomočjo. + + + No output file name specified! + Navedenega ni nobenega imena izhodne datoteke. + + + The file %1 cannot be overwritten! + Datoteke %1 ni moč nadomestiti. + + + Building up file structure... + Grajenje datotečne strukture ... + + + Cannot open data base file %1! + Datoteke podatkovne zbirke %1 ni moč odpreti. + + + Cannot register namespace %1! + Imenskega prostora %1 ni moč registrirati. + + + Insert custom filters... + Vstavi filtre po meri ... + + + Insert help data for filter section (%1 of %2)... + Vstavljanje podatkov s pomočjo za filtrirni razdelek (%1 od %2) ... + + + Documentation successfully generated. + Dokumentacija je bila uspešno ustvarjena. + + + Some tables already exist! + Nekatere tabele že obstajajo. + + + Cannot create tables! + Tabel ni moč ustvariti. + + + Cannot register virtual folder! + Navidezne mape ni moč registrirati. + + + Insert files... + Vstavi datoteke ... + + + The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. + Sklicana datoteka %1 se mora nahajti v mapi (%1) ali njeni podmapi. Preskakujem jo. + + + The file %1 does not exist! Skipping it. + Datoteka %1 ne obstaja. Preskakujem jo. + + + Cannot open file %1! Skipping it. + Datoteke %1 ni moč odpreti. Preskakujem jo. + + + The filter %1 is already registered! + Filter %1 je že registriran. + + + Cannot register filter %1! + Filtra %1 ni moč registrirati. + + + Insert indices... + Vstavi kazala ... + + + Insert contents... + Vstavi vsebino ... + + + Cannot insert contents! + Vsebine ni moč vstaviti. + + + Cannot register contents! + Vsebine ni moč registrirati. + + + File '%1' does not exist. + Filter »%1« ne obstaja. + + + File '%1' cannot be opened. + Filtra »%1« ni moč odpreti. + + + File '%1' contains an invalid link to file '%2' + Datoteka »%1« vsebuje neveljavno povezavo na datoteko »%2« + + + Invalid links in HTML files. + Neveljavne povezave v datotekah HTML. + + + + QHelpProject + + Unknown token. + Neznan žeton. + + + Unknown token. Expected "QtHelpProject"! + Neznan žeton. Pričakovan je bil »QtHelpProject«. + + + Error in line %1: %2 + Napaka v vrstici %1: %2 + + + Virtual folder has invalid syntax. + Navidezna mapa ima neveljavno skladnjo. + + + Namespace has invalid syntax. + Imenski prostor ima neveljavno skladnjo. + + + Missing namespace in QtHelpProject. + Manjkajoč imenski prostor v QtHelpProject. + + + Missing virtual folder in QtHelpProject + Manjkajoča navidezna mapa v QtHelpProject. + + + Missing attribute in keyword at line %1. + Manjkajoča lastnost v ključni besedi v vrstici %1. + + + The input file %1 could not be opened! + Vhodne datoteke %1 ni bilo moč odpreti. + + + + QHelpSearchQueryWidget + + Search for: + Išči: + + + Previous search + Predhodno iskanje + + + Next search + Naslednje iskanje + + + Search + Išči + + + Advanced search + Napredno iskanje + + + words <B>similar</B> to: + besede <B>podobne</B>: + + + <B>without</B> the words: + <B>brez</B> besed: + + + with <B>exact phrase</B>: + s <B>točnim izrazom</B>: + + + with <B>all</B> of the words: + z <B>vsemi</B> besedami: + + + with <B>at least one</B> of the words: + z <B>vsaj eno</B> izmed besed: + + + + QHelpSearchResultWidget + + %1 - %2 of %n Hits + + %1 – %2 od %n zadetka + %1 – %2 od %n zadetkov + %1 – %2 od %n zadetkov + %1 – %2 od %n zadetkov + + + + 0 - 0 of 0 Hits + 0 - 0 od 0 zadetkov + + + diff -r ef0373b55136 -r 758a864f9613 translations/qt_help_uk.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/qt_help_uk.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,320 @@ + + + + + QCLuceneResultWidget + + Search Results + Результати пошуку + + + Note: + Примітка: + + + The search results may not be complete since the documentation is still being indexed! + Результати пошуку можуть бути не повні, оскільки документація досі індексується! + + + Your search did not match any documents. + Ваш пошук не повернув результатів. + + + (The reason for this might be that the documentation is still being indexed.) + (Причиною цього може бути те, що документація досі індексується.) + + + + QHelp + + Untitled + Без назви + + + + QHelpCollectionHandler + + The collection file '%1' is not set up yet! + Файл колекції '%1' ще не встановлено! + + + Cannot load sqlite database driver! + Неможливо завантажити драйвер бази даних sqlite! + + + Cannot open collection file: %1 + Неможливо відкрити файл колекції: %1 + + + Cannot create tables in file %1! + Неможливо створити таблиці в файлі %1! + + + The collection file '%1' already exists! + Файл колекції '%1' вже існує! + + + Cannot create directory: %1 + Неможливо створити теку: %1 + + + Cannot copy collection file: %1 + Неможливо скопіювати файл колекції: %1 + + + Unknown filter '%1'! + Невідомий фільтр '%1'! + + + Cannot register filter %1! + Неможливо зареєструвати фільтр %1! + + + Cannot open documentation file %1! + Неможливо відкрити файл документації %1! + + + Invalid documentation file '%1'! + Неправильний файл документації '%1'! + + + The namespace %1 was not registered! + Простір імен %1 не зареєстровано! + + + Namespace %1 already exists! + Простір імен %1 вже існує! + + + Cannot register namespace '%1'! + Неможливо зареєструвати простір імен '%1'! + + + Cannot open database '%1' to optimize! + Неможливо відкрити базу даних '%1' для оптимізації! + + + + QHelpDBReader + + Cannot open database '%1' '%2': %3 + The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string + Не можу відкрити базу даних '%1' '%2': %3 + + + + QHelpEngineCore + + Cannot open documentation file %1: %2! + Неможливо відкрити файл документації %1: %2! + + + The specified namespace does not exist! + Вказаний простір імен не існує! + + + + QHelpGenerator + + Invalid help data! + Неправильні дані довідки! + + + No output file name specified! + Не вказане ім'я вихідного файлу! + + + The file %1 cannot be overwritten! + Неможливо перезаписати файл %1! + + + Building up file structure... + Побудова структури файлу.... + + + Cannot open data base file %1! + Неможливо відкрити файл бази даних %1! + + + Cannot register namespace %1! + Неможливо зареєструвати простір імен %1! + + + Insert custom filters... + Вставка фільтрів користувача... + + + Insert help data for filter section (%1 of %2)... + Вставка даних довідки для розділу фільтра (%1 з %2)... + + + Documentation successfully generated. + Документацію успішно згенеровано. + + + Some tables already exist! + Деякі таблиці вже існують! + + + Cannot create tables! + Неможливо створити таблиці! + + + Cannot register virtual folder! + Неможливо зареєструвати віртуальну теку! + + + Insert files... + Вставка файлів... + + + The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. + Файл %1 має бути всередині підтеки (%2). Пропускаємо його. + + + The file %1 does not exist! Skipping it. + Файл %1 не існує! Пропускаємо його. + + + Cannot open file %1! Skipping it. + Неможливо відкрити файл %1! Пропускаємо його. + + + The filter %1 is already registered! + Фільтр %1 вже зареєстровано! + + + Cannot register filter %1! + Неможливо зареєструвати фільтр %1! + + + Insert indices... + Вставка індексів... + + + Insert contents... + Вставка змісту... + + + Cannot insert contents! + Неможливо вставити зміст! + + + Cannot register contents! + Неможливо зареєструвати зміст! + + + File '%1' does not exist. + Файл '%1' не існує. + + + File '%1' cannot be opened. + Неможливо відкрити файл '%1'. + + + File '%1' contains an invalid link to file '%2' + Файл '%1' містить неправильне посилання до файлу '%2' + + + Invalid links in HTML files. + Неправильні посилання в файлах HTML. + + + + QHelpProject + + Unknown token. + Невідомий токен. + + + Unknown token. Expected "QtHelpProject"! + Невідомий токен. Очікувався "QtHelpProject"! + + + Error in line %1: %2 + Помилка в рядку %1: %2 + + + Virtual folder has invalid syntax. + Віртуальна тека має неправильний синтаксис. + + + Namespace has invalid syntax. + Простір імен має неправильний синтаксис. + + + Missing namespace in QtHelpProject. + Відсутній простір імен в QtHelpProject. + + + Missing virtual folder in QtHelpProject + Відсутня віртуальна тека в QtHelpProject + + + Missing attribute in keyword at line %1. + Відсутній атрибут в ключовому слові на рядку %1. + + + The input file %1 could not be opened! + Не вдалось відкрити вхідний файл %1! + + + + QHelpSearchQueryWidget + + Search for: + Шукати: + + + Previous search + Попередній пошук + + + Next search + Наступний пошук + + + Search + Шукати + + + Advanced search + Розширений пошук + + + words <B>similar</B> to: + слова <B>схожі</B> на: + + + <B>without</B> the words: + <B>без</B> слів: + + + with <B>exact phrase</B>: + з <B>точною фразою</B>: + + + with <B>all</B> of the words: + з <B>усіма</B> словами: + + + with <B>at least one</B> of the words: + з <B>щонайменше одним</B> зі слів: + + + + QHelpSearchResultWidget + + %1 - %2 of %n Hits + + %1 - %2 з %n збіг + %1 - %2 з %n збіги + %1 - %2 з %n збігів + + + + 0 - 0 of 0 Hits + 0 - 0 з 0 збігів + + + diff -r ef0373b55136 -r 758a864f9613 translations/qt_ja.ts --- a/translations/qt_ja.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qt_ja.ts Mon Oct 04 01:19:32 2010 +0300 @@ -2,92 +2,78 @@ - MAC_APPLICATION_MENU - - - Services - サービス - - - - Hide %1 - %1を隠す - - - - Hide Others - ほかを隠す - - - - Show All - すべてを表示 - - - - Preferences... - 環境設定... - - - - Quit %1 - %1 を終了 - - - - About %1 - %1 について - - - CloseButton - Close Tab ToolTip タブを閉じる - PPDOptionsModel - - Name - 名前 - - - Value - 値 + FakeReply + + Fake error ! + 疑似エラー! + + + Invalid URL + 無効なURL + + + + MAC_APPLICATION_MENU + + Services + サービス + + + Hide %1 + %1を隠す + + + Hide Others + ほかを隠す + + + Show All + すべてを表示 + + + Preferences... + 環境設定... + + + Quit %1 + %1 を終了 + + + About %1 + %1 について Phonon:: - Notifications 通知 - Music 音楽 - Video 動画 - Communication コミュニケーション - Games ゲーム - Accessibility アクセシビリティ @@ -95,31 +81,30 @@ Phonon::AudioOutput - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>オーディオ再生デバイス<b>%1</b>が動作しません。<br/><b>%2</b>を使用します。</html> - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> <html>より高いパフォーマンスを得られるオーディオデバイス <b>%1</b> が使用可能となったので、使用します。</html> - Revert back to device '%1' デバイス '%1' に戻す + + <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> + <html>より高いパフォーマンスを得られるかこのストリーム用に指定されているオーディオデバイス <b>%1</b> を使用します。</html> + Phonon::Gstreamer::Backend - Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. 警告: gstreamer0.10-plugins-good がインストールされていません。幾つかの動画機能は使用できません。 - Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled 警告: GStreamer plugin がインストールされていません。すべての音声、動画機能は使用できません @@ -128,72 +113,358 @@ Phonon::Gstreamer::MediaObject - Cannot start playback. -Check your Gstreamer installation and make sure you +Check your GStreamer installation and make sure you have libgstreamer-plugins-base installed. 再生できません。 -Gstreamer と libgstreamer-plugins-base が正しくインストールされているか確認してください。 - - - +Gstreamer がインストールされているか確認してください。 +libgstreamer-plugins-base はインストールされていますか。 + + + Missing codec helper script assistant. + コーデックヘルパースクリプトによる支援が受けられません。 + + + Plugin codec installation failed for codec: %0 + コーデックプラグインのインストールに失敗しました: %0 + + A required codec is missing. You need to install the following codec(s) to play this content: %0 必要なコーデックがみつかりません。このコンテンツを再生するためには、以下のコーデックをインストールする必要があります: %0 - - - - - - - - Could not open media source. メディアソースを開くことができません。 - Invalid source type. 無効なソースの形式です。 - Could not locate media source. メディアソースがみつかりません。 - Could not open audio device. The device is already in use. オーディオデバイスを開くことができません。デバイスは既に他のプロセスにより使用されています。 - Could not decode media source. メディアソースを開くことができません。見つからないか、未知の形式です。 + Phonon::MMF + + Audio Output + オーディオ出力 + + + The audio output device + オーディオ出力デバイス + + + No error + エラーはありません + + + Not found + 見つかりませんでした + + + Out of memory + メモリが足りません + + + Not supported + サポートされていません + + + Overflow + オーバーフロー + + + Underflow + アンダーフロー + + + Already exists + 既に存在します + + + Path not found + パスが見つかりません + + + In use + 使用中 + + + Not ready + 準備不足 + + + Access denied + アクセスできません + + + Could not connect + 接続できませんでした + + + Disconnected + 切断されました + + + Permission denied + 許可されていません + + + Insufficient bandwidth + 帯域幅が足りません + + + Network unavailable + ネットワークが見つかりません + + + Network communication error + ネットワークの通信エラー + + + Streaming not supported + ストリーミングはサポートされていません + + + Server alert + サーバの警告 + + + Invalid protocol + 無効なプロトコル + + + Invalid URL + 無効なURL + + + Multicast error + マルチキャストエラー + + + Proxy server error + プロキシーサーバのエラー + + + Proxy server not supported + プロキシーサーバはサポートされていません + + + Audio output error + オーディオ出力エラー + + + Video output error + ビデオ出力エラー + + + Decoder error + デコーダエラー + + + Audio or video components could not be played + オーディオもしくはビデオコンポーネントが再生できませんでした + + + DRM error + DRMエラー + + + Unknown error (%1) + 未知のエラー (%1) + + + + Phonon::MMF::AbstractMediaPlayer + + Not ready to play + 再生の準備ができていません + + + Error opening file + ファイルのオープン時にエラーが発生しました + + + Error opening URL + URL のオープン時にエラーが発生しました + + + Error opening resource + リソースのオープン時にエラーが発生しました + + + Error opening source: resource not opened + ソースのオープン時にエラーが発生しました: リソースがオープンされていません + + + Setting volume failed + ボリュームの設定に失敗しました + + + Loading clip failed + クリップのロードに失敗しました + + + Playback complete + 再生が終了しました + + + + Phonon::MMF::AbstractVideoPlayer + + Pause failed + 一時停止に失敗しました + + + Seek failed + シークに失敗しました + + + Getting position failed + 再生位置の取得に失敗しました + + + Opening clip failed + クリップのオープンに失敗しました + + + + Phonon::MMF::AudioEqualizer + + %1 Hz + %1 Hz + + + + Phonon::MMF::AudioPlayer + + Getting position failed + 再生位置の取得に失敗しました + + + + Phonon::MMF::DsaVideoPlayer + + Video display error + ビデオ表示のエラー + + + + Phonon::MMF::EffectFactory + + Enabled + 許可 + + + + Phonon::MMF::EnvironmentalReverb + + Decay HF ratio (%) + DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. + + + + Decay time (ms) + DecayTime: Time over which reverberation is diminished. + + + + Density (%) + Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. + + + + Diffusion (%) + Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. + + + + Reflections delay (ms) + ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. + + + + Reflections level (mB) + ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. + + + + Reverb delay (ms) + ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. + + + + Reverb level (mB) + ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. + + + + Room HF level + RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. + + + + Room level (mB) + RoomLevel: Master volume control for all reflected sound. + + + + + Phonon::MMF::MediaObject + + Error opening source: type not supported + ソースのオープン時にエラーが発生しました: ソースはサポートされていないタイプです + + + Error opening source: resource is compressed + ソースのオープン時にエラーが発生しました: リソースが圧縮されています + + + Error opening source: resource not valid + ソースのオープン時にエラーが発生しました: 不正なリソースです + + + Error opening source: media type could not be determined + ソースのオープン時にエラーが発生しました: メディアのタイプが不明です + + + + Phonon::MMF::StereoWidening + + Level (%) + レベル (%) + + + + Phonon::MMF::SurfaceVideoPlayer + + Video display error + ビデオ表示のエラー + + + Phonon::VolumeSlider - - - - Volume: %1% 音量: %1% - - - Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% スライダを用いて音量を指定してください。左端が0%、右端が%1%になります - Muted ミュート @@ -201,12 +472,10 @@ Q3Accel - %1, %2 not defined %1, %2 は定義されていません - Ambiguous %1 not handled 曖昧な %1 は扱えません @@ -214,27 +483,22 @@ Q3DataTable - True 真 - False 偽 - Insert 挿入 - Update アップデート - Delete 削除 @@ -242,328 +506,250 @@ Q3FileDialog - All Files (*.*) すべてのファイル(*.*) - Open オープン - Select a Directory ディレクトリを選択 - Copy or Move a File ファイルをコピーまたは移動 - Read: %1 読み込み: %1 - - Write: %1 書き込み: %1 - - Cancel キャンセル - - - - All Files (*) すべてのファイル(*) - Name 名前 - Size サイズ - Type タイプ - Date 日付 - Attributes 属性 - - &OK OK(&O) - Look &in: 検索する場所(&I): - - - File &name: ファイル名(&N): - File &type: ファイルタイプ(&T): - Back 戻る - One directory up 1つ上のディレクトリへ移動 - Create New Folder 新しいフォルダの作成 - List View 一覧表示 - Detail View 詳細表示 - Preview File Info ファイル情報のプレビュー - Preview File Contents ファイルの内容のプレビュー - Read-write 読み込み/書き込み - Read-only 読み込み専用 - Write-only 書き込み専用 - Inaccessible アクセス不可 - Symlink to File ファイルへのシンボリックリンク - Symlink to Directory ディレクトリへのシンボリックリンク - Symlink to Special スペシャルファイルへのシンボリックリンク - File ファイル - Dir ディレクトリ - Special スペシャル - - - Open オープン - - Save As 名前を付けて保存 - - - &Open オープン(&O) - - &Save 保存(&S) - &Rename 名前の変更(&R) - &Delete 削除(&D) - R&eload リロード(&E) - Sort by &Name 名前順にソート(&N) - Sort by &Size サイズ順にソート(&S) - Sort by &Date 日付順にソート(&D) - &Unsorted ソート解除(&U) - Sort ソート - Show &hidden files 隠しファイルの表示(&H) - the file ファイル - the directory ディレクトリ - the symlink シンボリックリンク - Delete %1 %1 の削除 - <qt>Are you sure you wish to delete %1 "%2"?</qt> <qt>%1 "%2" を削除しますか?</qt> - &Yes はい(&Y) - &No いいえ(&N) - New Folder 1 新しいフォルダ1 - New Folder 新しいフォルダ - New Folder %1 新しいフォルダ %1 - Find Directory ディレクトリの検索 - - Directories ディレクトリ - Directory: ディレクトリ: - - Error エラー - %1 File not found. Check path and filename. @@ -575,29 +761,24 @@ Q3LocalFs - - Could not read directory %1 ディレクトリを読み込めませんでした %1 - Could not create directory %1 ディレクトリを作成できませんでした %1 - Could not remove file or directory %1 ファイルまたはディレクトリを削除できませんでした %1 - Could not rename %1 to @@ -609,14 +790,12 @@ へ - Could not open %1 開けませんでした %1 - Could not write %1 書き込めませんでした @@ -626,12 +805,10 @@ Q3MainWindow - Line up 整列 - Customize... カスタマイズ... @@ -639,7 +816,6 @@ Q3NetworkProtocol - Operation stopped by the user 操作がユーザによって停止されました @@ -647,8 +823,6 @@ Q3ProgressDialog - - Cancel キャンセル @@ -656,28 +830,22 @@ Q3TabDialog - - OK OK - Apply 適用 - Help ヘルプ - Defaults デフォルト - Cancel キャンセル @@ -685,38 +853,30 @@ Q3TextEdit - &Undo 元に戻す(&U) - &Redo やり直す(&R) - Cu&t 切り取り(&T) - &Copy コピー(&C) - &Paste 貼り付け(&P) - Clear 消去 - - Select All すべてを選択 @@ -724,67 +884,54 @@ Q3TitleBar - System システム - Restore up 元に戻す - Minimize 最小化 - Restore down 元に戻す - Maximize 最大化 - Close 閉じる - Contains commands to manipulate the window ウィンドウを操作するコマンドを含みます - - Puts a minimized back to normal + Puts a minimized window back to normal 最小化されたウィンドウを元のサイズに戻します - Moves the window out of the way ウィンドウを隠します - Puts a maximized window back to normal 最大化されたウィンドウを元のサイズに戻します - Makes the window full screen ウィンドウをフルスクリーンにします - Closes the window ウィンドウを閉じます - Displays the name of the window and contains controls to manipulate it ウィンドウの名前と、ウィンドウを操作するコントロールを表示します @@ -792,7 +939,6 @@ Q3ToolBar - More... その他... @@ -800,51 +946,38 @@ Q3UrlOperator - - - The protocol `%1' is not supported プロトコル '%1' はサポートされていません - The protocol `%1' does not support listing directories プロトコル '%1' はディレクトリのリスティングをサポートしていません - The protocol `%1' does not support creating new directories プロトコル '%1' は新しいディレクトリの作成をサポートしていません - The protocol `%1' does not support removing files or directories プロトコル '%1' はファイルまたはディレクトリの削除をサポートしていません - The protocol `%1' does not support renaming files or directories プロトコル '%1' はファイルまたはディレクトリの名前の変更をサポートしていません - The protocol `%1' does not support getting files プロトコル '%1' はファイルの取得をサポートしていません - The protocol `%1' does not support putting files プロトコル '%1' はファイルの送信をサポートしていません - - The protocol `%1' does not support copying or moving files or directories プロトコル '%1' はファイルまたはディレクトリのコピーまたは移動をサポートしていません - - (unknown) (不明) @@ -852,27 +985,22 @@ Q3Wizard - &Cancel キャンセル(&C) - < &Back < 戻る(&B) - &Next > 次へ(&N) > - &Finish 完了(&F) - &Help ヘルプ(&H) @@ -880,45 +1008,31 @@ QAbstractSocket - - - - Host not found ホストが見つかりませんでした - - - Connection refused 接続が拒否されました - Connection timed out 接続がタイムアウトしました - - - Operation on socket is not supported 抽象ソケットクラスでのソケットのエラー このソケットへのこの操作はサポートされていません - Socket operation timed out ソケット操作がタイムアウトしました - Socket is not connected ソケットが接続されていません - Network unreachable ネットワークへ到達できません @@ -926,45 +1040,44 @@ QAbstractSpinBox - &Step up 上(&S) - Step &down 下(&D) - &Select All すべてを選択(&S) + QAccessibleButton + + Press + 押す + + + QApplication - Activate アクティブに - Activates the program's main window メインウィンドウをアクティブにする - Executable '%1' requires Qt %2, found Qt %3. 実行可能ファイル '%1' には Qt %2 が必要です。Qt %3 が見つかりました。 - Incompatible Qt Library Error 互換性のないQtライブラリエラー - QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -973,22 +1086,18 @@ QAxSelect - Select ActiveX Control ActiveX Control を選択 - OK OK - &Cancel キャンセル(&C) - COM &Object: COM オブジェクト(&O): @@ -996,17 +1105,14 @@ QCheckBox - Uncheck 選択解除 - Check 選択 - Toggle 反転 @@ -1014,97 +1120,65 @@ QColorDialog - Hu&e: 色相(&E): - &Sat: 彩度(&S): - &Val: 明度(&V): - &Red: 赤(&R): - &Green: 緑(&G): - Bl&ue: 青(&U): - A&lpha channel: アルファチャネル(&L): - Select Color 色 - &Basic colors 基本的なカラー(&B) - &Custom colors カスタムカラー(&C) - &Define Custom Colors >> - カスタムカラーの定義(&D) >> - - - OK - OK - - - Cancel - キャンセル - - - &Add to Custom Colors カスタムカラーに追加(&A) - - Select color - カラーの選択 - QComboBox - - Open オープン - False 偽 - True 真 - Close 閉じる @@ -1112,43 +1186,56 @@ QCoreApplication - %1: key is empty QSystemSemaphore %1: キーが空です - %1: unable to make key QSystemSemaphore %1: キーを作成できません - %1: ftok failed QSystemSemaphore %1: fork に失敗しました + + %1: already exists + QSystemSemaphore + %1: 既に存在します + + + %1: does not exist + QSystemSemaphore + %1: 存在しません + + + %1: out of resources + QSystemSemaphore + %1: リソース不足です + + + %1: unknown error %2 + QSystemSemaphore + %1: 未知のエラー %2 + QDB2Driver - Unable to connect 接続できません - Unable to commit transaction トランザクションをコミットできません - Unable to rollback transaction トランザクションをロールバックできません - Unable to set autocommit オートコミットを設定できません @@ -1156,33 +1243,26 @@ QDB2Result - - Unable to execute statement ステートメントを実行できません - Unable to prepare statement プリペアステートメントを使えません - Unable to bind variable 変数をバインドできません - Unable to fetch record %1 レコード %1 をフェッチできません - Unable to fetch next 次のレコードをフェッチできません - Unable to fetch first 最初のレコードをフェッチできません @@ -1190,40 +1270,910 @@ QDateTimeEdit - AM AM - am am - PM PM - pm pm + QDeclarativeAbstractAnimation + + Cannot animate non-existent property "%1" + 存在しないプロパティ "%1" はアニメーション出来ません + + + Cannot animate read-only property "%1" + 読込専用のプロパティ "%1" はアニメーション出来ません + + + Animation is an abstract class + Animation は抽象クラスです + + + + QDeclarativeAnchorAnimation + + Cannot set a duration of < 0 + 負の値はアニメーション時間として設定できません + + + + QDeclarativeAnchors + + Possible anchor loop detected on fill. + fill によってアンカーのループが発生しています。 + + + Possible anchor loop detected on centerIn. + centerIn によってアンカーのループが発生しています。 + + + Cannot anchor to an item that isn't a parent or sibling. + 親でも兄弟でもない要素にはアンカー出来ません。 + + + Possible anchor loop detected on vertical anchor. + 縦方向のアンカーによってアンカーのループが発生しています。 + + + Possible anchor loop detected on horizontal anchor. + 横方向のアンカーによってアンカーのループが発生しています。 + + + Cannot specify left, right, and hcenter anchors. + left, right, hcenter のどのアンカーを使用しているか限定できません。 + + + Cannot anchor to a null item. + 空の要素にはアンカー出来ません。 + + + Cannot anchor a horizontal edge to a vertical edge. + 横方向のエッジから縦方向のエッジへはアンカー出来ません。 + + + Cannot anchor item to self. + 自分自身へはアンカー出来ません。 + + + Cannot specify top, bottom, and vcenter anchors. + top, bottom, vcenter のどのアンカーを使用しているか限定できません。 + + + Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. + baseline アンカーを top, bottom, vcenter アンカーと組み合わせることはできません。 + + + Cannot anchor a vertical edge to a horizontal edge. + 縦方向のエッジから横方向のエッジへはアンカー出来ません。 + + + + QDeclarativeAnimatedImage + + Qt was built without support for QMovie + Qt は QMovie のサポートを外してビルドされています + + + + QDeclarativeBehavior + + Cannot change the animation assigned to a Behavior. + Behavior へ割り当てられたアニメーションは変更できません。 + + + + QDeclarativeBinding + + Binding loop detected for property "%1" + プロパティ "%1" へのバインディングにループが発生しています + + + + QDeclarativeCompiledBindings + + Binding loop detected for property "%1" + プロパティ "%1" へのバインディングにループが発生しています + + + + QDeclarativeCompiler + + Invalid property assignment: "%1" is a read-only property + 無効なプロパティの値: "%1" は読込専用のプロパティです + + + Invalid property assignment: unknown enumeration + 無効なプロパティの値: 未知の列挙型です + + + Invalid property assignment: string expected + 無効なプロパティの値: 文字列を指定してください + + + Invalid property assignment: url expected + 無効なプロパティの値: URI を指定してください + + + Invalid property assignment: unsigned int expected + 無効なプロパティの値: 符号なしの整数を指定してください + + + Invalid property assignment: int expected + 無効なプロパティの値: 整数を指定してください + + + Invalid property assignment: number expected + 無効なプロパティの値: 数値を指定してください + + + Invalid property assignment: color expected + 無効なプロパティの値: 色を指定してください + + + Invalid property assignment: date expected + 無効なプロパティの値: 日付を指定してください + + + Invalid property assignment: time expected + 無効なプロパティの値: 時間を指定してください + + + Invalid property assignment: datetime expected + 無効なプロパティの値: 日付と時間を指定してください + + + Invalid property assignment: point expected + 無効なプロパティの値: 位置を指定してください + + + Invalid property assignment: size expected + 無効なプロパティの値: サイズを指定してください + + + Invalid property assignment: rect expected + 無効なプロパティの値: 矩形を指定してください + + + Invalid property assignment: boolean expected + 無効なプロパティの値: 真偽値を指定してください + + + Invalid property assignment: 3D vector expected + 無効なプロパティの値: 3D ベクターを指定してください + + + Invalid property assignment: unsupported type "%1" + 無効なプロパティの値: 未知の型 "%1" です + + + Element is not creatable. + 要素が作成できません。 + + + Component elements may not contain properties other than id + コンポーネント要素に ID 以外のプロパティが含まれていません + + + Invalid component id specification + 無効なコンポーネント ID の指定です + + + id is not unique + ID が重複しています + + + Invalid component body specification + 無効なコンポーネントボディの指定です + + + Component objects cannot declare new properties. + コンポーネントオブジェクトに新しいプロパティを宣言できません。 + + + Component objects cannot declare new signals. + コンポーネントオブジェクトに新しいシグナルを宣言できません。 + + + Component objects cannot declare new functions. + コンポーネントオブジェクトに新しい関数を宣言できません。 + + + Cannot create empty component specification + 仕様が空であるコンポーネントは作成できません + + + Incorrectly specified signal assignment + 仕様と異なるシグナルが割り当てられています + + + Cannot assign a value to a signal (expecting a script to be run) + 値をシグナルに割り当てることはできません(ただし、スクリプトは除きます) + + + Empty signal assignment + シグナルへの割り当てが空です + + + Empty property assignment + プロパティの値が空です + + + Attached properties cannot be used here + アタッチされたプロパティはここでは利用できません + + + Non-existent attached object + アタッチされたオブジェクトが存在しません + + + Invalid attached object assignment + 無効なアタッチされたオブジェクトへの割り当て + + + Cannot assign to non-existent default property + 存在しないデフォルトプロパティへは割り当てできません + + + Cannot assign to non-existent property "%1" + 存在しないプロパティ "%1" へは割り当てできません + + + Invalid use of namespace + 無効なネームスペースの使用法です + + + Not an attached property name + アタッチされたプロパティの名前ではありません + + + Invalid use of id property + 無効な ID プロパティの使用法です + + + Property has already been assigned a value + プロパティには既に値が割り当てられています + + + Invalid grouped property access + 無効なグループ化されたプロパティへのアクセスです + + + Cannot assign a value directly to a grouped property + グループ化されたプロパティに直接値を割り当てることはできません + + + Invalid property use + 無効なプロパティの使用法です + + + Property assignment expected + プロパティに値が必要です + + + Single property assignment expected + プロパティに複数の値は割り当てられません + + + Unexpected object assignment + オブジェクトを割り当てることはできません + + + Cannot assign object to list + オブジェクトをリストに割り当てることはできません + + + Can only assign one binding to lists + リストへは一つのバインディングのみ割り当てることができます + + + Cannot assign primitives to lists + プリミティブをリストに割り当てることはできません + + + Cannot assign multiple values to a script property + 複数の値をスクリプトプロパティに割り当てることはできません + + + Invalid property assignment: script expected + 無効なプロパティの値: スクリプトを指定してください + + + Cannot assign object to property + オブジェクトをプロパティに割り当てることはできません + + + "%1" cannot operate on "%2" + "%1" は "%2" を操作できません + + + Duplicate default property + デフォルトプロパティが重複しています + + + Duplicate property name + プロパティの名前が重複しています + + + Property names cannot begin with an upper case letter + プロパティの名前を大文字から始めることはできません + + + Illegal property name + プロパティの名前が無効です + + + Duplicate signal name + シグナルの名前が重複しています + + + Signal names cannot begin with an upper case letter + シグナルの名前を大文字から始めることはできません + + + Illegal signal name + シグナルの名前が無効です + + + Duplicate method name + メソッドの名前が重複しています + + + Method names cannot begin with an upper case letter + メソッドの名前を大文字から始めることはできません + + + Illegal method name + メソッドの名前が無効です + + + Property value set multiple times + 複数回プロパティに値を割り当てています + + + Invalid property nesting + 無効なプロパティのネストです + + + Cannot override FINAL property + FINAL プロパティを上書きすることはできません + + + Invalid property type + 無効なプロパティの型です + + + Invalid empty ID + 空の ID は無効です + + + IDs cannot start with an uppercase letter + ID を大文字から始めることはできません + + + IDs must start with a letter or underscore + ID は英字もしくはアンダースコアで始めてください + + + IDs must contain only letters, numbers, and underscores + ID には英数字およびアンダースコアのみ使用できます + + + ID illegally masks global JavaScript property + ID はグローバルな JavaScript のプロパティを不正に隠しています + + + No property alias location + プロパティのエイリアスのパスがありません + + + Invalid alias location + 無効なエイリアスのパス + + + Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> + 無効なエイリアスの参照です。エイリアスの参照先は <ID> もしくは <ID>.<プロパティ> でなくてはいけません + + + Invalid alias reference. Unable to find id "%1" + 無効なエイリアスの参照です。 ID "%1" が見つかりません + + + + QDeclarativeComponent + + Invalid empty URL + 空の URL は無効です + + + + QDeclarativeCompositeTypeManager + + Resource %1 unavailable + リソース %1 が利用できません + + + Namespace %1 cannot be used as a type + ネームスペース %1 を型として使用することはできません + + + %1 %2 + %1 %2 + + + Type %1 unavailable + 型 %1 が利用できません + + + + QDeclarativeConnections + + Cannot assign to non-existent property "%1" + 存在しないプロパティ "%1" へは割り当てできません + + + Connections: nested objects not allowed + 接続： オブジェクトのネストは許可されていません + + + Connections: syntax error + 接続: 構文エラー + + + Connections: script expected + 接続: スクリプトを指定してください + + + + QDeclarativeEngine + + executeSql called outside transaction() + transaction() の外部から executeSql が呼び出されました + + + Read-only Transaction + 読込専用のトランザクションです + + + Version mismatch: expected %1, found %2 + バージョンが一致しません: 予期したバージョンは %1 ですが、 %2 が見つかりました + + + SQL transaction failed + SQL のトランザクションを失敗しました + + + transaction: missing callback + トランザクション: コールバックが欠けています + + + SQL: database version mismatch + SQL: データーベースのバージョンが一致しません + + + + QDeclarativeFlipable + + front is a write-once property + front は一度のみ書き込み可能なプロパティです + + + back is a write-once property + back は一度のみ書き込み可能なプロパティです + + + + QDeclarativeImportDatabase + + module "%1" definition "%2" not readable + "%1" モジュールの定義 "%2" が読めません + + + plugin cannot be loaded for module "%1": %2 + "%1" モジュール用のプラグインがロードできません: %2 + + + module "%1" plugin "%2" not found + "%1" モジュールの "%2" プラグインが見つかりません + + + module "%1" version %2.%3 is not installed + バージョン %2.%3 の "%1" モジュールがインストールされていません + + + module "%1" is not installed + "%1" モジュールがインストールされていません + + + "%1": no such directory + "%1": そのようなディレクトリはありません + + + import "%1" has no qmldir and no namespace + import する "%1" に qmldir もネームスペースもありません + + + - %1 is not a namespace + - %1 はネームスペースではありません + + + - nested namespaces not allowed + - ネームスペースのネストは許可されていません + + + local directory + ローカルディレクトリ + + + is ambiguous. Found in %1 and in %2 + を特定できません。%1 と %2 の双方で見つけました + + + is ambiguous. Found in %1 in version %2.%3 and %4.%5 + を特定できません。%1 にバージョン %2.%3 と %4.%5 の双方を見つけました + + + is instantiated recursively + の使用の際に再帰が発生しています + + + is not a type + は型ではありません + + + + QDeclarativeKeyNavigationAttached + + KeyNavigation is only available via attached properties + KeyNavigation はアタッチド・プロパティ(Attached Property: 型名.プロパティ名)の形式でのみ利用できます + + + + QDeclarativeKeysAttached + + Keys is only available via attached properties + Keys はアタッチド・プロパティ(Attached Property: 型名.プロパティ名)の形式でのみ利用できます + + + + QDeclarativeListModel + + remove: index %1 out of range + remove: インデックス %1 は有効範囲外の値です + + + insert: value is not an object + insert: オブジェクト以外の値は挿入できません + + + insert: index %1 out of range + insert: インデックス %1 は有効範囲外の値です + + + move: out of range + move: 有効範囲外の値です + + + append: value is not an object + append: オブジェクト以外の値は追加できません + + + set: value is not an object + set: オブジェクト以外の値は代入できません + + + set: index %1 out of range + set: インデックス %1 は有効範囲外の値です + + + ListElement: cannot contain nested elements + ListElement: ネストしたエレメントは保持できません + + + ListElement: cannot use reserved "id" property + ListElement: 予約語 "id" をプロパティに使用できません + + + ListElement: cannot use script for property value + ListElement: スクリプトをプロパティの値には使用できません + + + ListModel: undefined property '%1' + ListModel: '%1' は未定義のプロパティです + + + + QDeclarativeLoader + + Loader does not support loading non-visual elements. + Loader は可視化できない要素の読み込みをサポートしていません。 + + + + QDeclarativeParentAnimation + + Unable to preserve appearance under complex transform + 複雑な変換を伴う外観は保持できません + + + Unable to preserve appearance under non-uniform scale + 不均等な拡大/縮小を伴う外観は保持できません + + + Unable to preserve appearance under scale of 0 + サイズが0に縮小される変換を伴う外観は保持できません + + + + QDeclarativeParentChange + + Unable to preserve appearance under complex transform + 複雑な変換を伴う外観は保持できません + + + Unable to preserve appearance under non-uniform scale + 不均等な拡大/縮小を伴う外観は保持できません + + + Unable to preserve appearance under scale of 0 + サイズが0に縮小される変換を伴う外観は保持できません + + + + QDeclarativeParser + + Illegal unicode escape sequence + 無効な Unicode のエスケープシーケンスです + + + Illegal character + 無効な文字です + + + Unclosed string at end of line + 文字列が行末で閉じていません + + + Illegal escape squence + 無効なエスケープシーケンスです + + + Unclosed comment at end of file + コメントが行末で閉じていません + + + Illegal syntax for exponential number + 無効な指数の構文です + + + Identifier cannot start with numeric literal + 識別子は数字で始めることはできません + + + Unterminated regular expression literal + 正規表現リテラルが閉じていません + + + Invalid regular expression flag '%0' + '%0' は無効な正規表現のフラグです + + + Unterminated regular expression backslash sequence + 正規表現のバックスラッシュエスケープが閉じていません + + + Unterminated regular expression class + 正規表現の文字クラスが閉じていません + + + Syntax error + 構文エラー + + + Unexpected token `%1' + '%1' は予期しないトークンです + + + Expected token `%1' + トークン '%1' を予期してます + + + Property value set multiple times + 複数回プロパティに値を割り当てています + + + Expected type name + 予期する型の名前 + + + Invalid import qualifier ID + import するネームスペースの ID が無効です + + + Reserved name "Qt" cannot be used as an qualifier + 予約語 "Qt" を import するネームスペースに使用することはできません + + + Script import qualifiers must be unique. + スクリプトを import するネームスペースは一意である必要があります。 + + + Script import requires a qualifier + スクリプトを import する際にはネームスペースの指定が必要です + + + Library import requires a version + ライブラリの import にはバージョンが必要です + + + Expected parameter type + 予期するパラメータの型 + + + Invalid property type modifier + 無効なプロパティの型の修飾子 + + + Unexpected property type modifier + 予期しないプロパティの型の修飾子 + + + Expected property type + 予期するプロパティの型 + + + Readonly not yet supported + Readonly はまだサポートされていません + + + JavaScript declaration outside Script element + Script 要素の外部での JavaScript の宣言 + + + + QDeclarativePauseAnimation + + Cannot set a duration of < 0 + 負の値はアニメーション時間として設定できません + + + + QDeclarativePixmap + + Error decoding: %1: %2 + デコード中にエラーが発生しました: %1: %2 + + + Failed to get image from provider: %1 + プロバイダーからの画像の取得に失敗しました: %1 + + + Cannot open: %1 + 開けませんでした: %1 + + + + QDeclarativePropertyAnimation + + Cannot set a duration of < 0 + 負の値はアニメーション時間として設定できません + + + + QDeclarativePropertyChanges + + PropertyChanges does not support creating state-specific objects. + PropertyChanges は状態特有のオブジェクトの作成をサポートしていません。 + + + Cannot assign to non-existent property "%1" + 存在しないプロパティ "%1" へは割り当てできません + + + Cannot assign to read-only property "%1" + 読込専用のプロパティ "%1" へは割り当てできません + + + + QDeclarativeTextInput + + Could not load cursor delegate + カーソルデリゲートがロードできません + + + Could not instantiate cursor delegate + カーソルデリゲートのインスタンスを作成できません + + + + QDeclarativeVME + + Unable to create object of type %1 + 型 %1 のオブジェクトを作成できません + + + Cannot assign value %1 to property %2 + プロパティ %2 へ値 %1 を割り当てできません + + + Cannot assign object type %1 with no default method + 型 %1 のオブジェクトをデフォルトメソッドなしに割り当てることはできません + + + Cannot connect mismatched signal/slot %1 %vs. %2 + 型の合わないシグナルとスロット(%1 %vs %2)を接続することはできません + + + Cannot assign an object to signal property %1 + オブジェクトをシグナルプロパティ %1 に割り当てることはできません + + + Cannot assign object to list + オブジェクトをリストに割り当てることはできません + + + Cannot assign object to interface property + オブジェクトをインターフェースプロパティに割り当てることはできません + + + Unable to create attached object + アタッチされたオブジェクトを作成できません + + + Cannot set properties on %1 as it is null + %1 のプロパティが空のため値を代入できません + + + + QDeclarativeVisualDataModel + + Delegate component must be Item type. + デリゲートコンポーネントの型は Item である必要があります。 + + + + QDeclarativeXmlListModel + + Qt was built without support for xmlpatterns + Qt は xmlpatterns のサポートを外してビルドされています + + + + QDeclarativeXmlListModelRole + + An XmlRole query must not start with '/' + XmlRorl のクエリーを '/' で始めてはいけません + + + + QDeclarativeXmlRoleList + + An XmlListModel query must start with '/' or "//" + XmlListModel のクエリーは '/' か "//" で始まる必要があります + + + QDial - QDial ダイヤル - SpeedoMeter スピードメータ - SliderHandle スライダハンドル @@ -1231,12 +2181,10 @@ QDialog - What's This? ヒント? - Done 終了 @@ -1244,124 +2192,98 @@ QDialogButtonBox - - - OK OK - Cancel キャンセル - Apply 適用 - Ignore 無視 - Retry 再試行 - Abort 中止 - Help ヘルプ - Save 保存 - &Save 保存(&S) - Open オープン - &Cancel キャンセル(&C) - Close 閉じる - &Close 閉じる(&C) - Reset リセット - Don't Save 保存しない - Close without Saving 保存せずに閉じる - Discard 変更を破棄 - &Yes はい(&Y) - Yes to &All 全てにはい(&A) - &No いいえ(&N) - N&o to All 全てにいいえ(&O) - Save All すべて保存 - Restore Defaults デフォルトに戻す - &OK OK(&O) @@ -1369,28 +2291,23 @@ QDirModel - Name 名前 - Size サイズ - Date Modified 更新日 - Kind Match OS X Finder 種類 - Type All other platforms タイプ @@ -1399,17 +2316,14 @@ QDockWidget - Close 閉じる - Dock ドック - Float フロート @@ -1417,12 +2331,10 @@ QDoubleSpinBox - More 増やす - Less 減らす @@ -1430,27 +2342,22 @@ QErrorMessage - Debug Message: デバッグメッセージ: - Warning: 警告: - Fatal Error: 致命的なエラー: - &Show this message again 次回もこのメッセージを表示する(&S) - &OK OK(&O) @@ -1458,33 +2365,30 @@ QFile - - Destination file exists 新しい名前のファイルは既に存在します - + Will not rename sequential file using block copy + ブロックコピーを用いてシーケンシャルファイルの名前を変更することはできません + + Cannot remove source file 元のファイルを削除できません - Cannot open %1 for input コピー元ファイル %1 を読めません - Cannot open for output コピー先のファイルをオープンできません - Failure to write block 書き込みに失敗しました - Cannot create %1 for output コピー先として %1 を作成できません @@ -1492,68 +2396,40 @@ QFileDialog - - All Files (*) すべてのファイル(*) - Directories ディレクトリ - - Directory: ディレクトリ: - - File &name: ファイル名(&N): - - - - &Open オープン(&O) - - &Save 保存(&S) - Open オープン - Save - 保存 - - - -File not found. -Please verify the correct file name was given - -ファイルが見つかりません。 -正しいファイル名が入力されたかどうか確認してください - - - %1 already exists. Do you want to replace it? %1 はすでに存在します。 置き換えますか? - %1 File not found. Please verify the correct file name was given. @@ -1562,13 +2438,10 @@ 正しいファイル名が入力されたかどうか確認してください。 - My Computer マイ コンピュータ - - %1 Directory not found. Please verify the correct directory name was given. @@ -1577,547 +2450,428 @@ 正しいディレクトリ名が入力されたかどうか確認してください。 - Sort - ソート - - - &Rename 名前の変更(&R) - &Delete 削除(&D) - &Reload - リロード(&R) - - - Sort by &Name - 名前順にソート(&N) - - - Sort by &Size - サイズ順にソート(&S) - - - Sort by &Date - 日付順にソート(&D) - - - &Unsorted - ソート解除(&U) - - - Show &hidden files 隠しファイルの表示(&H) - - Back 戻る - - Parent Directory 親ディレクトリ - - Create New Folder 新しいフォルダの作成 - - List View 一覧表示 - - Detail View 詳細表示 - - Look in: 検索する場所: - - Files of type: ファイルの種類: - Drive ドライブ - - File ファイル - File Folder Match Windows Explorer ファイルフォルダ - Folder All other platforms フォルダ - Alias Mac OS X Finder エイリアス - Shortcut All other platforms ショートカット - Unknown 不明 - All Files (*.*) すべてのファイル(*.*) - Save As 名前を付けて保存 - Open - オープン - - - Select a Directory - ディレクトリを選択 - - - '%1' is write protected. Do you want to delete it anyway? '%1' は書き込みが禁止されています。 本当に削除しますか? - Are sure you want to delete '%1'? '%1' を本当に削除しますか? - Could not delete directory. ディレクトリを削除できませんでした。 - Find Directory ディレクトリの検索 - Show 表示 - &New Folder 新しいフォルダ(&N) - - &Choose 選択(&C) - New Folder 新しいフォルダ - Recent Places 履歴 - - Forward 進む - Remove 削除 + + Go back + 戻る + + + Go forward + 進む + + + Go to the parent directory + 親ディレクトリへ移動 + + + Create a New Folder + 新しいフォルダの作成 + + + Change to list view mode + リスト表示モードへ変更 + + + Change to detail view mode + 詳細表示モードへ変更 + QFileSystemModel - Name 名前 - Size サイズ - Date Modified 更新日 - Kind Match OS X Finder 種類 - Type All other platforms タイプ - - %1 TB %1 TB - - %1 GB %1 GB - - %1 MB %1 MB - - %1 KB %1 KB - - %1 bytes %1 バイト - Invalid filename 無効なファイル名 - <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. <b>ファイル名 "%1" は使用できません。</b><p>名前を短くしたり、アクセント記号などを削除して再度試してください。 - My Computer マイ コンピュータ - Computer コンピュータ + + %1 byte(s) + %1 バイト + QFontDatabase - - Normal ここはどう訳すべきか... 明朝 - - - Bold ゴシック - - Demi Bold Demi Bold - - - Black 太字 - Demi Demi - - Light 細字 - - Italic イタリック - - Oblique 斜体 - Any すべて - Latin ラテン - Greek ギリシャ - Cyrillic キリル - Armenian アルメニア - Hebrew ヘブライ - Arabic アラビア - Syriac シリア - Thaana ターナ - Devanagari デーヴァナーガリー - Bengali ベンガル - Gurmukhi グルムキー - Gujarati グジャラート - Oriya オリヤー - Tamil タミル - Telugu テルグ - Kannada カンナダ - Malayalam マラヤーラム - Sinhala シンハラ - Thai タイ - Lao ラーオ - Tibetan チベット - Myanmar ビルマ - Georgian グルジア - Khmer クメール - Simplified Chinese 簡体中国 - Traditional Chinese 繁体中国 - Japanese 日本 - Korean ハングル - Vietnamese ベトナム - Symbol 記号 - Ogham オガム - Runic ルーン + + N'Ko + ンコ + QFontDialog - &Font フォント(&F) - Font st&yle フォントスタイル(&Y) - &Size サイズ(&S) - Effects 文字飾り - Stri&keout 取り消し線(&K) - &Underline 下線(&U) - Sample サンプル - Wr&iting System 言語(&I) - - Select Font フォントの選択 @@ -2125,145 +2879,104 @@ QFtp - - Not connected 未接続です - - Host %1 not found ホスト %1 が見つかりませんでした - - Connection refused to host %1 ホスト %1 への接続が拒否されました - Connection timed out to host %1 ホスト %1 への接続がタイムアウトしました - - - Connected to host %1 ホスト %1 に接続しました - - Connection refused for data connection データ接続のための接続が拒否されました - - - - Unknown error - 不明なエラー - - - - + 未知のエラー + + Connecting to host failed: %1 ホストへの接続に失敗しました: %1 - - Login failed: %1 ログインに失敗しました: %1 - - Listing directory failed: %1 ディレクトリのリストに失敗しました: %1 - - Changing directory failed: %1 ディレクトリの変更に失敗しました: %1 - - Downloading file failed: %1 ファイルのダウンロードに失敗しました: %1 - - Uploading file failed: %1 ファイルのアップロードに失敗しました: %1 - - Removing file failed: %1 ファイルの削除に失敗しました: %1 - - Creating directory failed: %1 ディレクトリの作成に失敗しました: %1 - - Removing directory failed: %1 ディレクトリの削除に失敗しました: %1 - - - Connection closed 接続が閉じられました - Host %1 found ホスト %1 が見つかりました - Connection to %1 closed %1 への接続が閉じられました - Host found ホストが見つかりました - Connected to host ホストに接続しました @@ -2271,193 +2984,144 @@ QHostInfo - Unknown error - 不明なエラー + 未知のエラー + + + No host name given + ホストネームが与えられていません QHostInfoAgent - - - - - - - - Host not found ホストが見つかりません - - - - Unknown address type - 不明なアドレス型です - - - - - + 未知のアドレス型です + + + No host name given + ホストネームが与えられていません + + + Invalid hostname + 無効なホスト名 + + Unknown error - 不明なエラー + 未知のエラー QHttp - HTTPS connection requested but SSL support not compiled in HTTPSによる接続が要求されましたが、SSLのサポートがコンパイル時に組み込まれていないため、接続できません - - - - Unknown error - 不明なエラー - - - - + 未知のエラー + + Request aborted 要求が中止されました - - No server set to connect to 接続が設定されているサーバがありません - - Wrong content length コンテンツの長さが正しくありません - - Server closed connection unexpectedly サーバの接続が予期せず閉じられました - Unknown authentication method 非対応の認証方法が要求されました - Error writing response to device デバイスへの書き込み時にエラーが発生しました - - Connection refused 接続が拒否されました - - - Host %1 not found ホスト %1 が見つかりませんでした - - - - HTTP request failed HTTP要求に失敗しました - - Invalid HTTP response header 無効なHTTP応答ヘッダです - - - - Invalid HTTP chunked body 無効なHTTPチャンクドボディです - Host %1 found ホスト %1 が見つかりました - Connected to host %1 ホスト %1 に接続しました - Connection to %1 closed %1 への接続が閉じられました - Host found ホストが見つかりました - Connected to host ホストに接続しました - - Connection closed 接続が閉じられました - Proxy authentication required プロキシーの認証が必要です - Authentication required 認証が必要です - Connection refused (or timed out) 接続が拒否されたか、タイムアウトしました - Proxy requires authentication プロキシーの認証が必要です - Host requires authentication ホストの認証が必要です - Data corrupted データが破損しています - Unknown protocol specified 未対応のプロトコルです - SSL handshake failed SSLのハンドシェークに失敗しました @@ -2465,47 +3129,38 @@ QHttpSocketEngine - Did not receive HTTP response from proxy プロキシーからHTTPレスポンスを受信できませんでした - Error parsing authentication request from proxy プロキシーからの認証要求のパースに失敗しました - Authentication required 認証が必要です - Proxy denied connection プロキシーが接続を拒否しました - Error communicating with HTTP proxy HTTP プロキシーとの通信にて、エラーが発生しました - Proxy server not found プロキシーサーバが見つかりません - Proxy connection refused プロキシーが接続を拒否しました - Proxy server connection timed out プロキシーとの接続がタイムアウトしました - Proxy connection closed prematurely プロキシーの接続が通信の終了前に切断されました @@ -2513,22 +3168,18 @@ QIBaseDriver - Error opening database データベースのオープンでエラーが発生しました - Could not start transaction トランザクションを開始できませんでした - Unable to commit transaction トランザクションをコミットできません - Unable to rollback transaction トランザクションをロールバックできません @@ -2536,89 +3187,70 @@ QIBaseResult - Unable to create BLOB バイナリラージオブジェクトを作成できません - Unable to write BLOB バイナリラージオブジェクトを書き込めません - Unable to open BLOB バイナリラージオブジェクトをオープンできません - Unable to read BLOB バイナリラージオブジェクトを読み込めません - - Could not find array 配列が見つかりませんでした - Could not get array data 配列データを取得できませんでした - Could not get query info クエリー情報を取得できませんでした - Could not start transaction トランザクションを開始できませんでした - Unable to commit transaction トランザクションをコミットできません - Could not allocate statement ステートメントの領域を確保できませんでした - Could not prepare statement プリペアステートメントを使えませんでした - - Could not describe input statement INPUT ステートメントの情報を取得できませんでした - Could not describe statement ステートメントの情報を取得できませんでした - Unable to close statement ステートメントをクローズできません - Unable to execute query クエリーを実行できません - Could not fetch next item 次のレコードをフェッチできませんでした - Could not get statement info ステートメントの情報を取得できませんでした @@ -2626,58 +3258,56 @@ QIODevice - Permission denied 許可されていません - Too many open files 開かれたファイルが多すぎます - No such file or directory そのようなファイルやディレクトリはありません - No space left on device デバイスの残り容量がありません - Unknown error - 不明なエラー + 未知のエラー QInputContext - XIM XIM - + FEP + FEP + + XIM input method XIM 入力メソッド - Windows input method Windows 入力メソッド - Mac OS X input method Mac OS X 入力メソッド + + S60 FEP input method + S60 FEP 入力メソッド + QInputDialog - Enter a value: 数値を入力: @@ -2685,78 +3315,50 @@ QLibrary - Could not mmap '%1': %2 '%1' をメモリにマッピングできませんでした: %2 - Plugin verification data mismatch in '%1' '%1' でプラグイン検証データが一致しません - Could not unmap '%1': %2 '%1' のマッピングを解除できませんでした: %2 - The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] プラグイン '%1' は、互換性のない Qt ライブラリを使用しています。(%2.%3.%4) [%5] - The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" プラグイン '%1' は、互換性のない Qt ライブラリを使用しています。ビルドキー　"%2"　が必要ですが、"%3" しかありません - Unknown error - 不明なエラー - - - QLibrary::load_sys: Cannot load %1 (%2) - QLibrary::load_sys: %1 をロードできません (%2) - - - QLibrary::unload_sys: Cannot unload %1 (%2) - QLibrary::unload_sys: %1 をアンロードできません (%2) - - - QLibrary::resolve_sys: Symbol "%1" undefined in %2 (%3) - QLibrary::resolve_sys: シンボル "%1" は %2 で定義されていません (%3) - - - - + 未知のエラー + + The shared library was not found. 共有ライブラリがみつかりません。 - The file '%1' is not a valid Qt plugin. ファイル '%1' は Qt プラグインではありません。 - The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) プラグイン '%1' はこの Qt と互換性のないライブラリを使用しています。 (デバック版とリリース版のライブラリを同時に使用することはできません) - - Cannot load library %1: %2 ライブラリ '%1' を読み込むことができません: %2 - - Cannot unload library %1: %2 ライブラリ %1 を解放することができません: %2 - - Cannot resolve symbol "%1" in %2: %3 '%2'に含まれる識別子 "%1" を解決できません: %3 @@ -2764,37 +3366,30 @@ QLineEdit - &Undo 元に戻す(&U) - &Redo やり直す(&R) - Cu&t 切り取り(&T) - &Copy コピー(&C) - &Paste 貼り付け(&P) - Delete 削除 - Select All すべてを選択 @@ -2802,23 +3397,18 @@ QLocalServer - - %1: Name error %1: 名前の解決に失敗 - %1: Permission denied %1: 許可されていません - %1: Address in use %1: アドレスは既に使用されています - %1: Unknown error %2 %1: 未知のエラー %2 @@ -2826,70 +3416,46 @@ QLocalSocket - - %1: Connection refused %1: 接続が拒否されました - - %1: Remote closed %1: リモートにより接続が閉じられました - - - - %1: Invalid name %1: 無効な名前です - - %1: Socket access error %1: ソケットアクセスのエラーです - - %1: Socket resource error %1: ソケットリソースのエラーです - - %1: Socket operation timed out %1: ソケット操作がタイムアウトしました - - %1: Datagram too large %1: データグラムが大きすぎます - - - %1: Connection error %1: 接続のエラーが発生しました - - %1: The socket operation is not supported %1: そのソケット操作はサポートされていません - %1: Unknown error %1: 未知のエラーです - - %1: Unknown error %2 %1: 未知のエラー %2 @@ -2897,27 +3463,22 @@ QMYSQLDriver - Unable to open database ' データベースをオープンできません ' - Unable to connect 接続できません - Unable to begin transaction トランザクションを開始できません - Unable to commit transaction トランザクションをコミットできません - Unable to rollback transaction トランザクションをロールバックできません @@ -2925,59 +3486,46 @@ QMYSQLResult - Unable to fetch data データをフェッチできません - Unable to execute query クエリーを実行できません - Unable to store result 実行結果を記録できません - - Unable to prepare statement プリペアステートメントを使えません - Unable to reset statement ステートメントをリセットできません - Unable to bind value 値をバインドできません - Unable to execute statement ステートメントを実行できません - - Unable to bind outvalues 出力値をバインドできません - Unable to store statement results ステートメントの実行結果を記録できません - Unable to execute next query 次のクエリーを実行できません - Unable to store next result 次の結果を記録できません @@ -2985,7 +3533,6 @@ QMdiArea - (Untitled) (タイトルなし) @@ -2993,93 +3540,75 @@ QMdiSubWindow - %1 - [%2] %1 - [%2] - Close 閉じる - Minimize 最小化 - Restore Down 元に戻す - &Restore 元に戻す(&R) - &Move 移動(&M) - &Size サイズ(&S) - Mi&nimize 最小化(&N) - Ma&ximize 最大化(&X) - Stay on &Top 常に手前に表示(&T) - &Close 閉じる(&C) - - [%1] - [%1] - Maximize 最大化 - Unshade たぶん選択・非選択状態のウィンドウのことだと思うけど。fvwmなどのx11で使われている用語 非選択 - Shade 選択 - Restore 元に戻す - Help ヘルプ - Menu メニュー @@ -3087,21 +3616,14 @@ QMenu - - Close 閉じる - - Open オープン - - - Execute 実行 @@ -3109,91 +3631,44 @@ QMenuBar - About Qt - Qt について + Actions + アクション QMessageBox - Help ヘルプ - - - - OK OK - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>Qt について</h3>%1 -<p>QtはクロスプラットフォームのC++ アプリケーション開発ツールキットです。</p> -<p>Qt は MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, 商用のUnix派生版でソースコード互換を実現します。また、Qtopia Coreのように、内蔵デバイスでも利用可能です。</p> -<p>QtはTrolltechの商品です。詳細は<tt>http://qt.nokia.com/</tt>を参照してください。</p> - - - <p>This program uses Qt version %1.</p> - <p>このプログラムは Qt バージョン %1 を使用しています。</p> - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> for an overview of Qt licensing.</p> - <p>このプログラムは Qt オープンソース版バージョン %1 を使用しています。</p> -<p>Qt オープンソース版はオープンソースのアプリケーションの開発用です。ソースコードを公開しない商用アプリケーションを開発するには商用版のライセンスが必要です。</p><p>Qtのライセンスについては<tt>http://qt.nokia.com/company/model.html</tt>を参照してください。</p> - - - About Qt Qt について - Show Details... 詳細を表示... - Hide Details... 詳細を隠す... - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>Qtについて</h3> -<p>このプログラムは Qt バージョン %1 を使用しています。</p> -<p>Qt は、クロスプラットホームのアプリケーション開発に使用される C++ のツールキットです。</p> -<p>Qt は、 MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, そして多数の Unix 系OS環境に対して、単一のソースからバイナリを生成します。 -また、 Linux および Windows CE を元とした組み込み環境にも対応しています。</p> -<p>Qt は様々なユーザの要望に応じるために、3つの異なるライセンスで提供されています。</p> -<p> -Qt 商用ライセンスは、プロプライエタリまたは商用ソフトウェアに適用できます。 -この場合は、他者とのソースコードの共有を拒否し、 GNU LGP バージョン 2.1 または GNU GPL バージョン 3.0 を許容できないソフトウェアにおいて Qt を使用できます。 -</p> -<p> -Qt GNU LGPL バージョン 2.1 ライセンスは、プロプライエタリまたはオープンソースソフトウェアに適用できます。 -この場合は、 GNU LGPL バージョン 2.1 に従う必要があります。 -</p> -<p> -Qt GNU General Public License バージョン 3.0 ライセンスは、GNU GPL バージョン 3.0 または GPL 3.0 と互換性のあるライセンスを採用しているソフトウェアに適用されます。 -この場合は、GNU GPL バージョン 3.0 に従う必要があります。 -</p> -<p> -ライセンスの詳細については、<a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> -を参照してください。</p> -<p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p> -<p>Qt は Nokia の製品です。詳細については<a href="http://qt.nokia.com/">qt.nokia.com</a> を参照してください。</p> -<p> -訳注: ライセンスはここにある翻訳は参考のためのものであり、オリジナルの(英語の)ものが正式なものとなります。 -</p> + <h3>About Qt</h3><p>This program uses Qt version %1.</p> + <h3>Qt について</h3><p>このプログラムは Qt バージョン %1 を使用しています。</p> + + + <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> + QMultiInputContext - Select IM インプットメソッドを選択 @@ -3201,12 +3676,10 @@ QMultiInputContextPlugin - Multiple input method switcher 複数のインプットメソッドを切り替え - Multiple input method switcher that uses the context menu of the text widgets テキストウィジェットのコンテキストメニューを使った複数のインプットメソッドの切り替えです @@ -3214,132 +3687,106 @@ QNativeSocketEngine - Unable to initialize non-blocking socket 非ブロック型ソケットを初期化できません - Unable to initialize broadcast socket ブロードキャストソケットを初期化できません - Attempt to use IPv6 socket on a platform with no IPv6 support IPv6 がサポートされていないプラットフォームで IPv6 ソケットを使用しようとしています - The remote host closed the connection リモートホストは接続を閉じました - Network operation timed out ネットワーク操作がタイムアウトしました - Out of resources リソースが足りません - Unsupported socket operation サポートされていないソケット操作です - Protocol type not supported プロトコル型がサポートされていません - Invalid socket descriptor 無効なソケット記述子です - Host unreachable ホストへ到達できません - Network unreachable ネットワークへ到達できません - Permission denied 許可されていません - Connection timed out 接続がタイムアウトしました - Connection refused 接続を拒否されました - The bound address is already in use バインドアドレスは既に使われています - The address is not available そのアドレスは使用できません - The address is protected そのアドレスへのアクセス権がありません - Datagram was too large to send データグラムが大き過ぎて送信できませんでした - Unable to send a message メッセージを送信できません - Unable to receive a message メッセージを受信できません - Unable to write 書き込みができません - Network error ネットワークエラー - Another socket is already listening on the same port 別のソケットが同じポートで既に待ち受けています - Operation on non-socket 非ソケットに対する操作です - Unknown error - 不明なエラー - - - + 未知のエラー + + The proxy type is invalid for this operation このプロキシーは、この操作に対応していません @@ -3347,43 +3794,55 @@ QNetworkAccessCacheBackend - Error opening %1 オープンのエラー %1 + QNetworkAccessDataBackend + + Operation not supported on %1 + %1 ではこの操作はサポートされていません + + + Invalid URI: %1 + 無効なURIです: %1 + + + QNetworkAccessDebugPipeBackend - Write error writing to %1: %2 %1 への書き込み時にエラーが発生しました: %2 + + Socket error on %1: %2 + %1 のソケットにおいてエラーが発生しました: %2 + + + Remote host closed the connection prematurely on %1 + リモートホスト %1 との接続が通信の終了前に切断されました + QNetworkAccessFileBackend - Request for opening non-local file %1 非ローカルファイル %1 をオープンするよう要求されましたが、ローカルファイルのみオープンできます - Error opening %1: %2 %1 をオープンする時にエラーが発生しました: %2 - Write error writing to %1: %2 %1 への書き込み時にエラーが発生しました: %2 - Cannot open %1: Path is a directory %1 をオープンできません。指定されたパスはディレクトリです - Read error reading from %1: %2 %1 を読み込み時にエラーが発生しました: %2 @@ -3391,27 +3850,22 @@ QNetworkAccessFtpBackend - No suitable proxy found 適切なプロキシーがみつかりません - Cannot open %1: is a directory %1 をオープンできません。指定されたパスはディレクトリです - Logging in to %1 failed: authentication required %1 へのログインに失敗しました。認証が必要です - Error while downloading %1: %2 %1 をダウンロード中にエラーが発生しました: %2 - Error while uploading %1: %2 %1 をアップロード中にエラーが発生しました: %2 @@ -3419,58 +3873,105 @@ QNetworkAccessHttpBackend - No suitable proxy found 適切なプロキシーがみつかりません + QNetworkAccessManager + + Network access is disabled. + ネットワークへのアクセスが禁止されています。 + + + QNetworkReply - Error downloading %1 - server replied: %2 %1 をダウンロード中にエラーが発生しました。サーバの返答: %2 - Protocol "%1" is unknown プロトコル "%1" はサポートされていません + + Network session error. + ネットワークセッションエラー。 + + + Temporary network failure. + 一時的なネットワークの失敗。 + QNetworkReplyImpl - - Operation canceled 操作はキャンセルされました + QNetworkSession + + Invalid configuration. + 無効な設定です。 + + + + QNetworkSessionPrivateImpl + + Roaming error + ローミングエラー + + + Session aborted by user or system + セッションはユーザもしくはシステムによって停止されました + + + Unidentified Error + 未知のエラー + + + Unknown session error. + 未知のセッションエラーです。 + + + The session was aborted by the user or system. + このセッションはユーザもしくはシステムによって停止されました。 + + + The requested operation is not supported by the system. + 要求された操作はこのシステムではサポートされていません。 + + + The specified configuration cannot be used. + この設定は利用できません。 + + + Roaming was aborted or is not possible. + ローミングは停止されたか利用できません。 + + + QOCIDriver - Unable to initialize QOCIDriver 初期化できません - Unable to logon ログオンできません - Unable to begin transaction トランザクションを開始できません - Unable to commit transaction トランザクションをコミットできません - Unable to rollback transaction トランザクションをロールバックできません @@ -3478,43 +3979,34 @@ QOCIResult - - - Unable to bind column for batch execute バッチ処理用にフィールドをバインドできません - Unable to execute batch statement バッチステートメントを実行できません - Unable to goto next 次のレコードへ進めません - Unable to alloc statement ステートメントの領域を確保できません - Unable to prepare statement プリペアステートメントを使えません - + Unable to get statement type + ステートメントの型を取得できません + + Unable to bind value 値をバインドできません - Unable to execute select statement - SELECT ステートメントを実行できません - - - Unable to execute statement ステートメントを実行できません @@ -3522,32 +4014,26 @@ QODBCDriver - Unable to connect 接続できません - - Unable to connect - Driver doesn't support all needed functionality - 接続できません - ドライバは全ての必要な機能をサポートしていません - - - + Unable to connect - Driver doesn't support all functionality required + 接続できません - ドライバは必要な全ての機能をサポートしていません + + Unable to disable autocommit オートコミットを無効にできません - Unable to commit transaction トランザクションをコミットできません - Unable to rollback transaction トランザクションをロールバックできません - Unable to enable autocommit オートコミットを有効にできません @@ -3555,51 +4041,38 @@ QODBCResult - - Unable to execute statement ステートメントを実行できません - Unable to fetch next 次のレコードをフェッチできません - Unable to prepare statement プリペアステートメントを使えません - Unable to bind variable 変数をバインドできません - - QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: ステートメントの属性として 'SQL_CURSOR_STATUS' を設定できません。ODBC ドライバの構成をチェックしてください - - - Unable to fetch last リストを取得できません - Unable to fetch フェッチできません - Unable to fetch first 最初のレコードをフェッチできません - Unable to fetch previous 前のレコードをフェッチできません @@ -3607,54 +4080,25 @@ QObject - False - False - - - True - True - - - - Home - ホーム - - - - Operation not supported on %1 - %1 ではこの操作はサポートされていません - - - - Invalid URI: %1 - 無効なURIです: %1 - - - - Socket error on %1: %2 - %1 のソケットにおいてエラーが発生しました: %2 - - - - Remote host closed the connection prematurely on %1 - リモートホスト %1 との接続が通信の終了前に切断されました - - - - - No host name given - ホストネームが与えられていません + PulseAudio Sound Server + PulseAudio サウンドサーバ + + + "%1" duplicates a previous role name and will be disabled. + "%1" で直前のロール名を複製し、無効化されます。 + + + invalid query: "%1" + 無効なクエリー: "%1" QPPDOptionsModel - Name 名前 - Value 値 @@ -3662,32 +4106,26 @@ QPSQLDriver - Unable to connect 接続できません - Could not begin transaction トランザクションを開始できませんでした - Could not commit transaction トランザクションをコミットできませんでした - Could not rollback transaction トランザクションをロールバックできませんでした - Unable to subscribe subscribe できません - Unable to unsubscribe unsubscribe できません @@ -3695,12 +4133,10 @@ QPSQLResult - Unable to create query クエリーを作成できません - Unable to prepare statement プリペアステートメントを使えません @@ -3708,1164 +4144,93 @@ QPageSetupWidget - Centimeters (cm) センチメートル (cm) - Millimeters (mm) ミリメートル (mm) - Inches (in) インチ (in) - Points (pt) ポイント (pt) - Form 書式設定 - Paper 用紙 - Page size: ページサイズ: - Width: 幅: - Height: 高さ: - Paper source: 給紙装置: - Orientation 印刷方向 - Portrait 縦 (ポートレート) - Landscape 横 (ランドスケープ) - Reverse landscape 横 反転 (リバースランドスケープ) - Reverse portrait 縦 反転 (リバースポートレート) - Margins 余白 - top margin 上端余白 - left margin 左端余白 - right margin 右端余白 - bottom margin 下端余白 - QPatternist::QtXmlPatterns - - - An %1-attribute with value %2 has already been declared. - 属性 %1 の値 %2 は既に宣言されています。 - - - - An %1-attribute must have a valid %2 as value, which %3 isn't. - 属性 %1 の値は %2 の型でなければなりませんが、 %3 が指定されました。 - - - - %1 is an unsupported encoding. - %1 はサポートされていないエンコーディングです。 - - - - %1 contains octets which are disallowed in the requested encoding %2. - エンコーディング %2 では許可されていないオクテットが %1 に含まれています。 - - - - The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. - %2 で使用されているエンコード %3 では、コードポイント %1 は有効な XML 表現ではありません。 - - - - Network timeout. - ネットワーク接続がタイムアウトしました。 - - - - Element %1 can't be serialized because it appears outside the document element. - エレメント %1 はシリアライズできません。このドキュメントの範囲を越えるエレメントを含んでいます。 - - - - Attribute %1 can't be serialized because it appears at the top level. - 属性 %1 はシリアライズできません。トップレベルに現れているためです。 - - - - Year %1 is invalid because it begins with %2. - %1 年はむこうです。%2 で始まっています。 - - - - Day %1 is outside the range %2..%3. - %1 日は、有効な範囲 %2..%3 を逸脱しています。 - - - - Month %1 is outside the range %2..%3. - %1 月は、有効な範囲 %2..%3 を逸脱しています。 - - - - Overflow: Can't represent date %1. - オーバーフロー: 日付 %1 を再現できません。 - - - - Day %1 is invalid for month %2. - %2 月には、%1 日は存在しません。 - - - - Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; - 24:%1:%2.%3 は無効です。24時0分0秒のみ使用できます - - - - Time %1:%2:%3.%4 is invalid. - 時刻 %1時%2分%3.%4秒は無効です。 - - - - Overflow: Date can't be represented. - オーバーフロー: 日付を再現できません。 - - - - - At least one component must be present. - 年、月、日のうちいずれかを指定しなければなりません。 - - - - At least one time component must appear after the %1-delimiter. - %1 の後には、時刻を指定しなければなりません。 - - - - No operand in an integer division, %1, can be %2. - ゼロ除算? NaN? - 整数の除算のためのオペランドが不足しています。%1 は %2 でなければなりません。 - - - - The first operand in an integer division, %1, cannot be infinity (%2). - 整数の除算における最初のオペランド %1 を認識できません (%2)。 - - - - The second operand in a division, %1, cannot be zero (%2). - 整数の除算における二つ目のオペランド %1 はゼロであってはいけまん(%2)。 - - - - %1 is not a valid value of type %2. - %1 は、%2 の型に対して有効な値ではありません。 - - - - When casting to %1 from %2, the source value cannot be %3. - %2 から %1 への型変換に際しては、値 %3 は有効な値ではありません。 - - - - Integer division (%1) by zero (%2) is undefined. - 整数の除算において %1 をゼロ (%2) で割った結果は定義されていません。 - - - - Division (%1) by zero (%2) is undefined. - 除算において %1 をゼロ (%2) で割った結果は定義されていません。 - - - - Modulus division (%1) by zero (%2) is undefined. - 剰余を求めるに際し、%1 をゼロ (%2) で除した結果は定義されていません。 - - - - - Dividing a value of type %1 by %2 (not-a-number) is not allowed. - 型 %1 を非数 %2 (NaN) で除すことはできません。 - - - - Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. - 型 %1 を%2 または %3 (正または負のゼロ) で除することはできません。 - - - - Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. - 型 %1 を %2 または %3 (正または負のゼロ)で乗ずることはできません。 - - - - A value of type %1 cannot have an Effective Boolean Value. - 型 %1 は有効な論理型(bool)ではありません。 - - - - Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - ?? - 論理型は、論理型以外の複数の値からなる計算によって求めることはできません。 - - - - Value %1 of type %2 exceeds maximum (%3). - 型 %2 の値 %1 は、上限 (%3) を越えています。 - - - - Value %1 of type %2 is below minimum (%3). - 型 %2 の値 %1 は、下限 (%3) を越えています。 - - - - A value of type %1 must contain an even number of digits. The value %2 does not. - 型 %1 の値は偶数個の十進数文字を必要とします。しかし、%2 はそうではありません。 - - - - %1 is not valid as a value of type %2. - 型 %2 に対して、値 %1 は有効ではありません。 - - - - Ambiguous rule match. - 曖昧なルールにマッチしました。 - - - - Operator %1 cannot be used on type %2. - 型 %2 に対して、オペレータ %1 は使用できません。 - - - - Operator %1 cannot be used on atomic values of type %2 and %3. - アトミックな型 %2 と %3 に対して、オペレータ %1 は使用できません。 - - - - The namespace URI in the name for a computed attribute cannot be %1. - computed attrib. ってなんてやくすのが適当かな。 - 結合された属性に対する名前空間のURIとして、%1 を使用することはできません。 - - - - The name for a computed attribute cannot have the namespace URI %1 with the local name %2. - 結合された属性の名前空間URI %1 は、ローカルな名前である %2 と併用できません。 - - - - Type error in cast, expected %1, received %2. - 型変換時のエラーです。望んでいた %1 ではなく、%2 になりました。 - - - - When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. - %1 またはそれを継承している型への型変換においては、元の値の型は同じ型か、リテラルな文字列である必要があります。型 %2 は許可されていません。 - - - - No casting is possible with %1 as the target type. - 目標とする型に %1 を型変換することはできません。 - - - - It is not possible to cast from %1 to %2. - 型 %1 を型 %2 に型変換することはできません。 - - - - Casting to %1 is not possible because it is an abstract type, and can therefore never be instantiated. - 型 %1 への型変換はできません。抽象型であり、インスタンス化することができないからです。 - - - - It's not possible to cast the value %1 of type %2 to %3 - 型 %2 の値 %1 を、型 %3 に型変換することはできません - - - - Failure when casting from %1 to %2: %3 - %1 を %2 に型変換することができません: %3 - - - - A comment cannot contain %1 - コメントが %1 を含むことはできません - - - - A comment cannot end with a %1. - コメントは %1 で終了することはできません。 - - - - No comparisons can be done involving the type %1. - 型 %1 に対して比較を行うことはできません。 - - - - Operator %1 is not available between atomic values of type %2 and %3. - オペレータ %1 は、アトミックな型である %2 と %3 には適用できません。 - - - - In a namespace constructor, the value for a namespace cannot be an empty string. - 名前空間のスントラクトにおいて、空白の文字列を名前空間の値として使用することはできません。 - - - - The prefix must be a valid %1, which %2 is not. - プレフィックスは %1 でなければなりません。%2 は無効です。 - - - - The prefix %1 cannot be bound. - プレフィックス %1 はバウンドできません。 - - - - Only the prefix %1 can be bound to %2 and vice versa. - プレフィックス %1 は、%2 にのみバウンドできます。逆も同じです。 - - - - An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - ドキュメントノードの子として属性ノードを指定することはできません。属性 %1 は誤った場所にあります。 - - - - Circularity detected - 循環を検出しました - - - - A library module cannot be evaluated directly. It must be imported from a main module. - ライブラリモジュールを直接評価することはできません。メインモジュールからインポートする必要があります。 - - - - No template by name %1 exists. - テンプレート名 %1 は存在しません。 - - - - A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. - 型 %1 は述部として使用できません。数値型か、論理型である必要があります。 - - - - A positional predicate must evaluate to a single numeric value. - positional? - 述部は評価されたとき、単一の数値になるようにしなければなりません。 - - - - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. - ターゲットとしている名前は、%1 であってはなりません。%2 は無効です。 - - - - %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. - %1 はターゲットとして無効です。%2 である必要があります。例えば "%3" のようにです。 - - - - The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - バスの末端であるリーフは、単一のノードかアトミックな値である必要があります。複数の型の組み合わせであってはいけません。 - - - - The data of a processing instruction cannot contain the string %1 - 処理中のデータは、以下の文字列を含んでいてはなりません: %1 - - - - No namespace binding exists for the prefix %1 - プレフィックス %1 にバインドされたネームスペースがありません - - - - No namespace binding exists for the prefix %1 in %2 - %2 におけるプレフィックス %1 にバインディングされたネームスペースが存在しません - - - - - %1 is an invalid %2 - 型 %2 に対し、値 %1 は無効です - - - - The parameter %1 is passed, but no corresponding %2 exists. - パラメータ %1 を処理しました。しかし、対応する %2 が存在しません。 - - - - The parameter %1 is required, but no corresponding %2 is supplied. - パメータ %1 が必要です。しかし、対応する %2 がありません。 - - - - %1 takes at most %n argument(s). %2 is therefore invalid. - - %1 は、最大で %n 個の引数をとることができます。%2 は無効です。 - - - - - %1 requires at least %n argument(s). %2 is therefore invalid. - - %1 は、少くとも %n 個の引数を必要とします。%2 は無効です。 - - - - - The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. - %1 への最初の引数は、型 %2 であってはなりません。数値型、xs:yerMonthDuration、xs:dayTimeDurationである必要があります。 - - - - The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. - %1 への最初の引数は、型 %2 であってはなりません。%3, %4, %5 のいずれかである必要があります。 - - - - The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. - %1 への二つ目の引数は、型 %2 であってはなりません。%3, %4, %5 のいずれかである必要があります。 - - - - %1 is not a valid XML 1.0 character. - %1 は XML 1.0 において有効な文字ではありません。 - - - - The first argument to %1 cannot be of type %2. - %1 への最初の引数は、型 %2 であってはなりません。 - - - - The root node of the second argument to function %1 must be a document node. %2 is not a document node. - %1 への二つ目の引数のルートノードは、ドキュメントノードでなければなりません。しかし、%2 はドキュメントノードではありません。 - - - - If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - ゾーンオフセットってなに? xmlにそんなのあったっけ? - もし二つの値がゾーンオフセットをもつ場合、両者は同じゾーンオフセットでなければなりません。%1 と %2 は同一ではありません。 - - - - %1 was called. - %1 が呼ばれました。 - - - - %1 must be followed by %2 or %3, not at the end of the replacement string. - %1 の後には、%2 か %3 が続かなければなりません。 - - - - In the replacement string, %1 must be followed by at least one digit when not escaped. - 置換操作において、%1 には少くとも一文字以上の数値が続く必要があります(エスケープされている場合を除く)。 - - - - In the replacement string, %1 can only be used to escape itself or %2, not %3 - 置換操作において、%1 はそれ自身または %2 をエスケープする為にのみ使用できます。%3 に対しては使用できません - - - - %1 matches newline characters - %1 は改行文字(列)にマッチしました - - - - %1 and %2 match the start and end of a line. - %1 と %2 は、行の先頭と末尾にマッチしました。 - - - - Matches are case insensitive - マッチは大文字小文字を区別しません - - - - Whitespace characters are removed, except when they appear in character classes - CDATA? - 空白文字は削除されました。ただし、キャラクタークラスに属するものは除きます - - - - %1 is an invalid regular expression pattern: %2 - %1 は有効な正規表現ではありません。: %2 - - - - %1 is an invalid flag for regular expressions. Valid flags are: - %1 は正規表現において無効なフラグです。使用可能なフラグは次の通りです: - - - - If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. - もし、最初の引数が空白からなる文字列か、長さが0 (名前空間をともなわない)である場合、プレフィックスを指定することはできません。しかし、プレフィックスとして %1 が指定されています。 - - - - It will not be possible to retrieve %1. - %1 を取得することはできないかもしれません。 - - - - The default collection is undefined - デフォルトのコレクションが定義されていません - - - - %1 cannot be retrieved - %1 を取得できません - - - - The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - つまり、空白の文字です、はどうでもいいよね。 - 正規化された表現 %1 はサポートされていません。サポートされている表現は、%2, %3, %4, %5 のみです。 - - - - A zone offset must be in the range %1..%2 inclusive. %3 is out of range. - ゾーンオフセットは、%1 から %2 の範囲である必要があります(境界を含む)。%3 は範囲外です。 - - - - %1 is not a whole number of minutes. - %1 は、分を現す値ではありません。 - - - - The URI cannot have a fragment - この URI はフラグメントをもつことはできません - - - - Required cardinality is %1; got cardinality %2. - カーディナリティ %1 が必要です。%2 ではありません。 - - - - The item %1 did not match the required type %2. - アイテム %1 は、要求された型 %2 にマッチしません。 - - - - Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. - エレメント %2 に属性 %1 を指定することはできません。標準の属性のみが許可されています。 - - - - Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the standard attributes. - エレメント %2 に属性 %1 を指定することはできません。%3 と標準の属性のみが許可されています。 - - - - Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the standard attributes. - エレメント %2 に属性 %1 を指定することはできません。%3, %4 と標準の属性のみが許可されています。 - - - - Attribute %1 cannot appear on the element %2. Allowed is %3, and the standard attributes. - エレメント %2 に %1 は指定できません。%3 と標準の属性のみが指定できます。 - - - - XSL-T attributes on XSL-T elements must be in the null namespace, not in the XSL-T namespace which %1 is. - XSLT エレメントに対するXSLT属性は、名前空間がnullでなければなりません。%1 は使用できません。 - - - - The attribute %1 must appear on element %2. - 属性 %1 は、エレメント %2 にのみ記述できます。 - - - - The element with local name %1 does not exist in XSL-T. - ローカル名 %1 のエレメントは、XSLTに存在しません。 - - - - The variable %1 is unused - 値 %1 は使用されませんでした - - - - A construct was encountered which only is allowed in XQuery. - XQuery でのみ許可されている construct に遭遇しました。 - - - - - %1 is an unknown schema type. - %1 はサポートされていないスキーマのタイプです。 - - - - A template by name %1 has already been declared. - テンプレート名 '%1' は、既に宣言されています。 - - - - %1 is not a valid numeric literal. - %1 は数値リテラルとして無効です。 - - - - Only one %1 declaration can occur in the query prolog. - クェリーのプロローグでは、%1 は一回のみ宣言できます。 - - - - The initialization of variable %1 depends on itself - 再帰? - 値 %1 の初期化は、それ自身に依存しています - - - - No variable by name %1 exists - 変数 %1 は存在しません - - - - Version %1 is not supported. The supported XQuery version is 1.0. - バージョン %1 はサポートされていません。XQuery バージョン 1.0 のみサポートされています。 - - - - The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. - エンコーディング '%1' は無効です。ラテン文字 (空白を除く) からなるもので、正規表現 '%2' にマッチするもののみ使用できます。 - - - - No function with signature %1 is available - シグネチャ %1 をもつ関数がみつかりません - - - - - A default namespace declaration must occur before function, variable, and option declarations. - 標準の名前空間の宣言は、関数、変数、オプションの宣言の前にしなければなりません。 - - - - Namespace declarations must occur before function, variable, and option declarations. - 名前空間の宣言は、関数、変数、オプションの宣言の前にしなければなりません。 - - - - Module imports must occur before function, variable, and option declarations. - モジュールのインポートは、関数、変数、オプションの宣言の前にしなければなりません。 - - - - The keyword %1 cannot occur with any other mode name. - キーワード %1 は、他の名をともなって使用することはできません。 - - - - The value of attribute %1 must of type %2, which %3 isn't. - 属性 '%1' の値として '%3' が指定されましたが、型 '%2' でなければなりません。 - - - - It is not possible to redeclare prefix %1. - プレフィックス '%1' を再定義することはできません。 - - - - The prefix %1 can not be bound. By default, it is already bound to the namespace %2. - プレフィックス '%1' はバウンドできません。デフォルトでは、それは既に名前空間 '%2' にバウンドされています。 - - - - Prefix %1 is already declared in the prolog. - プロローグ部において、プレフィックス '%1' はすでに宣言されています。 - - - - The name of an option must have a prefix. There is no default namespace for options. - オプションの名前はプレフィックスをもたなければなりません。このオプションに対するデフォルトの名前空間は存在しません。 - - - - The Schema Import feature is not supported, and therefore %1 declarations cannot occur. - このスキーマのインポート機能は使用できません。また、'%1' 宣言も使用できません。 - - - - The target namespace of a %1 cannot be empty. - 名前空間 '%1' は、空であってはなりません。 - - - - The module import feature is not supported - モジュールインポートの機能はサポートされていません - - - - A variable by name %1 has already been declared. - 名前 '%1' の変数は、すでに宣言されています。 - - - - No value is available for the external variable by name %1. - 外部変数 '%1' の値がみつかりません。 - - - - A stylesheet function must have a prefixed name. - スタイルシート関数は、プレフィックス名を持たなければなりません。 - - - - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) - ユーザ定義の関数の名前空間は、空であってはなりません。(すでに定義されているプレフィックス '%1' が使用できます) - - - - The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. - 名前空間 '%1' は予約済です。ユーザ定義の関数では使用することはできません。プレフィックス '%2' が使用できます。 - - - - The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 - ライブラリモジュールで使用されている名前空間は、モジュールの名前空間と同一でなければなりません。つまり、'%2' ではなく、'%1' でなければなりません - - - - A function already exists with the signature %1. - シグネチャー '%1' の関数はすでに存在しています。 - - - - No external functions are supported. All supported functions can be used directly, without first declaring them as external - 外部関数はサポートされていません。すべてのサポートされている関数は、外部宣言をすることなく、直接使用することができます - - - - An argument by name %1 has already been declared. Every argument name must be unique. - 引数名 '%1' は既に宣言されています。すべての引数名はユニークである必要があります。 - - - - When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. - パターン一致の内側で関数 '%1' を使用する場合、引数はリテラルな文字列を参照する値でなければなりません。 - - - - In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. - XSL-T パターンマッチングにおいて、関数 '%1' の最初の引数は、リテラルな文字列でなければなりません。 - - - - In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. - variable ref? - XSL-T パターンマッチングにおいて、関数 '%1' への最初の引数は、リテラルか変数でなければなりません。 - - - - In an XSL-T pattern, function %1 cannot have a third argument. - XSL-T パターンにおいて、関数 '%1' は三つの引数をもつことはできません。 - - - - In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. - XSL-T パターンマッチングにおいて、関数 '%1' と '%2' のみ使用できます。'%3' は使用できません。 - - - - In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. - XSL-T パターンにおいて、axis %1 は使用できません。%2 または %3 のみ使用できます。 - - - - %1 is an invalid template mode name. - %1 はテンプレートモジュール名として無効です。 - - - - The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. - for 構文において使用する変数は、場所に関する変数とは異なる必要があります。つまり、'%1' が重複して使用されています。 - - - - The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. - スキーマの検証機能はサポートされていません。よって、'%1' 構文は使用できません。 - - - - None of the pragma expressions are supported. Therefore, a fallback expression must be present - pragma 構文はサポートされていません。fallback 構文でなければなりません - - - - Each name of a template parameter must be unique; %1 is duplicated. - テンプレートパラメータ名はユニークである必要があります。'%1' は重複しています。 - - - - The %1-axis is unsupported in XQuery - XQuery において、%1 axis はサポートされていません - - - - No function by name %1 is available. - 関数名 '%1' はみつかりません。 - - - - The namespace URI cannot be the empty string when binding to a prefix, %1. - プレフィックス '%1' にバインディングする名前空間の URI は、空であってはなりません。 - - - - %1 is an invalid namespace URI. - %1 は名前空間 URI として無効です。 - - - - It is not possible to bind to the prefix %1 - プレフィックス %1 にバインドすることはできません - - - - Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). - ? - 名前空間 %1 は %2 にのみバウンドできます。 - - - - Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). - プリフィックス %1 は %2 にのみバウンドできます。 - - - - Two namespace declaration attributes have the same name: %1. - 二つの名前空間宣言の属性が、同じ名前 '%1' をもっています。 - - - - The namespace URI must be a constant and cannot use enclosed expressions. - 名前空間 URI は、constantでなければなりません。式を含むことはできません。 - - - - An attribute by name %1 has already appeared on this element. - 属性名 '%1' は、すでにこのエレメントで使用されています。 - - - - A direct element constructor is not well-formed. %1 is ended with %2. - 直積的な指定のエレメントがwell formedではありません。'%1' が、'%2' で終わっています。 - - - - The name %1 does not refer to any schema type. - 名前 '%1' は、なんのスキーマタイプも参照していません。 - - - - %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. - '%1' は complex 型です。complex 型への型変換はできません。しかし、アトミックな型である '%2' への変換はできます。 - - - - %1 is not an atomic type. Casting is only possible to atomic types. - '%1' はアトミックな型ではありません。型変換はアトミックな型に対してのみ可能です。 - - - - %1 is not a valid name for a processing-instruction. - 処理指定において、'%1' は無効です。 - - - - - %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. - '%1' は、スコープ属性宣言ではありません。スキーマインポート機能はサポートされていません。 - - - - The name of an extension expression must be in a namespace. - 拡張式 (extension expression) の名前は、名前空間の中になければなりません。 - - - - Element %1 is not allowed at this location. - この場所にエレメント '%1' をおくことは許されていません。 - - - - Text nodes are not allowed at this location. - この場所にテキストノードをおくことは許されていません。 - - - - Parse error: %1 - パースエラー: %1 - - - - The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. - XSL-T バージョン属性の値は、'%1' 型でなければなりません。'%2' はそうではありません。 - - - - Running an XSL-T 1.0 stylesheet with a 2.0 processor. - XSL-T 1.0 のスタイルシートを 2.0 のプロセッサで使用します。 - - - - Unknown XSL-T attribute %1. - 未知の XSL-T 属性 %1 があります。 - - - - Attribute %1 and %2 are mutually exclusive. - 属性 '%1' と '%2' は排他的にのみ使用できます。 - - - - In a simplified stylesheet module, attribute %1 must be present. - simplified stylesheet モジュールにおいては、属性 '%1' を指定されなければなりません。 - - - - If element %1 has no attribute %2, it cannot have attribute %3 or %4. - エレメント '%1' が属性 '%2' を持たない場合は、属性 '%3' や '%4' を使用することはできません。 - - - - Element %1 must have at least one of the attributes %2 or %3. - エレメント '%1' は、属性 '%2' か '%3' のいずれかを持たなければなりません。 - - - - At least one mode must be specified in the %1-attribute on element %2. - エレメント '%2' において、'%1' 属性は少くとも一つのモードを指定しなければなりません。 - - - - Element %1 must come last. - エレメント %1 は最後になければなりません。 - - - - At least one %1-element must occur before %2. - %2 の前に、少くとも一つは %1 エレメントが存在しなければなりません。 - - - - Only one %1-element can appear. - %1 エレメントは一つのみ存在しなければなりません。 - - - - At least one %1-element must occur inside %2. - %2 の内側には、少くとも一つの '%1' エレメントが存在しなければなりません。 - - - - When attribute %1 is present on %2, a sequence constructor cannot be used. - %2 に属性 %1 がある場合、sequence constructor は使用できません。 - - - - Element %1 must have either a %2-attribute or a sequence constructor. - エレメント %1 には、%2 属性またはsequence constructorがなければなりません。 - - - - When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. - パラメータが要求されているときには、デフォルトの値は、%1 属性または sequence constructor によって指定されていてはなりません。 - - - - Element %1 cannot have children. - エレメント %1 は、子要素を持つことができません。 - - - - Element %1 cannot have a sequence constructor. - エレメント %1 は、sequence constructor を含むことができません。 - - - - - The attribute %1 cannot appear on %2, when it is a child of %3. - %2 が %3 の子要素であるときは、属性 %1 を使用してはなりません。 - - - - A parameter in a function cannot be declared to be a tunnel. - 関数へのパラメータは、トンネルであってはなりません。 - - - - This processor is not Schema-aware and therefore %1 cannot be used. - この処理系は、Schema-aware ではありません。よって、%1 は使用できません。 - - - - Top level stylesheet elements must be in a non-null namespace, which %1 isn't. - トップレベルのスタイルシートのエレメントは、non-nullな名前空間を持っていなければなりません。しかし、%1 はそうではありません。 - - - - The value for attribute %1 on element %2 must either be %3 or %4, not %5. - エレメント %2 の属性 %1 の値は、%3 または %4 でなければなりません。%5 は異なります。 - - - - Attribute %1 cannot have the value %2. - 属性 %1 に、値 %2 を指定することはできません。 - - - - The attribute %1 can only appear on the first %2 element. - 属性 %1 は、最初の %2 エレメントにのみ指定できます。 - - - - At least one %1 element must appear as child of %2. - %2 の子要素としては、少くとも一つは %1 エレメントがなければなりません。 - - - - empty - 空 - - - - zero or one - ゼロまたは一つ - - - - exactly one - 厳密に一つ - - - - one or more - 一つまたは複数 - - - - zero or more - ゼロまたはそれ以上 - - - - Required type is %1, but %2 was found. - 要求されている型は %1 ですが、 %2 があります。 - - - - Promoting %1 to %2 may cause loss of precision. - %1 を %2 に変換する際に、精度のロスが生じます。 - - - - The focus is undefined. - フォーカスが定義されていません。 - - - - It's not possible to add attributes after any other kind of node. - 他の種類のノードの中では、属性を追加することはできません。 - - - - An attribute by name %1 has already been created. - 名前 '%1' の属性は、すでに生成されています。 - - - - Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - UNICODE Codepoint Collection のみ使用できます(%1)。 %2 はサポートされていません。 - - - QPluginLoader - Unknown error - 不明なエラー - - - + 未知のエラー + + The plugin was not loaded. そのプラグインはロードされていません。 @@ -4873,528 +4238,344 @@ QPrintDialog - Page size: - ページサイズ: - - - Orientation: - 方向: - - - Paper source: - 給紙装置: - - - OK OK - Cancel - キャンセル - - - Portrait - 縦 - - - Landscape - 横 - - - locally connected ローカルに接続しています - - Aliases: %1 エイリアス: %1 - - unknown 不明 - Print in color if available - 可能であればカラーで印刷 - - - Print to file - ファイルに出力: - - - Browse - 参照... - - - Print all すべて印刷 - Selection - 選択した部分を印刷 - - - Print range 印刷範囲 - Pages from - 先頭のページ: - - - to - 末尾のページ: - - - Print last page first - 末尾のページから印刷 - - - Number of copies: - 部数: - - - Paper format - 用紙の形式 - - - A0 (841 x 1189 mm) A0 (841 x 1189mm) - A1 (594 x 841 mm) A1 (594 x 841mm) - A2 (420 x 594 mm) A2 (420 x 594mm) - A3 (297 x 420 mm) A3 (297 x 420mm) - A4 (210 x 297 mm, 8.26 x 11.7 inches) A4 (210 x 297mm、8.26 x 11.7インチ) - A5 (148 x 210 mm) A5 (148 x 210mm) - A6 (105 x 148 mm) A6 (105 x 148mm) - A7 (74 x 105 mm) A7 (74 x 105mm) - A8 (52 x 74 mm) A8 (52 x 74mm) - A9 (37 x 52 mm) A9 (37 x 52mm) - B0 (1000 x 1414 mm) B0 (1000 x 1414mm) - B1 (707 x 1000 mm) B1 (707 x 1000mm) - B2 (500 x 707 mm) B2 (500 x 707mm) - B3 (353 x 500 mm) B3 (353 x 500mm) - B4 (250 x 353 mm) B4 (250 x 353mm) - B5 (176 x 250 mm, 6.93 x 9.84 inches) B5 (176 x 250mm、6.93 x 9.84インチ) - B6 (125 x 176 mm) B6 (125 x 176mm) - B7 (88 x 125 mm) B7 (88 x 125mm) - B8 (62 x 88 mm) B8 (62 x 88mm) - B9 (44 x 62 mm) B9 (44 x 62mm) - B10 (31 x 44 mm) B10 (31 x 44mm) - C5E (163 x 229 mm) C5E (163 x 229mm) - DLE (110 x 220 mm) DLE (110 x 220mm) - Executive (7.5 x 10 inches, 191 x 254 mm) Executive (7.5 x 10インチ、191 x 254mm) - Folio (210 x 330 mm) Folio (210 x 330mm) - Ledger (432 x 279 mm) Ledger (432 x 279mm) - Legal (8.5 x 14 inches, 216 x 356 mm) Legal (8.5 x 14インチ、216 x 356mm) - Letter (8.5 x 11 inches, 216 x 279 mm) Letter (8.5 x 11インチ、216 x 279mm) - Tabloid (279 x 432 mm) Tabloid (279 x 432mm) - US Common #10 Envelope (105 x 241 mm) US Common #10 Envelope (105 x 241mm) - Print dialog - プリントダイアログ - - - Size: - サイズ: - - - Printer - プリンタ - - - Properties - プロパティ - - - Printer info: - プリンタ情報: - - - Copies - 印刷部数 - - - Collate - 丁合い - - - Other - その他 - - - Double side printing - 両面印刷 - - - - - + Print current page + 現在のページの印刷 + + Print 印刷 - File - ファイル - - - Print To File ... ファイルへ出力... - File %1 is not writable. Please choose a different file name. ファイル %1 は書き込み可能ではありません。 別のファイル名を選んでください。 - %1 already exists. Do you want to overwrite it? %1 はすでに存在します。 上書きしますか? - File exists ファイルは既に存在しています - <qt>Do you want to overwrite it?</qt> <qt>ファイルを上書きしてもよろしいですか?</qt> - Print selection 選択された範囲を印刷 - %1 is a directory. Please choose a different file name. %1 はディレクトリです。 ファイル名を指定してください。 - A0 A0 - A1 A1 - A2 A2 - A3 A3 - A4 A4 - A5 A5 - A6 A6 - A7 A7 - A8 A8 - A9 A9 - B0 B0 - B1 B1 - B2 B2 - B3 B3 - B4 B4 - B5 B5 - B6 B6 - B7 B7 - B8 B8 - B9 B9 - B10 B10 - C5E C5E - DLE DLE - Executive Exclusive - Folio Folio - Ledger Ledger - Legal リーガルサイズ - Letter レターサイズ - Tabloid タブロイドサイズ - US Common #10 Envelope US標準#10封筒 - Custom カスタム - - &Options >> オプション(&O) >> - &Print 印刷(&P) - &Options << オプション(&O) << - Print to File (PDF) PDFファイルに出力 - Print to File (Postscript) Postscriptファイルに出力 - Local file ローカルファイル - Write %1 file ファイル %1 に書き込みました - The 'From' value cannot be greater than the 'To' value. QPrintPropertiesWidgetにFromとToがあってそれを指している 印刷開始ページ番号は、印刷終了ページ番号より小さくなければなりません。 @@ -5403,140 +4584,101 @@ QPrintPreviewDialog - - Page Setup ページの設定 - %1% %1% - Print Preview 印刷のプレビュー - Next page 次のページ - Previous page 前のページ - First page 最初のページ - Last page 最後のページ - Fit width 幅をあわせる - Fit page 高さをあわせる - Zoom in 拡大 - Zoom out 縮小 - Portrait 縦 - Landscape 横 - Show single page 一枚のページを表示する - Show facing pages 見開きのページを表示する - Show overview of all pages すべてのページを表示する - Print 印刷 - Page setup ページの設定 Close - 閉じる - - - + 閉じる + + Export to PDF PDFに出力 - Export to PostScript Postscriptに出力 - QPrintPropertiesDialog - - PPD Properties - 印刷プロパティのダイアログのプロパティ - - - Save - 保存 - - - OK - OK - - - QPrintPropertiesWidget - Form 書式 - Page ページ - Advanced 高度な設定 @@ -5544,145 +4686,121 @@ QPrintSettingsOutput - Form 書式 - Copies 印刷部数 - Print range 印刷範囲 - Print all すべて印刷 - Pages from 先頭のページ - to 末尾のページ - Selection 選択した部分を印刷 - Output Settings 出力設定 - Copies: 印刷部数: - Collate 丁合い - Reverse 逆順 - Options オプション - Color Mode 色 - Color カラー - Grayscale グレースケール - Duplex Printing 両面印刷 - None なし - Long side 長辺綴じ - Short side 短辺綴じ + + Current Page + 現在のページ + QPrintWidget - Form 書式 - Printer プリンタ - &Name: 名前(&N): - P&roperties プロパティ(&r) - Location: 設置場所: - Preview プレビュー - Type: タイプ: - Output &file: 出力ファイル名(&f): - ... ... @@ -5690,70 +4808,45 @@ QProcess - - Could not open input redirection for reading 標準入力リダイレクトを読み込みのためにオープンすることができません - - Could not open output redirection for writing 標準出力リダイレクトを書き込みのためにオープンすることができません - Resource error (fork failure): %1 リソースエラー (fork に失敗しました): %1 - - - - - - - - - Process operation timed out プロセス処理がタイムアウトしました - - - - Error reading from process プロセスからの読み込みにおいてエラーが発生しました - - - Error writing to process プロセスへの書き込みにおいてエラーが発生しました - Process crashed プロセスがクラッシュしました - No program defined プログラム名が指定されていません - - Process failed to start - プロセスのスタートに失敗しました + Process failed to start: %1 + プロセスの起動に失敗しました: %1 QProgressDialog - Cancel キャンセル @@ -5761,7 +4854,6 @@ QPushButton - Open オープン @@ -5769,7 +4861,6 @@ QRadioButton - Check 選択 @@ -5777,83 +4868,76 @@ QRegExp - no error occurred エラーは発生しませんでした - disabled feature used 無効な機能が使用されました - bad char class syntax 不正なcharクラス構文 - bad lookahead syntax 不正なlookahead構文 - bad repetition syntax 不正なrepetition構文 - invalid octal value 無効な8進値 - missing left delim 左の区切り文字がありません - unexpected end 予期しない末尾です - met internal limit 内部制限を満たしました + + invalid interval + 無効な間隔 + + + invalid category + 無効なカテゴリー + QSQLite2Driver - - Error to open database + Error opening database データベースのオープンでエラーが発生しました - Unable to begin transaction トランザクションを開始できません - Unable to commit transaction トランザクションをコミットできません - - Unable to rollback Transaction + Unable to rollback transaction トランザクションをロールバックできません QSQLite2Result - Unable to fetch results 実行結果をフェッチできません - Unable to execute statement ステートメントを実行できません @@ -5861,31 +4945,22 @@ QSQLiteDriver - Error opening database データベースのオープンでエラーが発生しました - Error closing database データベースのクローズでエラーが発生しました - Unable to begin transaction トランザクションを開始できません - Unable to commit transaction トランザクションをコミットできません - Unable to roll back transaction - トランザクションをロールバックできません - - - Unable to rollback transaction トランザクションをロールバックできません @@ -5893,119 +4968,368 @@ QSQLiteResult - - - Unable to fetch row レコードをフェッチできません - Unable to execute statement ステートメントを実行できません - Unable to reset statement ステートメントをリセットできません - Unable to bind parameters パラメータをバインドできません - Parameter count mismatch パラメータの数が合っていません - No query - クェリーがありません + クエリーがありません + + + + QScriptBreakpointsModel + + ID + ID + + + Location + ファイル:行番号 + + + Condition + 条件 + + + Ignore-count + 無視する回数 + + + Single-shot + 初回のみ + + + Hit-count + ヒットした回数 + + + + QScriptBreakpointsWidget + + New + 新規 + + + Delete + 削除 + + + + QScriptDebugger + + Go to Line + 指定した行へ移動 + + + Line: + 行番号: + + + Interrupt + 割り込み + + + Shift+F5 + Shift+F5 + + + Continue + 続行 + + + F5 + F5 + + + Step Into + ステップイン + + + F11 + F11 + + + Step Over + ステップオーバー + + + F10 + F10 + + + Step Out + ステップアウト + + + Shift+F11 + Shift+F11 + + + Run to Cursor + カーソル位置まで実行 + + + Ctrl+F10 + Ctrl+F10 + + + Run to New Script + 新たなスクリプトまで実行 + + + Toggle Breakpoint + ブレークポイントの有効/無効の切り替え + + + F9 + F9 + + + Clear Debug Output + デバッグ出力のクリア + + + Clear Error Log + エラーログのクリア + + + Clear Console + コンソールのクリア + + + &Find in Script... + スクリプト内を検索(&F)... + + + Ctrl+F + Ctrl+F + + + Find &Next + 次を検索(&N) + + + F3 + F3 + + + Find &Previous + 前を検索(&P) + + + Shift+F3 + Shift+F3 + + + Ctrl+G + Ctrl+G + + + Debug + デバッグ + + + + QScriptDebuggerCodeFinderWidget + + Close + 閉じる + + + Previous + 前を検索 + + + Next + 次を検索 + + + Case Sensitive + 大文字/小文字を区別する + + + Whole words + 単語単位で検索する + + + <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped + <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;先頭から再び検索します + + + + QScriptDebuggerLocalsModel + + Name + 名前 + + + Value + 値 + + + + QScriptDebuggerStackModel + + Level + レベル + + + Name + 名前 + + + Location + ファイル:行番号 + + + + QScriptEdit + + Toggle Breakpoint + ブレークポイントの有効/無効の切り替え + + + Disable Breakpoint + ブレークポイントを無効にする + + + Enable Breakpoint + ブレークポイントを有効にする + + + Breakpoint Condition: + ブレークポイントの条件: + + + + QScriptEngineDebugger + + Loaded Scripts + ロードしたスクリプト + + + Breakpoints + ブレークポイント + + + Stack + スタック + + + Locals + ローカル変数 + + + Console + コンソール + + + Debug Output + デバッグ出力 + + + Error Log + エラーログ + + + Search + 検索 + + + View + 表示 + + + Qt Script Debugger + Qt Script デバッガ + + + + QScriptNewBreakpointWidget + + Close + 閉じる QScrollBar - Scroll here ここにスクロール - Left edge 左端 - Top 上端 - Right edge 右端 - Bottom 下端 - Page left １ページ左へスクロール - - Page up １ページ戻る - Page right １ページ右へスクロール - - Page down １ページ進む - Scroll left 左へスクロール - Scroll up 上へスクロール - Scroll right 右へスクロール - Scroll down 下へスクロール - Line up １行上へ - Position 位置 - Line down １行下へ @@ -6013,570 +5337,966 @@ QSharedMemory - %1: unable to set key on lock 共有メモリ関連 %1: ロックするためのキーを設定できません - %1: create size is less then 0 %1: 0より小さいサイズの共有メモリは作成できません - - %1: unable to lock %1: ロックできません - %1: unable to unlock %1: アンロックできません - - %1: permission denied %1: 許可されていません - - %1: already exists %1: 既に存在します - - %1: doesn't exists %1: 存在しません - - %1: out of resources %1: リソース不足です - - %1: unknown error %2 %1: 未知のエラー %2 - %1: key is empty %1: キーが空です - - %1: unix key file doesn't exists - ? - %1: UNIX key file が存在しません - - - %1: ftok failed %1: fork に失敗しました - - %1: unable to make key %1: キーを作成できません - + %1: doesn't exist + %1: 存在しません + + + %1: UNIX key file doesn't exist + %1: UNIX key file が存在しません + + %1: system-imposed size restrictions EINVAL %1: 指定されたサイズはシステムにより拒否されました - %1: not attached %1: アタッチしていません - %1: invalid size %1: 無効なサイズです - %1: key error safekey.isEmpty()==true %1: キーかありません - %1: size query failed - %1: サイズのクェリーに失敗しました + %1: サイズのクエリーに失敗しました QShortcut - Space + This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. Space - Esc Esc - Tab Tab - Backtab Backtab - Backspace Backspace - Return Return - Enter Enter - Ins Ins - Del Del - Pause Pause - Print Print - SysReq SysReq - Home Home - End End - Left → - Up ↑ - Right ← - Down ↓ - PgUp PgUp - PgDown PgDown - CapsLock CapsLock - NumLock NumLock - ScrollLock ScrollLock - Menu メニュー - Help ヘルプ - Back 戻る - Forward 進む - Stop 停止 - Refresh 更新間隔 - Volume Down 音量を下げる - Volume Mute 消音 - Volume Up 音量を上げる - Bass Boost 低音ブースト - Bass Up 低音を上げる - Bass Down 低音を下げる - Treble Up 高音を上げる - Treble Down 高音を下げる - Media Play メディアの再生 - Media Stop メディアの停止 - Media Previous 前のメディア - Media Next 次のメディア - Media Record メディアの録音 - + Media Pause + Media player pause button + メディアの一時停止 + + + Toggle Media Play/Pause + Media player button to toggle between playing and paused + メディアの再生と一時停止の切り替え + + Home Page ホームページ - Favorites お気に入り - Search 検索 - Standby スタンバイ - Open URL URLを開く - Launch Mail メールの起動 - Launch Media メディアの起動 - Launch (0) (0)の起動 - Launch (1) (1)の起動 - Launch (2) (2)の起動 - Launch (3) (3)の起動 - Launch (4) (4)の起動 - Launch (5) (5)の起動 - Launch (6) (6)の起動 - Launch (7) (7)の起動 - Launch (8) (8)の起動 - Launch (9) (9)の起動 - Launch (A) (A)の起動 - Launch (B) (B)の起動 - Launch (C) (C)の起動 - Launch (D) (D)の起動 - Launch (E) (E)の起動 - Launch (F) (F)の起動 - + Monitor Brightness Up + モニタの輝度を上げる + + + Monitor Brightness Down + モニタの輝度を下げる + + + Keyboard Light On/Off + キーボードライトのオン・オフ + + + Keyboard Brightness Up + キーボードの輝度を上げる + + + Keyboard Brightness Down + キーボードの輝度を下げる + + + Power Off + 電源オフ + + + Wake Up + 起動 + + + Eject + 取り出し + + + Screensaver + スクリーンセーバ + + + WWW + WWW + + + Sleep + スリープ + + + LightBulb + ライト + + + Shop + ショップ + + + History + 履歴 + + + Add Favorite + お気に入りに追加 + + + Hot Links + + + + Adjust Brightness + 輝度の調整 + + + Finance + ファイナンス + + + Community + コミュニティ + + + Audio Rewind + オーディオの巻き戻し + + + Back Forward + + + + Application Left + + + + Application Right + + + + Book + 書籍 + + + CD + CD + + + Calculator + 電卓 + + + Clear + クリア + + + Clear Grab + + + + Close + 閉じる + + + Copy + コピー + + + Cut + 切り取り + + + Display + ディスプレイ + + + DOS + DOS + + + Documents + ドキュメント + + + Spreadsheet + スプレッドシート + + + Browser + ブラウザ + + + Game + ゲーム + + + Go + + + + iTouch + + + + Logoff + ログオフ + + + Market + マーケット + + + Meeting + 会議 + + + Keyboard Menu + キーボードメニュー + + + Menu PB + + + + My Sites + マイサイト + + + News + ニュース + + + Home Office + ホームオフィス + + + Option + オプション + + + Paste + 貼り付け + + + Phone + 電話 + + + Reply + 返信 + + + Reload + リロード + + + Rotate Windows + + + + Rotation PB + + + + Rotation KB + + + + Save + 保存 + + + Send + 送信 + + + Spellchecker + スペルチェッカー + + + Split Screen + 画面の分割 + + + Support + サポート + + + Task Panel + タスクパネル + + + Terminal + 端末 + + + Tools + ツール + + + Travel + 旅行 + + + Video + 動画 + + + Word Processor + ワードプロセッサ + + + XFer + 変換 + + + Zoom In + 拡大 + + + Zoom Out + 縮小 + + + Away + 離席 + + + Messenger + メッセンジャー + + + WebCam + Webカメラ + + + Mail Forward + メールの転送 + + + Pictures + 画像 + + + Music + 音楽 + + + Battery + バッテリ + + + Bluetooth + ブルートゥース + + + Wireless + 無線 + + + Ultra Wide Band + 超広帯域無線(UWB) + + + Audio Forward + オーディオの早送り + + + Audio Repeat + オーディオの繰り返し + + + Audio Random Play + オーディオのランダム再生 + + + Subtitle + 字幕 + + + Audio Cycle Track + + + + Time + 時間 + + + View + 表示 + + + Top Menu + トップメニュー + + + Suspend + サスペンド + + + Hibernate + 休止 + + Print Screen Print Screen - Page Up Page Up - Page Down Page Down - Caps Lock Caps Lock - Num Lock Num Lock - Number Lock Number Lock - Scroll Lock Scroll Lock - Insert Insert - Delete Delete - Escape Escape - System Request System Request - Select Select - Yes はい - No いいえ - Context1 Context1 - Context2 Context2 - Context3 Context3 - Context4 Context4 - Call + Button to start a call (note: a separate button is used to end the call) Call - Hangup + Button to end a call (note: a separate button is used to start the call) Hangup - + Toggle Call/Hangup + Button that will hang up if we're in call, or make a call if we're not. + + + Flip Flip - - + Voice Dial + Button to trigger voice dialling + ボイスダイアル + + + Last Number Redial + Button to redial the last number called + 直前の番号にリダイヤル + + + Camera Shutter + Button to trigger the camera shutter (take a picture) + カメラシャッター + + + Camera Focus + Button to focus the camera + カメラフォーカス + + + Kanji + 漢字 + + + Muhenkan + 無変換 + + + Henkan + 変換 + + + Romaji + ローマ字 + + + Hiragana + ひらがな + + + Katakana + カタカナ + + + Hiragana Katakana + ひらがな/カタカナ + + + Zenkaku + 全角 + + + Hankaku + 半角 + + + Zenkaku Hankaku + 全角/半角 + + + Touroku + 単語登録 + + + Massyo + 単語抹消 + + + Kana Lock + カナロック + + + Kana Shift + カナシフト + + + Eisu Shift + 英数シフト + + + Eisu toggle + 英数 + + + Code input + コード入力 + + + Multiple Candidate + 全候補 + + + Previous Candidate + 前候補 + + + Hangul + ハングル + + + Hangul Start + + + + Hangul End + + + + Hangul Hanja + + + + Hangul Jamo + + + + Hangul Romaja + + + + Hangul Jeonja + + + + Hangul Banja + + + + Hangul PreHanja + + + + Hangul PostHanja + + + + Hangul Special + + + Ctrl Ctrl - - Shift Shift - - Alt Alt - - Meta Meta - + + - F%1 F%1 @@ -6584,27 +6304,22 @@ QSlider - Page left １ページ左へスクロール - Page up １ページ戻る - Position 位置 - Page right 1ページ右へスクロール - Page down １ページ進む @@ -6612,90 +6327,97 @@ QSocks5SocketEngine - Connection to proxy refused プロキシーへの接続が拒否されました - Connection to proxy closed prematurely プロキシーの接続が通信の終了前に切断されました - Proxy host not found プロキシーホストが見つかりません - Connection to proxy timed out プロキシーとの接続がタイムアウトしました - Proxy authentication failed プロキシーの認証に失敗しました - Proxy authentication failed: %1 プロキシーの認証に失敗しました: %1 - SOCKS version 5 protocol error SOCKS バージョン 5 プロトコルのエラーです - General SOCKSv5 server failure SOCKS バージョン 5 サーバのエラーです - Connection not allowed by SOCKSv5 server SOCKSv5 サーバより接続を拒否されました - TTL expired 実際はホップ数です 有効期限(TTL)がきれました - SOCKSv5 command not supported この SOCKSv5 コマンドはサポートされていません - Address type not supported 指定されたアドレスタイプはサポートされていません - Unknown SOCKSv5 proxy error code 0x%1 未知の SOCKSv5 プロキシーエラーです: 0x%1 - Socks5 timeout error connecting to socks server - Socks5 はソックスサーバ接続しようとしてタイムアウトになりました - - - Network operation timed out ネットワーク操作がタイムアウトしました + QSoftKeyManager + + Ok + OK + + + Select + セレクト + + + Done + 終了 + + + Options + オプション + + + Cancel + キャンセル + + + Exit + 終了 + + + QSpinBox - More 増やす - Less 減らす @@ -6703,56 +6425,42 @@ QSql - Delete 削除 - Delete this record? このレコードを削除しますか? - - - Yes はい - - - No いいえ - Insert 挿入 - Update アップデート - Save edits? 編集内容を保存しますか? - Cancel キャンセル - Confirm 確認 - Cancel your edits? 編集をキャンセルしますか? @@ -6760,88 +6468,184 @@ QSslSocket - Error creating SSL context (%1) SSL content の作成に失敗しました (%1) - Invalid or empty cipher list (%1) - 暗号方式リストが無効または空です (%1) - - - + 暗号方式リストが不正または空です (%1) + + Cannot provide a certificate with no key, %1 鍵が指定されていないため、証明書を扱えません。 %1 - Error loading local certificate, %1 ローカルの証明書をロードできません。 %1 - Error loading private key, %1 プライベートキーをロードできません。 %1 - - Private key does not certificate public key, %1 - プライベートキーが、パブリックキーの証明書となっていません %1 - - - + Private key does not certify public key, %1 + 秘密鍵が公開鍵 %1 を証明していません + + Error creating SSL session, %1 SSL セッションを作成できません。 %1 - Error creating SSL session: %1 SSL セッションを作成できません: %1 - Unable to write data: %1 書き込みできません: %1 - + Unable to decrypt data: %1 + データを解読できません: %1 + + Error while reading: %1 読み込み時にエラーが発生しました: %1 - Error during SSL handshake: %1 SSL ハンドシェーク時にエラーが発生しました: %1 + + No error + エラーはありません + + + The issuer certificate could not be found + 発行者証明書が見つかりません + + + The certificate signature could not be decrypted + 証明書の署名が復号できません + + + The public key in the certificate could not be read + 証明書の公開鍵が読めません + + + The signature of the certificate is invalid + 証明書の署名が不正です + + + The certificate is not yet valid + 証明書が有効ではありません + + + The certificate has expired + 証明書の有効期限が切れています + + + The certificate's notBefore field contains an invalid time + 証明書の notBefore フィールドに不正な時刻が含まれています + + + The certificate's notAfter field contains an invalid time + 証明書の notAfter フィールドに不正な時刻が含まれています + + + The certificate is self-signed, and untrusted + この証明書は自己証明書であり、信頼されていません + + + The root certificate of the certificate chain is self-signed, and untrusted + 証明書チェインのルート証明書が自己証明書であり、信頼されていません + + + The issuer certificate of a locally looked up certificate could not be found + ローカルで発見した証明書の発行者証明書が見つかりません + + + No certificates could be verified + どの証明書も検証できませんでした + + + One of the CA certificates is invalid + CA 証明書に不正な証明書があります + + + The basicConstraints path length parameter has been exceeded + 基本制約(basicConstraints)で制限されたパスの長さを超えています + + + The supplied certificate is unsuitable for this purpose + 与えられた証明書はこの目的には利用できません + + + The root CA certificate is not trusted for this purpose + ルートCA証明書はこの目的には信頼されていません + + + The root CA certificate is marked to reject the specified purpose + ルートCA証明書を指定された目的に使用することは拒否されています + + + The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate + 更新用に準備された発行者証明書は、その所有者名が現在の証明書の発行者名と異なるため拒否されました + + + The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate + 更新用に準備された発行者証明書は、その発行者名とシリアル番号が現在の証明書の機関鍵識別子と異なるため拒否されました + + + The peer did not present any certificate + 通信相手は証明書を提示しませんでした + + + The host name did not match any of the valid hosts for this certificate + ホスト名がこの証明書のどの有効なホストとも一致しませんでした + + + Unknown error + 未知のエラー + + + + QStateMachine + + Missing initial state in compound state '%1' + 複合ステート '%1' に初期ステートが見つかりません + + + Missing default state in history state '%1' + ヒストリーステート '%1' にデフォルトステートが見つかりません + + + No common ancestor for targets and source of transition from state '%1' + ステート '%1' からの遷移のソースおよびターゲットに共通した祖先がありません + + + Unknown error + 未知のエラー + QSystemSemaphore - - %1: out of resources %1: リソース不足です - - %1: permission denied %1: 許可されていません - %1: already exists %1: 既に存在します - %1: does not exist %1: 存在しません - - %1: unknown error %2 %1: 未知のエラーです %2 @@ -6849,12 +6653,10 @@ QTDSDriver - Unable to open connection 接続をオープンできません - Unable to use database データベースを使用できません @@ -6862,12 +6664,10 @@ QTabBar - Scroll Left 左へスクロール - Scroll Right 右へスクロール @@ -6875,11 +6675,6 @@ QTcpServer - Socket operation unsupported - ソケット操作はサポートされていません - - - Operation on socket is not supported このソケットへの操作はサポートされていません @@ -6887,42 +6682,34 @@ QTextControl - &Undo 元に戻す(&U) - &Redo やり直す(&R) - Cu&t 切り取り(&T) - &Copy コピー(&C) - Copy &Link Location リンクの場所をコピー(&L) - &Paste 貼り付け(&P) - Delete 削除 - Select All すべてを選択 @@ -6930,14 +6717,10 @@ QToolButton - - Press 押す - - Open オープン @@ -6945,7 +6728,6 @@ QUdpSocket - This platform does not support IPv6 このプラットフォームは IPv6 をサポートしていません @@ -6953,12 +6735,10 @@ QUndoGroup - Undo 元に戻す - Redo やり直す @@ -6966,7 +6746,6 @@ QUndoModel - <empty> <空> @@ -6974,12 +6753,10 @@ QUndoStack - Undo 元に戻す - Redo やり直す @@ -6987,57 +6764,46 @@ QUnicodeControlCharacterMenu - LRM Left-to-right mark LRM (左横書き指定) - RLM Right-to-left mark RLM (右横書き指定) - ZWJ Zero width joiner ZWJ (幅のない接続文字) - ZWNJ Zero width non-joiner ZWNJ (幅のない非接続文字) - ZWSP Zero width space ZWSP (幅の無い空白) - LRE Start of left-to-right embedding LRE (左横書き開始指定) - RLE Start of right-to-left embedding RLE (右横書き開始指定) - LRO Start of left-to-right override LRO (左横書き上書き開始指定) - RLO Start of right-to-left override RLO (右横書き上書き開始指定) - PDF Pop directional formatting PDF (方向上書きの終了指定) - Insert Unicode control character Unicode制御文字を挿入 @@ -7045,32 +6811,26 @@ QWebFrame - Request cancelled リクエストはキャンセルされました - Request blocked リクエストはブロックされました - Cannot show URL URL を表示できません - - Frame load interruped by policy change - ポリシーの変更により、フレームのロードが中断しました - - - + Frame load interrupted by policy change + ポリシーが変更されたためフレームのロードを中断しました + + Cannot show mimetype MIME Type を表示できません - File does not exist ファイルが存在しません @@ -7078,377 +6838,516 @@ QWebPage - + Redirection limit reached + リダイレクトの上限に達しました + + Bad HTTP request 誤った HTTP のリクエストです - Submit default label for Submit buttons in forms on web pages 送信 - Submit Submit (input element) alt text for <input> elements with no alt, title, or value 送信 - Reset default label for Reset buttons in forms on web pages リセット - This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' 検索が可能です。検索のためのキーワードを入力してください: - Choose File title for file button used in HTML forms ファイルを選ぶ - No file selected text to display in file button used in HTML forms when no file is selected ファイルが選択されていません - Open in New Window Open in New Window context menu item 新しいウィンドウで開く - Save Link... Download Linked File context menu item リンク先を保存... - Copy Link Copy Link context menu item リンク先をコピー - Open Image Open Image in New Window context menu item イメージを開く - Save Image Download Image context menu item 画像を保存 - Copy Image Copy Link context menu item 画像をコピー - Open Frame Open Frame in New Window context menu item フレームを新しいウィンドウで開く - Copy Copy context menu item コピー - Go Back Back context menu item 戻る - Go Forward Forward context menu item 進む - Stop Stop context menu item 停止 - Reload Reload context menu item リロード - Cut Cut context menu item 切り取り - Paste Paste context menu item 貼り付け - No Guesses Found No Guesses Found context menu item 推測候補はありません - Ignore Ignore Spelling context menu item 無視 - Add To Dictionary Learn Spelling context menu item 辞書に追加 - Search The Web Search The Web context menu item Web を検索 - Look Up In Dictionary Look Up in Dictionary context menu item 辞書から探す - Open Link Open Link context menu item リンクを開く - Ignore Ignore Grammar context menu item 無視 - Spelling Spelling and Grammar context sub-menu item スペル - Show Spelling and Grammar menu item title スペルと文法を表示 - Hide Spelling and Grammar menu item title スペルと文法を隠す - Check Spelling Check spelling context menu item スペルをチェックする - Check Spelling While Typing Check spelling while typing context menu item 入力中にスペルをチェックする - Check Grammar With Spelling Check grammar with spelling context menu item スペルおよび文法をチェックする - Fonts Font context sub-menu item フォント - Bold Bold context menu item 太字 - Italic Italic context menu item イタリック - Underline Underline context menu item 下線 - Outline Outline context menu item アウトライン - Direction Writing direction context sub-menu item 方向 - Text Direction Text direction context sub-menu item テキストの方向 - Default Default writing direction context menu item デフォルト - - LTR + Left to Right Left to Right context menu item 左横書き - - RTL + Right to Left Right to Left context menu item 右横書き - + Loading... + Media controller status message when the media is loading + 読込中... + + + Live Broadcast + Media controller status message when watching a live broadcast + ライブブロードキャスト + + + Audio Element + Media controller element + オーディオ要素 + + + Video Element + Media controller element + ビデオ要素 + + + Mute Button + Media controller element + 消音ボタン + + + Unmute Button + Media controller element + 消音解除ボタン + + + Play Button + Media controller element + 再生ボタン + + + Pause Button + Media controller element + 一時停止ボタン + + + Slider + Media controller element + スライダ + + + Slider Thumb + Media controller element + スライダーのつまみ + + + Rewind Button + Media controller element + 巻き戻しボタン + + + Return to Real-time Button + Media controller element + 現在時間に戻るボタン + + + Elapsed Time + Media controller element + 経過時間 + + + Remaining Time + Media controller element + 残り時間 + + + Status Display + Media controller element + ステータス表示 + + + Fullscreen Button + Media controller element + フルスクリーンボタン + + + Seek Forward Button + Media controller element + 早送りボタン + + + Seek Back Button + Media controller element + 巻き戻しボタン + + + Audio element playback controls and status display + Media controller element + オーディオ要素の再生制御とステータスの表示 + + + Video element playback controls and status display + Media controller element + ビデオ要素の再生制御とステータスの表示 + + + Mute audio tracks + Media controller element + 音声を消音する + + + Unmute audio tracks + Media controller element + 音声の消音を解除する + + + Begin playback + Media controller element + 再生を開始する + + + Pause playback + Media controller element + 再生を一時停止する + + + Movie time scrubber + Media controller element + 動画再生時間プログレスバー + + + Movie time scrubber thumb + Media controller element + 動画再生時間プログレスバーのつまみ + + + Rewind movie + Media controller element + 動画の巻き戻し + + + Return streaming movie to real-time + Media controller element + ストリーミング動画の再生を現在時間に戻る + + + Current movie time + Media controller element + 現在の動画再生時間 + + + Remaining movie time + Media controller element + 残り動画再生時間 + + + Current movie status + Media controller element + 現在の動画のステータス + + + Play movie in full-screen mode + Media controller element + フルスクリーンモードで動画を再生する + + + Seek quickly back + Media controller element + + + + Seek quickly forward + Media controller element + + + + Indefinite time + Media time description + 無期限 + + + %1 days %2 hours %3 minutes %4 seconds + Media time description + %1 日 %2 時間 %3 分 %4 秒 + + + %1 hours %2 minutes %3 seconds + Media time description + %1 時間 %2 分 %3 秒 + + + %1 minutes %2 seconds + Media time description + %1 分 %2 秒 + + + %1 seconds + Media time description + %1 秒 + + Inspect Inspect Element context menu item ? 検査 - No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed 検索の履歴はありません - Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title 検索の履歴 - Clear recent searches menu item in Recent Searches menu that empties menu's contents 検索の履歴をクリア - + Missing Plug-in + Label text to be used when a plug-in is missing + プラグインがありません + + Unknown Unknown filesize FTP directory listing item 不明 - %1 (%2x%3 pixels) Title string for images %1 (%2x%3 ピクセル) - Web Inspector - %2 Web の検査 - %2 - Scroll here ここにスクロール - Left edge 左端 - Top 上端 - Right edge 右端 - Bottom 下端 - Page left 1ページ左へスクロール - Page up 1ページ戻る - Page right 1ページ右へスクロール - Page down 1ページ進む - Scroll left 左へスクロール - Scroll up 上へスクロール - Scroll right 右へスクロール - Scroll down 下へスクロール - %n file(s) number of chosen file @@ -7456,171 +7355,198 @@ - JavaScript Alert - %1 - JavaScript アラート - %1 - - - + JavaScript 警告 - %1 + + JavaScript Confirm - %1 JavaScript 確認 - %1 - JavaScript Prompt - %1 - JavaScript 質問 - %1 - - - + JavaScript プロンプト - %1 + + + JavaScript Problem - %1 + JavaScript 問題 - %1 + + + The script on this page appears to have a problem. Do you want to stop the script? + このページのスクリプトには問題があるようです。 スクリプトを停止しますか? + + Move the cursor to the next character 次の文字へカーソルを移動 - Move the cursor to the previous character 前の文字にカーソルを移動 - Move the cursor to the next word 次の単語にカーソルを移動 - Move the cursor to the previous word 前の単語にカーソルを移動 - Move the cursor to the next line 次の行にカーソルを移動 - Move the cursor to the previous line 前の行にカーソルを移動 - Move the cursor to the start of the line 文なのか行なのか 文頭にカーソルを移動 - Move the cursor to the end of the line 文末にカーソルを移動 - Move the cursor to the start of the block ブロックの先頭にカーソルを移動 - Move the cursor to the end of the block ブロックの末尾にカーソルを移動 - Move the cursor to the start of the document 文章の先頭にカーソルを移動 - Move the cursor to the end of the document 文章の末尾にカーソルを移動 - Select all すべてを選択 - Select to the next character 次の文字を選択 - Select to the previous character 前の文字を選択 - Select to the next word 次の単語を選択 - Select to the previous word 前の単語を選択 - Select to the next line 次の行を選択 - Select to the previous line 前の行を選択 - Select to the start of the line 文頭から選択 - Select to the end of the line 文末まで選択 - Select to the start of the block ブロックの先頭から選択 - Select to the end of the block ブロックの末尾まで選択 - Select to the start of the document ドキュメントの先頭から選択 - Select to the end of the document ドキュメントの末尾まで選択 - Delete to the start of the word 単語の先頭まで削除 - Delete to the end of the word 単語の末尾まで削除 - Insert a new paragraph 新しい段落を挿入 - Insert a new line 新しい行を挿入 + + Paste and Match Style + ペースとしてスタイルを合わせる + + + Remove formatting + 装飾の削除 + + + Strikethrough + 取り消し線 + + + Subscript + 下付き文字 + + + Superscript + 上付き文字 + + + Insert Bulleted List + 箇条書きの挿入 + + + Insert Numbered List + 順序付きリストの挿入 + + + Indent + インデント + + + Outdent + アウトデント + + + Center + センタリング + + + Justify + 両端揃え + + + Align Left + 左寄せ + + + Align Right + 右寄せ + QWhatsThisAction - What's This? ヒント? @@ -7628,7 +7554,6 @@ QWidget - * * @@ -7636,57 +7561,46 @@ QWizard - Go Back 戻る - Continue 続き - Commit 適用 - Done 終了 - Help ヘルプ - < &Back < 戻る(&B) - &Finish 完了(&F) - Cancel キャンセル - &Help ヘルプ(&H) - &Next 次へ(&N) - &Next > 次へ(&N) > @@ -7694,69 +7608,54 @@ QWorkspace - &Restore 元に戻す(&R) - &Move 移動(&M) - &Size サイズを変更(&S) - Mi&nimize 最小化(&N) - Ma&ximize 最大化(&X) - &Close 閉じる(&C) - Stay on &Top 常に手前に表示(&T) - - Sh&ade シェード(&A) - - %1 - [%2] %1 - [%2] - Minimize 最小化 - Restore Down 元に戻す - Close 閉じる - &Unshade シェードを解除(&U) @@ -7764,307 +7663,2088 @@ QXml - no error occurred エラーは発生しませんでした - error triggered by consumer 消費者によってエラーが誘発されました - unexpected end of file - 予期せぬファイルの終りです - - - + 予期しないファイルの終りです + + more than one document type definition ドキュメントタイプの定義が複数あります - error occurred while parsing element 要素の解析中にエラーが発生しました - tag mismatch タグが一致しません - error occurred while parsing content コンテンツの解析中にエラーが発生しました - unexpected character 予期しない文字です - invalid name for processing instruction 処理の指示に無効な名前です - version expected while reading the XML declaration XML宣言を読み込むにはバージョンが必要です - wrong value for standalone declaration スタンドアロン宣言として正しくない値です - encoding declaration or standalone declaration expected while reading the XML declaration XML宣言を読み込むにはエンコーディング宣言かスタンドアローン宣言が必要です - standalone declaration expected while reading the XML declaration XML宣言を読み込むにはスタンドアローン宣言が必要です - error occurred while parsing document type definition ドキュメントタイプの定義を解析中にエラーが発生しました - letter is expected 文字が必要です - error occurred while parsing comment コメントの解析中にエラーが発生しました - error occurred while parsing reference 参照の解析中にエラーが発生しました - internal general entity reference not allowed in DTD - 内部一般エンティティ参照はDTDで許されていません - - - + 内部一般エンティティ参照はDTDで許可されていません + + external parsed general entity reference not allowed in attribute value 解析された外部一般エンティティ参照は属性値で許されていません - external parsed general entity reference not allowed in DTD 解析された外部一般エンティティ参照はDTDで許されていません - unparsed entity reference in wrong context 不正な文脈で解析されないエンティティ参照です - recursive entities 再帰的エンティティ - error in the text declaration of an external entity 外部エンティティのテキスト宣言にエラーがあります + QXmlPatternistCLI + + Warning in %1, at line %2, column %3: %4 + %1 にて警告(%2 行目, %3 列): %4 + + + Warning in %1: %2 + %1 にて警告: %2 + + + Unknown location + 無効なパス + + + Error %1 in %2, at line %3, column %4: %5 + %2 にてエラー %1 (%3 行目, %4 列): %5 + + + Error %1 in %2: %3 + %2 にてエラー %1: %3 + + + QXmlStream - - Extra content at end of document. ドキュメントの末尾に余計なものがついています。 - Invalid entity value. エンティティの値が無効です。 - Invalid XML character. 無効な XML 文字です。 - Sequence ']]>' not allowed in content. このコンテキストでは、']]>' は許可されていません。 - - Encountered incorrectly encoded content. 正しくないエンコードの文脈に遭遇しました。 - Namespace prefix '%1' not declared 名前空間のブリフィックス '%1' は宣言されていません - Attribute redefined. 属性が再度指定されています。 - Unexpected character '%1' in public id literal. DTD宣言の部分 公開 ID 指定に使用できない文字 '%1' が使用されています。 - Invalid XML version string. 無効な XML バージョン指定です。 - Unsupported XML version. この XML のバージョンはサポートされていません。 - The standalone pseudo attribute must appear after the encoding. &ddd; は、エンコーディングを指定していないと使えないということかな。utf8だとおもうけど。 仮想属性指定は、エンコーディング指定の後にのみ使用できます。 - %1 is an invalid encoding name. %1 は無効なエンコーディングの名前です。 - Encoding %1 is unsupported エンコーディング '%1' はサポートされていません - Standalone accepts only yes or no. standalone の指定は yes または no のみ指定できます。 - Invalid attribute in XML declaration. XML 宣言に無効な属性がついています。 - Premature end of document. ドキュメントが途中で終わっています。 - Invalid document. 無効なドキュメントです。 - Expected 予期していた表現は、 - , but got ' ですが、取得した表現は以下のものでした ' - Unexpected ' 予期していなかった表現 ' - Expected character data. 予期していた文字列。 - Recursive entity detected. 再帰しているエンティティを発見しました。 - Start tag expected. - 開始タグをよきしていましたが、みつかりません。 - - - + 開始タグを予期していましたが、みつかりません。 + + NDATA in parameter entity declaration. パラメータエンティティの宣言において NDATA があります。 - XML declaration not at start of document. XML 宣言がドキュメントの先頭にありません。 - %1 is an invalid processing instruction name. XMLにそんなのあったっけ? %1 は無効な処理指定の名前です。 - Invalid processing instruction name. 無効な処理命令です。 - %1 is an invalid PUBLIC identifier. %1 は、公開 (PUBLIC) 識別子として無効です。 - - - - Illegal namespace declaration. 無効な名前空間の指定です。 - Invalid XML name. 無効な XML 名です。 - Opening and ending tag mismatch. 開始タグと、終了タグがマッチしません。 - Reference to unparsed entity '%1'. まだパースしていないエンティティ '%1' を参照しています。 - - - Entity '%1' not declared. エンティティ '%1' は宣言されていません。 - Reference to external entity '%1' in attribute value. 属性値として、外部エンティティ '%1' を再度指定しています。 - Invalid character reference. 無効な文字への参照です。 + + QtXmlPatterns + + %1 is an unsupported encoding. + %1 はサポートされていないエンコーディングです。 + + + %1 contains octets which are disallowed in the requested encoding %2. + エンコーディング %2 では許可されていないオクテットが %1 に含まれています。 + + + The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. + %2 で使用されているエンコード %3 では、コードポイント %1 は有効な XML 表現ではありません。 + + + Network timeout. + ネットワーク接続がタイムアウトしました。 + + + Element %1 can't be serialized because it appears outside the document element. + エレメント %1 はシリアライズできません。このドキュメントの範囲を越えるエレメントを含んでいます。 + + + Attribute %1 can't be serialized because it appears at the top level. + 属性 %1 はシリアライズできません。トップレベルに現れているためです。 + + + Year %1 is invalid because it begins with %2. + %1 年はむこうです。%2 で始まっています。 + + + Day %1 is outside the range %2..%3. + %1 日は、有効な範囲 %2..%3 を逸脱しています。 + + + Month %1 is outside the range %2..%3. + %1 月は、有効な範囲 %2..%3 を逸脱しています。 + + + Overflow: Can't represent date %1. + オーバーフロー: 日付 %1 を再現できません。 + + + Day %1 is invalid for month %2. + %2 月には、%1 日は存在しません。 + + + Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; + 24:%1:%2.%3 は無効です。24時0分0秒のみ使用できます + + + Time %1:%2:%3.%4 is invalid. + 時刻 %1時%2分%3.%4秒は無効です。 + + + Overflow: Date can't be represented. + オーバーフロー: 日付を再現できません。 + + + At least one component must be present. + 年、月、日のうちいずれかを指定しなければなりません。 + + + At least one time component must appear after the %1-delimiter. + %1 の後には、時刻を指定しなければなりません。 + + + %1 is not a valid value of type %2. + %1 は、%2 の型に対して有効な値ではありません。 + + + When casting to %1 from %2, the source value cannot be %3. + %2 から %1 への型変換に際しては、値 %3 は有効な値ではありません。 + + + Integer division (%1) by zero (%2) is undefined. + 整数の除算において %1 をゼロ (%2) で割った結果は定義されていません。 + + + Division (%1) by zero (%2) is undefined. + 除算において %1 をゼロ (%2) で割った結果は定義されていません。 + + + Modulus division (%1) by zero (%2) is undefined. + 剰余を求めるに際し、%1 をゼロ (%2) で除した結果は定義されていません。 + + + Dividing a value of type %1 by %2 (not-a-number) is not allowed. + 型 %1 を非数 %2 (NaN) で除すことはできません。 + + + Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. + 型 %1 を%2 または %3 (正または負のゼロ) で除することはできません。 + + + Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. + 型 %1 を %2 または %3 (正または負のゼロ)で乗ずることはできません。 + + + A value of type %1 cannot have an Effective Boolean Value. + 型 %1 は有効な論理型(bool)ではありません。 + + + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. + 論理型は、論理型以外の複数の値からなる計算によって求めることはできません。 + + + Value %1 of type %2 exceeds maximum (%3). + 型 %2 の値 %1 は、上限 (%3) を越えています。 + + + Value %1 of type %2 is below minimum (%3). + 型 %2 の値 %1 は、下限 (%3) を越えています。 + + + A value of type %1 must contain an even number of digits. The value %2 does not. + 型 %1 の値は偶数個の十進数文字を必要とします。しかし、%2 はそうではありません。 + + + %1 is not valid as a value of type %2. + 型 %2 に対して、値 %1 は有効ではありません。 + + + Ambiguous rule match. + 曖昧なルールにマッチしました。 + + + Operator %1 cannot be used on type %2. + 型 %2 に対して、オペレータ %1 は使用できません。 + + + Operator %1 cannot be used on atomic values of type %2 and %3. + アトミックな型 %2 と %3 に対して、オペレータ %1 は使用できません。 + + + The namespace URI in the name for a computed attribute cannot be %1. + 結合された属性に対する名前空間のURIとして、%1 を使用することはできません。 + + + The name for a computed attribute cannot have the namespace URI %1 with the local name %2. + 結合された属性の名前空間URI %1 は、ローカルな名前である %2 と併用できません。 + + + Type error in cast, expected %1, received %2. + 型変換時のエラーです。望んでいた %1 ではなく、%2 になりました。 + + + When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. + %1 またはそれを継承している型への型変換においては、元の値の型は同じ型か、リテラルな文字列である必要があります。型 %2 は許可されていません。 + + + A comment cannot contain %1 + コメントが %1 を含むことはできません + + + A comment cannot end with a %1. + コメントは %1 で終了することはできません。 + + + In a namespace constructor, the value for a namespace cannot be an empty string. + 名前空間のスントラクトにおいて、空白の文字列を名前空間の値として使用することはできません。 + + + The prefix must be a valid %1, which %2 is not. + プレフィックスは %1 でなければなりません。%2 は無効です。 + + + The prefix %1 cannot be bound. + プレフィックス %1 はバウンドできません。 + + + Only the prefix %1 can be bound to %2 and vice versa. + プレフィックス %1 は、%2 にのみバウンドできます。逆も同じです。 + + + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. + ドキュメントノードの子として属性ノードを指定することはできません。属性 %1 は誤った場所にあります。 + + + A library module cannot be evaluated directly. It must be imported from a main module. + ライブラリモジュールを直接評価することはできません。メインモジュールからインポートする必要があります。 + + + No template by name %1 exists. + テンプレート名 %1 は存在しません。 + + + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. + 型 %1 は述部として使用できません。数値型か、論理型である必要があります。 + + + A positional predicate must evaluate to a single numeric value. + 述部は評価されたとき、単一の数値になるようにしなければなりません。 + + + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. + ターゲットとしている名前は、%1 であってはなりません。%2 は無効です。 + + + %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. + %1 はターゲットとして無効です。%2 である必要があります。例えば "%3" のようにです。 + + + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. + バスの末端であるリーフは、単一のノードかアトミックな値である必要があります。複数の型の組み合わせであってはいけません。 + + + The data of a processing instruction cannot contain the string %1 + 処理中のデータは、以下の文字列を含んでいてはなりません: %1 + + + No namespace binding exists for the prefix %1 + プレフィックス %1 にバインドされたネームスペースがありません + + + No namespace binding exists for the prefix %1 in %2 + %2 におけるプレフィックス %1 にバインディングされたネームスペースが存在しません + + + %1 is an invalid %2 + 型 %2 に対し、値 %1 は無効です + + + The parameter %1 is passed, but no corresponding %2 exists. + パラメータ %1 を処理しました。しかし、対応する %2 が存在しません。 + + + The parameter %1 is required, but no corresponding %2 is supplied. + パメータ %1 が必要です。しかし、対応する %2 がありません。 + + + %1 takes at most %n argument(s). %2 is therefore invalid. + + %1 は、最大で %n 個の引数をとることができます。%2 は無効です。 + + + + %1 requires at least %n argument(s). %2 is therefore invalid. + + %1 は、少くとも %n 個の引数を必要とします。%2 は無効です。 + + + + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. + %1 への最初の引数は、型 %2 であってはなりません。数値型、xs:yerMonthDuration、xs:dayTimeDurationである必要があります。 + + + The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. + %1 への最初の引数は、型 %2 であってはなりません。%3, %4, %5 のいずれかである必要があります。 + + + The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. + %1 への二つ目の引数は、型 %2 であってはなりません。%3, %4, %5 のいずれかである必要があります。 + + + %1 is not a valid XML 1.0 character. + %1 は XML 1.0 において有効な文字ではありません。 + + + The root node of the second argument to function %1 must be a document node. %2 is not a document node. + %1 への二つ目の引数のルートノードは、ドキュメントノードでなければなりません。しかし、%2 はドキュメントノードではありません。 + + + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. + もし二つの値がゾーンオフセットをもつ場合、両者は同じゾーンオフセットでなければなりません。%1 と %2 は同一ではありません。 + + + %1 was called. + %1 が呼ばれました。 + + + %1 must be followed by %2 or %3, not at the end of the replacement string. + %1 の後には、%2 か %3 が続かなければなりません。 + + + In the replacement string, %1 must be followed by at least one digit when not escaped. + 置換操作において、%1 には少くとも一文字以上の数値が続く必要があります(エスケープされている場合を除く)。 + + + In the replacement string, %1 can only be used to escape itself or %2, not %3 + 置換操作において、%1 はそれ自身または %2 をエスケープする為にのみ使用できます。%3 に対しては使用できません + + + %1 matches newline characters + %1 は改行文字(列)にマッチしました + + + %1 and %2 match the start and end of a line. + %1 と %2 は、行の先頭と末尾にマッチしました。 + + + Matches are case insensitive + マッチは大文字小文字を区別しません + + + Whitespace characters are removed, except when they appear in character classes + 空白文字は削除されました。ただし、キャラクタークラスに属するものは除きます + + + %1 is an invalid regular expression pattern: %2 + %1 は有効な正規表現ではありません。: %2 + + + %1 is an invalid flag for regular expressions. Valid flags are: + %1 は正規表現において無効なフラグです。使用可能なフラグは次の通りです: + + + If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. + もし、最初の引数が空白からなる文字列か、長さが0 (名前空間をともなわない)である場合、プレフィックスを指定することはできません。しかし、プレフィックスとして %1 が指定されています。 + + + It will not be possible to retrieve %1. + %1 を取得することはできないかもしれません。 + + + The default collection is undefined + デフォルトのコレクションが定義されていません + + + %1 cannot be retrieved + %1 を取得できません + + + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). + 正規化された表現 %1 はサポートされていません。サポートされている表現は、%2, %3, %4, %5 のみです。 + + + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. + ゾーンオフセットは、%1 から %2 の範囲である必要があります(境界を含む)。%3 は範囲外です。 + + + %1 is not a whole number of minutes. + %1 は、分を現す値ではありません。 + + + The URI cannot have a fragment + この URI はフラグメントをもつことはできません + + + Required cardinality is %1; got cardinality %2. + カーディナリティ %1 が必要です。%2 ではありません。 + + + The item %1 did not match the required type %2. + アイテム %1 は、要求された型 %2 にマッチしません。 + + + The variable %1 is unused + 値 %1 は使用されませんでした + + + W3C XML Schema identity constraint selector + + + + W3C XML Schema identity constraint field + + + + A construct was encountered which is disallowed in the current language(%1). + + + + %1 is an unknown schema type. + %1 はサポートされていないスキーマのタイプです。 + + + A template with name %1 has already been declared. + テンプレート名 '%1' は、既に宣言されています。 + + + %1 is not a valid numeric literal. + %1 は数値リテラルとして無効です。 + + + Only one %1 declaration can occur in the query prolog. + クエリーのプロローグでは、%1 は一回のみ宣言できます。 + + + The initialization of variable %1 depends on itself + 値 %1 の初期化は、それ自身に依存しています + + + No variable with name %1 exists + 変数 %1 は存在しません + + + Version %1 is not supported. The supported XQuery version is 1.0. + バージョン %1 はサポートされていません。XQuery バージョン 1.0 のみサポートされています。 + + + The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. + エンコーディング '%1' は無効です。ラテン文字 (空白を除く) からなるもので、正規表現 '%2' にマッチするもののみ使用できます。 + + + No function with signature %1 is available + シグネチャ %1 をもつ関数がみつかりません + + + A default namespace declaration must occur before function, variable, and option declarations. + 標準の名前空間の宣言は、関数、変数、オプションの宣言の前にしなければなりません。 + + + Namespace declarations must occur before function, variable, and option declarations. + 名前空間の宣言は、関数、変数、オプションの宣言の前にしなければなりません。 + + + Module imports must occur before function, variable, and option declarations. + モジュールのインポートは、関数、変数、オプションの宣言の前にしなければなりません。 + + + The keyword %1 cannot occur with any other mode name. + キーワード %1 は、他の名をともなって使用することはできません。 + + + The value of attribute %1 must be of type %2, which %3 isn't. + 属性 '%1' の値として '%3' が指定されましたが、型 '%2' でなければなりません。 + + + It is not possible to redeclare prefix %1. + プレフィックス '%1' を再定義することはできません。 + + + The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. + プレフィックス '%1' はバウンドできません。デフォルトでは、それは既に名前空間 '%2' にバウンドされています。 + + + Prefix %1 is already declared in the prolog. + プロローグ部において、プレフィックス '%1' はすでに宣言されています。 + + + The name of an option must have a prefix. There is no default namespace for options. + オプションの名前はプレフィックスをもたなければなりません。このオプションに対するデフォルトの名前空間は存在しません。 + + + The Schema Import feature is not supported, and therefore %1 declarations cannot occur. + このスキーマのインポート機能は使用できません。また、'%1' 宣言も使用できません。 + + + The target namespace of a %1 cannot be empty. + 名前空間 '%1' は、空であってはなりません。 + + + The module import feature is not supported + モジュールインポートの機能はサポートされていません + + + A variable with name %1 has already been declared. + 名前 '%1' の変数は、すでに宣言されています。 + + + No value is available for the external variable with name %1. + 外部変数 '%1' の値がみつかりません。 + + + A stylesheet function must have a prefixed name. + スタイルシート関数は、プレフィックス名を持たなければなりません。 + + + The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) + ユーザ定義の関数の名前空間は、空であってはなりません。(すでに定義されているプレフィックス '%1' が使用できます) + + + The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. + 名前空間 '%1' は予約済です。ユーザ定義の関数では使用することはできません。プレフィックス '%2' が使用できます。 + + + The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 + ライブラリモジュールで使用されている名前空間は、モジュールの名前空間と同一でなければなりません。つまり、'%2' ではなく、'%1' でなければなりません + + + A function already exists with the signature %1. + シグネチャー '%1' の関数はすでに存在しています。 + + + No external functions are supported. All supported functions can be used directly, without first declaring them as external + 外部関数はサポートされていません。すべてのサポートされている関数は、外部宣言をすることなく、直接使用することができます + + + An argument with name %1 has already been declared. Every argument name must be unique. + 引数名 '%1' は既に宣言されています。すべての引数名はユニークである必要があります。 + + + When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. + パターン一致の内側で関数 '%1' を使用する場合、引数はリテラルな文字列を参照する値でなければなりません。 + + + In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. + XSL-T パターンマッチングにおいて、関数 '%1' の最初の引数は、リテラルな文字列でなければなりません。 + + + In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. + XSL-T パターンマッチングにおいて、関数 '%1' への最初の引数は、リテラルか変数でなければなりません。 + + + In an XSL-T pattern, function %1 cannot have a third argument. + XSL-T パターンにおいて、関数 '%1' は三つの引数をもつことはできません。 + + + In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. + XSL-T パターンマッチングにおいて、関数 '%1' と '%2' のみ使用できます。'%3' は使用できません。 + + + In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. + XSL-T パターンにおいて、axis %1 は使用できません。%2 または %3 のみ使用できます。 + + + %1 is an invalid template mode name. + %1 はテンプレートモジュール名として無効です。 + + + The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. + for 構文において使用する変数は、場所に関する変数とは異なる必要があります。つまり、'%1' が重複して使用されています。 + + + The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. + スキーマの検証機能はサポートされていません。よって、'%1' 構文は使用できません。 + + + None of the pragma expressions are supported. Therefore, a fallback expression must be present + pragma 構文はサポートされていません。fallback 構文でなければなりません + + + Each name of a template parameter must be unique; %1 is duplicated. + テンプレートパラメータ名はユニークである必要があります。'%1' は重複しています。 + + + The %1-axis is unsupported in XQuery + XQuery において、%1 axis はサポートされていません + + + No function with name %1 is available. + 関数名 '%1' はみつかりません。 + + + The namespace URI cannot be the empty string when binding to a prefix, %1. + プレフィックス '%1' にバインディングする名前空間の URI は、空であってはなりません。 + + + %1 is an invalid namespace URI. + %1 は名前空間 URI として無効です。 + + + It is not possible to bind to the prefix %1 + プレフィックス %1 にバインドすることはできません + + + Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). + 名前空間 %1 は %2 にのみバウンドできます。 + + + Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). + プリフィックス %1 は %2 にのみバウンドできます。 + + + Two namespace declaration attributes have the same name: %1. + 二つの名前空間宣言の属性が、同じ名前 '%1' をもっています。 + + + The namespace URI must be a constant and cannot use enclosed expressions. + 名前空間 URI は、constantでなければなりません。式を含むことはできません。 + + + An attribute with name %1 has already appeared on this element. + 属性名 '%1' は、すでにこのエレメントで使用されています。 + + + A direct element constructor is not well-formed. %1 is ended with %2. + 直積的な指定のエレメントがwell formedではありません。'%1' が、'%2' で終わっています。 + + + The name %1 does not refer to any schema type. + 名前 '%1' は、なんのスキーマタイプも参照していません。 + + + %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. + '%1' は complex 型です。complex 型への型変換はできません。しかし、アトミックな型である '%2' への変換はできます。 + + + %1 is not an atomic type. Casting is only possible to atomic types. + '%1' はアトミックな型ではありません。型変換はアトミックな型に対してのみ可能です。 + + + %1 is not a valid name for a processing-instruction. + 処理指定において、'%1' は無効です。 + + + %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. + '%1' は、スコープ属性宣言ではありません。スキーマインポート機能はサポートされていません。 + + + The name of an extension expression must be in a namespace. + 拡張式 (extension expression) の名前は、名前空間の中になければなりません。 + + + Element %1 is not allowed at this location. + この場所にエレメント '%1' をおくことは許可されていません。 + + + Text nodes are not allowed at this location. + この場所にテキストノードをおくことは許可されていません。 + + + Parse error: %1 + パースエラー: %1 + + + The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. + XSL-T バージョン属性の値は、'%1' 型でなければなりません。'%2' はそうではありません。 + + + Running an XSL-T 1.0 stylesheet with a 2.0 processor. + XSL-T 1.0 のスタイルシートを 2.0 のプロセッサで使用します。 + + + Unknown XSL-T attribute %1. + 未知の XSL-T 属性 %1 があります。 + + + Attribute %1 and %2 are mutually exclusive. + 属性 '%1' と '%2' は排他的にのみ使用できます。 + + + In a simplified stylesheet module, attribute %1 must be present. + simplified stylesheet モジュールにおいては、属性 '%1' を指定されなければなりません。 + + + If element %1 has no attribute %2, it cannot have attribute %3 or %4. + エレメント '%1' が属性 '%2' を持たない場合は、属性 '%3' や '%4' を使用することはできません。 + + + Element %1 must have at least one of the attributes %2 or %3. + エレメント '%1' は、属性 '%2' か '%3' のいずれかを持たなければなりません。 + + + At least one mode must be specified in the %1-attribute on element %2. + エレメント '%2' において、'%1' 属性は少くとも一つのモードを指定しなければなりません。 + + + Element %1 must come last. + エレメント %1 は最後になければなりません。 + + + At least one %1-element must occur before %2. + %2 の前に、少くとも一つは %1 エレメントが存在しなければなりません。 + + + Only one %1-element can appear. + %1 エレメントは一つのみ存在しなければなりません。 + + + At least one %1-element must occur inside %2. + %2 の内側には、少くとも一つの '%1' エレメントが存在しなければなりません。 + + + When attribute %1 is present on %2, a sequence constructor cannot be used. + %2 に属性 %1 がある場合、sequence constructor は使用できません。 + + + Element %1 must have either a %2-attribute or a sequence constructor. + エレメント %1 には、%2 属性またはsequence constructorがなければなりません。 + + + When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. + パラメータが要求されているときには、デフォルトの値は、%1 属性または sequence constructor によって指定されていてはなりません。 + + + Element %1 cannot have children. + エレメント %1 は、子要素を持つことができません。 + + + Element %1 cannot have a sequence constructor. + エレメント %1 は、sequence constructor を含むことができません。 + + + The attribute %1 cannot appear on %2, when it is a child of %3. + %2 が %3 の子要素であるときは、属性 %1 を使用してはなりません。 + + + A parameter in a function cannot be declared to be a tunnel. + 関数へのパラメータは、トンネルであってはなりません。 + + + This processor is not Schema-aware and therefore %1 cannot be used. + この処理系は、Schema-aware ではありません。よって、%1 は使用できません。 + + + Top level stylesheet elements must be in a non-null namespace, which %1 isn't. + トップレベルのスタイルシートのエレメントは、non-nullな名前空間を持っていなければなりません。しかし、%1 はそうではありません。 + + + The value for attribute %1 on element %2 must either be %3 or %4, not %5. + エレメント %2 の属性 %1 の値は、%3 または %4 でなければなりません。%5 は異なります。 + + + Attribute %1 cannot have the value %2. + 属性 %1 に、値 %2 を指定することはできません。 + + + The attribute %1 can only appear on the first %2 element. + 属性 %1 は、最初の %2 エレメントにのみ指定できます。 + + + At least one %1 element must appear as child of %2. + %2 の子要素としては、少くとも一つは %1 エレメントがなければなりません。 + + + Empty particle cannot be derived from non-empty particle. + 空ではない particle から空の particle を得ることはできません。 + + + Derived particle is missing element %1. + 取得した particle に要素 %1 がありません。 + + + Derived element %1 is missing value constraint as defined in base particle. + + + + Derived element %1 has weaker value constraint than base particle. + + + + Fixed value constraint of element %1 differs from value constraint in base particle. + + + + Derived element %1 cannot be nillable as base element is not nillable. + + + + Block constraints of derived element %1 must not be more weaker than in the base element. + + + + Simple type of derived element %1 cannot be validly derived from base element. + + + + Complex type of derived element %1 cannot be validly derived from base element. + + + + Element %1 is missing in derived particle. + + + + Element %1 does not match namespace constraint of wildcard in base particle. + + + + Wildcard in derived particle is not a valid subset of wildcard in base particle. + + + + processContent of wildcard in derived particle is weaker than wildcard in base particle. + + + + Derived particle allows content that is not allowed in the base particle. + + + + %1 has inheritance loop in its base type %2. + + + + Circular inheritance of base type %1. + + + + Circular inheritance of union %1. + + + + %1 is not allowed to derive from %2 by restriction as the latter defines it as final. + + + + %1 is not allowed to derive from %2 by extension as the latter defines it as final. + + + + Base type of simple type %1 cannot be complex type %2. + + + + Simple type %1 cannot have direct base type %2. + + + + Simple type %1 is not allowed to have base type %2. + + + + Simple type %1 can only have simple atomic type as base type. + + + + Simple type %1 cannot derive from %2 as the latter defines restriction as final. + + + + Variety of item type of %1 must be either atomic or union. + + + + Variety of member types of %1 must be atomic. + + + + %1 is not allowed to derive from %2 by list as the latter defines it as final. + + + + Simple type %1 is only allowed to have %2 facet. + + + + Base type of simple type %1 must have variety of type list. + + + + Base type of simple type %1 has defined derivation by restriction as final. + + + + Item type of base type does not match item type of %1. + + + + Simple type %1 contains not allowed facet type %2. + + + + %1 is not allowed to derive from %2 by union as the latter defines it as final. + + + + %1 is not allowed to have any facets. + + + + Base type %1 of simple type %2 must have variety of union. + + + + Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. + + + + Member type %1 cannot be derived from member type %2 of %3's base type %4. + + + + Derivation method of %1 must be extension because the base type %2 is a simple type. + + + + Complex type %1 has duplicated element %2 in its content model. + + + + Complex type %1 has non-deterministic content. + + + + Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. + + + + Content model of complex type %1 is not a valid extension of content model of %2. + + + + Complex type %1 must have simple content. + + + + Complex type %1 must have the same simple type as its base class %2. + + + + Complex type %1 cannot be derived from base type %2%3. + + + + Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. + + + + Complex type %1 with simple content cannot be derived from complex base type %2. + + + + Item type of simple type %1 cannot be a complex type. + + + + Member type of simple type %1 cannot be a complex type. + + + + %1 is not allowed to have a member type with the same name as itself. + + + + %1 facet collides with %2 facet. + + + + %1 facet must have the same value as %2 facet of base type. + + + + %1 facet must be equal or greater than %2 facet of base type. + + + + %1 facet must be less than or equal to %2 facet of base type. + + + + %1 facet contains invalid regular expression + + + + Unknown notation %1 used in %2 facet. + + + + %1 facet contains invalid value %2: %3. + + + + %1 facet cannot be %2 or %3 if %4 facet of base type is %5. + + + + %1 facet cannot be %2 if %3 facet of base type is %4. + + + + %1 facet must be less than or equal to %2 facet. + + + + %1 facet must be less than %2 facet of base type. + + + + %1 facet and %2 facet cannot appear together. + + + + %1 facet must be greater than %2 facet of base type. + + + + %1 facet must be less than %2 facet. + + + + %1 facet must be greater than or equal to %2 facet of base type. + + + + Simple type contains not allowed facet %1. + + + + %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. + + + + Only %1 and %2 facets are allowed when derived by union. + + + + %1 contains %2 facet with invalid data: %3. + + + + Attribute group %1 contains attribute %2 twice. + + + + Attribute group %1 contains two different attributes that both have types derived from %2. + + + + Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. + + + + Complex type %1 contains attribute %2 twice. + + + + Complex type %1 contains two different attributes that both have types derived from %2. + + + + Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. + + + + Element %1 is not allowed to have a value constraint if its base type is complex. + + + + Element %1 is not allowed to have a value constraint if its type is derived from %2. + + + + Value constraint of element %1 is not of elements type: %2. + + + + Element %1 is not allowed to have substitution group affiliation as it is no global element. + + + + Type of element %1 cannot be derived from type of substitution group affiliation. + + + + Value constraint of attribute %1 is not of attributes type: %2. + + + + Attribute %1 has value constraint but has type derived from %2. + + + + %1 attribute in derived complex type must be %2 like in base type. + + + + Attribute %1 in derived complex type must have %2 value constraint like in base type. + + + + Attribute %1 in derived complex type must have the same %2 value constraint like in base type. + + + + Attribute %1 in derived complex type must have %2 value constraint. + + + + processContent of base wildcard must be weaker than derived wildcard. + + + + Element %1 exists twice with different types. + + + + Particle contains non-deterministic wildcards. + + + + Base attribute %1 is required but derived attribute is not. + + + + Type of derived attribute %1 cannot be validly derived from type of base attribute. + + + + Value constraint of derived attribute %1 does not match value constraint of base attribute. + + + + Derived attribute %1 does not exist in the base definition. + + + + Derived attribute %1 does not match the wildcard in the base definition. + + + + Base attribute %1 is required but missing in derived definition. + + + + Derived definition contains an %1 element that does not exists in the base definition + + + + Derived wildcard is not a subset of the base wildcard. + + + + %1 of derived wildcard is not a valid restriction of %2 of base wildcard + + + + Attribute %1 from base type is missing in derived type. + + + + Type of derived attribute %1 differs from type of base attribute. + + + + Base definition contains an %1 element that is missing in the derived definition + + + + Can not process unknown element %1, expected elements are: %2. + + + + Element %1 is not allowed in this scope, possible elements are: %2. + + + + Child element is missing in that scope, possible child elements are: %1. + + + + Document is not a XML schema. + + + + %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. + + + + %1 attribute of %2 element contains invalid content: {%3}. + + + + Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. + + + + Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. + + + + %1 element is not allowed to have the same %2 attribute value as the target namespace %3. + + + + %1 element without %2 attribute is not allowed inside schema without target namespace. + + + + %1 element is not allowed inside %2 element if %3 attribute is present. + + + + %1 element has neither %2 attribute nor %3 child element. + + + + %1 element with %2 child element must not have a %3 attribute. + + + + %1 attribute of %2 element must be %3 or %4. + + + + %1 attribute of %2 element must have a value of %3. + + + + %1 attribute of %2 element must have a value of %3 or %4. + + + + %1 element must not have %2 and %3 attribute together. + + + + Content of %1 attribute of %2 element must not be from namespace %3. + + + + %1 attribute of %2 element must not be %3. + + + + %1 attribute of %2 element must have the value %3 because the %4 attribute is set. + + + + Specifying use='prohibited' inside an attribute group has no effect. + + + + %1 element must have either %2 or %3 attribute. + + + + %1 element must have either %2 attribute or %3 or %4 as child element. + + + + %1 element requires either %2 or %3 attribute. + + + + Text or entity references not allowed inside %1 element + + + + %1 attribute of %2 element must contain %3, %4 or a list of URIs. + + + + %1 element is not allowed in this context. + + + + %1 attribute of %2 element has larger value than %3 attribute. + + + + Prefix of qualified name %1 is not defined. + + + + %1 attribute of %2 element must either contain %3 or the other values. + + + + Component with ID %1 has been defined previously. + + + + Element %1 already defined. + + + + Attribute %1 already defined. + + + + Type %1 already defined. + + + + Attribute group %1 already defined. + + + + Element group %1 already defined. + + + + Notation %1 already defined. + + + + Identity constraint %1 already defined. + + + + Duplicated facets in simple type %1. + + + + %1 references unknown %2 or %3 element %4. + + + + %1 references identity constraint %2 that is no %3 or %4 element. + + + + %1 has a different number of fields from the identity constraint %2 that it references. + + + + Base type %1 of %2 element cannot be resolved. + + + + Item type %1 of %2 element cannot be resolved. + + + + Member type %1 of %2 element cannot be resolved. + + + + Type %1 of %2 element cannot be resolved. + + + + Base type %1 of complex type cannot be resolved. + + + + %1 cannot have complex base type that has a %2. + + + + Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. + + + + Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. + + + + Type of %1 element must be a simple type, %2 is not. + + + + Substitution group %1 of %2 element cannot be resolved. + + + + Substitution group %1 has circular definition. + + + + Duplicated element names %1 in %2 element. + + + + Reference %1 of %2 element cannot be resolved. + + + + Circular group reference for %1. + + + + %1 element is not allowed in this scope + + + + %1 element cannot have %2 attribute with value other than %3. + + + + %1 element cannot have %2 attribute with value other than %3 or %4. + + + + %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. + + + + Attribute group %1 has circular reference. + + + + %1 attribute in %2 must have %3 use like in base type %4. + + + + Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. + + + + %1 has attribute wildcard but its base type %2 has not. + + + + Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. + + + + Enumeration facet contains invalid content: {%1} is not a value of type %2. + + + + Namespace prefix of qualified name %1 is not defined. + + + + %1 element %2 is not a valid restriction of the %3 element it redefines: %4. + + + + %1 is not valid according to %2. + + + + String content does not match the length facet. + + + + String content does not match the minLength facet. + + + + String content does not match the maxLength facet. + + + + String content does not match pattern facet. + + + + String content is not listed in the enumeration facet. + + + + Signed integer content does not match the maxInclusive facet. + + + + Signed integer content does not match the maxExclusive facet. + + + + Signed integer content does not match the minInclusive facet. + + + + Signed integer content does not match the minExclusive facet. + + + + Signed integer content is not listed in the enumeration facet. + + + + Signed integer content does not match pattern facet. + + + + Signed integer content does not match in the totalDigits facet. + + + + Unsigned integer content does not match the maxInclusive facet. + + + + Unsigned integer content does not match the maxExclusive facet. + + + + Unsigned integer content does not match the minInclusive facet. + + + + Unsigned integer content does not match the minExclusive facet. + + + + Unsigned integer content is not listed in the enumeration facet. + + + + Unsigned integer content does not match pattern facet. + + + + Unsigned integer content does not match in the totalDigits facet. + + + + Double content does not match the maxInclusive facet. + + + + Double content does not match the maxExclusive facet. + + + + Double content does not match the minInclusive facet. + + + + Double content does not match the minExclusive facet. + + + + Double content is not listed in the enumeration facet. + + + + Double content does not match pattern facet. + + + + Decimal content does not match in the fractionDigits facet. + + + + Decimal content does not match in the totalDigits facet. + + + + Date time content does not match the maxInclusive facet. + + + + Date time content does not match the maxExclusive facet. + + + + Date time content does not match the minInclusive facet. + + + + Date time content does not match the minExclusive facet. + + + + Date time content is not listed in the enumeration facet. + + + + Date time content does not match pattern facet. + + + + Duration content does not match the maxInclusive facet. + + + + Duration content does not match the maxExclusive facet. + + + + Duration content does not match the minInclusive facet. + + + + Duration content does not match the minExclusive facet. + + + + Duration content is not listed in the enumeration facet. + + + + Duration content does not match pattern facet. + + + + Boolean content does not match pattern facet. + + + + Binary content does not match the length facet. + + + + Binary content does not match the minLength facet. + + + + Binary content does not match the maxLength facet. + + + + Binary content is not listed in the enumeration facet. + + + + Invalid QName content: %1. + + + + QName content is not listed in the enumeration facet. + + + + QName content does not match pattern facet. + + + + Notation content is not listed in the enumeration facet. + + + + List content does not match length facet. + + + + List content does not match minLength facet. + + + + List content does not match maxLength facet. + + + + List content is not listed in the enumeration facet. + + + + List content does not match pattern facet. + + + + Union content is not listed in the enumeration facet. + + + + Union content does not match pattern facet. + + + + Data of type %1 are not allowed to be empty. + + + + Element %1 is missing child element. + + + + There is one IDREF value with no corresponding ID: %1. + + + + Loaded schema file is invalid. + + + + %1 contains invalid data. + + + + xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. + + + + xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. + + + + No schema defined for validation. + + + + No definition for element %1 available. + + + + Specified type %1 is not known to the schema. + + + + Element %1 is not defined in this scope. + + + + Declaration for element %1 does not exist. + + + + Element %1 contains invalid content. + + + + Element %1 is declared as abstract. + + + + Element %1 is not nillable. + + + + Attribute %1 contains invalid data: %2 + + + + Element contains content although it is nillable. + + + + Fixed value constraint not allowed if element is nillable. + + + + Specified type %1 is not validly substitutable with element type %2. + + + + Complex type %1 is not allowed to be abstract. + + + + Element %1 contains not allowed attributes. + + + + Element %1 contains not allowed child element. + + + + Content of element %1 does not match its type definition: %2. + + + + Content of element %1 does not match defined value constraint. + + + + Element %1 contains not allowed child content. + + + + Element %1 contains not allowed text content. + + + + Element %1 cannot contain other elements, as it has a fixed content. + + + + Element %1 is missing required attribute %2. + + + + Attribute %1 does not match the attribute wildcard. + + + + Declaration for attribute %1 does not exist. + + + + Element %1 contains two attributes of type %2. + + + + Attribute %1 contains invalid content. + + + + Element %1 contains unknown attribute %2. + + + + Content of attribute %1 does not match its type definition: %2. + + + + Content of attribute %1 does not match defined value constraint. + + + + Non-unique value found for constraint %1. + + + + Key constraint %1 contains absent fields. + + + + Key constraint %1 contains references nillable element %2. + + + + No referenced value found for key reference %1. + + + + More than one value found for field %1. + + + + Field %1 has no simple type. + + + + ID value '%1' is not unique. + + + + '%1' attribute contains invalid QName content: %2. + + + + empty + 空 + + + zero or one + ゼロまたは一つ + + + exactly one + 厳密に一つ + + + one or more + 一つまたは複数 + + + zero or more + ゼロまたはそれ以上 + + + Required type is %1, but %2 was found. + 要求されている型は %1 ですが、 %2 があります。 + + + Promoting %1 to %2 may cause loss of precision. + %1 を %2 に変換する際に、精度のロスが生じます。 + + + The focus is undefined. + フォーカスが定義されていません。 + + + It's not possible to add attributes after any other kind of node. + 他の種類のノードの中では、属性を追加することはできません。 + + + An attribute by name %1 has already been created. + 名前 '%1' の属性は、すでに生成されています。 + + + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. + UNICODE Codepoint Collection のみ使用できます(%1)。 %2 はサポートされていません。 + + diff -r ef0373b55136 -r 758a864f9613 translations/qt_pl.ts --- a/translations/qt_pl.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qt_pl.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,7 +4,6 @@ CloseButton - Close Tab Zamknij kartę @@ -12,12 +11,10 @@ FakeReply - Fake error ! Fałszywy błąd! - Invalid URL Niepoprawny URL @@ -25,37 +22,30 @@ MAC_APPLICATION_MENU - Services Usługi - Hide %1 Ukryj %1 - Hide Others Ukryj pozostałe - Show All Pokaż wszystko - Preferences... Preferencje… - Quit %1 Zakończ %1 - About %1 %1… @@ -63,32 +53,26 @@ Phonon:: - Notifications Powiadomienia - Music Muzyka - Video Wideo - Communication Komunikacja - Games Gry - Accessibility Dostępność @@ -96,24 +80,18 @@ Phonon::AudioOutput - - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Urządzenie dźwiękowe <b>%1</b> nie działa.<br/>Przywracanie do <b>%2</b>.</html> - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> <html>Przełączanie na urządzenie dźwiękowe <b>%1</b><br/>które właśnie stało się dostępne i ma wyższy priorytet.</html> - - Revert back to device '%1' Przywróć do urządzenia '%1' - <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> <html>Przełączanie na urządzenie dźwiękowe <b>%1</b><br/>które ma wyższy priorytet lub jest specjalnie skonfigurowane dla tego strumienia.</html> @@ -121,14 +99,12 @@ Phonon::Gstreamer::Backend - Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. Ostrzeżenie: Wygląda na to, że pakiet gstreamer0.10-plugins-good nie jest zainstalowany w tym systemie. Niektóre możliwości wideo zostały wyłączone. - Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled Ostrzeżenie: Wygląda na to, że podstawowe wtyczki GStreamer nie są zainstalowane w tym systemie. @@ -138,7 +114,6 @@ Phonon::Gstreamer::MediaObject - Cannot start playback. Check your GStreamer installation and make sure you @@ -149,49 +124,34 @@ zainstalowałeś libgstreamer-plugins-base. - Missing codec helper script assistant. - Plugin codec installation failed for codec: %0 Błąd podczas instalacji wtyczki dla kodeka: %0 - A required codec is missing. You need to install the following codec(s) to play this content: %0 Brak wymaganego kodeka. Aby odtworzyć zawartość musisz zainstalować poniższy kodek: %0 - - - - - - - - Could not open media source. Nie można otworzyć źródła mediów. - Invalid source type. Niepoprawny typ źródła. - Could not locate media source. Nie można znaleźć źródła mediów. - Could not open audio device. The device is already in use. Nie można otworzyć urządzenia dźwiękowego. Urządzenie jest już używane. - Could not decode media source. Nie można zdekodować źródła mediów. @@ -199,162 +159,130 @@ Phonon::MMF - Audio Output Wyjście dźwięku - The audio output device Wyjściowe urządzenie dźwiękowe - No error Brak błędu - Not found Nie znaleziono - Out of memory Brak pamięci - Not supported Nieobsługiwane - Overflow Przepełnienie - Underflow Niedopełnienie - Already exists Już istnieje - Path not found Nie znaleziono ścieżki - In use W użyciu - Not ready Brak gotowości - Access denied Odmowa dostępu - Could not connect Nie można połączyć - Disconnected Rozłączono - Permission denied Brak uprawnień - Insufficient bandwidth Niewystarczająca szerokość pasma - Network unavailable Sieć niedostępna - Network communication error Błąd komunikacji sieciowej - Streaming not supported Transmisje strumieniowe nie są obsługiwane - Server alert Ostrzeżenie serwera - Invalid protocol Nieprawidłowy protokół - Invalid URL Nieprawidłowy adres URL - Multicast error Błąd multiemisji - Proxy server error Błąd serwera pośredniczącego - Proxy server not supported Nieobsługiwany serwer pośredniczący - Audio output error Błąd wyjściowego sygnału dźwiękowego - Video output error Błąd wyjściowego sygnału wideo - Decoder error Błąd dekodera - Audio or video components could not be played Nie można odtworzyć dźwięku lub wideo - DRM error Błąd DRM - Unknown error (%1) Nieznany błąd (%1) @@ -362,33 +290,34 @@ Phonon::MMF::AbstractMediaPlayer - Not ready to play Brak gotowości odtwarzania - - Error opening file Błąd otwierania pliku - Error opening URL Błąd otwierania adresu URL - + Error opening resource + Błąd otwierania zasobu + + + Error opening source: resource not opened + Błąd otwierania źródła: zasób nie został otwarty + + Setting volume failed Ustawienie głośności zakończone błędem - Loading clip failed Załadowanie klipu zakończone błędem - Playback complete Zakończono odtwarzanie @@ -396,22 +325,18 @@ Phonon::MMF::AbstractVideoPlayer - Pause failed Zatrzymanie zakończone błędem - Seek failed Wyszukiwanie zakończone błędem - Getting position failed Ustalanie pozycji zakończone błędem - Opening clip failed Otwieranie klipu zakończone błędem @@ -419,7 +344,6 @@ Phonon::MMF::AudioEqualizer - %1 Hz %1 Hz @@ -427,7 +351,6 @@ Phonon::MMF::AudioPlayer - Getting position failed Ustalanie pozycji zakończone błędem @@ -435,11 +358,6 @@ Phonon::MMF::DsaVideoPlayer - - - - - Video display error Błąd wyświetlacza wideo @@ -447,7 +365,6 @@ Phonon::MMF::EffectFactory - Enabled Włączono @@ -455,61 +372,51 @@ Phonon::MMF::EnvironmentalReverb - Decay HF ratio (%) DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. Współczynnik zanikania HF (%) - Decay time (ms) DecayTime: Time over which reverberation is diminished. Czas zanikania (ms) - Density (%) Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. Gęstość (%) - Diffusion (%) Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. Rozpraszanie (%) - Reflections delay (ms) ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. Opóźnienie odbić (ms) - Reflections level (mB) ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. Poziom odbić (mB) - Reverb delay (ms) ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. Opóźnienie pogłosu (ms) - Reverb level (mB) ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. Poziom pogłosu (mB) - Room HF level RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. Poziom HF pomieszczenia - Room level (mB) RoomLevel: Master volume control for all reflected sound. Poziom pomieszczenia (mB) @@ -518,12 +425,18 @@ Phonon::MMF::MediaObject - Error opening source: type not supported Błąd otwierania źródła: typ źródła nie jest obsługiwany - + Error opening source: resource is compressed + Błąd otwierania źródła: zasób jest skompresowany + + + Error opening source: resource not valid + Błąd otwierania źródła: niepoprawny zasób + + Error opening source: media type could not be determined Błąd otwierania źródła: nie można określić typu multimediów @@ -531,7 +444,6 @@ Phonon::MMF::StereoWidening - Level (%) Poziom (%) @@ -539,8 +451,6 @@ Phonon::MMF::SurfaceVideoPlayer - - Video display error Błąd wyświetlacza wideo @@ -548,22 +458,14 @@ Phonon::VolumeSlider - - - - Volume: %1% Głośność: %1% - - - Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% Użyj tego suwaka aby zmienić głośność. Skrajnie lewa pozycja to 0%, skrajnie prawa to %1% - Muted Wyciszony @@ -571,12 +473,10 @@ Q3Accel - %1, %2 not defined %1, %2 nie określone - Ambiguous %1 not handled Niejednoznaczne %1, nie obsłużone @@ -584,27 +484,22 @@ Q3DataTable - Delete Skasuj - False Fałsz - Insert Wstaw - True Prawda - Update Uaktualnij @@ -612,7 +507,6 @@ Q3FileDialog - %1 File not found. Check path and filename. @@ -621,323 +515,246 @@ Sprawdź ścieżkę i nazwę pliku. - <qt>Are you sure you wish to delete %1 "%2"?</qt> <qt>Na pewno chcesz skasować %1 "%2"?</qt> - - - - All Files (*) Wszystkie pliki (*) - Attributes Atrybuty - Back Powrót - - Cancel Anuluj - Copy or Move a File Skopiuj lub przenieś plik - Create New Folder Utwórz nowy katalog - Date Data - &Delete &Skasuj - Delete %1 Skasuj %1 - Detail View Szczegóły - Dir Katalog - - Directories Katalogi - Directory: Katalog: - - Error Błąd - File Plik - - - File &name: Nazwa &pliku: - File &type: &Rodzaj pliku: - Find Directory Znajdź katalog - Inaccessible Niedostępny - List View Lista - Look &in: Sprawdź &w: - Name Nazwa - New Folder Nowy katalog - New Folder %1 Nowy katalog %1 - New Folder 1 Nowy katalog 1 - &No &Nie - - &OK &OK - One directory up Katalog wyżej - - - &Open &Otwórz - - - Open Otwórz - Preview File Contents Podgląd zawartości pliku - Preview File Info Podgląd informacji o pliku - Read: %1 Czytaj: %1 - Read-only Tylko do odczytu - Read-write Do zapisu i odczytu - R&eload &Odśwież - &Rename &Zmień nazwę - - &Save &Zachowaj - - Save As Zachowaj jako - Show &hidden files Pokaż &ukryte pliki - Size Rozmiar - Sort Sortuj - Sort by &Date Sortuj po &dacie - Sort by &Name Sortuj &po nazwie - Sort by &Size Sortuj po &rozmiarze - Special Specjalny - Symlink to Directory Dowiązanie symboliczne do katalogu - Symlink to File Dowiązanie symboliczne do pliku - Symlink to Special Dowiązanie symboliczne do pliku specjalnego - the directory katalog - the file plik - the symlink dowiązanie symboliczne - Type Rodzaj - &Unsorted &Bez sortowania - - Write: %1 Pisz: %1 - Write-only Tylko do zapisu - &Yes &Tak - All Files (*.*) Wszystkie pliki (*.*) - Open Otwórz - Select a Directory Wybierz katalog @@ -945,36 +762,30 @@ Q3LocalFs - Could not create directory %1 Nie można utworzyć katalogu %1 - Could not open %1 Nie można otworzyć %1 - - Could not read directory %1 Nie można czytać katalogu %1 - Could not remove file or directory %1 Nie można usunąć pliku lub katalogu %1 - Could not rename %1 to @@ -985,7 +796,6 @@ %2 - Could not write %1 Nie można zapisać @@ -995,12 +805,10 @@ Q3MainWindow - Customize... Ustawienia użytkownika... - Line up Wyrównaj położenie @@ -1008,7 +816,6 @@ Q3NetworkProtocol - Operation stopped by the user Operacja zatrzymana przez użytkownika @@ -1016,8 +823,6 @@ Q3ProgressDialog - - Cancel Anuluj @@ -1025,28 +830,22 @@ Q3TabDialog - Apply Zatwierdź - Cancel Anuluj - Defaults Domyślne - Help Pomoc - - OK OK @@ -1054,38 +853,30 @@ Q3TextEdit - Clear Wyczyść - &Copy S&kopiuj - Cu&t W&ytnij - &Paste &Wklej - &Redo &Przywróć - - Select All Zaznacz wszystko - &Undo &Cofnij @@ -1093,67 +884,54 @@ Q3TitleBar - Close Zamknij okno - Closes the window Zamyka okno - Contains commands to manipulate the window Zawiera polecenia zarządzające oknem - Displays the name of the window and contains controls to manipulate it Wyświetla nazwę okna i zawiera elementy do zarządzania nim - Makes the window full screen Powiększa maksymalnie okno - Maximize Zmaksymalizuj - Minimize Zminimalizuj - Puts a minimized window back to normal Przywraca normalny rozmiar uprzednio zminimalizowanego okna - Moves the window out of the way Przenosi okno w inne położenie - Puts a maximized window back to normal Przywraca normalny rozmiar uprzednio zmaksymalizowanego okna - Restore down Przywróć pod spód - Restore up Przywróć na wierzch - System System @@ -1161,7 +939,6 @@ Q3ToolBar - More... Więcej... @@ -1169,51 +946,38 @@ Q3UrlOperator - - (unknown) (nieznany) - - The protocol `%1' does not support copying or moving files or directories Protokół '%1' nie obsługuje kopiowania lub przenoszenia plików lub katalogów - The protocol `%1' does not support creating new directories Protokół '%1' nie obsługuje tworzenia nowych katalogów - The protocol `%1' does not support getting files Protokół '%1' nie obsługuje pobierania plików - The protocol `%1' does not support listing directories Protokół '%1' nie obsługuje pokazywania katalogów - The protocol `%1' does not support putting files Protokół '%1' nie obsługuje wysyłania plików - The protocol `%1' does not support removing files or directories Protokół '%1' nie obsługuje usuwania plików lub katalogów - The protocol `%1' does not support renaming files or directories Protokół '%1' nie obsługuje zmiany nazwy plików lub katalogów - - - The protocol `%1' is not supported Protokół '%1' nie jest obsługiwany @@ -1221,27 +985,22 @@ Q3Wizard - < &Back < &Wstecz - &Cancel &Anuluj - &Finish &Zakończ - &Help &Pomoc - &Next > &Dalej > @@ -1249,45 +1008,30 @@ QAbstractSocket - - - Connection refused Połączenie odrzucone - - - - Host not found Host nie znaleziony - Connection timed out Przekroczony czas połączenia - - - Operation on socket is not supported Operacja na gnieździe nie jest obsługiwana - Socket is not connected Gniazdo nie jest podłączone - - Socket operation timed out Przekroczony czas operacji gniazda - Network unreachable Sieć niedostępna @@ -1295,17 +1039,14 @@ QAbstractSpinBox - Step &down Krok w &dół - &Step up Krok do &góry - &Select All &Zaznacz wszystko @@ -1313,7 +1054,6 @@ QAccessibleButton - Press Wciśnij @@ -1321,27 +1061,22 @@ QApplication - Activate Uaktywnij - Activates the program's main window Uaktywnia główne okno programu - Executable '%1' requires Qt %2, found Qt %3. Program '%1' wymaga do uruchomienia Qt %2, znaleziono Qt %3. - Incompatible Qt Library Error Niekompatybilność biblioteki Qt - QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -1350,22 +1085,18 @@ QAxSelect - Select ActiveX Control Wybierz kontrolkę ActiveX - OK OK - &Cancel &Anuluj - COM &Object: &Obiekt COM: @@ -1373,17 +1104,14 @@ QCheckBox - Check Zaznacz - Toggle Przełącz - Uncheck Odznacz @@ -1391,57 +1119,46 @@ QColorDialog - &Add to Custom Colors &Dodaj do własnych kolorów - A&lpha channel: Kanał &alfa: - Select Color Wybierz kolor - &Basic colors &Kolory podstawowe - Bl&ue: Błęki&t: - &Custom colors Wła&sne kolory - &Green: &Zieleń: - Hu&e: &Barwa: - &Red: &Czerwień: - &Sat: &Nasycenie: - &Val: &Wartość: @@ -1449,23 +1166,18 @@ QComboBox - - Open Otwórz - False Fałsz - True Prawda - Close Zamknij @@ -1473,43 +1185,36 @@ QCoreApplication - %1: already exists QSystemSemaphore %1: już istnieje - %1: does not exist QSystemSemaphore %1: nie istnieje - %1: out of resources QSystemSemaphore %1: zasoby wyczerpane - %1: unknown error %2 QSystemSemaphore %1: nieznany błąd %2 - %1: key is empty QSystemSemaphore %1: klucz jest pusty - %1: unable to make key QSystemSemaphore %1: nie można utworzyć klucza - %1: ftok failed QSystemSemaphore %1: wystąpił błąd w funkcji ftok() @@ -1518,22 +1223,18 @@ QDB2Driver - Unable to connect Nie można nawiązać połączenia - Unable to commit transaction Nie można dokonać transakcji - Unable to rollback transaction Nie można wycofać transakcji - Unable to set autocommit Nie można ustawić trybu automatycznego dokonywania transakcji @@ -1541,33 +1242,26 @@ QDB2Result - - Unable to execute statement Nie można wykonać polecenia - Unable to prepare statement Nie można przygotować polecenia - Unable to bind variable Nie można powiązać zmiennej - Unable to fetch record %1 Nie można pobrać rekordu %1 - Unable to fetch next Nie można pobrać kolejnego wiersza danych - Unable to fetch first Nie można pobrać pierwszego wiersza danych @@ -1575,22 +1269,18 @@ QDateTimeEdit - am am - AM AM - pm pm - PM PM @@ -1598,17 +1288,14 @@ QDeclarativeAbstractAnimation - Cannot animate non-existent property "%1" Nie można animować nieistniejącej właściwości "%1" - Cannot animate read-only property "%1" Nie można animować właściwości (tylko do odczytu): "%1" - Animation is an abstract class "Animation" jest klasą abstrakcyjną @@ -1616,7 +1303,6 @@ QDeclarativeAnchorAnimation - Cannot set a duration of < 0 Nie można ustawić ujemnego czasu trwania @@ -1624,67 +1310,50 @@ QDeclarativeAnchors - Possible anchor loop detected on fill. Wykryto możliwe zapętlenie dla kotwicy "fill". - Possible anchor loop detected on centerIn. Wykryto możliwe zapętlenie dla kotwicy "centerIn". - - - - Cannot anchor to an item that isn't a parent or sibling. Nie można doczepić kotwicy do elementu który nie jest rodzicem ani rodzeństwem. - Possible anchor loop detected on vertical anchor. Wykryto możliwe zapętlenie dla pionowej kotwicy. - Possible anchor loop detected on horizontal anchor. Wykryto możliwe zapętlenie dla poziomej kotwicy. - Cannot specify left, right, and hcenter anchors. Nie można jednocześnie podać lewej, prawej i centralnej poziomej kotwicy. - - Cannot anchor to a null item. Nie można doczepić kotwicy do zerowego elementu. - Cannot anchor a horizontal edge to a vertical edge. Nie można doczepić poziomej krawędzi do pionowej. - - Cannot anchor item to self. Nie można doczepić kotwicy do tego samego elementu. - Cannot specify top, bottom, and vcenter anchors. Nie można jednocześnie podać górnej, dolnej i centralnej pionowej kotwicy. - Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. Bazowa kotwica nie może być użyta w połączeniu z górną, dolną lub centralną pionową kotwicą. - Cannot anchor a vertical edge to a horizontal edge. Nie można doczepić pionowej krawędzi do poziomej. @@ -1692,7 +1361,6 @@ QDeclarativeAnimatedImage - Qt was built without support for QMovie Qt zostało zbudowane bez obsługi QMovie @@ -1700,7 +1368,6 @@ QDeclarativeBehavior - Cannot change the animation assigned to a Behavior. Nie można zmienić animacji przypisanej do "Zachowania". @@ -1708,7 +1375,6 @@ QDeclarativeBinding - Binding loop detected for property "%1" Zapętlenie powiązania dla właściwości "%1" @@ -1716,7 +1382,6 @@ QDeclarativeCompiledBindings - Binding loop detected for property "%1" Zapętlenie powiązania dla właściwości "%1" @@ -1724,37 +1389,26 @@ QDeclarativeCompiler - - - - - - Invalid property assignment: "%1" is a read-only property Niepoprawne przypisanie wartości: "%1" jest właściwością tylko do odczytu - Invalid property assignment: unknown enumeration Niepoprawne przypisanie wartości: nieznana wartość wyliczeniowa - Invalid property assignment: string expected Niepoprawne przypisanie wartości: oczekiwano ciągu - Invalid property assignment: url expected Niepoprawne przypisanie wartości: oczekiwano url - Invalid property assignment: unsigned int expected Niepoprawne przypisanie wartości: oczekiwano liczby naturalnej - Invalid property assignment: int expected Niepoprawne przypisanie wartości: oczekiwano liczby całkowitej @@ -1767,356 +1421,278 @@ Niepoprawne przypisanie wartości: oczekiwano liczby zmiennoprzecinkowej podwójnej precyzji - - Invalid property assignment: number expected Niepoprawne przypisanie wartości: oczekiwano liczby - Invalid property assignment: color expected Niepoprawne przypisanie wartości: oczekiwano koloru - Invalid property assignment: date expected Niepoprawne przypisanie wartości: oczekiwano daty - Invalid property assignment: time expected Niepoprawne przypisanie wartości: oczekiwano czasu - Invalid property assignment: datetime expected Niepoprawne przypisanie wartości: oczekiwano daty i czasu - Invalid property assignment: point expected Niepoprawne przypisanie wartości: oczekiwano punktu - Invalid property assignment: size expected Niepoprawne przypisanie wartości: oczekiwano rozmiaru - Invalid property assignment: rect expected Niepoprawne przypisanie wartości: oczekiwano prostokąta - Invalid property assignment: boolean expected Niepoprawne przypisanie wartości: oczekiwano wartości boolowskiej - Invalid property assignment: 3D vector expected - Niepoprawne przypisanie wartości: oczekiwano wektoru 3D - - - + Niepoprawne przypisanie wartości: oczekiwano wektora 3D + + Invalid property assignment: unsupported type "%1" Niepoprawne przypisanie wartości: nieobsługiwany typ "%1" - Element is not creatable. Nie można utworzyć elementu ("creatable" wyłączone). - Component elements may not contain properties other than id Elementy komponentu nie mogą posiadać właściwości innych niż "id" - Invalid component id specification Niepoprawna specyfikacja "id" komponentu - - id is not unique Wartość "id" nie jest unikatowa - Invalid component body specification Niepoprawna specyfikacja "body" komponentu - Component objects cannot declare new properties. Instancje komponentu nie mogą deklarować nowych właściwości. - Component objects cannot declare new signals. Instancje komponentu nie mogą deklarować nowych sygnałów. - Component objects cannot declare new functions. Instancje komponentu nie mogą deklarować nowych funkcji. - Cannot create empty component specification Nie można utworzyć pustej specyfikacji komponentu - Incorrectly specified signal assignment Przypisanie sygnału błędnie podane - Cannot assign a value to a signal (expecting a script to be run) Nie można przypisać wartości do sygnału (oczekiwano uruchomienia skryptu) - Empty signal assignment Przypisanie pustego sygnału - Empty property assignment Przypisanie pustej właściwości - Attached properties cannot be used here Dołączone właściwości nie mogą być tutaj użyte - - Non-existent attached object Nieistniejący dołączony obiekt - - Invalid attached object assignment Niepoprawne przypisanie dołączonego obiektu - Cannot assign to non-existent default property Nie można przypisać wartości do nieistniejącej domyślnej właściwości - - Cannot assign to non-existent property "%1" Nie można przypisać wartości do nieistniejącej właściwości "%1" - Invalid use of namespace Niepoprawne użycie przestrzeni nazw - Not an attached property name Nie jest to nazwa dołączonej właściwości - Invalid use of id property Niepoprawne użycie właściwości "id" - - Property has already been assigned a value Wartość została już przypisana do właściwości - - Invalid grouped property access Błędny dostęp do zgrupowanej właściwości - Cannot assign a value directly to a grouped property Nie można bezpośrednio przypisać wartości do zgrupowanej właściwości - Invalid property use Niepoprawne użycie właściwości - Property assignment expected Oczekiwano przypisania wartości - Single property assignment expected Oczekiwano przypisania pojedynczej wartości - Unexpected object assignment Nieoczekiwane przypisanie obiektu - Cannot assign object to list Nie można przypisać obiektu do listy - Can only assign one binding to lists Tylko jedno powiązanie może być przypisane do listy - Cannot assign primitives to lists Nie można przypisać elementu do listy - Cannot assign multiple values to a script property Nie można przypisać wielu wartości do skryptowej właściwości - Invalid property assignment: script expected Niepoprawne przypisanie wartości: oczekiwano skryptu - Cannot assign object to property Nie można przypisać obiektu dla właściwości - "%1" cannot operate on "%2" "%1" nie może operować na "%2" - Duplicate default property Powielona domyślna właściwość - Duplicate property name Powielona nazwa właściwości - Property names cannot begin with an upper case letter Nazwy właściwości nie mogą rozpoczynać się wielką literą - Illegal property name Niepoprawna nazwa właściwości - Duplicate signal name Powielona nazwa sygnału - Signal names cannot begin with an upper case letter Nazwy sygnałów nie mogą rozpoczynać się wielką literą - Illegal signal name Niepoprawna nazwa sygnału - Duplicate method name - Powielona nazwa medoty - - - + Powielona nazwa metody + + Method names cannot begin with an upper case letter Nazwy metod nie mogą rozpoczynać się wielką literą - Illegal method name Niepoprawna nazwa metody - Property value set multiple times Wartość właściwości ustawiona wielokrotnie - Invalid property nesting Niepoprawne zagnieżdżenie właściwości - Cannot override FINAL property Nie można nadpisać właściwości "FINAL" - Invalid property type Niepoprawny typ właściwości - Invalid empty ID Niepoprawny pusty identyfikator - IDs cannot start with an uppercase letter Identyfikatory nie mogą rozpoczynać się wielką literą - IDs must start with a letter or underscore Identyfikatory muszą rozpoczynać się literą lub znakiem podkreślenia - IDs must contain only letters, numbers, and underscores Identyfikatory mogą zawierać jedynie litery, cyfry i znaki podkreślenia - ID illegally masks global JavaScript property - - No property alias location - - Invalid alias location Niepoprawne położenie aliasu - Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> Niepoprawna referencja aliasu. Referencja aliasu musi być podana jako <id> lub <id> <property> - Invalid alias reference. Unable to find id "%1" Niepoprawna referencja aliasu. Nie można odnaleźć identyfikatora "%1" @@ -2124,7 +1700,6 @@ QDeclarativeComponent - Invalid empty URL Niepoprawny pusty URL @@ -2132,23 +1707,18 @@ QDeclarativeCompositeTypeManager - - Resource %1 unavailable Zasób %1 nie jest dostępny - Namespace %1 cannot be used as a type Przestrzeń nazw %1 nie może być użyta jako typ - %1 %2 %1 %2 - Type %1 unavailable Typ %1 nie jest dostępny @@ -2156,23 +1726,18 @@ QDeclarativeConnections - - Cannot assign to non-existent property "%1" Nie można przypisać wartości do nieistniejącej właściwości "%1" - Connections: nested objects not allowed Połączenia: zagnieżdżone obiekty nie są dozwolone - Connections: syntax error Połączenia: błąd składni - Connections: script expected Połączenia: oczekiwano skryptu @@ -2180,33 +1745,26 @@ QDeclarativeEngine - executeSql called outside transaction() "executeSql" zawołane na zewnątrz "transation()" - Read-only Transaction Transakcja tylko do odczytu - Version mismatch: expected %1, found %2 Niezgodność wersji: oczekiwano %1, znaleziono %2 - SQL transaction failed Transakcja SQL zakończona błędem - transaction: missing callback - - SQL: database version mismatch SQL: niezgodność wersji bazy danych @@ -2214,12 +1772,10 @@ QDeclarativeFlipable - front is a write-once property "front" jest właściwością tylko do odczytu - back is a write-once property "back" jest właściwością tylko do odczytu @@ -2227,75 +1783,58 @@ QDeclarativeImportDatabase - module "%1" definition "%2" not readable definicja "%2" modułu "%1" nie może zostać odczytana - plugin cannot be loaded for module "%1": %2 wtyczka nie może zostać załadowana dla modułu "%1": %2 - module "%1" plugin "%2" not found wtyczka "%2" modułu "%1" nie została odnaleziona - - module "%1" version %2.%3 is not installed wersja %2.%3 modułu %1 nie jest zainstalowana - module "%1" is not installed moduł "%1" nie jest zainstalowany - - "%1": no such directory "%1": brak katalogu - import "%1" has no qmldir and no namespace - - %1 is not a namespace - %1 nie jest przestrzenią nazw - - nested namespaces not allowed - zagnieżdżone przestrzenie nazw nie są dozwolone - - local directory lokalny katalog - is ambiguous. Found in %1 and in %2 jest niejednoznaczny. Znaleziono w %1 i w %2 - is ambiguous. Found in %1 in version %2.%3 and %4.%5 jest niejednoznaczny. Znaleziono w %1 w wersji %2.%3 i %4.%5 - is instantiated recursively jest zinstancjonowany rekurencyjnie - is not a type nie jest typem @@ -2303,7 +1842,6 @@ QDeclarativeKeyNavigationAttached - KeyNavigation is only available via attached properties "KeyNavigation" jest dostępny jedynie poprzez dołączone właściwości @@ -2311,7 +1849,6 @@ QDeclarativeKeysAttached - Keys is only available via attached properties "Keys" jest dostępny jedynie poprzez dołączone właściwości @@ -2319,59 +1856,46 @@ QDeclarativeListModel - remove: index %1 out of range remove: indeks %1 poza zakresem - insert: value is not an object insert: wartość nie jest obiektem - insert: index %1 out of range insert: indeks %1 poza zakresem - move: out of range move: poza zakresem - append: value is not an object append: wartość nie jest obiektem - set: value is not an object set: wartość nie jest obiektem - - set: index %1 out of range set: indeks %1 poza zakresem - - ListElement: cannot contain nested elements ListElement: nie może zawierać zagnieżdżonych elementów - ListElement: cannot use reserved "id" property ListElement: nie można używać zarezerwowanej właściwości "id" - ListElement: cannot use script for property value ListElement: nie można używać skryptu jako wartości właściwości - ListModel: undefined property '%1' ListModel: niezdefiniowana właściwość "%1" @@ -2379,7 +1903,6 @@ QDeclarativeLoader - Loader does not support loading non-visual elements. Ładowanie elementów niewizualnych nie jest obsługiwane. @@ -2387,18 +1910,14 @@ QDeclarativeParentAnimation - Unable to preserve appearance under complex transform - - Unable to preserve appearance under non-uniform scale - Unable to preserve appearance under scale of 0 @@ -2406,18 +1925,14 @@ QDeclarativeParentChange - Unable to preserve appearance under complex transform - - Unable to preserve appearance under non-uniform scale - Unable to preserve appearance under scale of 0 @@ -2425,144 +1940,110 @@ QDeclarativeParser - - - Illegal unicode escape sequence - Illegal character Niepoprawny znak - Unclosed string at end of line Niedomknięty ciąg na końcu linii - Illegal escape squence - Unclosed comment at end of file Niedomknięty komentarz na końcu linii - Illegal syntax for exponential number Niepoprawna składnia liczby o postaci wykładniczej - Identifier cannot start with numeric literal Identyfikator nie może rozpoczynać się stałą liczbową - Unterminated regular expression literal Niedokończone wyrażenie regularne - Invalid regular expression flag '%0' Niepoprawna flaga "%0" w wyrażeniu regularnym - - Unterminated regular expression backslash sequence - Unterminated regular expression class Niedokończona klasa wyrażenia regularnego - - Syntax error Błąd składni - Unexpected token `%1' Nieoczekiwany znak "%1" - - Expected token `%1' Oczekiwany znak "%1" - - - Property value set multiple times Wartość właściwości ustawiona wielokrotnie - Expected type name Oczekiwana nazwa typu - Invalid import qualifier ID - Reserved name "Qt" cannot be used as an qualifier "Qt" jest nazwą zarezerwowaną i nie może być użyta jako kwalifikator - Script import qualifiers must be unique. Kwalifikator importu skryptu musi być unikatowy. - Script import requires a qualifier Import skryptu wymaga użycia kwalifikatora - Library import requires a version Import biblioteki wymaga podania wersji - Expected parameter type Oczekiwany typ parametru - Invalid property type modifier Niepoprawny modyfikator typu właściwości - Unexpected property type modifier Nieoczekiwany modyfikator typu właściwości - Expected property type Oczekiwany typ właściwości - Readonly not yet supported "Tylko do odczytu" nie jest jeszcze obsługiwane - JavaScript declaration outside Script element Deklaracja "JavaScript" na zewnątrz elementu "Script" @@ -2570,7 +2051,6 @@ QDeclarativePauseAnimation - Cannot set a duration of < 0 Nie można ustawić ujemnego czasu trwania @@ -2578,19 +2058,14 @@ QDeclarativePixmap - Error decoding: %1: %2 Błąd dekodowania: %1: %2 - - Failed to get image from provider: %1 Pobieranie obrazka od dostawcy zakończone błędem: %1 - - Cannot open: %1 Nie można otworzyć: %1 @@ -2617,7 +2092,6 @@ QDeclarativePropertyAnimation - Cannot set a duration of < 0 Nie można ustawić ujemnego czasu trwania @@ -2625,17 +2099,14 @@ QDeclarativePropertyChanges - PropertyChanges does not support creating state-specific objects. "PropertyChanges" nie obsługuje tworzenia obiektów charakterystycznych dla stanów. - Cannot assign to non-existent property "%1" Nie można przypisać wartości do nieistniejącej właściwości "%1" - Cannot assign to read-only property "%1" Nie można przypisać wartości do właściwości (tylko do odczytu): "%1" @@ -2643,13 +2114,10 @@ QDeclarativeTextInput - - Could not load cursor delegate - Could not instantiate cursor delegate @@ -2657,47 +2125,38 @@ QDeclarativeVME - Unable to create object of type %1 Nie można utworzyć obiektu typu %1 - Cannot assign value %1 to property %2 Nie można przypisać wartości %1 do właściwości %2 - Cannot assign object type %1 with no default method Nie można przypisać obiektu typu %1 który nie posiada domyślnej metody - Cannot connect mismatched signal/slot %1 %vs. %2 Nie można podłączyć niezgodnych sygnałów / slotów (%1 i %2) - Cannot assign an object to signal property %1 - Cannot assign object to list Nie można przypisać obiektu do listy - Cannot assign object to interface property - Unable to create attached object Nie można utworzyć dołączonego obiektu - Cannot set properties on %1 as it is null Nie można ustawić właściwości dla %1 ponieważ jest on zerowy @@ -2705,7 +2164,6 @@ QDeclarativeVisualDataModel - Delegate component must be Item type. @@ -2713,8 +2171,6 @@ QDeclarativeXmlListModel - - Qt was built without support for xmlpatterns Qt zostało zbudowane bez obsługi xmlpatterns @@ -2722,7 +2178,6 @@ QDeclarativeXmlListModelRole - An XmlRole query must not start with '/' Zapytanie XmlRole nie może rozpoczynać się od "/" @@ -2730,7 +2185,6 @@ QDeclarativeXmlRoleList - An XmlListModel query must start with '/' or "//" Zapytanie XmlListModel nie może rozpoczynać się od "/" ani od "//" @@ -2738,17 +2192,14 @@ QDial - QDial QDial - SpeedoMeter Miernik prędkości - SliderHandle Uchwyt suwaka @@ -2756,12 +2207,10 @@ QDialog - What's This? Co to jest? - Done Zrobione @@ -2769,124 +2218,98 @@ QDialogButtonBox - Abort Przerwij - Apply Zastosuj - &Save &Zachowaj - Cancel Anuluj - &Cancel &Anuluj - Close Zamknij - &Close &Zamknij - Close without Saving Zamknij bez zapisywania - Discard Odrzuć - Don't Save Nie zachowuj - Help Pomoc - Ignore Zignoruj - &No &Nie - N&o to All Ni&e dla wszystkich - - - OK OK - Open Otwórz - Reset Resetuj - Restore Defaults Przywróć ustawienia - Retry Ponów - Save Zachowaj - Save All Zachowaj wszystko - &Yes &Tak - Yes to &All Ta&k dla wszystkich - &OK &OK @@ -2894,28 +2317,23 @@ QDirModel - Date Modified Data modyfikacji - Kind Match OS X Finder Typ - Name Nazwa - Size Rozmiar - Type All other platforms Rodzaj @@ -2924,17 +2342,14 @@ QDockWidget - Close Zamknij - Dock Zadokuj - Float Uwolnij @@ -2942,12 +2357,10 @@ QDoubleSpinBox - More Więcej - Less Mniej @@ -2955,27 +2368,22 @@ QErrorMessage - Debug Message: Komunikat dla programisty: - Fatal Error: Błąd krytyczny: - &OK &OK - &Show this message again &Pokaż ten komunikat ponownie - Warning: Ostrzeżenie: @@ -2983,38 +2391,30 @@ QFile - - Destination file exists Plik wyjściowy już istnieje - Will not rename sequential file using block copy Nie można zmienić nazwy pliku sekwencyjnego używając kopiowania blokowego - Cannot remove source file Nie można usunąć oryginalnego pliku - Cannot open %1 for input Nie można otworzyć pliku wejściowego %1 - Cannot open for output Nie można otworzyć pliku wyjściowego - Failure to write block Nie można zapisać bloku - Cannot create %1 for output Nie można utworzyć pliku wyjściowego %1 @@ -3022,22 +2422,18 @@ QFileDialog - %1 already exists. Do you want to replace it? %1 już istnieje. Czy chcesz zamienić? - '%1' is write protected. Do you want to delete it anyway? '%1' jest zabezpieczony przed zapisem. Czy na pewno chcesz go skasować? - - %1 Directory not found. Please verify the correct directory name was given. @@ -3046,7 +2442,6 @@ Sprawdź podaną nazwę katalogu. - %1 File not found. Please verify the correct file name was given. @@ -3055,237 +2450,178 @@ Proszę o sprawdzenie podanej nazwy pliku. - Are sure you want to delete '%1'? Czy na pewno chcesz skasować '%1'? - Recent Places Ostatnie miejsca - - Back Powrót - Could not delete directory. Nie można skasować katalogu. - &Delete &Skasuj - - Detail View Szczegóły - Directories Katalogi - - Directory: Katalog: - Drive Urządzenie - - File Plik - File Folder Match Windows Explorer Katalog - Folder All other platforms Katalog - Alias Mac OS X Finder Alias - Shortcut All other platforms Skrót - - Files of type: Pliki rodzaju: - - List View Lista - My Computer Mój komputer - - - &Open &Otwórz - - Parent Directory Katalog wyżej - &Rename &Zmień nazwę - - &Save &Zachowaj - Show &hidden files Pokaż &ukryte pliki - Unknown Nieznany - Open Otwórz - Save As Zachowaj jako - Find Directory Znajdź katalog - All Files (*.*) Wszystkie pliki (*.*) - Show Pokaż - - Forward Do przodu - New Folder Nowy katalog - &New Folder &Nowy katalog - - &Choose &Wybierz - Remove Usuń - - All Files (*) Wszystkie pliki (*) - - File &name: Nazwa &pliku: - - Look in: Szukaj w: - - Create New Folder Utwórz nowy katalog - Go back Wróć - Go forward Przejdź dalej - Go to the parent directory Przejdź do katalogu wyżej - Create a New Folder Utwórz nowy katalog - Change to list view mode Pokaż listę - Change to detail view mode Pokaż szczegóły @@ -3293,83 +2629,64 @@ QFileSystemModel - - %1 TB %1 TB - - %1 GB %1 GB - - %1 MB %1 MB - - %1 KB %1 KB - %1 bytes %1 bajtów - Invalid filename Niepoprawna nazwa pliku - <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. <b>Nazwa "%1" nie może zostać użyta.</b><p>Spróbuj użyć nowej nazwy z mniejszą liczbą znaków lub bez znaków przystankowych. - Name Nazwa - Size Rozmiar - Kind Match OS X Finder Typ - Type All other platforms Rodzaj - Date Modified Data modyfikacji - My Computer Mój komputer - Computer Komputer - %1 byte(s) %1 bajt(ów) @@ -3377,223 +2694,172 @@ QFontDatabase - - Normal Normalny - - - Bold Pogrubiony - - Demi Bold Na wpół pogrubiony - - - Black it's about font weight Bardzo gruby - Demi Na wpół - - Light it's about font weight Cienki - - Italic Kursywa - - Oblique Pochyły - Any Każdy - Latin Łaciński - Greek Grecki - Cyrillic Cyrylica - Armenian Ormiański - Hebrew Hebrajski - Arabic Arabski - Syriac Syryjski - Thaana Thaana - Devanagari Devanagari - Bengali Bengalski - Gurmukhi Gurmukhi - Gujarati Gudżaracki - Oriya Orija - Tamil Tamilski - Telugu Telugu - Kannada Kannada - Malayalam Malajalam - Sinhala Syngaleski - Thai Tajski - Lao Laotański - Tibetan Tybetański - Myanmar Birmański - Georgian Gruziński - Khmer Khmerski - Simplified Chinese Uproszczony chiński - Traditional Chinese Tradycyjny chiński - Japanese Japoński - Korean Koreański - Vietnamese Wietnamski - Symbol Symboliczny - Ogham Ogamiczny - Runic Runiczny - N'Ko N'Ko @@ -3601,47 +2867,38 @@ QFontDialog - Effects Efekty - &Font &Czcionka - Font st&yle St&yl czcionki - Sample Przykład - Select Font Wybierz czcionkę - &Size &Rozmiar - Stri&keout Pr&zekreślenie - &Underline &Podkreślenie - Wr&iting System Sys&tem pisania @@ -3649,143 +2906,102 @@ QFtp - - Changing directory failed: %1 Zmiana katalogu zakończona błędem: %1 - Connected to host Podłączony do hosta - - - Connected to host %1 Podłączony do hosta %1 - - Connecting to host failed: %1 Podłączanie do hosta zakończone błędem: %1 - - - Connection closed Połączenie zamknięte - - Connection refused for data connection Połączenie do przesyłu danych odrzucone - - Connection refused to host %1 Połączenie do hosta %1 odrzucone - Connection to %1 closed Połączenie do %1 zakończone - - Creating directory failed: %1 Tworzenie katalogu zakończone błędem: %1 - - Downloading file failed: %1 Pobieranie pliku zakończone błędem: %1 - Host %1 found Host %1 znaleziony - - Host %1 not found Host %1 nie znaleziony - Host found Host znaleziony - - Listing directory failed: %1 Listowanie katalogu zakończone błędem: %1 - - Login failed: %1 Logowanie zakończone błędem: %1 - - Not connected Nie podłączony - Connection timed out to host %1 Przekroczony czas połączenia do hosta %1 - - Removing directory failed: %1 Usuwanie katalogu zakończone błędem: %1 - - Removing file failed: %1 Usuwanie pliku zakończone błędem: %1 - - - - Unknown error Nieznany błąd - - Uploading file failed: %1 Wysyłanie pliku zakończone błędem: @@ -3795,12 +3011,10 @@ QHostInfo - Unknown error Nieznany błąd - No host name given Nie podano nazwy hosta @@ -3808,37 +3022,22 @@ QHostInfoAgent - - - - Host not found Host nie znaleziony - - - - Unknown address type Nieznany typ adresu - - - Unknown error Nieznany błąd - - No host name given Nie podano nazwy hosta - - Invalid hostname Niepoprawna nazwa hosta @@ -3846,153 +3045,110 @@ QHttp - Connected to host Podłączony do hosta - Connected to host %1 Podłączony do hosta %1 - - Connection closed Połączenie zakończone - - Connection refused Połączenie odrzucone - Connection to %1 closed Połączenie do %1 zamknięte - Host %1 found Host %1 znaleziony - - - Host %1 not found Host %1 nie znaleziony - Host found Host znaleziony - - HTTP request failed Komenda HTTP zakończona błędem - - - - Invalid HTTP chunked body Niepoprawne ciało HTTP - - Invalid HTTP response header Niepoprawny nagłówek odpowiedzi HTTP - - No server set to connect to Brak serwera do podłączenia - - Request aborted Komenda przerwana - - Server closed connection unexpectedly Serwer nieoczekiwanie zakończył połączenie - - - - Unknown error Nieznany błąd - HTTPS connection requested but SSL support not compiled in Zażądano połączenia HTTPS lecz obsługa SSL nie jest wkompilowana - - Wrong content length Błędna długość zawartości - Unknown authentication method Nieznana metoda autoryzacji - Proxy authentication required Wymagana autoryzacja pośrednika - Authentication required Wymagana autoryzacja - Error writing response to device Błąd zapisywania odpowiedzi do urządzenia - Proxy requires authentication Pośrednik wymaga autoryzacji - Host requires authentication Host wymaga autoryzacji - Data corrupted Dane uszkodzone - Unknown protocol specified Podano nieznany protokół - SSL handshake failed Nawiązanie sesji SSL zakończone błędem - Connection refused (or timed out) Połączenie odrzucone (przekroczony czas połączenia) @@ -4000,47 +3156,38 @@ QHttpSocketEngine - Did not receive HTTP response from proxy Nie odebrano odpowiedzi HTTP od pośrednika - Error parsing authentication request from proxy Błąd parsowania żądania autoryzacji od pośrednika - Authentication required Wymagana autoryzacja - Proxy denied connection Pośrednik odmówił połączenia - Error communicating with HTTP proxy Błąd podczas komunikacji z pośrednikiem HTTP - Proxy server not found Nie znaleziono serwera pośredniczącego - Proxy connection refused Odmowa połączenia z pośrednikiem - Proxy server connection timed out Przekroczony czas połączenia do serwera pośredniczącego - Proxy connection closed prematurely Przedwczesne zakończenie połączenia z pośrednikiem @@ -4048,22 +3195,18 @@ QIBaseDriver - Could not start transaction Nie można rozpocząć transakcji - Error opening database Błąd otwierania bazy danych - Unable to commit transaction Nie można dokonać transakcji - Unable to rollback transaction Nie można wycofać transakcji @@ -4071,89 +3214,70 @@ QIBaseResult - Could not allocate statement Nie można zaallokować polecenia - - Could not describe input statement Nie można opisać polecenia wejściowego - Could not describe statement Nie można opisać polecenia - Could not fetch next item Nie można pobrać kolejnego elementu - - Could not find array Nie można odnaleźć tablicy - Could not get array data Nie można pobrać danych z tablicy - Could not get query info Nie można pobrać informacji o zapytaniu - Could not get statement info Nie można pobrać informacji o poleceniu - Could not prepare statement Nie można przygotować polecenia - Could not start transaction Nie można rozpocząć transakcji - Unable to close statement Nie można zamknąć polecenia - Unable to commit transaction Nie można dokonać transakcji - Unable to create BLOB Nie można utworzyć obiektu typu BLOB - Unable to execute query Nie można wykonać zapytania - Unable to open BLOB Nie można otworzyć obiektu typu BLOB - Unable to read BLOB Nie można odczytać obiektu typu BLOB - Unable to write BLOB Nie można zapisać obiektu typu BLOB @@ -4161,27 +3285,22 @@ QIODevice - No space left on device Brak wolnego miejsca na urządzeniu - No such file or directory Brak pliku lub katalogu - Permission denied Brak uprawnień - Too many open files Zbyt wiele otwartych plików - Unknown error Nieznany błąd @@ -4189,32 +3308,26 @@ QInputContext - Mac OS X input method Metoda wprowadzania Mac OS X - Windows input method Metoda wprowadzania Windows - XIM XIM - FEP FEP - XIM input method Metoda wprowadzania XIM - S60 FEP input method Metoda wprowadzania S60 FEP @@ -4222,7 +3335,6 @@ QInputDialog - Enter a value: Podaj wartość: @@ -4230,67 +3342,50 @@ QLibrary - Could not mmap '%1': %2 Nie można wykonać przypisania '%1': %2 - Could not unmap '%1': %2 Nie można usunąć przypisania '%1': %2 - Plugin verification data mismatch in '%1' Niezgodność podczas weryfikacji danych we wtyczce "%1" - The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] Wtyczka '%1' używa niepoprawnej wersji biblioteki QT. (%2.%3.%4) [%5] - The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" Wtyczka '%1' używa niepoprawnej wersji biblioteki QT. Oczekiwano klucza "%2", uzyskano "%3" - Unknown error Nieznany błąd - - - The shared library was not found. Biblioteka współdzielona niedostępna. - The file '%1' is not a valid Qt plugin. Plik "%1" nie jest poprawną wtyczką Qt. - The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) Wtyczka "%1" używa innej wersji biblioteki Qt. (Nie można łączyć bibliotek zwykłych i debugowych.) - - Cannot load library %1: %2 Nie można załadować biblioteki %1: %2 - - Cannot unload library %1: %2 Nie można zwolnić biblioteki %1: %2 - - Cannot resolve symbol "%1" in %2: %3 Nie można zidentyfikować symbolu "%1" w %2: %3 @@ -4298,37 +3393,30 @@ QLineEdit - &Copy S&kopiuj - Cu&t W&ytnij - Delete Skasuj - &Paste &Wklej - &Redo &Przywróć - Select All Zaznacz wszystko - &Undo &Cofnij @@ -4336,23 +3424,18 @@ QLocalServer - - %1: Name error %1: Błąd nazwy - %1: Permission denied %1: Brak uprawnień - %1: Address in use %1: Adres użyty - %1: Unknown error %2 %1: Nieznany błąd %2 @@ -4360,70 +3443,46 @@ QLocalSocket - - %1: Connection refused %1: Odmowa połączenia - - %1: Remote closed %1: Drugi koniec odłączony - - - - %1: Invalid name %1: Niepoprawna nazwa - - %1: Socket access error %1: Błąd dostępu do gniazda - - %1: Socket resource error %1: Błąd zasobów gniazda - - %1: Socket operation timed out %1: Przekroczony czas operacji gniazda - - %1: Datagram too large %1: Za duży datagram - - - %1: Connection error %1: Błąd połączenia - - %1: The socket operation is not supported %1: Operacja nie jest obsługiwana przez gniazdo - %1: Unknown error %1: Nieznany błąd - - %1: Unknown error %2 %1: Nieznany błąd %2 @@ -4431,27 +3490,22 @@ QMYSQLDriver - Unable to begin transaction Nie można rozpocząć transakcji - Unable to commit transaction Nie można potwierdzić transakcji - Unable to connect Nie można nawiązać połączenia - Unable to open database ' Nie można otworzyć bazy danych ' - Unable to rollback transaction Nie można wycofać transakcji @@ -4459,60 +3513,46 @@ QMYSQLResult - - Unable to bind outvalues Nie można powiązać wartości zewnętrznych - Unable to bind value Nie można powiązać wartości - Unable to execute query Nie można wykonać zapytania - Unable to execute statement Nie można wykonać polecenia - - Unable to fetch data Nie można pobrać danych - - Unable to prepare statement Nie można przygotować polecenia - Unable to reset statement Nie można skasować polecenia - Unable to store result Nie można zachować wyników - Unable to store statement results Nie można zachować wyników polecenia - Unable to execute next query Nie można wykonać następnego zapytania - Unable to store next result Nie można zachować następnego wyniku @@ -4520,7 +3560,6 @@ QMdiArea - (Untitled) (Nienazwany) @@ -4528,92 +3567,74 @@ QMdiSubWindow - %1 - [%2] %1 - [%2] - Close Zamknij - Minimize Zminimalizuj - Restore Down Przywróć pod spód - &Restore &Przywróć - &Move Prze&nieś - &Size &Rozmiar - Mi&nimize Zmi&nimalizuj - Ma&ximize Zma&ksymalizuj - Stay on &Top Pozostaw na &wierzchu - &Close &Zamknij - Maximize Zmaksymalizuj - Unshade Rozwiń - Shade Zwiń - Restore Przywróć - Help Pomoc - Menu Menu - - [%1] - [%1] @@ -4621,21 +3642,14 @@ QMenu - - Close Zamknij - - - Execute Wykonaj - - Open Otwórz @@ -4643,7 +3657,6 @@ QMenuBar - Actions Akcje @@ -4651,40 +3664,30 @@ QMessageBox - About Qt Informacje o Qt - Help Pomoc - Hide Details... Ukryj szczegóły... - - - - OK OK - <h3>About Qt</h3><p>This program uses Qt version %1.</p> <h3>Informacje o Qt</h3><p> Ten program używa Qt w wersji %1.</p> - <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> <p>Qt jest zestawem narzędzi programistycznych dedykowanym dla języka C++. Służy on do opracowywania aplikacji międzyplatformowych.</p><p>Qt umożliwia jednoźródłowe przenoszenie między systemami MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux i wszystkimi głównymi wersjami komercyjnymi systemu Unix. Środowisko Qt jest dostępne dla urządzeń wbudowanych opartych na systemie Linux ( Qt dla wbudowanego systemu Linux) oraz Windows CE.</p><p>Zestaw Qt jest dostępny w trzech różnych opcjach licencjonowania stworzonych w celu zadowolenia naszych różnych użytkowników.</p><p>Qt podlegający licencji zgodnie z naszą komercyjną umową licencyjną jest odpowiedni do opracowywania oprogramowań własnościowych/komercyjnych, dzięki czemu kod źródłowy nie jest udostępniany osobom trzecim. W przeciwnym razie zestaw Qt jest niezgodny z warunkami licencji GNU LGPL w wersji 2.1 lub GNU GPL w wersji 3.0.</p><p>Środowisko Qt objęte licencją GNU LGPL w wersji 2.1 nadaje się do tworzenia aplikacji Qt (własnościowych lub oprogramowań otwartych) tylko wtedy, gdy przestrzegane są warunki licencji GNU LGPL w wersji 2.1.</p><p>Qt objęty Powszechną Licencją Publiczną GNU w wersji 3.0 jest odpowiedni do opracowywania aplikacji QT, aby móc korzystać z aplikacji w połączeniu z oprogramowaniem podlegającym warunkom licencji GNU GPL w wersji 3.0 lub aby przestrzegać warunków licencji GNU GPL w wersji 3.0.</p><p>Więcej informacji na temat licencji Qt można znaleźć na stronie <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a>.</p><p>Copyright (C) 2010 Nokia Corporation i/lub oddziały firmy.</p><p>Qt jest produktem firmy Nokia. Dodatkowe informacje znajdują się na stronie <a href="http://qt.nokia.com/">qt.nokia.com</a> </p> - Show Details... Pokaż szczegóły... @@ -4692,7 +3695,6 @@ QMultiInputContext - Select IM Wybierz metodę wprowadzania @@ -4700,12 +3702,10 @@ QMultiInputContextPlugin - Multiple input method switcher Przełącznik metody wprowadzania - Multiple input method switcher that uses the context menu of the text widgets Przełącznik metody wprowadzania, który w widżetach tekstowych używa podręcznego menu @@ -4713,132 +3713,106 @@ QNativeSocketEngine - Another socket is already listening on the same port Inne gniazdo nasłuchuje już na tym porcie - Attempt to use IPv6 socket on a platform with no IPv6 support Próba użycia IPv6 na platformie bez obsługi IPv6 - Connection refused Połączenie odrzucone - Connection timed out Przekroczony czas połączenia - Datagram was too large to send Datagram za długi do wysłania - Host unreachable Komputer niedostępny - Invalid socket descriptor Niepoprawny opis gniazda - Network error Błąd sieci - Network operation timed out Przekroczony czas operacji sieciowej - Network unreachable Sieć niedostępna - Operation on non-socket Nieprawidłowa operacja na gnieździe - Out of resources Zasoby wyczerpane - Permission denied Brak uprawnień - Protocol type not supported Nieobsługiwany typ protokołu - The address is not available Adres nie jest dostępny - The address is protected Adres jest zabezpieczony - The bound address is already in use Adres jest aktualnie w użyciu - The remote host closed the connection Zdalny host zakończył połączenie - Unable to initialize broadcast socket Nie można uruchomić gniazda rozsyłającego - Unable to initialize non-blocking socket Nie można uruchomić gniazda w nieblokującym trybie - Unable to receive a message Nie można odebrać wiadomości - Unable to send a message Nie można wysłać wiadomości - Unable to write Nie można zapisać - Unknown error Nieznany błąd - Unsupported socket operation Nieobsługiwana operacja gniazda - The proxy type is invalid for this operation Typ pośrednika nie jest poprawny dla tej operacji @@ -4846,7 +3820,6 @@ QNetworkAccessCacheBackend - Error opening %1 Błąd otwierania %1 @@ -4854,12 +3827,10 @@ QNetworkAccessDataBackend - Operation not supported on %1 Operacja nieobsługiwana na %1 - Invalid URI: %1 Niepoprawny URI: %1 @@ -4867,17 +3838,14 @@ QNetworkAccessDebugPipeBackend - Write error writing to %1: %2 Błąd w trakcie zapisywania do %1: %2 - Socket error on %1: %2 Błąd gniazda na %1: %2 - Remote host closed the connection prematurely on %1 Zdalny host przedwcześnie zakończył połączenie na %1 @@ -4885,30 +3853,22 @@ QNetworkAccessFileBackend - - Request for opening non-local file %1 Żądanie otwarcia zdalnego pliku %1 - - Error opening %1: %2 Błąd otwierania %1: %2 - Write error writing to %1: %2 Błąd w trakcie zapisywania do %1: %2 - - Cannot open %1: Path is a directory Nie można otworzyć %1: Ścieżka jest katalogiem - Read error reading from %1: %2 Błąd w trakcie czytania z %1: %2 @@ -4916,27 +3876,22 @@ QNetworkAccessFtpBackend - No suitable proxy found Nie odnaleziono odpowiedniego pośrednika - Cannot open %1: is a directory Nie można otworzyć %1: jest to katalog - Logging in to %1 failed: authentication required Błąd podczas logowania do %1: wymagana autoryzacja - Error while downloading %1: %2 Błąd podczas pobierania %1: %2 - Error while uploading %1: %2 Błąd podczas wysyłania %1: %2 @@ -4944,7 +3899,6 @@ QNetworkAccessHttpBackend - No suitable proxy found Nie odnaleziono odpowiedniego pośrednika @@ -4952,7 +3906,6 @@ QNetworkAccessManager - Network access is disabled. Dostęp do sieci wyłączony. @@ -4960,22 +3913,18 @@ QNetworkReply - Error downloading %1 - server replied: %2 Błąd podczas pobierania %1 - odpowiedź serwera: %2 - Protocol "%1" is unknown Protokół "%1" nie jest znany - Network session error. Błąd sesji sieciowej. - Temporary network failure. Chwilowy błąd w sieci. @@ -4983,8 +3932,6 @@ QNetworkReplyImpl - - Operation canceled Operacja anulowana @@ -4992,7 +3939,6 @@ QNetworkSession - Invalid configuration. Niepoprawna konfiguracja. @@ -5000,47 +3946,34 @@ QNetworkSessionPrivateImpl - Roaming error Błąd roamingu - Session aborted by user or system Sesja przerwana przez użytkownika lub system - Unidentified Error Niezidentyfikowany błąd - - Unknown session error. Nieznany błąd sesji. - - The session was aborted by the user or system. Sesja została przerwana przez użytkownika lub system. - - The requested operation is not supported by the system. Zażądana operacja nie jest obsługiwana przez system. - - The specified configuration cannot be used. Podana konfiguracja nie może być użyta. - - Roaming was aborted or is not possible. Roaming przerwany albo niemożliwy. @@ -5048,28 +3981,23 @@ QOCIDriver - Unable to initialize QOCIDriver Nie można dokonać inicjalizacji - Unable to logon Nie można się zalogować - Unable to begin transaction Nie można rozpocząć transakcji - Unable to commit transaction Nie można dokonać transakcji - Unable to rollback transaction Nie można wycofać transakcji @@ -5077,44 +4005,34 @@ QOCIResult - - - Unable to bind column for batch execute Nie można powiązać kolumny dla wykonania zestawu poleceń - Unable to execute batch statement Nie można wykonać polecenia wsadowego - Unable to goto next Nie można przejść do kolejnego wiersza danych - Unable to alloc statement Nie można przydzielić miejsca na polecenie - Unable to prepare statement Nie można przygotować polecenia - Unable to get statement type Nie można pobrać typu polecenia - Unable to bind value Nie można powiązać wartości - Unable to execute statement Nie można wykonać polecenia @@ -5122,32 +4040,26 @@ QODBCDriver - Unable to commit transaction Nie można potwierdzić transakcji - Unable to connect Nie można nawiązać połączenia - Unable to disable autocommit Nie można wyłączyć trybu automatycznego dokonywania transakcji - Unable to enable autocommit Nie można włączyć trybu automatycznego dokonywania transakcji - Unable to rollback transaction Nie można wycofać transakcji - Unable to connect - Driver doesn't support all functionality required Nie można nawiązać połączenia - sterownik nie obsługuje całej potrzebnej funkcjonalności @@ -5155,51 +4067,38 @@ QODBCResult - - QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Nie można ustawić 'SQL_CURSOR_STATIC' jako atrybutu polecenia. Proszę sprawdzić konfiguracje sterownika ODBC - Unable to bind variable Nie można powiązać zmiennej - - Unable to execute statement Nie można wykonać polecenia - Unable to fetch next Nie można pobrać kolejnych danych - Unable to prepare statement Nie można przygotować polecenia - - - Unable to fetch last Nie można pobrać ostatnich danych - Unable to fetch Nie można pobrać - Unable to fetch first Nie można pobrać pierwszych danych - Unable to fetch previous Nie można pobrać poprzednich danych @@ -5207,19 +4106,14 @@ QObject - - PulseAudio Sound Server Serwer dźwięku PulseAudio - "%1" duplicates a previous role name and will be disabled. - - invalid query: "%1" Niepoprawne zapytanie: "%1" @@ -5227,12 +4121,10 @@ QPPDOptionsModel - Name Nazwa - Value Wartość @@ -5240,32 +4132,26 @@ QPSQLDriver - Could not begin transaction Nie można rozpocząć transakcji - Could not commit transaction Nie można potwierdzić transakcji - Could not rollback transaction Nie można wycofać transakcji - Unable to connect Nie można nawiązać połączenia - Unable to subscribe Nie można wykonać subskrypcji - Unable to unsubscribe Nie można zrezygnować z subskrypcji @@ -5273,12 +4159,10 @@ QPSQLResult - Unable to create query Nie można utworzyć zapytania - Unable to prepare statement Nie można przygotować polecenia @@ -5286,102 +4170,82 @@ QPageSetupWidget - Centimeters (cm) Centymetry (cm) - Millimeters (mm) Milimetry (mm) - Inches (in) Cale (in) - Points (pt) Punkty (pt) - Form Formularz - Paper Papier - Page size: Rozmiar strony: - Width: Szerokość: - Height: Wysokość: - Paper source: Źródło papieru: - Orientation Położenie - Portrait Portret - Landscape Pejzaż - Reverse landscape Odwrócony pejzaż - Reverse portrait Odwrócony portret - Margins Marginesy - top margin Górny margines - left margin Lewy margines - right margin Prawy margines - bottom margin Dolny margines @@ -5389,12 +4253,10 @@ QPluginLoader - Unknown error Nieznany błąd - The plugin was not loaded. Wtyczka nie została załadowana. @@ -5402,433 +4264,344 @@ QPrintDialog - A0 (841 x 1189 mm) A0 (841 x 1189 mm) - A1 (594 x 841 mm) A1 (594 x 841 mm) - A2 (420 x 594 mm) A2 (420 x 594 mm) - A3 (297 x 420 mm) A3 (297 x 420 mm) - A4 (210 x 297 mm, 8.26 x 11.7 inches) A4 (210 x 297 mm, 8.26 x 11.7 cali) - A5 (148 x 210 mm) A5 (148 x 210 mm) - A6 (105 x 148 mm) A6 (105 x 148 mm) - A7 (74 x 105 mm) A7 (74 x 105 mm) - A8 (52 x 74 mm) A8 (52 x 74 mm) - A9 (37 x 52 mm) A9 (37 x 52 mm) - Print current page Wydrukuj bieżącą stronę - - Aliases: %1 Aliasy: %1 - B0 (1000 x 1414 mm) B0 (1000 x 1414 mm) - B1 (707 x 1000 mm) B1 (707 x 1000 mm) - B10 (31 x 44 mm) B10 (31 x 44 mm) - B2 (500 x 707 mm) B2 (500 x 707 mm) - B3 (353 x 500 mm) B3 (353 x 500 mm) - B4 (250 x 353 mm) B4 (250 x 353 mm) - B5 (176 x 250 mm, 6.93 x 9.84 inches) B5 (176 x 250 mm, 6.93 x 9.84 cali) - B6 (125 x 176 mm) B6 (125 x 176 mm) - B7 (88 x 125 mm) B7 (88 x 125 mm) - B8 (62 x 88 mm) B8 (62 x 88 mm) - B9 (44 x 62 mm) B9 (44 x 62 mm) - C5E (163 x 229 mm) C5E (163 x 229 mm) - DLE (110 x 220 mm) DLE (110 x 220 mm) - locally connected podłączony lokalnie - OK OK - Print all Drukuj wszystko - Print range Drukuj zakres - - unknown nieznany - Executive (7.5 x 10 inches, 191 x 254 mm) Executive (7.5 x 10 cali, 191 x 254 mm) - Folio (210 x 330 mm) Folio (210 x 330 mm) - Ledger (432 x 279 mm) Ledger (432 x 279 mm) - Legal (8.5 x 14 inches, 216 x 356 mm) Legal (8.5 x 14 cali, 216 x 356 mm) - Letter (8.5 x 11 inches, 216 x 279 mm) Letter (8.5 x 11 cali, 216 x 279 mm) - Tabloid (279 x 432 mm) Tabloid (279 x 432 mm) - US Common #10 Envelope (105 x 241 mm) US Common #10 Envelope (105 x 241 mm) - - - Print Drukowanie - Print To File ... Drukuj do pliku ... - File %1 is not writable. Please choose a different file name. Plik %1 jest plikiem tylko do odczytu. Proszę wybrać inną nazwę pliku. - %1 already exists. Do you want to overwrite it? %1 już istnieje. Czy chcesz nadpisać? - %1 is a directory. Please choose a different file name. %1 jest katalogiem. Proszę wybrać inną nazwę pliku. - File exists Plik istnieje - <qt>Do you want to overwrite it?</qt> <qt>Czy chcesz nadpisać?</qt> - Print selection Drukuj zaznaczone - A0 A0 - A1 A1 - A2 A2 - A3 A3 - A4 A4 - A5 A5 - A6 A6 - A7 A7 - A8 A8 - A9 A9 - B0 B0 - B1 B1 - B2 B2 - B3 B3 - B4 B4 - B5 B5 - B6 B6 - B7 B7 - B8 B8 - B9 B9 - B10 B10 - C5E C5E - DLE DLE - Executive Executive - Folio Folio - Ledger Ledger - Legal Legal - Letter Letter - Tabloid Tabloid - US Common #10 Envelope US Common #10 Envelope - Custom Niestandardowy - - &Options >> &Opcje >> - &Print Wy&drukuj - &Options << &Opcje << - Print to File (PDF) Drukuj do pliku (PDF) - Print to File (Postscript) Drukuj do pliku (Postscript) - Local file Plik lokalny - Write %1 file Zapisz %1 plik - The 'From' value cannot be greater than the 'To' value. Wartość "od" nie może być większa od wartości "do". @@ -5836,108 +4609,86 @@ QPrintPreviewDialog - %1% %1% - Print Preview Podgląd wydruku - Next page Następna strona - Previous page Poprzednia strona - First page Pierwsza strona - Last page Ostatnia strona - Fit width Dopasuj szerokość - Fit page Dopasuj stronę - Zoom in Powiększ - Zoom out Pomniejsz - Portrait Portret - Landscape Pejzaż - Show single page Pokaż pojedynczą stronę - Show facing pages Pokaż sąsiednie strony - Show overview of all pages Pokaż wszystkie strony - Print Wydrukuj - Page setup Ustawienia strony - Close Zamknij - Export to PDF Wyeksportuj do PDF - Export to PostScript Wyeksportuj do PostScript - - Page Setup Ustawienia strony @@ -5945,17 +4696,14 @@ QPrintPropertiesWidget - Form Forma - Page Strona - Advanced Zaawansowane @@ -5963,102 +4711,82 @@ QPrintSettingsOutput - Form Forma - Copies Liczba kopii - Print range Zakres wydruku - Print all Drukuj wszystko - Pages from Strony od - to do - Selection Wybrane strony - Output Settings Ustawienia wyjściowe - Copies: Kopie: - Collate Parami - Reverse Odwróć - Options Opcje - Color Mode Tryb koloru - Color Kolor - Grayscale Skala szarości - Duplex Printing Drukowanie dupleksowe - None Brak - Long side Długa strona - Short side Krótka strona - Current Page Bieżąca strona @@ -6066,47 +4794,38 @@ QPrintWidget - Form Forma - Printer Drukarka - &Name: &Nazwa: - P&roperties &Właściwości - Location: Położenie: - Preview Podgląd - Type: Typ: - Output &file: &Plik wyjściowy: - ... ... @@ -6114,62 +4833,38 @@ QProcess - - Could not open input redirection for reading Nie można otworzyć wejściowego przekierowania do odczytu - - Could not open output redirection for writing Nie można otworzyć wyjściowego przekierowania do zapisu - Resource error (fork failure): %1 Błąd zasobów (błąd forkowania): %1 - - - - - - - - - Process operation timed out Przekroczony czas operacji procesu - - - - Error reading from process Błąd odczytywania z procesu - - - Error writing to process Błąd zapisywania do procesu - Process crashed Wystąpił błąd w procesie - proces zakończony - No program defined Nie zdefiniowano programu - Process failed to start: %1 Nie można rozpocząć procesu: %1 @@ -6177,7 +4872,6 @@ QProgressDialog - Cancel Anuluj @@ -6185,7 +4879,6 @@ QPushButton - Open Otwórz @@ -6193,7 +4886,6 @@ QRadioButton - Check Zaznacz @@ -6201,57 +4893,46 @@ QRegExp - bad char class syntax niepoprawna składnia klasy znakowej - bad lookahead syntax niepoprawna składnia "lookahead" - bad repetition syntax niepoprawna składnia powtórzenia - invalid interval Niepoprawny interwał - invalid category Niepoprawna kategoria - disabled feature used użyta funkcja została wyłączona - invalid octal value niepoprawna wartość ósemkowa - met internal limit napotkano wewnętrzne ograniczenie - missing left delim brakujący lewy separator - no error occurred nie pojawił się żaden błąd - unexpected end nieoczekiwany koniec @@ -6259,22 +4940,18 @@ QSQLite2Driver - Error opening database Błąd otwierania bazy danych - Unable to begin transaction Nie można rozpocząć transakcji - Unable to commit transaction Nie można dokonać transakcji - Unable to rollback transaction Nie można wycofać transakcji @@ -6282,12 +4959,10 @@ QSQLite2Result - Unable to execute statement Nie można wykonać polecenia - Unable to fetch results Nie można pobrać wyników @@ -6295,27 +4970,22 @@ QSQLiteDriver - Error closing database Błąd zamykania bazy danych - Error opening database Błąd otwierania bazy danych - Unable to begin transaction Nie można rozpocząć transakcji - Unable to commit transaction Nie można dokonać transakcji - Unable to rollback transaction Nie można wycofać transakcji @@ -6323,34 +4993,26 @@ QSQLiteResult - Parameter count mismatch Niezgodna liczba parametrów - Unable to bind parameters Nie można powiązać parametrów - Unable to execute statement Nie można wykonać polecenia - - - Unable to fetch row Nie można pobrać wiersza danych - Unable to reset statement Nie można skasować polecenia - No query Brak zapytania @@ -6358,32 +5020,26 @@ QScriptBreakpointsModel - ID Identyfikator - Location Położenie - Condition Warunek - Ignore-count Licznik pominięć - Single-shot - - - - + Pojedyncze trafienie + + Hit-count Licznik trafień @@ -6391,12 +5047,10 @@ QScriptBreakpointsWidget - New Nowy - Delete Skasuj @@ -6404,143 +5058,114 @@ QScriptDebugger - - Go to Line Przejdź do linii - Line: Linia: - Interrupt Przerwij - Shift+F5 Shift+F5 - Continue Kontynuuj - F5 F5 - Step Into Wskocz do wnętrza - F11 F11 - Step Over Przeskocz - F10 F10 - Step Out Wyskocz na zewnątrz - Shift+F11 Shift+F11 - Run to Cursor Uruchom do kursora - Ctrl+F10 Ctrl+F10 - Run to New Script Uruchom do nowego skryptu - Toggle Breakpoint Przełącz ustawienie pułapki - F9 F9 - Clear Debug Output Wyczyść wyjście debuggera - Clear Error Log Wyczyść log z błędami - Clear Console Wyczyść konsolę - &Find in Script... &Znajdź w skrypcie... - Ctrl+F Ctrl+F - Find &Next Znajdź &następne - F3 F3 - Find &Previous Znajdź &poprzednie - Shift+F3 Shift+F3 - Ctrl+G Ctrl+G - Debug Debuguj @@ -6548,32 +5173,26 @@ QScriptDebuggerCodeFinderWidget - Close Zamknij - Previous Poprzednie - Next Następne - Case Sensitive Uwzględniaj wielkość liter - Whole words Całe słowa - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Przeszukano od początku @@ -6581,12 +5200,10 @@ QScriptDebuggerLocalsModel - Name Nazwa - Value Wartość @@ -6594,17 +5211,14 @@ QScriptDebuggerStackModel - Level Poziom - Name Nazwa - Location Położenie @@ -6612,22 +5226,18 @@ QScriptEdit - Toggle Breakpoint Przełącz ustawienie pułapki - Disable Breakpoint Wyłącz pułapkę - Enable Breakpoint Włącz pułapkę - Breakpoint Condition: Warunek dla pułapki: @@ -6635,52 +5245,42 @@ QScriptEngineDebugger - Loaded Scripts Załadowane skrypty - Breakpoints Pułapki - Stack Stos - Locals Zmienne lokalne - Console Konsola - Debug Output Wyjście debuggera - Error Log Log z błędami - Search Szukaj - View Widok - Qt Script Debugger Debugger Qt Script @@ -6688,7 +5288,6 @@ QScriptNewBreakpointWidget - Close Zamknij @@ -6696,84 +5295,66 @@ QScrollBar - Bottom W dół - Left edge Lewa krawędź - Line down Linia w dół - Line up Linia w górę - - Page down Strona w dół - Page left Strona w lewo - Page right Strona w prawo - - Page up Strona do góry - Position Pozycja - Right edge Prawa krawędź - Scroll down Przewiń w dół - Scroll here Przewiń tutaj - Scroll left Przewiń w lewo - Scroll right Przewiń w prawo - Scroll up Przewiń do góry - Top Do góry @@ -6781,111 +5362,78 @@ QSharedMemory - %1: create size is less then 0 %1: rozmiar przy tworzeniu mniejszy od 0 - - %1: unable to lock %1: nie można zablokować - %1: unable to unlock %1: nie można odblokować - - - %1: permission denied %1: brak uprawnień - - - %1: already exists %1: już istnieje - %1: doesn't exists %1: nie istnieje - - - %1: out of resources %1: zasoby wyczerpane - - - %1: unknown error %2 %1: nieznany błąd %2 - %1: key is empty %1: klucz jest pusty - %1: ftok failed %1: wystąpił błąd w funkcji ftok() - - - %1: unable to make key %1: nie można utworzyć klucza - - %1: doesn't exist %1: nie istnieje - %1: UNIX key file doesn't exist %1: unixowy plik z kluczem nie istnieje - %1: system-imposed size restrictions %1: ograniczenia rozmiarów narzucone przez system - %1: not attached %1: niedołączony - - %1: invalid size %1: niepoprawny rozmiar - - %1: key error %1: błąd klucza - %1: size query failed %1: zapytanie o rozmiar zakończone błędem - %1: unable to set key on lock %1: nie można ustawić klucza na zablokowanym segmencie pamięci współdzielonej @@ -6893,1107 +5441,884 @@ QShortcut - + + - - Alt Alt - Back Back - Backspace Backspace - Backtab Backtab - Bass Boost Wzmocnienie basów - Bass Down Basy w dół - Bass Up Basy w górę - Call Button to start a call (note: a separate button is used to end the call) Wywołaj - Caps Lock Caps Lock - CapsLock CapsLock - Media Pause Media player pause button - Toggle Media Play/Pause Media player button to toggle between playing and paused - Monitor Brightness Up Zwiększ jasność monitora - Monitor Brightness Down Zmniejsz jasność monitora - Keyboard Light On/Off Włącz/wyłącz podświetlenie klawiatury - Keyboard Brightness Up Zwiększ jasność klawiatury - Keyboard Brightness Down Zmniejsz jasność klawiatury - Power Off Wyłącz zasilanie - Wake Up Przebudzenie - Eject Wysuń - Screensaver Wygaszacz ekranu - WWW WWW - Sleep Uśpienie - LightBulb Żarówka - Shop Sklep - History Historia - Add Favorite Dodaj do ulubionych - Hot Links Popularne łącza - Adjust Brightness Ustaw jasność - Finance Finanse - Community Społeczność - Audio Rewind Przewijanie do tyłu - Back Forward - Application Left - Application Right - Book Książka - CD CD - Calculator Kalkulator - Clear Wyczyść - Clear Grab - Close Zamknij - Copy Skopiuj - Cut Wytnij - Display Wyświetlacz - DOS DOS - Documents Dokumenty - Spreadsheet Arkusz kalkulacyjny - Browser Przeglądarka - Game Gra - Go Przejdź - iTouch iTouch - Logoff Wyloguj - Market Rynek - Meeting Spotkanie - Keyboard Menu Menu klawiatury - Menu PB Menu PB - My Sites Moje strony - News Wiadomości - Home Office Biuro domowe - Option Opcje - Paste Wklej - Phone Telefon - Reply Odpowiedz - Reload Przeładuj - Rotate Windows Obróć okna - Rotation PB Obrót PB - Rotation KB Obrót KB - Save Zachowaj - Send Wyślij - Spellchecker Sprawdzanie pisowni - Split Screen Podziel ekran - Support Pomoc techniczna - Task Panel Panel zadań - Terminal Terminal - Tools Narzędzia - Travel Podróże - Video Wideo - Word Processor Procesor tekstu - XFer XFer - Zoom In Powiększ - Zoom Out Pomniejsz - Away - Messenger Komunikator - WebCam WebCam - Mail Forward Przekazanie poczty - Pictures Zdjęcia - Music Muzyka - Battery Bateria - Bluetooth Bluetooth - Wireless Bezprzewodowy - Ultra Wide Band Ultraszerokie pasmo - Audio Forward Przewijanie do przodu - Audio Repeat Powtarzanie - Audio Random Play Odtwarzanie losowe - Subtitle Napisy - Audio Cycle Track - Time Czas - View Widok - Top Menu Menu główne - Suspend Wstrzymanie - Hibernate Hibernacja - Context1 Kontekst1 - Context2 Kontekst2 - Context3 Kontekst3 - Context4 Kontekst4 - Toggle Call/Hangup Button that will hang up if we're in call, or make a call if we're not. - Voice Dial Button to trigger voice dialling - Last Number Redial Button to redial the last number called - Camera Shutter Button to trigger the camera shutter (take a picture) - Camera Focus Button to focus the camera - Kanji Kanji - Muhenkan Muhenkan - Henkan Henkan - Romaji Romaji - Hiragana Hiragana - Katakana Katakana - Hiragana Katakana Hiragana Katakana - Zenkaku Zenkaku - Hankaku Hankaku - Zenkaku Hankaku Zenkaku Hankaku - Touroku Touroku - Massyo Massyo - Kana Lock Kana Lock - Kana Shift Kana Shift - Eisu Shift Eisu Shift - Eisu toggle Eisu toggle - Code input Wprowadzanie kodu - Multiple Candidate Kandydat wielokrotny - Previous Candidate Poprzedni kandydat - Hangul Hangul - Hangul Start Hangul Start - Hangul End Hangul End - Hangul Hanja Hangul Hanja - Hangul Jamo Hangul Jamo - Hangul Romaja Hangul Romaja - Hangul Jeonja Hangul Jeonja - Hangul Banja Hangul Banja - Hangul PreHanja Hangul PreHanja - Hangul PostHanja Hangul PostHanja - Hangul Special Hangul Special - - Ctrl Ctrl - Del Del - Delete Delete - Down Dół - End End - Enter Enter - Esc Esc - Escape Escape - F%1 F%1 - Favorites Ulubione - Flip Odwróć - Forward Do przodu - Hangup Button to end a call (note: a separate button is used to start the call) Zawieś - Help Pomoc - Home Home - Home Page Strona startowa - Ins Ins - Insert Insert - Launch (0) Uruchom (0) - Launch (1) Uruchom (1) - Launch (2) Uruchom (2) - Launch (3) Uruchom (3) - Launch (4) Uruchom (4) - Launch (5) Uruchom (5) - Launch (6) Uruchom (6) - Launch (7) Uruchom (7) - Launch (8) Uruchom (8) - Launch (9) Uruchom (9) - Launch (A) Uruchom (A) - Launch (B) Uruchom (B) - Launch (C) Uruchom (C) - Launch (D) Uruchom (D) - Launch (E) Uruchom (E) - Launch (F) Uruchom (F) - Launch Mail Uruchom program pocztowy - Launch Media Uruchom przeglądarkę mediów - Left Lewo - Media Next Następna ścieżka - Media Play Odtwarzaj - Media Previous Poprzednia ścieżka - Media Record Nagrywaj - Media Stop Zatrzymaj - Menu Menu - - Meta Meta - No Nie - Num Lock Num Lock - Number Lock Number Lock - NumLock NumLock - Open URL Otwórz adres - Page Down Strona do góry - Page Up Strona w dół - Pause Pauza - PgDown PgDown - PgUp PgUp - Print Wydrukuj - Print Screen Wydrukuj zawartość ekranu - Refresh Odśwież - Return Powrót - Right Prawo - Scroll Lock Scroll Lock - ScrollLock ScrollLock - Search Szukaj - - Select Wybierz - - Shift Shift - Space This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. Spacja - Standby Tryb oczekiwania - Stop Zatrzymaj - SysReq SysReq - System Request Żądanie systemu - Tab Tabulator - Treble Down Soprany w dół - Treble Up Soprany w górę - Up Góra - Volume Down Przycisz - Volume Mute Wycisz - Volume Up Zrób głośniej - Yes Tak @@ -8001,27 +6326,22 @@ QSlider - Page down Strona w dół - Page left Strona w lewo - Page right Strona w prawo - Page up Strona do góry - Position Położenie @@ -8029,72 +6349,58 @@ QSocks5SocketEngine - Connection to proxy refused Odmowa połączenia z pośrednikiem - Connection to proxy closed prematurely Przedwczesne zakończenie połączenia z pośrednikiem - Proxy host not found Nie odnaleziono hosta pośredniczącego - Connection to proxy timed out Przekroczony czas połączenia do pośrednika - Proxy authentication failed Autoryzacja pośrednika zakończona błędem - Proxy authentication failed: %1 Autoryzacja pośrednika zakończona błędem: %1 - SOCKS version 5 protocol error Błąd protokołu SOCKS wersji 5 - General SOCKSv5 server failure Generalny błąd serwera SOCKS wersji 5 - Connection not allowed by SOCKSv5 server Połączenie niedozwolone przez serwer SOCKS wersji 5 - TTL expired TTL stracił ważność - SOCKSv5 command not supported Nieobsługiwana komenda SOCKS wersji 5 - Address type not supported Nieobsługiwany typ adresu - Unknown SOCKSv5 proxy error code 0x%1 Nieznany kod błędu (0x%1) pośrednika SOCKS wersji 5 - Network operation timed out Przekroczony czas operacji sieciowej @@ -8102,32 +6408,26 @@ QSoftKeyManager - Ok OK - Select Wybierz - Done Zrobione - Options Opcje - Cancel Anuluj - Exit Wyjście @@ -8135,12 +6435,10 @@ QSpinBox - Less Mniej - More Więcej @@ -8148,56 +6446,42 @@ QSql - Cancel Anuluj - Cancel your edits? Anulować zmiany? - Confirm Potwierdź - Delete Skasuj - Delete this record? Skasować ten rekord? - Insert Wstaw - - - No Nie - Save edits? Zachować zmiany? - Update Uaktualnij - - - Yes Tak @@ -8205,178 +6489,142 @@ QSslSocket - Unable to write data: %1 - Unable to decrypt data: %1 Nie można odszyfrować danych: %1 - - Error while reading: %1 Błąd podczas czytania: %1 - Error during SSL handshake: %1 Błąd podczas nawiązania sesji SSL: %1 - Error creating SSL context (%1) Błąd tworzenia kontekstu (%1) - Invalid or empty cipher list (%1) Niepoprawna lub pusta lista szyfrów (%1) - Private key does not certify public key, %1 Prywatny klucz nie uwiarygodnia publicznego, %1 - Error creating SSL session, %1 Błąd tworzenia sesji SSL, %1 - Error creating SSL session: %1 Błąd tworzenia sesji SSL: %1 - Cannot provide a certificate with no key, %1 Nie można dostarczyć certyfikatu bez klucza, %1 - Error loading local certificate, %1 Błąd ładowania lokalnego certyfikatu, %1 - Error loading private key, %1 Błąd ładowania prywatnego klucza, %1 - No error Brak błędu - The issuer certificate could not be found Nie można odnaleźć wydawcy certyfikatu - The certificate signature could not be decrypted Nie można odszyfrować podpisu certyfikatu - The public key in the certificate could not be read Nie można odczytać publicznego klucza w certyfikacie - The signature of the certificate is invalid Niepoprawny podpis certyfikatu - The certificate is not yet valid Certyfikat nie jest jeszcze ważny - The certificate has expired Certyfikat utracił ważność - The certificate's notBefore field contains an invalid time Pole "notBefore" certyfikatu zawiera niepoprawną datę - The certificate's notAfter field contains an invalid time Pole "notAfter" certyfikatu zawiera niepoprawną datę - The certificate is self-signed, and untrusted Niewiarygodny certyfikat z podpisem własnym - The root certificate of the certificate chain is self-signed, and untrusted Główny certyfikat łańcucha zaufania ma własny podpis i jest niewiarygodny - The issuer certificate of a locally looked up certificate could not be found Nie można odnaleźć certyfikatu wydawcy wyszukanego lokalnie certyfikatu - No certificates could be verified Nie można zweryfikować żadnych certyfikatów - One of the CA certificates is invalid Jeden z certyfikatów urzędu certyfikacji jest nieprawidłowy - The basicConstraints path length parameter has been exceeded Długość ścieżki określona w podstawowych warunkach ograniczających została przekroczona - The supplied certificate is unsuitable for this purpose Dostarczony certyfikat jest nieodpowiedni dla tego przeznaczenia - The root CA certificate is not trusted for this purpose Główny certyfikat urzędu certyfikacji nie jest wiarygodny dla tego przeznaczenia - The root CA certificate is marked to reject the specified purpose Główny certyfikat urzędu certyfikacji jest wyznaczony do odrzucania podanego przeznaczenia - The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate Certyfikat wydawcy obecnego kandydata został odrzucony, ponieważ nazwa podmiotu nie odpowiadała nazwie wydawcy obecnego certyfikatu - The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate Certyfikat wydawcy obecnego kandydata został odrzucony, ponieważ nazwa wydawcy i przedstawiony numer seryjny nie odpowiadały identyfikatorowi klucza urzędu certyfikacji obecnego certyfikatu - The peer did not present any certificate Element równorzędny nie przedstawił żadnego certyfikatu - The host name did not match any of the valid hosts for this certificate Nazwa hosta nie odpowiadała żadnemu z poprawnych hostów dla tego certyfikatu - Unknown error Nieznany błąd @@ -8384,22 +6632,18 @@ QStateMachine - Missing initial state in compound state '%1' Brak stanu początkowego w stanie złożonym "%1" - Missing default state in history state '%1' Brak domyślnego stanu w historycznym stanie "%1" - No common ancestor for targets and source of transition from state '%1' Brak wspólnego przodka dla stanów docelowych i stanu źródłowego w przejściu ze stanu "%1" - Unknown error Nieznany błąd @@ -8407,30 +6651,22 @@ QSystemSemaphore - - %1: out of resources %1: zasoby wyczerpane - - %1: permission denied %1: brak uprawnień - %1: already exists %1: już istnieje - %1: does not exist %1: nie istnieje - - %1: unknown error %2 %1: nieznany błąd %2 @@ -8438,12 +6674,10 @@ QTDSDriver - Unable to open connection Nie można otworzyć połączenia - Unable to use database Nie można użyć bazy danych @@ -8451,12 +6685,10 @@ QTabBar - Scroll Left Przewiń w lewo - Scroll Right Przewiń w prawo @@ -8464,7 +6696,6 @@ QTcpServer - Operation on socket is not supported Operacja na gnieździe nieobsługiwana @@ -8472,42 +6703,34 @@ QTextControl - &Copy S&kopiuj - Copy &Link Location Skopiuj &adres odsyłacza - Cu&t W&ytnij - Delete Skasuj - &Paste &Wklej - &Redo &Przywróć - Select All Zaznacz wszystko - &Undo &Cofnij @@ -8515,14 +6738,10 @@ QToolButton - - Open Otwórz - - Press Wciśnij @@ -8530,7 +6749,6 @@ QUdpSocket - This platform does not support IPv6 Ta platforma nie obsługuje IPv6 @@ -8538,12 +6756,10 @@ QUndoGroup - Redo Przywróć - Undo Cofnij @@ -8551,7 +6767,6 @@ QUndoModel - <empty> <pusty> @@ -8559,12 +6774,10 @@ QUndoStack - Redo Przywróć - Undo Cofnij @@ -8572,57 +6785,46 @@ QUnicodeControlCharacterMenu - Insert Unicode control character Wstaw znak kontroli Unicode - LRE Start of left-to-right embedding LRE Początek osadzania od lewej do prawej - LRM Left-to-right mark LRM znacznik od prawej do lewej - LRO Start of left-to-right override LRO Początek nadpisania od lewej do prawej - PDF Pop directional formatting PDF Formatowanie kierunkowe pop - RLE Start of right-to-left embedding RLE Początek osadzania od prawej do lewej - RLM Right-to-left mark RLM Znacznik od prawej do lewej - RLO Start of right-to-left override RLO Początek nadpisania od prawej do lewej - ZWJ Zero width joiner ZWJ Łącznik zerowej długości - ZWNJ Zero width non-joiner ZWNJ Rozdzielnik zerowej długości - ZWSP Zero width space ZWSP Przerwa zerowej długości @@ -8630,32 +6832,26 @@ QWebFrame - Request cancelled Prośba anulowana - Request blocked Prośba zablokowana - Cannot show URL Nie można pokazać URL - Frame load interrupted by policy change Ładowanie ramki przerwane przez zmianę strategii - Cannot show mimetype Nie można pokazać typu MIME - File does not exist Plik nie istnieje @@ -8663,621 +6859,515 @@ QWebPage - Submit default label for Submit buttons in forms on web pages Wyślij - Submit Submit (input element) alt text for <input> elements with no alt, title, or value Wyślij - Reset default label for Reset buttons in forms on web pages Wyczyść - Choose File title for file button used in HTML forms Wybierz plik - No file selected text to display in file button used in HTML forms when no file is selected Nie zaznaczono pliku - Open in New Window Open in New Window context menu item Otwórz w nowym oknie - Save Link... Download Linked File context menu item Zachowaj odsyłacz... - Copy Link Copy Link context menu item Skopiuj odsyłacz - Open Image Open Image in New Window context menu item Otwórz obrazek - Save Image Download Image context menu item Zachowaj obrazek - Copy Image Copy Link context menu item Skopiuj obrazek - Open Frame Open Frame in New Window context menu item Otwórz ramkę - Copy Copy context menu item Skopiuj - Go Back Back context menu item Wróć - Go Forward Forward context menu item Przejdź dalej - Stop Stop context menu item Zatrzymaj - Reload Reload context menu item Przeładuj - Cut Cut context menu item Wytnij - Paste Paste context menu item Wklej - No Guesses Found No Guesses Found context menu item Nie odnaleziono podpowiedzi - Ignore Ignore Spelling context menu item Zignoruj - Add To Dictionary Learn Spelling context menu item Dodaj do słownika - Search The Web Search The Web context menu item Wyszukaj w sieci - Look Up In Dictionary Look Up in Dictionary context menu item Poszukaj w słowniku - Open Link Open Link context menu item Otwórz odsyłacz - Ignore Ignore Grammar context menu item Zignoruj - Spelling Spelling and Grammar context sub-menu item Pisownia - Show Spelling and Grammar menu item title Pokaż pisownię i gramatykę - Hide Spelling and Grammar menu item title Schowaj pisownię i gramatykę - Check Spelling Check spelling context menu item Sprawdź pisownię - Check Spelling While Typing Check spelling while typing context menu item Sprawdzaj pisownię podczas pisania - Check Grammar With Spelling Check grammar with spelling context menu item Sprawdzaj gramatykę wraz z pisownią - Fonts Font context sub-menu item Czcionki - Bold Bold context menu item Pogrubiony - Italic Italic context menu item Kursywa - Underline Underline context menu item Podkreślenie - Outline Outline context menu item Kontur - Direction Writing direction context sub-menu item Kierunek - Text Direction Text direction context sub-menu item Kierunek tekstu - Default Default writing direction context menu item Domyślny - Missing Plug-in Label text to be used when a plug-in is missing Brakująca wtyczka - Loading... Media controller status message when the media is loading Ładowanie... - Live Broadcast Media controller status message when watching a live broadcast Transmisja na żywo - Audio Element Media controller element Element dźwiękowy - Video Element Media controller element Element wideo - Mute Button Media controller element Przycisk wyłączania głosu - Unmute Button Media controller element Przycisk włączania głosu - Play Button Media controller element Przycisk odtwarzania - Pause Button Media controller element Przycisk pauzy - Slider Media controller element Suwak - Slider Thumb Media controller element Uchwyt suwaka - Rewind Button Media controller element Przycisk przewijania - Return to Real-time Button Media controller element Przycisk powrotu do czasu rzeczywistego - Elapsed Time Media controller element Czas który upłynął - Remaining Time Media controller element Czas który pozostał - Status Display Media controller element Wyświetlacz stanu - Fullscreen Button Media controller element Przycisk trybu pełnoekranowego - Seek Forward Button Media controller element Przycisk przeszukiwania do przodu - Seek Back Button Media controller element Przycisk przeszukiwania do tyłu - Audio element playback controls and status display Media controller element Kontrolki odtwarzania dźwięku i wyświetlacz stanu - Video element playback controls and status display Media controller element Kontrolki odtwarzania wideo i wyświetlacz stanu - Mute audio tracks Media controller element Wyłącz ścieżkę dźwiękową - Unmute audio tracks Media controller element Włącz ścieżkę dźwiękową - Begin playback Media controller element Rozpocznij odtwarzanie - Pause playback Media controller element Zatrzymaj odtwarzanie - Movie time scrubber Media controller element Suwak czasu - Movie time scrubber thumb Media controller element Uchwyt suwaka czasu - Rewind movie Media controller element Przewiń film - Return streaming movie to real-time Media controller element Przywróć przesyłanie filmu do czasu rzeczywistego - Current movie time Media controller element Czas bieżącego filmu - Remaining movie time Media controller element Czas do końca filmu - Current movie status Media controller element Stan bieżącego filmu - Play movie in full-screen mode Media controller element Odtwarzaj film w trybie pełnoekranowym - Seek quickly back Media controller element Przeszukaj szybko do tyłu - Seek quickly forward Media controller element Przeszukaj szybko do przodu - Indefinite time Media time description Nieokreślony czas - %1 days %2 hours %3 minutes %4 seconds Media time description %1 dni %2 godzin %3 minut %4 sekund - %1 hours %2 minutes %3 seconds Media time description %1 godzin %2 minut %3 sekund - %1 minutes %2 seconds Media time description %1 minut %2 sekund - %1 seconds Media time description %1 sekund - Inspect Inspect Element context menu item Zwiedzaj - No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed Brak ostatnich wyszukiwań - Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title Ostatnie wyszukiwania - Clear recent searches menu item in Recent Searches menu that empties menu's contents Wyczyść ostatnie wyszukiwania - Unknown Unknown filesize FTP directory listing item Nieznany - Web Inspector - %2 Wizytator sieciowy - %2 - Redirection limit reached Osiągnięto limit przekierowań - Bad HTTP request Niepoprawna komenda HTTP - This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' To jest indeks wyszukiwawczy. Podaj słowa do wyszukania: - Left to Right Left to Right context menu item Z lewej na prawą - Right to Left Right to Left context menu item Z prawej na lewą - %1 (%2x%3 pixels) Title string for images %1 (%2x%3 piksli) - Scroll here Przewiń tutaj - Left edge Lewa krawędź - Top Do góry - Right edge Prawa krawędź - Bottom W dół - Page left Strona w lewo - Page up Strona do góry - Page right Strona w prawo - Page down Strona w dół - Scroll left Przewiń w lewo - Scroll up Przewiń do góry - Scroll right Przewiń w prawo - Scroll down Przewiń w dół - %n file(s) number of chosen file @@ -9287,237 +7377,190 @@ - JavaScript Alert - %1 Ostrzeżenie JavaScript - %1 - JavaScript Confirm - %1 Potwierdzenie JavaScript - %1 - JavaScript Prompt - %1 Zachęta JavaScript - %1 - JavaScript Problem - %1 Problem JavaScript - %1 - The script on this page appears to have a problem. Do you want to stop the script? Skrypt na tej stronie nie działa poprawnie. Czy chcesz przerwać ten skrypt? - Move the cursor to the next character Przesuń kursor do następnego znaku - Move the cursor to the previous character Przesuń kursor do poprzedniego znaku - Move the cursor to the next word Przesuń kursor do następnego słowa - Move the cursor to the previous word Przesuń kursor do poprzedniego słowa - Move the cursor to the next line Przesuń kursor do następnej linii - Move the cursor to the previous line Przesuń kursor do poprzedniej linii - Move the cursor to the start of the line Przesuń kursor do początku linii - Move the cursor to the end of the line Przesuń kursor do końca linii - Move the cursor to the start of the block Przesuń kursor do początku bloku - Move the cursor to the end of the block Przesuń kursor do końca bloku - Move the cursor to the start of the document Przesuń kursor do początku dokumentu - Move the cursor to the end of the document Przesuń kursor do końca dokumentu - Select all Zaznacz wszystko - Select to the next character Zaznacz do następnego znaku - Select to the previous character Zaznacz do poprzedniego znaku - Select to the next word Zaznacz do następnego słowa - Select to the previous word Zaznacz do poprzedniego słowa - Select to the next line Zaznacz do następnej linii - Select to the previous line Zaznacz do poprzedniej linii - Select to the start of the line Zaznacz do początku linii - Select to the end of the line Zaznacz do końca linii - Select to the start of the block Zaznacz do początku bloku - Select to the end of the block Zaznacz do końca bloku - Select to the start of the document Zaznacz do początku dokumentu - Select to the end of the document Zaznacz do końca dokumentu - Delete to the start of the word Skasuj do początku słowa - Delete to the end of the word Skasuj do końca słowa - Insert a new paragraph Wstaw nowy paragraf - Insert a new line Wstaw nową linię - Paste and Match Style Wklej i dopasuj styl - Remove formatting Usuń formatowanie - Strikethrough Przekreślenie - Subscript Indeks dolny - Superscript Indeks górny - Insert Bulleted List Wstaw listę wypunktowaną - Insert Numbered List Wstaw listę ponumerowaną - Indent Zwiększ wcięcie - Outdent Zmniejsz wcięcie - Center Wyśrodkuj - Justify Wyjustuj - Align Left Wyrównaj do lewej - Align Right Wyrównaj do prawej @@ -9525,7 +7568,6 @@ QWhatsThisAction - What's This? Co to jest? @@ -9533,7 +7575,6 @@ QWidget - * * @@ -9541,57 +7582,46 @@ QWizard - Go Back Wróć - Continue Kontynuuj - Commit Dokonaj - Done Zrobione - Help Pomoc - < &Back < &Wstecz - &Finish &Zakończ - Cancel Anuluj - &Help &Pomoc - &Next &Dalej - &Next > &Dalej > @@ -9599,69 +7629,54 @@ QWorkspace - - %1 - [%2] %1 - [%2] - Close Zamknij - &Close &Zamknij - Ma&ximize Zma&ksymalizuj - Minimize Zminimalizuj - Mi&nimize Zmi&nimalizuj - &Move &Przenieś - &Restore &Przywróć - Restore Down Przywróć pod spód - - Sh&ade &Zwiń - &Size &Rozmiar - Stay on &Top Pozostaw na &wierzchu - &Unshade R&ozwiń @@ -9669,117 +7684,94 @@ QXml - encoding declaration or standalone declaration expected while reading the XML declaration oczekiwano deklaracji "encoding" lub "standalone" podczas odczytywania deklaracji XML - error in the text declaration of an external entity błąd w deklaracji "text" zewnętrznej jednostki - error occurred while parsing comment wystąpił błąd podczas parsowania komentarza - error occurred while parsing content wystąpił błąd podczas parsowania zawartości - error occurred while parsing document type definition wystąpił błąd podczas parsowania typu definicji dokumentu - error occurred while parsing element wystąpił błąd podczas parsowania elementu - error occurred while parsing reference wystąpił błąd podczas parsowania odwołania - error triggered by consumer błąd wywołany przez konsumenta - external parsed general entity reference not allowed in attribute value odwołanie do jednostki ogólnej zewnętrznie przetworzonej nie dozwolone dla wartości atrybutu - external parsed general entity reference not allowed in DTD odwołanie do jednostki ogólnej zewnętrznie przetworzonej nie dozwolone w DTD - internal general entity reference not allowed in DTD odwołanie do jednostki ogólnej wewnętrznej nie dozwolone w DTD - invalid name for processing instruction niepoprawna nazwa dla instrukcji przetwarzającej - letter is expected oczekiwana jest litera - more than one document type definition więcej niż jedna definicja typu dokumentu - no error occurred nie pojawił się żaden błąd - recursive entities jednostki rekurencyjne - standalone declaration expected while reading the XML declaration deklaracja "standalone" oczekiwana podczas czytania deklaracji XML - tag mismatch niezgodny tag - unexpected character nieoczekiwany znak - unexpected end of file nieoczekiwany koniec pliku - unparsed entity reference in wrong context odwołanie do jednostki nieprzetworzonej w złym kontekście - version expected while reading the XML declaration oczekiwano wersji podczas czytania deklaracji XML - wrong value for standalone declaration błędna wartość dla deklaracji "standalone" @@ -9787,27 +7779,22 @@ QXmlPatternistCLI - Warning in %1, at line %2, column %3: %4 Ostrzeżenie w %1, wiersz %2, kolumna %3: %4 - Warning in %1: %2 Ostrzeżenie w %1: %2 - Unknown location Nieznane położenie - Error %1 in %2, at line %3, column %4: %5 Błąd %1 w %2, wiersz %3, kolumna %4: %5 - Error %1 in %2: %3 Błąd %1 w %2: %3 @@ -9815,184 +7802,142 @@ QXmlStream - - Extra content at end of document. Dodatkowa treść na końcu dokumentu. - Invalid entity value. Niepoprawna wartość jednostki. - Invalid XML character. Niepoprawny znak XML. - Sequence ']]>' not allowed in content. Ciąg ']]>' niedozwolony w treści. - Namespace prefix '%1' not declared Przedrostek przestrzeni nazw '%1' nie został zadeklarowany - Attribute redefined. Atrybut zdefiniowany wielokrotnie. - Unexpected character '%1' in public id literal. Nieoczekiwany znak '%1' w publicznej stałej znakowej. - Invalid XML version string. Niepoprawna wersja XML. - Unsupported XML version. Nieobsługiwana wersja XML. - %1 is an invalid encoding name. %1 jest niepoprawną nazwą kodowania. - Encoding %1 is unsupported Kodowanie %1 jest nieobsługiwane - Standalone accepts only yes or no. Tylko wartości "tak" lub "nie" są akceptowane przez "standalone". - Invalid attribute in XML declaration. Niepoprawny atrybut w deklaracji XML. - Premature end of document. Przedwczesne zakończenie dokumentu. - Invalid document. Niepoprawny dokument. - Expected Oczekiwano - , but got ' , ale otrzymano ' - Unexpected ' Nieoczekiwany ' - Expected character data. Oczekiwana dana znakowa. - Recursive entity detected. Wykryto jednostkę rekurencyjną. - Start tag expected. Oczekiwano rozpoczęcia tagu. - XML declaration not at start of document. Deklaracja XML nie jest na początku dokumentu. - NDATA in parameter entity declaration. NDATA w deklaracji parametru obiektu. - %1 is an invalid processing instruction name. %1 jest niepoprawną nazwą instrukcji przetwarzającej. - Invalid processing instruction name. Niepoprawna nazwa instrukcji przetwarzającej. - - - - Illegal namespace declaration. Niepoprawna deklaracja przestrzeni nazw. - Invalid XML name. Niepoprawna nazwa XML. - Opening and ending tag mismatch. Niezgodne tagi początku i końca. - Reference to unparsed entity '%1'. Odwołanie do nieprzetworzonej jednostki '%1'. - - - Entity '%1' not declared. Jednostka '%1' nie zadeklarowana. - Reference to external entity '%1' in attribute value. Odwołanie do zewnętrznej jednostki '%1' jako wartość atrybutu. - Invalid character reference. Niepoprawny znak odwołania. - - Encountered incorrectly encoded content. Natrafiono na niepoprawnie zakodowaną treść. - The standalone pseudo attribute must appear after the encoding. Pseudo atrybut "standalone" musi pojawić się po "encoding". - %1 is an invalid PUBLIC identifier. %1 jest niepoprawnym publicznym identyfikatorem. @@ -10000,707 +7945,562 @@ QtXmlPatterns - Network timeout. Przekroczony czas połączenia. - Element %1 can't be serialized because it appears outside the document element. Element %1 nie może być zserializowany ponieważ pojawił się poza elementem "document". - Attribute %1 can't be serialized because it appears at the top level. Atrybut %1 nie może być zserializowany ponieważ pojawił się na najwyższym poziomie. - Year %1 is invalid because it begins with %2. Rok %1 jest niepoprawny ponieważ rozpoczyna się: %2. - Day %1 is outside the range %2..%3. Dzień %1 jest poza zakresem %2..%3. - Month %1 is outside the range %2..%3. Miesiąc %1 jest poza zakresem %2..%3. - Overflow: Can't represent date %1. Przepełnienie: Nie można wyrazić daty %1. - Day %1 is invalid for month %2. Dzień %1 jest niepoprawny dla miesiąca %2. - Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; Czas 24:%1:%2:%3 jest niepoprawny. Godzina jest 24, ale minuty, sekundy i milisekundy nie są równocześnie zerami; - Time %1:%2:%3.%4 is invalid. Czas %1:%2:%3.%4 jest niepoprawny. - Overflow: Date can't be represented. Przepełnienie: Data nie może być wyrażona. - - At least one component must be present. Przynajmniej jeden komponent musi być obecny. - At least one time component must appear after the %1-delimiter. Przynajmniej jeden komponent musi wystąpić po nawiasie %1. - %1 is not a valid value of type %2. %1 nie jest poprawną wartością dla typu %2. - When casting to %1 from %2, the source value cannot be %3. W rzutowaniu %1 na %2 wartość źródłowa nie może być %3. - - Dividing a value of type %1 by %2 (not-a-number) is not allowed. Dzielenie wartości typu %1 przez %2 (typ nienumeryczny) jest niedozwolone. - Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. Dzielenie wartości typu %1 przez %2 lub %3 (plus lub minus zero) jest niedozwolone. - Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. Mnożenie wartości typu %1 przez %2 lub %3 (plus lub minus nieskończoność) jest niedozwolone. - A value of type %1 cannot have an Effective Boolean Value. Wartość typu %1 nie może posiadać efektywnej wartości boolowskiej (EBV). - Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Efektywna wartość boolowska (EBV) nie może być obliczona dla sekwencji zawierającej dwie lub więcej wartości atomowe. - Value %1 of type %2 exceeds maximum (%3). Wartość %1 typu %2 przekracza maksimum (%3). - Value %1 of type %2 is below minimum (%3). Wartość %1 typu %2 jest poniżej minimum (%3). - A value of type %1 must contain an even number of digits. The value %2 does not. Wartość typu %1 musi zawierać parzystą liczbę cyfr. Wartość %2 nie zawiera. - %1 is not valid as a value of type %2. Wartość %1 nie jest poprawna jako wartość typu %2. - Operator %1 cannot be used on type %2. Operator %1 nie może być użyty dla typu %2. - Operator %1 cannot be used on atomic values of type %2 and %3. Operator %1 nie może być użyty dla atomowych wartości typu %2 i %3. - The namespace URI in the name for a computed attribute cannot be %1. Przestrzeń nazw URI nie może być %1 w nazwie dla obliczonego atrybutu. - The name for a computed attribute cannot have the namespace URI %1 with the local name %2. Nazwa dla wyliczonego atrybutu nie może zawierać przestrzeni nazw URI %1 z lokalną nazwą %2. - Type error in cast, expected %1, received %2. Błąd typów w rzutowaniu: oczekiwano %1, otrzymano %2. - When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. Podczas rzutowania na %1 lub na typ pochodny, wartość źródłowa musi być tego samego typu lub musi być stałą znakową. Typ %2 nie jest dozwolony. - A comment cannot contain %1 Komentarz nie może zawierać %1 - A comment cannot end with a %1. Komentarz nie może kończyć się: %1. - An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. Węzeł "attribute" nie może być podelementem węzła "document". Dlatego atrybut %1 jest w złym miejscu. - A library module cannot be evaluated directly. It must be imported from a main module. Moduł biblioteki nie może być bezpośrednio oceniony. On musi być zaimportowany z głównego modułu. - No template by name %1 exists. Szablon o nazwie %1 nie istnieje. - A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Wartość typu %1 nie może być predykatem. Predykat musi być typu liczbowego lub Efektywną Wartość Logiczną. - A positional predicate must evaluate to a single numeric value. Wynikiem predykatu pozycyjnego musi być pojedyncza wartość liczbowa. - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. Docelowa nazwa w instrukcji przetwarzania nie może być %1 w żadnej kombinacji wielkich i małych liter. Dlatego nazwa %2 jest niepoprawna. - %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 nie jest poprawną nazwą docelową w instrukcji przetwarzania. Nazwa musi być wartością %2, np. %3. - The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. Ostatni krok w ścieżce musi zawierać albo węzły albo wartości atomowe. Nie może zawierać obu jednocześnie. - The data of a processing instruction cannot contain the string %1 Dane instrukcji przetwarzania nie mogą zawierać ciągu %1 - No namespace binding exists for the prefix %1 Żadna przestrzeń nazw nie jest powiązana z przedrostkiem %1 - No namespace binding exists for the prefix %1 in %2 Żadna przestrzeń nazw nie jest powiązana z przedrostkiem %1 w %2 - - %1 is an invalid %2 %1 jest niepoprawnym %2 - The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Pierwszy argument w %1 nie może być typu %2. Musi on być typu liczbowego: xs:yearMonthDuration lub xs:dayTimeDuration. - The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Pierwszy argument w %1 nie może być typu %2. Musi on być typu: %3, %4 lub %5. - The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Drugi argument w %1 nie może być typu %2. Musi on być typu: %3, %4 lub %5. - %1 is not a valid XML 1.0 character. %1 nie jest poprawnym znakiem XML 1.0. - If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. Jeśli oba argumenty mają przesunięcia strefowe, muszą one być takie same. %1 i %2 nie są takie same. - %1 was called. Wywołano %1. - %1 must be followed by %2 or %3, not at the end of the replacement string. Po %1 musi następować %2 lub %3, lecz nie na końcu zastępczego ciągu. - In the replacement string, %1 must be followed by at least one digit when not escaped. W ciągu zastępczym, po %1 musi następować przynajmniej jedna cyfra - In the replacement string, %1 can only be used to escape itself or %2, not %3 W ciągu zastępczym, %1 może być użyte tylko do zabezpieczenia samej siebie lub %2, nigdy %3 - %1 matches newline characters %1 dopasowało znak nowej linii - %1 and %2 match the start and end of a line. %1 i %2 dopasowały początek i koniec linii. - Matches are case insensitive Dopasowania uwzględniają wielkość liter - Whitespace characters are removed, except when they appear in character classes Spacje są usuwane z wyjątkiem kiedy pojawią się w klasach znakowych - %1 is an invalid regular expression pattern: %2 %1 jest niepoprawnym wzorcem wyrażenia regularnego: %2 - %1 is an invalid flag for regular expressions. Valid flags are: %1 jest niepoprawną flagą dla wyrażeń regularnych. Poprawnymi flagami są: - If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. Jeśli pierwszy argument jest pustą sekwencją lub zerowej długości ciągiem (przy braku przestrzeni nazw), przedrostek nie może wystąpić. Podano przedrostek %1. - It will not be possible to retrieve %1. Nie będzie można odzyskać %1. - The default collection is undefined Domyślna kolekcja jest niezdefiniowana - %1 cannot be retrieved %1 nie może być odzyskane - The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Znormalizowana forma %1 nie jest obsługiwana. Obsługiwanymi formami są: %2, %3, %4 i %5 oraz pusta forma (brak normalizacji). - A zone offset must be in the range %1..%2 inclusive. %3 is out of range. Przesunięcie strefowe musi być w zakresie %1..%2 włącznie. %3 jest poza tym zakresem. - Required cardinality is %1; got cardinality %2. Wymagana liczność wynosi %1; otrzymano %2. - The item %1 did not match the required type %2. Element %1 nie został dopasowany do wymaganego typu %2. - - %1 is an unknown schema type. %1 jest nieznanym typem schematu. - A template with name %1 has already been declared. Szablon o nazwie %1 został już zadeklarowany. - Only one %1 declaration can occur in the query prolog. Tylko jedna deklaracja %1 może się pojawić w prologu zapytania. - The initialization of variable %1 depends on itself Inicjalizacja zmiennej %1 zależy od niej samej - The variable %1 is unused Zmienna %1 jest nieużywana - Version %1 is not supported. The supported XQuery version is 1.0. Wersja %1 nie jest obsługiwana. Obsługiwaną wersją XQuery jest wersja 1.0. - No function with signature %1 is available Żadna funkcja w postaci %1 nie jest dostępna - It is not possible to redeclare prefix %1. Nie jest możliwe ponowne zadeklarowanie przedrostka %1. - Prefix %1 is already declared in the prolog. Przedrostek %1 jest już zadeklarowany w prologu. - The name of an option must have a prefix. There is no default namespace for options. Nazwa opcji musi posiadać przedrostek. Nie istnieje domyślna przestrzeń nazw dla opcji. - The Schema Import feature is not supported, and therefore %1 declarations cannot occur. Cecha "Import schematu" nie jest obsługiwana, dlatego deklaracje %1 nie mogą pojawić. - The target namespace of a %1 cannot be empty. Docelowa przestrzeń nazw dla %1 nie może być pusta. - The module import feature is not supported Cecha "Import modułu" nie jest obsługiwana - The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. Przestrzeń nazw %1 jest zarezerwowana, dlatego funkcje zdefiniowane przez użytkownika nie mogą jej użyć. Spróbuj predefiniowany przedrostek %2, który istnieje w takich przypadkach. - The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 Przestrzeń nazw dla funkcji zdefiniowanej przez użytkownika w module bibliotecznym musi odpowiadać przestrzeni nazw modułu. Powinna to być %1 zamiast %2 - A function already exists with the signature %1. Funkcja w postaci %1 już istnieje. - No external functions are supported. All supported functions can be used directly, without first declaring them as external Zewnętrzne funkcje nie są obsługiwane. Wszystkie obsługiwane funkcje mogą być używane bezpośrednio, bez ich uprzedniego deklarowania jako zewnętrzne - The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. Nazwa zmiennej powiązanej w wyrażeniu "for" musi być inna od zmiennej pozycjonującej. W związku z tym dwie zmienne o nazwie %1 kolidują ze sobą. - The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. Cecha "Walidacja schematu" nie jest obsługiwana. Dlatego też wyrażenia %1 nie mogą być użyte. - None of the pragma expressions are supported. Therefore, a fallback expression must be present Wyrażenia "pragma" nie są obsługiwane. Dlatego musi wystąpić wyrażenie zastępcze - The %1-axis is unsupported in XQuery Oś %1 nie jest obsługiwana w XQuery - %1 is not a valid numeric literal. %1 nie jest poprawną stałą liczbową. - W3C XML Schema identity constraint selector Selektor narzucenia niepowtarzalności W3C XML Schema - W3C XML Schema identity constraint field Pole narzucenia niepowtarzalności W3C XML Schema - A construct was encountered which is disallowed in the current language(%1). Wystąpiła konstrukcja która jest niedozwolona w bieżącym języku (%1). - The keyword %1 cannot occur with any other mode name. Słowo kluczowe %1 nie może wystąpić z inną nazwą trybu. - No variable with name %1 exists Zmienna o nazwie %1 nie istnieje - The value of attribute %1 must be of type %2, which %3 isn't. Wartość atrybutu %1 musi być typu %2, którym nie jest %3. - The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. Przedrostek %1 nie może być powiązany. Jest on domyślnie powiązany z przestrzenią nazw %2. - A variable with name %1 has already been declared. Zmienna o nazwie %1 została już zadeklarowana. - No value is available for the external variable with name %1. Brak wartości dla zewnętrznej zmiennej o nazwie %1. - A stylesheet function must have a prefixed name. Funkcja arkusza stylu musi zawierać nazwę z przedrostkiem. - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) Przestrzeń nazw dla funkcji zdefiniowanej przez użytkownika nie może być pusta (spróbuj predefiniowany przedrostek %1, który stworzono specjalnie do takich sytuacji) - An argument with name %1 has already been declared. Every argument name must be unique. Argument o nazwie %1 został już zadeklarowany. Każda nazwa argumentu musi być unikatowa. - When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. Gdy funkcja %1 jest wykorzystana do dopasowania wewnątrz wzorca, jej argument musi być referencją do zmiennej lub stałą znakową. - In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. We wzorze XSL-T pierwszy argument w funkcji %1 musi być stałą znakową podczas dopasowywania. - In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. We wzorze XSL-T pierwszy argument w funkcji %1 musi być stałą znakową lub nazwą zmiennej podczas dopasowywania. - In an XSL-T pattern, function %1 cannot have a third argument. We wzorze XSL-T funkcja %1 nie może zawierać trzeciego argumentu. - In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. We wzorze XSL-T tylko funkcje %1 i %2 mogą być użyte do dopasowania, zaś funkcja %3 nie. - In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. We wzorze XSL-T tylko osie %2 i %3 mogą być użyte, zaś oś %1 nie. - %1 is an invalid template mode name. %1 nie jest poprawną nazwa trybu szablonu. - Each name of a template parameter must be unique; %1 is duplicated. Każda nazwa parametru szablonu musi być unikatowa; %1 się powtarza. - No function with name %1 is available. Żadna funkcja o nazwie %1 nie jest dostępna. - An attribute with name %1 has already appeared on this element. Atrybut o nazwie %1 już się pojawił w tym elemencie. - The namespace URI cannot be the empty string when binding to a prefix, %1. Przestrzeń nazw URI nie może być pustym ciągiem w powiązaniu z przedrostkiem, %1. - %1 is an invalid namespace URI. %1 jest niepoprawną przestrzenią nazw URI. - It is not possible to bind to the prefix %1 Nie jest możliwe powiązanie z przedrostkiem %1 - Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). Przestrzeń nazw %1 może być jedynie powiązana z %2 (w przeciwnym wypadku jest ona domyślnie zadeklarowana). - Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). Przedrostek %1 może być jedynie powiązany z %2 (w przeciwnym wypadku jest on domyślnie zadeklarowany). - Two namespace declaration attributes have the same name: %1. Atrybuty deklaracji przestrzeni nazw mają tą samą nazwę: %1. - The namespace URI must be a constant and cannot use enclosed expressions. Przestrzeń nazw URI nie może być stałą i nie może używać zawartych w niej wyrażeń. - A direct element constructor is not well-formed. %1 is ended with %2. Konstruktor elementu bezpośredniego nie jest dobrze sformatowany. %1 jest zakończony %2. - The name %1 does not refer to any schema type. Nazwa %1 nie odpowiada żadnemu typowi schematu. - %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. %1 jest typem złożonym. Rzutowanie na typy złożone nie jest możliwe. Jednakże rzutowanie na typy atomowe np.: %2 jest dozwolone. - %1 is not an atomic type. Casting is only possible to atomic types. %1 nie jest typem atomowym. Możliwe jest rzutowanie tylko na typy atomowe. - %1 is not a valid name for a processing-instruction. %1 nie jest poprawną nazwą dla instrukcji przetwarzającej. - - %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. %1 nie jest wewnątrz zakresu deklaracji atrybutów. Zwróć uwagę że importowanie schematów nie jest obsługiwane. - The name of an extension expression must be in a namespace. Nazwa dodatkowego wyrażenia musi znajdować sie w przestrzeni nazw. - empty pusty - zero or one zero lub jeden - exactly one dokładnie jeden - one or more jeden lub więcej - zero or more zero lub więcej - Required type is %1, but %2 was found. Odnaleziono typ %2, lecz wymaganym typem jest %1. - Promoting %1 to %2 may cause loss of precision. Przekształcenie %1 do %2 może spowodować utratę precyzji. - The focus is undefined. Fokus jest niezdefiniowany. - It's not possible to add attributes after any other kind of node. Dodanie atrybutu poza węzłami nie jest możliwe. - An attribute by name %1 has already been created. Atrybut o nazwie %1 został już utworzony. - Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. Obsługiwane jest jedynie "Unicode Codepoint Collation" (%1), %2 nie jest obsługiwane. - Integer division (%1) by zero (%2) is undefined. Dzielenie w dziedzinie liczb całkowitych (%1) przez zero (%2) jest niezdefiniowane. - Division (%1) by zero (%2) is undefined. Dzielenie (%1) przez zero (%2) jest niezdefiniowane. - Modulus division (%1) by zero (%2) is undefined. Dzielenie modulo (%1) przez zero (%2) jest niezdefiniowane. - %1 takes at most %n argument(s). %2 is therefore invalid. %1 przyjmuje co najwyżej %n argument. %2 jest dlatego niepoprawne. @@ -10709,7 +8509,6 @@ - %1 requires at least %n argument(s). %2 is therefore invalid. %1 wymaga przynajmniej %n argumentu. %2 jest dlatego niepoprawne. @@ -10718,1651 +8517,1255 @@ - The root node of the second argument to function %1 must be a document node. %2 is not a document node. Głównym węzłem drugiego argumentu w funkcji %1 musi być węzeł "document". %2 nie jest węzłem "document". - %1 is not a whole number of minutes. %1 nie jest całkowitą liczbą minut. - The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. Enkodowanie %1 jest niepoprawne. Może ono zawierać jedynie znaki alfabetu łacińskiego, nie może zawierać spacji i musi być dopasowane do wyrażenia regularnego %2. - - A default namespace declaration must occur before function, variable, and option declarations. Domyślna deklaracja przestrzeni nazw musi pojawić się przed deklaracjami funkcji, zmiennych i opcji. - Namespace declarations must occur before function, variable, and option declarations. Deklaracje przestrzeni nazw muszą pojawić się przed deklaracjami funkcji, zmiennych i opcji. - Module imports must occur before function, variable, and option declarations. Importy modułów muszą pojawić się przed deklaracjami funkcji, zmiennych i opcji. - %1 is an unsupported encoding. Nieobsługiwane kodowanie %1. - %1 contains octets which are disallowed in the requested encoding %2. %1 zawiera bity które są niedozwolone w zażądanym kodowaniu %2. - The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. Kod %1 który pojawił się w %2 i który używa kodowania %3 jest niepoprawnym znakiem XML. - Ambiguous rule match. Dopasowano niejednoznaczną regułę. - In a namespace constructor, the value for a namespace cannot be an empty string. W konstruktorze przestrzeni nazw wartość przestrzeni nazw nie może być pustym ciągiem. - The prefix must be a valid %1, which %2 is not. Przedrostek musi być poprawnym %1, którym %2 nie jest. - The prefix %1 cannot be bound. Przedrostek %1 nie może być powiązany. - Only the prefix %1 can be bound to %2 and vice versa. Tylko przedrostek %1 może być powiązany z %2 i vice versa. - The parameter %1 is required, but no corresponding %2 is supplied. Wymagany jest parametr %1 lecz żaden odpowiadający mu %2 nie został dostarczony. - The parameter %1 is passed, but no corresponding %2 exists. Przekazany jest parametr %1 lecz żaden odpowiadający mu %2 nie istnieje. - The URI cannot have a fragment URI nie może posiadać fragmentu - Element %1 is not allowed at this location. Element %1 jest niedozwolony w tym miejscu. - Text nodes are not allowed at this location. Węzły tekstowe są niedozwolone w tym miejscu. - Parse error: %1 Błąd parsowania: %1 - The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. Wartość atrybutu wersji XSL-T musi być typu %1, którym %2 nie jest. - Running an XSL-T 1.0 stylesheet with a 2.0 processor. Przetwarzanie arkusza XSL-T w wersji 1.0 przez procesor w wersji 2.0. - Unknown XSL-T attribute %1. Nieznany atrybut %1 XSL-T. - Attribute %1 and %2 are mutually exclusive. Atrybuty %1 i %2 wzajemnie się wykluczającą. - In a simplified stylesheet module, attribute %1 must be present. W uproszczonym module arkuszu stylu musi wystąpić atrybut %1. - If element %1 has no attribute %2, it cannot have attribute %3 or %4. Jeśli element %1 nie posiada atrybutu %2, nie może on również posiadać atrybutu %3 ani %4. - Element %1 must have at least one of the attributes %2 or %3. Element %1 musi posiadać przynajmniej jeden z atrybutów: %2 lub %3. - At least one mode must be specified in the %1-attribute on element %2. Przynajmniej jeden tryb musi być podany w atrybucie %1 elementu %2. - Element %1 must come last. Element %1 musi wystąpić jako ostatni. - At least one %1-element must occur before %2. Przynajmniej jeden element %1 musi wystąpić przed %2. - Only one %1-element can appear. Może wystąpić tylko jeden element %1. - At least one %1-element must occur inside %2. Przynajmniej jeden element %1 musi wystąpić wewnątrz %2. - When attribute %1 is present on %2, a sequence constructor cannot be used. Kiedy atrybut %1 występuje w %2 konstruktor sekwencyjny nie może być użyty. - Element %1 must have either a %2-attribute or a sequence constructor. Element %1 musi posiadać albo atrybut %2 albo sekwencyjny konstruktor. - When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. Kiedy wymagany jest parametr, domyślna wartość nie może być dostarczona przez atrybut %1 ani przez sekwencyjny konstruktor. - Element %1 cannot have children. Element %1 nie może posiadać potomków. - Element %1 cannot have a sequence constructor. Element %1 nie może posiadać sekwencyjnego konstruktora. - - The attribute %1 cannot appear on %2, when it is a child of %3. Atrybut %1 nie może wystąpić w %2 kiedy jest on potomkiem %3. - A parameter in a function cannot be declared to be a tunnel. Parametr funkcji nie może być zadeklarowany jako tunelowy. - This processor is not Schema-aware and therefore %1 cannot be used. Procesor nie obsługuje schematów, więc %1 nie może zostać użyte. - Top level stylesheet elements must be in a non-null namespace, which %1 isn't. Elementy arkusza stylu najwyższego poziomu muszą być w niezerowej przestrzeni nazw, którą %1 nie jest. - The value for attribute %1 on element %2 must either be %3 or %4, not %5. Wartością atrybutu %1 w elemencie %2 musi być %3 albo %4, lecz nie %5. - Attribute %1 cannot have the value %2. Atrybut %1 nie może posiadać wartości %2. - The attribute %1 can only appear on the first %2 element. Atrybut %1 może wystąpić jedynie w pierwszym elemencie %2. - At least one %1 element must appear as child of %2. Przynajmniej jeden element %1 musi wystąpić jako potomek %2. - %1 has inheritance loop in its base type %2. %1 ma pętlę w dziedziczeniu w jego podstawowym typie %2. - - Circular inheritance of base type %1. Cykliczne dziedziczenie podstawowego typu %1. - Circular inheritance of union %1. Cykliczne dziedziczenie unii %1. - %1 is not allowed to derive from %2 by restriction as the latter defines it as final. Nie można wywieść %1 z %2 ograniczając go ponieważ jest on zdefiniowany jako końcowy. - %1 is not allowed to derive from %2 by extension as the latter defines it as final. Nie można wywieść %1 z %2 rozszerzając go ponieważ jest on zdefiniowany jako końcowy. - Base type of simple type %1 cannot be complex type %2. Typ podstawowy dla typu prostego %1 nie może być typem złożonym %2. - Simple type %1 cannot have direct base type %2. Typ prosty %1 nie może mieć bezpośredniego typu podstawowego %2. - - Simple type %1 is not allowed to have base type %2. Typ prosty %1 nie może mieć typu podstawowego %2. - Simple type %1 can only have simple atomic type as base type. Typem podstawowym typu prostego %1 może być tylko typ atomowy. - Simple type %1 cannot derive from %2 as the latter defines restriction as final. Typ prosty %1 nie może wywodzić się z %2 ponieważ ten ostatni jest zdefiniowany jako końcowy. - - Variety of item type of %1 must be either atomic or union. Typem elementów listy %1 musi być albo typ atomowy albo unia. - - Variety of member types of %1 must be atomic. Typy składników %1 muszą być atomowe. - - %1 is not allowed to derive from %2 by list as the latter defines it as final. Nie można wywieść %1 z %2 poprzez listę ponieważ jest to zdefiniowane ostatecznie w typie podstawowym. - Simple type %1 is only allowed to have %2 facet. Typ prosty %1 może jedynie posiadać aspekt %2. - Base type of simple type %1 must have variety of type list. Typ podstawowy dla typu prostego %1 musi być listą typów. - Base type of simple type %1 has defined derivation by restriction as final. Typ podstawowy dla typu prostego %1 ma zdefiniowane wywodzenie poprzez ograniczenie jako końcowe. - Item type of base type does not match item type of %1. Typ elementów listy typu podstawowego nie pasuje do typu elementów listy %1. - - Simple type %1 contains not allowed facet type %2. Typ prosty %1 posiada niedozwolony aspekt %2. - - %1 is not allowed to derive from %2 by union as the latter defines it as final. Nie można wywieść %1 z %2 poprzez unię ponieważ jest to zdefiniowane ostatecznie w typie podstawowym. - %1 is not allowed to have any facets. %1 nie może posiadać żadnych aspektów. - Base type %1 of simple type %2 must have variety of union. Typ podstawowy %1 dla typu prostego %2 musi być unią. - Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. Typ podstawowy %1 dla typu prostego %2 nie może posiadać ograniczenia dla atrybutu %3. - Member type %1 cannot be derived from member type %2 of %3's base type %4. Typ %1 składnika nie może być wywiedziony z typu %2 który jest typem składnika %3 typu podstawowego %4. - Derivation method of %1 must be extension because the base type %2 is a simple type. Metodą wywodzenia z %1 musi być rozszerzenie ponieważ typ podstawowy %2 jest typem prostym. - Complex type %1 has duplicated element %2 in its content model. Typ złożony %1 posiada powielony element %2 w jego modelu zawartości. - Complex type %1 has non-deterministic content. Typ złożony %1 posiada nieokreśloną zawartość. - Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. Atrybuty typu złożonego %1 nie są poprawnym rozszerzeniem atrybutów typu podstawowego %2: %3. - Content model of complex type %1 is not a valid extension of content model of %2. Model zawartości typu złożonego %1 nie jest poprawnym rozszerzeniem modelu zawartości %2. - Complex type %1 must have simple content. Typ złożony %1 musi mieć prostą zawartość. - Complex type %1 must have the same simple type as its base class %2. Typ złożony %1 musi posiadać ten sam prosty typ jaki posiada jego klasa podstawowa %2. - Complex type %1 cannot be derived from base type %2%3. Typ złożony %1 nie może być wywiedziony z typu %2%3. - Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. Atrybuty typu złożonego %1 nie są poprawnym ograniczeniem atrybutów typu podstawowego %2: %3. - Complex type %1 with simple content cannot be derived from complex base type %2. Typ złożony %1 z prostą zawartością nie może być wywiedziony z podstawowego typu złożonego %2. - Item type of simple type %1 cannot be a complex type. Typ elementów listy w prostym typie %1 nie może być typem złożonym. - Member type of simple type %1 cannot be a complex type. Typ składnika typu prostego %1 nie może być typem złożonym. - %1 is not allowed to have a member type with the same name as itself. %1 nie może posiadać typu składnika o tej samej nazwie jaką on sam posiada. - - - %1 facet collides with %2 facet. Aspekt %1 koliduje z aspektem %2. - %1 facet must have the same value as %2 facet of base type. Aspekt %1 musi mieć tą samą wartość jaką ma aspekt %2 typu podstawowego. - %1 facet must be equal or greater than %2 facet of base type. Wartość aspektu %1 musi większa od lub równa wartości aspektu %2 typu podstawowego. - - - - - - - - %1 facet must be less than or equal to %2 facet of base type. Wartość aspektu %1 musi być mniejsza od lub równa wartości aspektu %2 typu podstawowego. - %1 facet contains invalid regular expression Aspekt %1 zawiera niepoprawne wyrażenie regularne - Unknown notation %1 used in %2 facet. Nieznany zapis %1 użyty w aspekcie %2. - %1 facet contains invalid value %2: %3. Aspekt %1 zawiera niepoprawną wartość %2: %3. - %1 facet cannot be %2 or %3 if %4 facet of base type is %5. Aspektem %1 nie może być %2 ani %3 jeśli aspektem %4 typu podstawowego jest %5. - %1 facet cannot be %2 if %3 facet of base type is %4. Aspektem %1 nie może być %2 jeśli aspektem %3 typu podstawowego jest %4. - - - %1 facet must be less than or equal to %2 facet. Wartość aspektu %1 musi być mniejsza od lub równa wartości aspektu %2. - - - %1 facet must be less than %2 facet of base type. Wartość aspektu %1 musi być mniejsza od wartości aspektu %2 typu podstawowego. - - %1 facet and %2 facet cannot appear together. Aspekty %1 i %2 nie mogą wystąpić jednocześnie. - - - %1 facet must be greater than %2 facet of base type. Wartość aspektu %1 musi być większa od wartości aspektu %2 typu podstawowego. - - %1 facet must be less than %2 facet. Wartość aspektu %1 musi być mniejsza od wartości aspektu %2. - - %1 facet must be greater than or equal to %2 facet of base type. Wartość aspektu %1 musi być większa od lub równa wartości aspektu %2 typu podstawowego. - Simple type contains not allowed facet %1. Typ prosty zawiera niedozwolony aspekt %1. - %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. Aspekty %1, %2, %3, %4, %5 i %6 nie są dozwolone podczas wywodzenia z listy. - Only %1 and %2 facets are allowed when derived by union. Dozwolone są jedynie aspekty %1 i %2 podczas wywodzenia z unii. - - %1 contains %2 facet with invalid data: %3. %1 zawiera aspekt %2 z niepoprawnymi danymi: %3. - Attribute group %1 contains attribute %2 twice. Grupa atrybutów %1 zawiera dwukrotnie atrybut %2. - Attribute group %1 contains two different attributes that both have types derived from %2. Grupa atrybutów %1 zawiera dwa różne atrybuty których typy są wywiedzione z %2. - Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. Grupa atrybutów %1 zawiera atrybut %2 który ma ograniczenie wartości ale typ wywodzi się z %3. - Complex type %1 contains attribute %2 twice. Typ złożony %1 zawiera atrybut %2 dwukrotnie. - Complex type %1 contains two different attributes that both have types derived from %2. Typ złożony %1 zawiera dwa różne atrybuty których typy są wywiedzione z %2. - Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. Typ złożony %1 zawiera atrybut %2 który ma ograniczenie wartości ale typ wywodzi się z %3. - Element %1 is not allowed to have a value constraint if its base type is complex. Element %1 nie może zawierać ograniczenia wartości gdy jego typ podstawowy jest złożony. - Element %1 is not allowed to have a value constraint if its type is derived from %2. Element %1 nie może zawierać ograniczenia wartości gdy jego typ jest wywiedziony z %2. - - Value constraint of element %1 is not of elements type: %2. Ograniczenie wartości elementu %1 nie jest typu: %2. - Element %1 is not allowed to have substitution group affiliation as it is no global element. Element %1 nie może przynależeć do grupy zastępującej ponieważ nie jest on elementem globalnym. - Type of element %1 cannot be derived from type of substitution group affiliation. Typ elementu %1 nie może być wywiedziony z typu przynależnego do grupy zastępującej. - Value constraint of attribute %1 is not of attributes type: %2. Ograniczenie wartości atrybutu %1 nie jest typu: %2. - Attribute %1 has value constraint but has type derived from %2. Atrybut %1 posiada ograniczenie wartości lecz jego typ wywodzi się z %2. - %1 attribute in derived complex type must be %2 like in base type. Atrybut %1 w wywiedzionym typie złożonym musi być %2 jak w typie podstawowym. - Attribute %1 in derived complex type must have %2 value constraint like in base type. Atrybut %1 w wywiedzionym typie złożonym musi zawierać ograniczenie wartości %2 jak w typie podstawowym. - Attribute %1 in derived complex type must have the same %2 value constraint like in base type. Atrybut %1 w wywiedzionym typie złożonym musi zawierać te same ograniczenie wartości %2 jak w typie podstawowym. - Attribute %1 in derived complex type must have %2 value constraint. Atrybut %1 w wywiedzionym typie złożonym musi zawierać ograniczenie wartości %2. - processContent of base wildcard must be weaker than derived wildcard. "processContent" podstawowego dżokera musi być słabszy od wywiedzionego dżokera. - - Element %1 exists twice with different types. Istnieją dwa elementy %1 o różnych typach. - Particle contains non-deterministic wildcards. Element zawiera nieokreślone dżokery. - - Base attribute %1 is required but derived attribute is not. Wymagany jest bazowy atrybut %1, wywiedziony zaś nie. - Type of derived attribute %1 cannot be validly derived from type of base attribute. Typ wywiedzionego atrybutu %1 nie może być poprawnie wywiedziony z typu podstawowego atrybutu. - Value constraint of derived attribute %1 does not match value constraint of base attribute. Ograniczenie wartości wywiedzionego atrybutu %1 nie pasuje do ograniczenia wartości podstawowego atrybutu. - Derived attribute %1 does not exist in the base definition. Wywiedziony atrybut %1 nie istnieje w podstawowej definicji. - Derived attribute %1 does not match the wildcard in the base definition. Wywiedziony atrybut %1 nie pasuje do dżokera w podstawowej definicji. - Base attribute %1 is required but missing in derived definition. Brak wymaganego bazowego atrybutu %1 w wywiedzionej definicji. - Derived definition contains an %1 element that does not exists in the base definition Wywiedziona definicja zawiera element %1 który nie istnieje w definicji podstawowej - Derived wildcard is not a subset of the base wildcard. Wywiedziony dżoker nie jest podzbiorem podstawowego dżokera. - %1 of derived wildcard is not a valid restriction of %2 of base wildcard %1 wywiedzionego dżokera nie jest poprawnym ograniczeniem %2 podstawowego dżokera - Attribute %1 from base type is missing in derived type. Brak atrybutu %1 typu bazowego w wywiedzionej definicji. - Type of derived attribute %1 differs from type of base attribute. Typ wywiedzionego atrybutu %1 różni się od typu podstawowego atrybutu. - Base definition contains an %1 element that is missing in the derived definition Podstawowa definicja zawiera element %1 którego brakuje w wywiedzionej definicji - %1 references unknown %2 or %3 element %4. %1 odwołuje się do nieznanego elementu %2 lub %3: %4. - %1 references identity constraint %2 that is no %3 or %4 element. %1 odwołuje się do narzucenia niepowtarzalności %2 które nie jest elementem %3 ani %4. - %1 has a different number of fields from the identity constraint %2 that it references. %1 posiada inna liczbę pól od narzucenia niepowtarzalności %2 które się do niego odwołuje. - Base type %1 of %2 element cannot be resolved. Nie można rozwiązać typu podstawowego %1 elementu %2. - Item type %1 of %2 element cannot be resolved. Nie można rozwiązać typu elementów listy %1 w elemencie %2. - Member type %1 of %2 element cannot be resolved. Nie można rozwiązać typu %1 składnika elementu %2. - - - Type %1 of %2 element cannot be resolved. Nie można rozwiązać typu %1 elementu %2. - Base type %1 of complex type cannot be resolved. Nie można rozwiązać typu podstawowego %1 dla typu złożonego. - %1 cannot have complex base type that has a %2. %1 nie może mieć złożonego typu podstawowego który ma %2. - Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. Model zawartości typu złożonego %1 posiada element %2 więc nie może być on wywiedziony poprzez rozszerzenie niepustego typu. - Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. Typ złożony %1 nie może być wywiedziony z %2 poprzez rozszerzenie ponieważ ten ostatni zawiera element %3 w jego modelu zawartości. - Type of %1 element must be a simple type, %2 is not. Typem elementu %1 musi być typ prosty, %2 nim nie jest. - Substitution group %1 of %2 element cannot be resolved. Nie można rozwiązać grupy zastępującej %1 elementu %2. - Substitution group %1 has circular definition. Grupa zastępująca %1 posiada cykliczną definicję. - - Duplicated element names %1 in %2 element. Powielona nazwa elementu %1 w elemencie %2. - - - - Reference %1 of %2 element cannot be resolved. Nie można rozwiązać odwołania %1 do elementu %2. - Circular group reference for %1. Cykliczne odwołanie do grupy dla %1. - %1 element is not allowed in this scope Element %1 nie jest dozwolony w tym zakresie - %1 element cannot have %2 attribute with value other than %3. Element %1 nie może mieć atrybutu %2 z wartością inną niż %3. - %1 element cannot have %2 attribute with value other than %3 or %4. Element %1 nie może mieć atrybutu %2 z wartością inną niż %3 lub %4. - %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. Atrybut %1 lub %2 odwołania %3 nie pasuje do deklaracji atrybutu %4. - Attribute group %1 has circular reference. Grupa atrybutów %1 posiada cykliczne odwołanie. - %1 attribute in %2 must have %3 use like in base type %4. Atrybut %1 w %2 powinien używać %3 jak w typie podstawowym %4. - Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. Atrybut dżokera %1 nie jest poprawnym ograniczeniem atrybutu dżokera typu podstawowego %2. - %1 has attribute wildcard but its base type %2 has not. %1 posiada atrybut dżokera lecz jego typ podstawowy %2 go nie posiada. - Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. Nie można wyrazić unii atrybutu dżokera typu %1 i atrybutu dżokera jego typu podstawowego %2. - Enumeration facet contains invalid content: {%1} is not a value of type %2. Aspekt "enumeration" posiada niepoprawną zawartość: {%1} nie jest wartością typu %2. - Namespace prefix of qualified name %1 is not defined. Przedrostek przestrzeni nazw występujący w pełnej nazwie %1 nie jest zdefiniowany. - - %1 element %2 is not a valid restriction of the %3 element it redefines: %4. Element %1 (%2) nie jest poprawnym ograniczeniem elementu %3 który redefiniuje: %4. - Empty particle cannot be derived from non-empty particle. Pusty element nie może być wywiedziony z niepustego elementu. - Derived particle is missing element %1. Brak elementu %1 w wywiedzionym elemencie. - Derived element %1 is missing value constraint as defined in base particle. Brak ograniczenia wartości w wywiedzionym elemencie %1 takiego jak w podstawowym elemencie. - Derived element %1 has weaker value constraint than base particle. Wywiedziony element %1 posiada słabsze ograniczenie wartości niż element podstawowy. - Fixed value constraint of element %1 differs from value constraint in base particle. Ograniczenie stałej wartości elementu %1 różni się od ograniczenia wartości w podstawowym elemencie. - Derived element %1 cannot be nillable as base element is not nillable. Wywiedziony element %1 może być zerowalny ponieważ element podstawowy nie jest zerowalny. - Block constraints of derived element %1 must not be more weaker than in the base element. Ograniczenia blokujące dla wywiedzionego elementu %1 nie mogą być słabsze od ograniczeń w elemencie podstawowym. - Simple type of derived element %1 cannot be validly derived from base element. Typ prosty w elemencie wywiedzionym %1 nie może być poprawnie wywiedziony z elementu podstawowego. - Complex type of derived element %1 cannot be validly derived from base element. Typ złożony w elemencie wywiedzionym %1 nie może być poprawnie wywiedziony z elementu podstawowego. - Element %1 is missing in derived particle. Brak elementu %1 w wywiedzionym elemencie. - Element %1 does not match namespace constraint of wildcard in base particle. Element %1 nie pasuje do ograniczenia przestrzeni nazw dżokera w elemencie podstawowym. - Wildcard in derived particle is not a valid subset of wildcard in base particle. Dżoker w wywiedzionym elemencie nie jest poprawnym podzbiorem dżokera w elemencie podstawowym. - processContent of wildcard in derived particle is weaker than wildcard in base particle. "processContent" dżokera w wywiedzionym elemencie jest słabszy od dżokera w podstawowym elemencie. - Derived particle allows content that is not allowed in the base particle. Wywiedziony element pozwala na zawartość która jest niedozwolona w podstawowym elemencie. - Can not process unknown element %1, expected elements are: %2. Nie można przetworzyć nieznanego elementu %1, oczekiwanymi elementami są: %2. - Element %1 is not allowed in this scope, possible elements are: %2. Element %1 jest niedozwolony w tym zakresie, możliwymi elementami są: %2. - Child element is missing in that scope, possible child elements are: %1. Brak podelementu w tym zakresie, możliwymi podelementami są: %1. - Document is not a XML schema. Dokument nie jest schematem XML. - %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. Atrybut %1 elementu %2 posiada niepoprawną zawartość: {%3} nie jest wartością typu %4. - %1 attribute of %2 element contains invalid content: {%3}. Atrybut %1 elementu %2 posiada niepoprawną zawartość: {%3}. - Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. Docelowa przestrzeń nazw %1 załączonego schematu jest różna od docelowej przestrzeni nazw %2 która jest zdefiniowana w schemacie załączającym. - - Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. Docelowa przestrzeń nazw %1 zaimportowanego schematu jest różna od docelowej przestrzeni nazw %2 która jest zdefiniowana w schemacie importującym. - %1 element is not allowed to have the same %2 attribute value as the target namespace %3. Element %1 nie może zawierać tej samej wartości atrybutu %2 co docelowa przestrzeń nazw %3. - %1 element without %2 attribute is not allowed inside schema without target namespace. Element %1 bez atrybutu %2 jest niedozwolony wewnątrz schematu bez docelowej przestrzeni nazw. - - %1 element is not allowed inside %2 element if %3 attribute is present. Element %1 jest niedozwolony wewnątrz elementu %2 jeśli jest obecny atrybut %3. - - - %1 element has neither %2 attribute nor %3 child element. Element %1 nie posiada ani atrybutu %2 ani podelementu %3. - - - - - - - - - - - - - - %1 element with %2 child element must not have a %3 attribute. Element %1 z podelementem %2 nie może mieć atrybutu %3. - %1 attribute of %2 element must be %3 or %4. Atrybutem %1 elementu %2 musi być %3 lub %4. - %1 attribute of %2 element must have a value of %3. Atrybut %1 elementu %2 musi posiadać wartość %3. - - %1 attribute of %2 element must have a value of %3 or %4. Atrybut %1 elementu %2 musi posiadać wartość %3 lub %4. - - - - - - - - - - - - - - %1 element must not have %2 and %3 attribute together. Element %1 nie może posiadać jednocześnie atrybutów %2 i %3. - - Content of %1 attribute of %2 element must not be from namespace %3. Zawartość atrybutu %1 elementu %2 nie może pochodzić z przestrzeni nazw %3. - - %1 attribute of %2 element must not be %3. Atrybut %1 elementu %2 nie może być %3. - %1 attribute of %2 element must have the value %3 because the %4 attribute is set. Atrybut %1 elementu %2 musi zawierać wartość %3 ponieważ atrybut %4 jest ustawiony. - Specifying use='prohibited' inside an attribute group has no effect. Podawanie: use='prohibited' wewnątrz grupy atrybutów nie przynosi żadnego efektu. - %1 element must have either %2 or %3 attribute. Element %1 musi zawierać atrybut %2 albo %3. - %1 element must have either %2 attribute or %3 or %4 as child element. Element %1 musi zawierać albo atrybut %2 albo %3 lub %4 jako podelement. - %1 element requires either %2 or %3 attribute. Element %1 wymaga atrybutu %2 albo %3. - Text or entity references not allowed inside %1 element Tekst ani odwołanie nie są dozwolone wewnątrz elementu %1 - - %1 attribute of %2 element must contain %3, %4 or a list of URIs. Atrybut %1 elementu %2 musi zawierać %3, %4 lub listę URI. - %1 element is not allowed in this context. Element %1 jest niedozwolony w tym kontekście. - %1 attribute of %2 element has larger value than %3 attribute. Atrybut %1 elementu %2 posiada większą wartość niż atrybut %3. - Prefix of qualified name %1 is not defined. Przedrostek w pełnej nazwie %1 nie jest zdefiniowany. - - %1 attribute of %2 element must either contain %3 or the other values. Atrybut %1 elementu %2 musi zawierać albo %3 albo inne wartości. - Component with ID %1 has been defined previously. Komponent o identyfikatorze %1 został uprzednio zdefiniowany. - Element %1 already defined. Element %1 jest już zdefiniowany. - Attribute %1 already defined. Atrybut %1 jest już zdefiniowany. - Type %1 already defined. Typ %1 jest już zdefiniowany. - Attribute group %1 already defined. Grupa atrybutów %1 jest już zdefiniowana. - Element group %1 already defined. Grupa elementów %1 jest już zdefiniowana. - Notation %1 already defined. Zapis %1 jest już zdefiniowany. - Identity constraint %1 already defined. Narzucenie niepowtarzalności %1 jest już zdefiniowane. - Duplicated facets in simple type %1. Powielone aspekty w prostym typie %1. - - - %1 is not valid according to %2. Ponieważ nie wiadomo co jest podmiotem nie można stwierdzić czy to ma być "poprawnym", "poprawną" czy "poprawne" %1 nie jest poprawne według %2. - String content does not match the length facet. Wartość ciągu koliduje z aspektem "length". - String content does not match the minLength facet. Wartość ciągu koliduje z aspektem "minLength". - String content does not match the maxLength facet. Wartość ciągu koliduje z aspektem "maxLength". - String content does not match pattern facet. Wartość ciągu koliduje z aspektem "pattern". - String content is not listed in the enumeration facet. Wartość ciągu nie widnieje na liście aspektu "enumeration". - Signed integer content does not match the maxInclusive facet. Wartość liczby całkowitej koliduje z aspektem "maxInclusive". - Signed integer content does not match the maxExclusive facet. Wartość liczby całkowitej koliduje z aspektem "maxExclusive". - Signed integer content does not match the minInclusive facet. Wartość liczby całkowitej koliduje z aspektem "minInclusive". - Signed integer content does not match the minExclusive facet. Wartość liczby całkowitej koliduje z aspektem "minExclusive". - Signed integer content is not listed in the enumeration facet. Wartość liczby całkowitej nie widnieje na liście aspektu "enumeration". - Signed integer content does not match pattern facet. Wartość liczby całkowitej koliduje z aspektem "pattern". - Signed integer content does not match in the totalDigits facet. Wartość liczby całkowitej koliduje z aspektem "totalDigits". - Unsigned integer content does not match the maxInclusive facet. Wartość liczby naturalnej koliduje z aspektem "maxInclusive". - Unsigned integer content does not match the maxExclusive facet. Wartość liczby naturalnej koliduje z aspektem "maxExclusive". - Unsigned integer content does not match the minInclusive facet. Wartość liczby naturalnej koliduje z aspektem "minInclusive". - Unsigned integer content does not match the minExclusive facet. Wartość liczby naturalnej koliduje z aspektem "minExclusive". - Unsigned integer content is not listed in the enumeration facet. Wartość liczby naturalnej nie widnieje na liście aspektu "enumeration". - Unsigned integer content does not match pattern facet. Wartość liczby naturalnej koliduje z aspektem "pattern". - Unsigned integer content does not match in the totalDigits facet. Wartość liczby naturalnej koliduje z aspektem "totalDigits". - Double content does not match the maxInclusive facet. Wartość liczby rzeczywistej koliduje z aspektem "maxInclusive". - Double content does not match the maxExclusive facet. Wartość liczby rzeczywistej koliduje z aspektem "maxExclusive". - Double content does not match the minInclusive facet. Wartość liczby rzeczywistej koliduje z aspektem "minInclusive". - Double content does not match the minExclusive facet. Wartość liczby rzeczywistej koliduje z aspektem "minExclusive". - Double content is not listed in the enumeration facet. Wartość liczby rzeczywistej nie widnieje na liście aspektu "enumeration". - Double content does not match pattern facet. Wartość liczby rzeczywistej koliduje z aspektem "pattern". - Decimal content does not match in the fractionDigits facet. Wartość liczby rzeczywistej koliduje z aspektem "fractionDigits". - Decimal content does not match in the totalDigits facet. Wartość liczby rzeczywistej koliduje z aspektem "totalDigits". - Date time content does not match the maxInclusive facet. Zawartość daty i czasu koliduje z aspektem "maxInclusive". - Date time content does not match the maxExclusive facet. Zawartość daty i czasu koliduje z aspektem "maxExclusive". - Date time content does not match the minInclusive facet. Zawartość daty i czasu koliduje z aspektem "minInclusive". - Date time content does not match the minExclusive facet. Zawartość daty i czasu koliduje z aspektem "minExclusive". - Date time content is not listed in the enumeration facet. Zawartość daty i czasu nie widnieje na liście aspektu "enumeration". - Date time content does not match pattern facet. Zawartość daty i czasu koliduje z aspektem "pattern". - Duration content does not match the maxInclusive facet. Wartość czasu trwania koliduje z aspektem "maxInclusive". - Duration content does not match the maxExclusive facet. Wartość czasu trwania koliduje z aspektem "maxExclusive". - Duration content does not match the minInclusive facet. Wartość czasu trwania koliduje z aspektem "minInclusive". - Duration content does not match the minExclusive facet. Wartość czasu trwania koliduje z aspektem "minExclusive". - Duration content is not listed in the enumeration facet. Wartość czasu trwania nie widnieje na liście aspektu "enumeration". - Duration content does not match pattern facet. Wartość czasu trwania koliduje z aspektem "pattern". - Boolean content does not match pattern facet. Wartość boolowska koliduje z aspektem "pattern". - Binary content does not match the length facet. Wartość binarna koliduje z aspektem "length". - Binary content does not match the minLength facet. Wartość binarna koliduje z aspektem "minLength". - Binary content does not match the maxLength facet. Wartość binarna koliduje z aspektem "maxLength". - Binary content is not listed in the enumeration facet. Wartość binarna nie widnieje na liście aspektu "enumeration". - Invalid QName content: %1. Niepoprawna zawartość QName: %1. - QName content is not listed in the enumeration facet. Zawartość QName nie widnieje na liście aspektu "enumeration". - QName content does not match pattern facet. Zawartość QName koliduje z aspektem "pattern". - Notation content is not listed in the enumeration facet. Zapis zawartości nie widnieje na liście aspektu "enumeration". - List content does not match length facet. Zawartość listy koliduje z aspektem "length". - List content does not match minLength facet. Zawartość listy koliduje z aspektem "minLength". - List content does not match maxLength facet. Zawartość listy koliduje z aspektem "maxLength". - List content is not listed in the enumeration facet. Zawartość listy nie widnieje na liście aspektu "enumeration". - List content does not match pattern facet. Zawartość listy koliduje z aspektem "pattern". - Union content is not listed in the enumeration facet. Zawartość unii nie widnieje na liście aspektu "enumeration". - Union content does not match pattern facet. Zawartość unii koliduje z aspektem "pattern". - Data of type %1 are not allowed to be empty. Dane typu %1 nie mogą być puste. - Element %1 is missing child element. Brak wymaganego podelementu w elemencie %1. - There is one IDREF value with no corresponding ID: %1. Istnieje wartość IDREF bez odpowiadającej jej wartości ID: %1. - Loaded schema file is invalid. Załadowany plik nie jest poprawnym plikiem ze schematem. - %1 contains invalid data. %1 zawiera niepoprawne dane. - xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. Przestrzeń nazw "xsi:schemaLocation" %1 wystąpiła już wcześniej w dokumencie. - xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. "xsi:noNamespaceSchemaLocation" nie może wystąpić po pierwszym elemencie lub atrybucie który nie jest przestrzenią nazw. - No schema defined for validation. Brak zdefiniowanego schematu dla walidacji. - No definition for element %1 available. Brak dostępnej definicji dla elementu %1. - - - Specified type %1 is not known to the schema. Podany typ %1 nie jest schematowi znany. - Element %1 is not defined in this scope. Element %1 nie jest zdefiniowany w tym zakresie. - Declaration for element %1 does not exist. Brak deklaracji dla elementu %1. - Element %1 contains invalid content. Element %1 posiada niepoprawną zawartość. - Element %1 is declared as abstract. Element %1 jest zadeklarowany jako abstrakcyjny. - Element %1 is not nillable. Element %1 nie jest zerowalny. - Attribute %1 contains invalid data: %2 Atrybut %1 zawiera niepoprawne dane: %2 - Element contains content although it is nillable. Element posiada zawartość chociaż jest zerowalny. - Fixed value constraint not allowed if element is nillable. Ograniczenie stałej wartości jest niedozwolone gdy element jest zerowalny. - Element %1 cannot contain other elements, as it has a fixed content. Element %1 nie może zawierać innych elementów ponieważ posiada on stałą zawartość. - Specified type %1 is not validly substitutable with element type %2. Podany typ %1 nie jest poprawnie zastępowalny typem elementu %2. - Complex type %1 is not allowed to be abstract. Typ złożony %1 nie może być abstrakcyjny. - Element %1 contains not allowed attributes. Element %1 zawiera niedozwolone atrybuty. - - Element %1 contains not allowed child element. Element %1 zawiera niedozwolony podelement. - - Content of element %1 does not match its type definition: %2. Zawartość elementu %1 nie pasuje do jego definicji typu: %2. - - - Content of element %1 does not match defined value constraint. Zawartość elementu %1 nie pasuje do zdefiniowanego ograniczenia wartości. - Element %1 contains not allowed child content. Element %1 zawiera niedozwolony podelement. - Element %1 contains not allowed text content. Element %1 zawiera niedozwolony text. - Element %1 is missing required attribute %2. Brak wymaganego atrybutu %2 w elemencie %1. - Attribute %1 does not match the attribute wildcard. Atrybut %1 nie pasuje do atrybutu dżokera. - Declaration for attribute %1 does not exist. Brak deklaracji atrybutu %1. - Element %1 contains two attributes of type %2. Element %1 posiada dwa atrybuty typu %2. - Attribute %1 contains invalid content. Atrybut %1 posiada niepoprawną zawartość. - Element %1 contains unknown attribute %2. Element %1 posiada nieznany atrybut %2. - - Content of attribute %1 does not match its type definition: %2. Zawartość atrybutu %1 nie pasuje do jego definicji typu: %2. - - Content of attribute %1 does not match defined value constraint. Zawartość elementu %1 nie pasuje do zdefiniowanego ograniczenia wartości. - Non-unique value found for constraint %1. Znaleziono nieunikatową wartość dla ograniczenia %1. - Key constraint %1 contains absent fields. Ograniczenie klucza %1 zawiera nieobecne pola. - Key constraint %1 contains references nillable element %2. - No referenced value found for key reference %1. Brak wartości do której odwołuje się klucz %1. - More than one value found for field %1. Znaleziono więcej niż jedną wartość dla pola %1. - Field %1 has no simple type. Pole %1 nie posiada prostego typu. - ID value '%1' is not unique. Wartość ID "%1" nie jest unikatowa. - '%1' attribute contains invalid QName content: %2. Atrybut "%1" zawiera niepoprawną zawartość QName: %2. diff -r ef0373b55136 -r 758a864f9613 translations/qt_ru.ts --- a/translations/qt_ru.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qt_ru.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,7 +4,6 @@ CloseButton - Close Tab Закрыть вкладку @@ -12,12 +11,10 @@ FakeReply - Fake error ! Фиктивная ошибка ! - Invalid URL Некорректный адрес URL @@ -25,37 +22,30 @@ MAC_APPLICATION_MENU - Services Службы - Hide %1 Скрыть %1 - Hide Others Скрыть остальные - Show All Показать все - Preferences... Настройки… - Quit %1 Завершить %1 - About %1 О программе %1 @@ -63,32 +53,26 @@ Phonon:: - Notifications Уведомления - Music Музыка - Video Видео - Communication Общение - Games Игры - Accessibility Специальные возможности @@ -96,24 +80,18 @@ Phonon::AudioOutput - - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Звуковое устройство <b>%1</b> не работает.<br/>Будет использоваться <b>%2</b>.</html> - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> <html>Переключение на звуковое устройство <b>%1</b><br/>, которое стало доступно и имеет высший приоритет.</html> - - Revert back to device '%1' Возвращение к устройству "%1" - <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> <html>Переключение на устройство вывода звука <b>%1</b><br/>, которое имеет высший приоритет или настроено для обработки данного потока.</html> @@ -121,14 +99,12 @@ Phonon::Gstreamer::Backend - Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. Внимание: Похоже, пакет gstreamer0.10-plugins-good не установлен. Некоторые возможности воспроизведения видео недоступны. - Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled Внимание: Похоже, основной модуль GStreamer не установлен. @@ -138,7 +114,6 @@ Phonon::Gstreamer::MediaObject - Cannot start playback. Check your GStreamer installation and make sure you @@ -149,49 +124,34 @@ что пакет libgstreamer-plugins-base установлен. - Missing codec helper script assistant. Отсутствует сценарий установки кодека. - Plugin codec installation failed for codec: %0 Не удалось установить модуль кодека: %0 - A required codec is missing. You need to install the following codec(s) to play this content: %0 Отсутствует необходимый кодек. Вам нужно установить следующие кодеки для воспроизведения данного содержимого: %0 - - - - - - - - Could not open media source. Не удалось открыть источник медиа-данных. - Invalid source type. Некорректный тип источника медиа-данных. - Could not locate media source. Не удалось найти источник медиа-данных. - Could not open audio device. The device is already in use. Не удалось открыть звуковое устройство. Устройство уже используется. - Could not decode media source. Не удалось декодировать источник медиа-данных. @@ -199,162 +159,130 @@ Phonon::MMF - Audio Output Воспроизведение звука - The audio output device Устройство воспроизведения звука - No error Нет ошибки - Not found Не найдено - Out of memory Недостаточно ресурсов - Not supported Не поддерживается - Overflow Переполнение - Underflow Переполнение - Already exists Уже существует - Path not found Путь не найден - In use Используется - Not ready Не готово - Access denied Доступ запрещён - Could not connect Не удалось установить соединение - Disconnected Соединение разорвано - Permission denied Доступ запрещён - Insufficient bandwidth Недостаточная скорость передачи данных - Network unavailable Сеть недоступна - Network communication error Ошибка сетевого обмена данными - Streaming not supported Потоковое воспроизведение не поддерживается - Server alert Сигнал сервера - Invalid protocol Некорректный протокол - Invalid URL Некорректный адрес URL - Multicast error Ошибка широковещательной передачи - Proxy server error Ошибка прокси-сервера - Proxy server not supported Прокси-сервер не поддерживается - Audio output error Ошибка воспроизведения звука - Video output error Ошибка воспроизведения видео - Decoder error Ошибка декодирования - Audio or video components could not be played Аудио- или видео-состовляющая не может быть воспроизведена - DRM error Ошибка DRM - Unknown error (%1) Неизвестная ошибка (%1) @@ -362,33 +290,26 @@ Phonon::MMF::AbstractMediaPlayer - Not ready to play Не готов к воспроизведению - - Error opening file Ошибка открытия файла - Error opening URL Ошибка открытия адреса URL - Setting volume failed Не удалось установить уровень громкости - Loading clip failed Не удалось загрузить клип - Playback complete Воспроизведение завершено @@ -396,22 +317,18 @@ Phonon::MMF::AbstractVideoPlayer - Pause failed Не удалось приостановить воспроизведение - Seek failed Не удалось установить позицию - Getting position failed Не удалось получить позицию - Opening clip failed Не удалось открыть клип @@ -419,7 +336,6 @@ Phonon::MMF::AudioEqualizer - %1 Hz %1 Гц @@ -427,7 +343,6 @@ Phonon::MMF::AudioPlayer - Getting position failed Не удалось получить позицию @@ -435,11 +350,6 @@ Phonon::MMF::DsaVideoPlayer - - - - - Video display error Ошибка отображения видео @@ -447,7 +357,6 @@ Phonon::MMF::EffectFactory - Enabled Включено @@ -455,61 +364,51 @@ Phonon::MMF::EnvironmentalReverb - Decay HF ratio (%) DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. Коэффициент затухания ВЧ (%) - Decay time (ms) DecayTime: Time over which reverberation is diminished. Время затухания (мс) - Density (%) Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. Плотность (%) - Diffusion (%) Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. Рассеивание (%) - Reflections delay (ms) ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. Затухание отражений (мс) - Reflections level (mB) ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. Уровень отражений (мБар) - Reverb delay (ms) ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. Задержка эха (мс) - Reverb level (mB) ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. Уровень эха (мБар) - Room HF level RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. Уровень ВЧ отражений - Room level (mB) RoomLevel: Master volume control for all reflected sound. Уровень отражений (мБар) @@ -518,20 +417,17 @@ Phonon::MMF::MediaObject - Error opening source: type not supported - Ошибка открытыия источника: тип не поддерживается - - - + Ошибка открытия источника: тип не поддерживается + + Error opening source: media type could not be determined - Ошибка открытыия источника: тип носителя не определён + Ошибка открытия источника: не удалось определить тип медиа-данных Phonon::MMF::StereoWidening - Level (%) Уровень (%) @@ -539,8 +435,6 @@ Phonon::MMF::SurfaceVideoPlayer - - Video display error Ошибка отображения видео @@ -548,22 +442,14 @@ Phonon::VolumeSlider - - - - Volume: %1% Громкость: %1% - - - Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% Используйте данный регулятор для настройки громкости. Крайнее левое положение соответствует 0%, крайнее правое - %1% - Muted Без звука @@ -571,12 +457,10 @@ Q3Accel - %1, %2 not defined %1, %2 не определён - Ambiguous %1 not handled @@ -584,27 +468,22 @@ Q3DataTable - True Да - False Нет - Insert Вставить - Update Обновить - Delete Удалить @@ -612,313 +491,238 @@ Q3FileDialog - Copy or Move a File Копировать или переместить файл - Read: %1 Чтение: %1 - - Write: %1 Запись: %1 - - Cancel Отмена - - - - All Files (*) Все файлы (*) - Name Имя - Size Размер - Type Тип - Date Дата - Attributes Атрибуты - - &OK &ОК - Look &in: &Папка: - - - File &name: &Имя файла: - File &type: &Тип файла: - Back Назад - One directory up Вверх на один уровень - Create New Folder Создать папку - List View Список - Detail View Подробный вид - Preview File Info Предпросмотр информации о файле - Preview File Contents Предпросмотр содержимого файла - Read-write Чтение и запись - Read-only Только чтение - Write-only Только запись - Inaccessible Нет доступа - Symlink to File Ссылка на файл - Symlink to Directory Ссылка на каталог - Symlink to Special Ссылка на спецфайл - File Файл - Dir Каталог - Special Спецфайл - - - Open Открыть - - Save As Сохранить как - - - &Open &Открыть - - &Save &Сохранить - &Rename &Переименовать - &Delete &Удалить - R&eload О&бновить - Sort by &Name По &имени - Sort by &Size По &размеру - Sort by &Date По &дате - &Unsorted &Не упорядочивать - Sort Упорядочить - Show &hidden files Показать ск&рытые файлы - the file файл - the directory каталог - the symlink ссылку - Delete %1 Удалить %1 - <qt>Are you sure you wish to delete %1 "%2"?</qt> <qt>Вы действительно хотите удалить %1 "%2"?</qt> - &Yes &Да - &No &Нет - New Folder 1 Новая папка 1 - New Folder Новая папка - New Folder %1 Новая папка %1 - Find Directory Найти каталог - - Directories Каталоги - Directory: Каталог: - - Error Ошибка - %1 File not found. Check path and filename. @@ -927,17 +731,14 @@ Проверьте правильность пути и имени файла. - All Files (*.*) Все файлы (*.*) - Open Открыть - Select a Directory Выбрать каталог @@ -945,29 +746,24 @@ Q3LocalFs - - Could not read directory %1 Не удалось прочитать каталог %1 - Could not create directory %1 Не удалось создать каталог %1 - Could not remove file or directory %1 Не удалось удалить файл или каталог %1 - Could not rename %1 to @@ -978,14 +774,12 @@ %2 - Could not open %1 Не удалось открыть %1 - Could not write %1 Не удалось записать @@ -995,12 +789,10 @@ Q3MainWindow - Line up Выровнять - Customize... Настроить... @@ -1008,7 +800,6 @@ Q3NetworkProtocol - Operation stopped by the user Операция остановлена пользователем @@ -1016,8 +807,6 @@ Q3ProgressDialog - - Cancel Отмена @@ -1025,28 +814,22 @@ Q3TabDialog - - OK ОК - Apply Применить - Help Справка - Defaults По умолчанию - Cancel Отмена @@ -1054,38 +837,30 @@ Q3TextEdit - &Undo &Отменить действие - &Redo &Повторить действие - Cu&t &Вырезать - &Copy &Копировать - &Paste В&ставить - Clear Очистить - - Select All Выделить всё @@ -1093,67 +868,54 @@ Q3TitleBar - System Системное меню - Restore up Восстановить - Minimize Свернуть - Restore down Восстановить - Maximize Распахнуть - Close Закрыть - Contains commands to manipulate the window Содержит команды управления окном - Puts a minimized window back to normal Возвращает свёрнутое окно в нормальное состояние - Moves the window out of the way Сворачивает окно - Puts a maximized window back to normal Возвращает распахнутое окно в нормальное состояние - Makes the window full screen Разворачивает окно на весь экран - Closes the window Зыкрывает окно - Displays the name of the window and contains controls to manipulate it Отображает название окна и содержит команды управления им @@ -1161,7 +923,6 @@ Q3ToolBar - More... Больше... @@ -1169,51 +930,38 @@ Q3UrlOperator - - - The protocol `%1' is not supported Протокол "%1" не поддерживается - The protocol `%1' does not support listing directories Протокол "%1" не поддерживает просмотр каталогов - The protocol `%1' does not support creating new directories Протокол "%1" не поддерживает создание каталогов - The protocol `%1' does not support removing files or directories Протокол "%1" не поддерживает удаление файлов или каталогов - The protocol `%1' does not support renaming files or directories Протокол "%1" не поддерживает переименование файлов или каталогов - The protocol `%1' does not support getting files Протокол "%1" не поддерживает доставку файлов - The protocol `%1' does not support putting files Протокол "%1" не поддерживает отправку файлов - - The protocol `%1' does not support copying or moving files or directories Протокол "%1" не поддерживает копирование или перемещение файлов или каталогов - - (unknown) (неизвестно) @@ -1221,27 +969,22 @@ Q3Wizard - &Cancel От&мена - < &Back < &Назад - &Next > &Далее > - &Finish &Завершить - &Help &Справка @@ -1249,45 +992,30 @@ QAbstractSocket - - - - Host not found Узел не найден - - - Connection refused Отказано в соединении - Connection timed out Время на соединение истекло - - - Operation on socket is not supported Операция с сокетом не поддерживается - - Socket operation timed out Время на операцию с сокетом истекло - Socket is not connected Сокет не подключён - Network unreachable Сеть недоступна @@ -1295,17 +1023,14 @@ QAbstractSpinBox - &Step up Шаг вв&ерх - Step &down Шаг вн&из - &Select All &Выделить всё @@ -1313,7 +1038,6 @@ QAccessibleButton - Press Нажать @@ -1321,27 +1045,22 @@ QApplication - Executable '%1' requires Qt %2, found Qt %3. Программный модуль "%1" требует Qt %2, найдена версия %3. - Incompatible Qt Library Error Ошибка совместимости библиотеки Qt - Activate Активировать - Activates the program's main window Активирует главное окно программы - QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -1350,22 +1069,18 @@ QAxSelect - Select ActiveX Control Выбор компоненты ActiveX - OK Выбрать - &Cancel От&мена - COM &Object: &Объект COM: @@ -1373,17 +1088,14 @@ QCheckBox - Uncheck Снять отметку - Check Отметить - Toggle Переключить @@ -1391,57 +1103,46 @@ QColorDialog - Hu&e: &Тон: - &Sat: &Нас: - &Val: &Ярк: - &Red: &Красный: - &Green: &Зелёный: - Bl&ue: С&иний: - A&lpha channel: &Альфа-канал: - Select Color Выбор цвета - &Basic colors &Основные цвета - &Custom colors &Пользовательские цвета - &Add to Custom Colors &Добавить к пользовательским цветам @@ -1449,23 +1150,18 @@ QComboBox - - Open Открыть - False Нет - True Да - Close Закрыть @@ -1473,43 +1169,36 @@ QCoreApplication - %1: key is empty QSystemSemaphore %1: пустой ключ - %1: unable to make key QSystemSemaphore %1: невозможно создать ключ - %1: ftok failed QSystemSemaphore %1: ошибка ftok - %1: already exists QSystemSemaphore %1: уже существует - %1: does not exist QSystemSemaphore %1: не существует - %1: out of resources QSystemSemaphore %1: недостаточно ресурсов - %1: unknown error %2 QSystemSemaphore %1: неизвестная ошибка %2 @@ -1518,22 +1207,18 @@ QDB2Driver - Unable to connect Невозможно соединиться - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию - Unable to set autocommit Невозможно установить автозавершение транзакций @@ -1541,33 +1226,26 @@ QDB2Result - - Unable to execute statement Невозможно выполнить выражение - Unable to prepare statement Невозможно подготовить выражение - Unable to bind variable Невозможно привязать значение - Unable to fetch record %1 Невозможно получить запись %1 - Unable to fetch next Невозможно получить следующую строку - Unable to fetch first Невозможно получить первую строку @@ -1575,22 +1253,18 @@ QDateTimeEdit - AM AM - am am - PM PM - pm pm @@ -1598,17 +1272,14 @@ QDeclarativeAbstractAnimation - Cannot animate non-existent property "%1" Невозможно анимировать несуществуещее свойство "%1" - Cannot animate read-only property "%1" Невозможно анимировать свойство только для чтения "%1" - Animation is an abstract class Animation - это абстрактный класс @@ -1616,7 +1287,6 @@ QDeclarativeAnchorAnimation - Cannot set a duration of < 0 Невозможно установить длительность < 0 @@ -1624,67 +1294,50 @@ QDeclarativeAnchors - Possible anchor loop detected on fill. Обнаружена возможная цикличная привязка на fill. - Possible anchor loop detected on centerIn. Обнаружена возможная цикличная привязка на centerIn. - - - - Cannot anchor to an item that isn't a parent or sibling. Невозможно установить привязку к элементу, не являющемуся родителем или соседом. - Possible anchor loop detected on vertical anchor. Обнаружена возможная цикличная привязка к вертикальной привязке. - Possible anchor loop detected on horizontal anchor. Обнаружена возможная цикличная привязка к горизонтальной привязке. - Cannot specify left, right, and hcenter anchors. Невозможно задать левую, правую и среднюю привязки. - - Cannot anchor to a null item. Невозможно привязаться к нулевому элементу. - Cannot anchor a horizontal edge to a vertical edge. Невозможно привязать горизонтальный край к вертикальному. - - Cannot anchor item to self. Невозможно привязать элемент к самому себе. - Cannot specify top, bottom, and vcenter anchors. Невозможно задать верхнюю, нижнюю и среднюю привязки. - Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. Невозможно использовать базовую привязку вместе с верхней, нижней и центральной по вертикали. - Cannot anchor a vertical edge to a horizontal edge. Невозможно привязать вертикальный край к горизонтальному. @@ -1692,7 +1345,6 @@ QDeclarativeAnimatedImage - Qt was built without support for QMovie Qt было собрано без поддержки QMovie @@ -1700,7 +1352,6 @@ QDeclarativeBehavior - Cannot change the animation assigned to a Behavior. Невозможно изменить анимацию, назначенную поведению. @@ -1708,7 +1359,6 @@ QDeclarativeBinding - Binding loop detected for property "%1" Обнаружена цикличная привязка для свойства "%1" @@ -1716,7 +1366,6 @@ QDeclarativeCompiledBindings - Binding loop detected for property "%1" Обнаружена цикличная привязка для свойства "%1" @@ -1724,381 +1373,303 @@ QDeclarativeCompiler - - - - - - Invalid property assignment: "%1" is a read-only property Некорректное присваивание свойства: "%1" свойство только для чтения - Invalid property assignment: unknown enumeration Некорректное присваивание свойства: неизвестное перечисление - Invalid property assignment: string expected Некорректное присваивание свойства: ожидается значение типа "string" - Invalid property assignment: url expected Некорректное присваивание свойства: ожидается значение типа "url" - Invalid property assignment: unsigned int expected Некорректное присваивание свойства: ожидается значение типа "unsigned int" - Invalid property assignment: int expected Некорректное присваивание свойства: ожидается значение типа "int" - - Invalid property assignment: float expected - Некорректное присваивание свойства: ожидается значение типа "float" - - - - Invalid property assignment: double expected - Некорректное присваивание свойства: ожидается значение типа "double" - - - + Invalid property assignment: number expected + Некорректное присваивание свойства: ожидается число + + Invalid property assignment: color expected Некорректное присваивание свойства: ожидается значение типа "color" - Invalid property assignment: date expected Некорректное присваивание свойства: ожидается значение типа "date" - Invalid property assignment: time expected Некорректное присваивание свойства: ожидается значение типа "time" - Invalid property assignment: datetime expected Некорректное присваивание свойства: ожидается значение типа "datetime" - Invalid property assignment: point expected Некорректное присваивание свойства: ожидается значение типа "point" - Invalid property assignment: size expected Некорректное присваивание свойства: ожидается значение типа "size" - Invalid property assignment: rect expected Некорректное присваивание свойства: ожидается значение типа "rect" - Invalid property assignment: boolean expected Некорректное присваивание свойства: ожидается значение булевого типа - Invalid property assignment: 3D vector expected Некорректное присваивание свойства: ожидается значение типа "трёхмерный вектор" - Invalid property assignment: unsupported type "%1" Некорректное присваивание свойства: неподдерживаемый тип "%1" - Element is not creatable. Элемент не является создаваемым. - Component elements may not contain properties other than id Элементы Component не могут содержать свойств кроме id - Invalid component id specification Некорректная спецификация id компонента - - id is not unique id не уникален - Invalid component body specification Некорректная спецификация тела компонента - Component objects cannot declare new properties. Объекты Component не могут объявлять новые свойства. - Component objects cannot declare new signals. Объекты Component не могут объявлять новые сигналы. - Component objects cannot declare new functions. Объекты Component не могут объявлять новые функции. - Cannot create empty component specification Невозможно создать пустую спецификацю компонента - Incorrectly specified signal assignment Неверно указано назначение сигнала - Cannot assign a value to a signal (expecting a script to be run) Невозможно назначить значение сигналу (сценарий должен быть запущен) - Empty signal assignment Пустое назначение сигнала - Empty property assignment Пустое назначение свойства - Attached properties cannot be used here здесь - в данном контексте? Прикреплённые свойства не могут быть использованы здесь - - Non-existent attached object Несуществующий прикреплённый объект - - Invalid attached object assignment Некорректное назначение прикреплённого объекта - Cannot assign to non-existent default property Невозможно назначить несуществующему свойству по умолчанию - - Cannot assign to non-existent property "%1" Невозможно назначить несуществующему свойству "%1" - Invalid use of namespace Некорректное использование пространства имён - Not an attached property name Не является именем привязанного свойства - Invalid use of id property Некорректное использование свойства id - - Property has already been assigned a value Свойству уже назначено значение - - Invalid grouped property access Некорректный доступ к сгруппированному свойству - Cannot assign a value directly to a grouped property Невозможно присвоить значение непосредственно сгруппированному свойству - Invalid property use Некорректное использование свойства - Property assignment expected Ожидается назначение свойства - Single property assignment expected Ожидается одиночное назначение свойства - Unexpected object assignment Неожиданное назначение объекта - Cannot assign object to list Невозможно назначить объект списку - Can only assign one binding to lists Можно назначить только одну связь для списка - Cannot assign primitives to lists Невозможно назначить примитивы списку - Cannot assign multiple values to a script property Невозможно назначить множественное значение свойству сценария - Invalid property assignment: script expected Некорректное присваивание свойства: ожидается сценарий - Cannot assign object to property Невозможно назначить объектсвойству - "%1" cannot operate on "%2" "%1" не может воздействовать на "%2" - Duplicate default property Дублирование свойства по умолчанию - Duplicate property name Дублирование названия свойства - Property names cannot begin with an upper case letter Названия свойств не могут начинаться с заглавной буквы - + Illegal property name + Недопустимое название свойства + + Duplicate signal name Дублирование названия сигнала - Signal names cannot begin with an upper case letter Названия сигналов не могут начинаться с заглавной буквы - + Illegal signal name + Недопустимое название сигнала + + Duplicate method name Дублирование название метода - Method names cannot begin with an upper case letter Названия методов не могут начинаться с заглавной буквы - + Illegal method name + Недопустимое название метода + + Property value set multiple times Значение свойства задано несколько раз - Invalid property nesting Некорректное вложенность свойств - Cannot override FINAL property Невозможно переопределить свойство FINAL - Invalid property type Некорректный тип свойства - Invalid empty ID Некорректный пустой идентификатор - IDs cannot start with an uppercase letter Идентификаторы не могут начинаться с заглавной буквы - IDs must start with a letter or underscore Идентификаторы должны начинаться с буквы или подчёркивания - IDs must contain only letters, numbers, and underscores Идентификаторы должны содержать только буквы, цифры и подчёркивания - ID illegally masks global JavaScript property Идентификатор неверно маскирует глобальное свойство JavaScript - - No property alias location Отсутствует размещение псевдонима свойства - - Invalid alias location Некорректное размещение псевдонима - Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> Некорректная ссылка на псевдоним. Ссылка на псевдоним должна быть указана, как <id> или <id>.<property> - Invalid alias reference. Unable to find id "%1" Некорректная ссылка на псевдоним. Не удалось найти id "%1" @@ -2106,7 +1677,6 @@ QDeclarativeComponent - Invalid empty URL Пустой адрес URL @@ -2114,23 +1684,18 @@ QDeclarativeCompositeTypeManager - - Resource %1 unavailable Ресурс "%1" недоступен - Namespace %1 cannot be used as a type Пространство имён "%1" не может быть использовано в качестве типа - %1 %2 %1 %2 - Type %1 unavailable Тип "%1" недоступен @@ -2138,23 +1703,18 @@ QDeclarativeConnections - - Cannot assign to non-existent property "%1" Невозможно назначить несуществующему свойству "%1" - Connections: nested objects not allowed Подключения: вложенные объекты недопустимы - Connections: syntax error Подключения: синтаксическая ошибка - Connections: script expected Подключения: ожидается сценарий @@ -2162,33 +1722,26 @@ QDeclarativeEngine - executeSql called outside transaction() executeSql() вызван вне transaction() - Read-only Transaction Транзакция только для чтения - Version mismatch: expected %1, found %2 Несовпадение версий: ожидалась %1, найдена %2 - SQL transaction failed Не удалось выполнить транзакцию SQL - transaction: missing callback транзакция: отсутствует обратный вызов - - SQL: database version mismatch Не совпадает версия базы данных SQL @@ -2196,12 +1749,10 @@ QDeclarativeFlipable - front is a write-once property front - свойство для однократной записи - back is a write-once property back - свойство для однократной записи @@ -2209,75 +1760,58 @@ QDeclarativeImportDatabase - module "%1" definition "%2" not readable невозможно прочитать определение "%2" модуля "%1" - plugin cannot be loaded for module "%1": %2 модуль не может быть загружен для подмодуля "%1": %2 - module "%1" plugin "%2" not found подмодуль "%1" модуля "%2" не найден - - module "%1" version %2.%3 is not installed модуль "%1" версии %2.%3 не установлен - module "%1" is not installed модуль "%1" не установлен - - "%1": no such directory "%1": каталог не существует - import "%1" has no qmldir and no namespace каталог "%1" не содержит ни qmldir, ни namespace - - %1 is not a namespace - %1 - некорректное пространство имён - - nested namespaces not allowed - вложенные пространства имён недопустимы - - local directory локальный каталог - is ambiguous. Found in %1 and in %2 неоднозначно. Найдено в %1 и %2 - is ambiguous. Found in %1 in version %2.%3 and %4.%5 неоднозначно. Найдено в %1 версий %2.%3 и %4.%5 - is instantiated recursively обрабатывается рекурсивно - is not a type не является типом @@ -2285,7 +1819,6 @@ QDeclarativeKeyNavigationAttached - KeyNavigation is only available via attached properties KeyNavigation доступна только через прикреплённые свойства @@ -2293,7 +1826,6 @@ QDeclarativeKeysAttached - Keys is only available via attached properties Keys доступны только через прикреплённые свойства @@ -2301,59 +1833,46 @@ QDeclarativeListModel - remove: index %1 out of range remove: индекс %1 вне диапазона - insert: value is not an object insert: значение не является объектом - insert: index %1 out of range insert: индекс %1 вне диапазона - move: out of range move: индекс вне диапазона - append: value is not an object append: значение не является объектом - set: value is not an object set: значение не является объектом - - set: index %1 out of range set: индекс %1 вне диапазона - - ListElement: cannot contain nested elements ListElement: не может содержать вложенные элементы - ListElement: cannot use reserved "id" property ListElement: невозможно использовать зарезервированное свойство "id" - ListElement: cannot use script for property value ListElement: невозможно использовать сценарий в качестве значения свойства - ListModel: undefined property '%1' ListModel: неопределённое свойство "%1" @@ -2361,7 +1880,6 @@ QDeclarativeLoader - Loader does not support loading non-visual elements. Загрузчик не поддерживает загрузку невизуальных элементов. @@ -2369,18 +1887,14 @@ QDeclarativeParentAnimation - Unable to preserve appearance under complex transform Невозможно сохранить внешний вид при сложном преобразовании - - Unable to preserve appearance under non-uniform scale Невозможно сохранить внешний вид при неоднородном масштабе - Unable to preserve appearance under scale of 0 Невозможно сохранить внешний вид при масштабе 0 @@ -2388,18 +1902,14 @@ QDeclarativeParentChange - Unable to preserve appearance under complex transform Невозможно сохранить внешний вид при сложном преобразовании - - Unable to preserve appearance under non-uniform scale Невозможно сохранить внешний вид при неоднородном масштабе - Unable to preserve appearance under scale of 0 Невозможно сохранить внешний вид при масштабе 0 @@ -2407,144 +1917,110 @@ QDeclarativeParser - - - Illegal unicode escape sequence Неверная unicode esc-последовательность - Illegal character Недопустимый символ - Unclosed string at end of line Незакрытый текст в конце строки - Illegal escape squence Неверная esc-последовательность - Unclosed comment at end of file Незакрытый комментарий в конце строки - Illegal syntax for exponential number Недопустимый синтаксис для экспоненциального числа - Identifier cannot start with numeric literal Идентификатор не может начинаться с цифры - Unterminated regular expression literal Незаконченный литерал регулярного выражения - Invalid regular expression flag '%0' Некорректный флаг "%0" в регулярном выражении - - Unterminated regular expression backslash sequence Регулярное выражение содержит незавершённую экранированную последовательность - Unterminated regular expression class Регулярное выражение содержит незавершённый класс - - Syntax error Синтаксическая ошибка - Unexpected token `%1' Неожиданный символ "%1" - - Expected token `%1' Ожидается символ "%1" - - - Property value set multiple times Значение свойства установлено несколько раз - Expected type name Ожидается название типа - Invalid import qualifier ID Некорректный ID спецификатора импорта - Reserved name "Qt" cannot be used as an qualifier Зарезервированное имя "Qt" не может быть использовано в качестве спецификатора - Script import qualifiers must be unique. Спецификаторы импорта сценария должны быть уникальными. - Script import requires a qualifier Для импорта сценария требуется спецификатор - Library import requires a version Импорт библиотеки требует версию - Expected parameter type Ожидается тип параметра - Invalid property type modifier Некорректный модификатор типа свойства - Unexpected property type modifier Неожиданный модификатор типа свойства - Expected property type Ожидается тип свойства - Readonly not yet supported Readonly ещё не поддерживается - JavaScript declaration outside Script element Определение JavaScript вне элемента Script @@ -2552,39 +2028,28 @@ QDeclarativePauseAnimation - Cannot set a duration of < 0 Невозможно установить длительность < 0 - QDeclarativePixmapCache - - + QDeclarativePixmap + Error decoding: %1: %2 Ошибка декодирования: %1: %2 - Failed to get image from provider: %1 - Не удалось получить изображение от поставщика: %1 - - - - + Не удалось получить изображение от постащика изображений: %1 + + Cannot open: %1 Не удалось открыть: %1 - - - Unknown Error loading %1 - Неизвестная ошибка загрузки %1 - QDeclarativePropertyAnimation - Cannot set a duration of < 0 Невозможно установить длительность < 0 @@ -2592,17 +2057,14 @@ QDeclarativePropertyChanges - PropertyChanges does not support creating state-specific objects. PropertyChanges не поддерживают создание объектов, зависимых от состояния. - Cannot assign to non-existent property "%1" Невозможно назначить несуществующему свойству "%1" - Cannot assign to read-only property "%1" Невозможно назначить свойству только для чтения "%1" @@ -2610,13 +2072,10 @@ QDeclarativeTextInput - - Could not load cursor delegate Не удалось загрузить делегат курсора - Could not instantiate cursor delegate Не удалось инстанциировать делегат курсора @@ -2624,47 +2083,38 @@ QDeclarativeVME - Unable to create object of type %1 Невозможно создать объект типа "%1" - Cannot assign value %1 to property %2 Невозможно установить значение "%1" свойству "%2" - Cannot assign object type %1 with no default method Невозможно назначить объект типа %1 без метода по умолчанию - Cannot connect mismatched signal/slot %1 %vs. %2 Невозможно подключить отсутствующий сигнал/слот %1 к %2 - Cannot assign an object to signal property %1 Невозможно назначить объект к свойству сигнала %1 - Cannot assign object to list Невозможно назначить объект списку - Cannot assign object to interface property Невозможно назначить объект свойству интерфейса - Unable to create attached object Не удалось создать вложенный объект - Cannot set properties on %1 as it is null Невозможно установить свойства для %1, так как он нулевой @@ -2672,7 +2122,6 @@ QDeclarativeVisualDataModel - Delegate component must be Item type. Компинент делегата должен быть типа Item. @@ -2680,8 +2129,6 @@ QDeclarativeXmlListModel - - Qt was built without support for xmlpatterns Qt было собрано без поддержки xmlpatterns @@ -2689,7 +2136,6 @@ QDeclarativeXmlListModelRole - An XmlRole query must not start with '/' Запрос XmlRole не должен начинаться с '/' @@ -2697,7 +2143,6 @@ QDeclarativeXmlRoleList - An XmlListModel query must start with '/' or "//" Запрос XmlListModel должен начинаться с '/' или "//" @@ -2705,17 +2150,14 @@ QDial - QDial QDial - SpeedoMeter SpeedoMeter - SliderHandle SliderHandle @@ -2723,12 +2165,10 @@ QDialog - What's This? Что это? - Done Готово @@ -2736,124 +2176,98 @@ QDialogButtonBox - - - OK ОК - Save Сохранить - &Save &Сохранить - Open Открыть - Cancel Отмена - &Cancel От&мена - Close Закрыть - &Close &Закрыть - Apply Применить - Reset Сбросить - Help Справка - Don't Save Не сохранять - Discard Отклонить - &Yes &Да - Yes to &All Да для &всех - &No &Нет - N&o to All Н&ет для всех - Save All Сохранить все - Abort Прервать - Retry Повторить - Ignore Пропустить - Restore Defaults Восстановить значения - Close without Saving Закрыть без сохранения - &OK &ОК @@ -2861,29 +2275,24 @@ QDirModel - Name Имя - Size Размер - Kind Match OS X Finder Вид - Type All other platforms Тип - Date Modified Дата изменения @@ -2891,17 +2300,14 @@ QDockWidget - Close Закрыть - Dock Прикрепить - Float Открепить @@ -2909,12 +2315,10 @@ QDoubleSpinBox - More Больше - Less Меньше @@ -2922,27 +2326,22 @@ QErrorMessage - &Show this message again &Показывать это сообщение в дальнейшем - &OK &Закрыть - Debug Message: Отладочное сообщение: - Warning: Предупреждение: - Fatal Error: Критическая ошибка: @@ -2950,38 +2349,30 @@ QFile - - Destination file exists Файл существует - Will not rename sequential file using block copy Последовательный файл не будет переименован с использованием поблочного копирования - Cannot remove source file Невозможно удалить исходный файл - Cannot open %1 for input Невозможно открыть %1 для ввода - Cannot open for output Невозможно открыть для вывода - Failure to write block Сбой записи блока - Cannot create %1 for output Невозможно создать %1 для вывода @@ -2989,143 +2380,110 @@ QFileDialog - - All Files (*) Все файлы (*) - - Back Назад - - List View Список - - Detail View Подробный вид - - File Файл - File Folder Match Windows Explorer Папка с файлами - Folder All other platforms Папка - Alias Mac OS X Finder Псевдоним - Shortcut All other platforms Ярлык - Open Открыть - Save As Сохранить как - - - &Open &Открыть - - &Save &Сохранить - '%1' is write protected. Do you want to delete it anyway? - - - - + "%1" защищён от записи. +Действительно желаете удалить? + + Recent Places Недавние документы - &Rename &Переименовать - &Delete &Удалить - Show &hidden files Показать ск&рытые файлы - New Folder Новая папка - Find Directory Найти каталог - Directories Каталоги - All Files (*.*) Все файлы (*.*) - - Directory: Каталог: - %1 already exists. Do you want to replace it? %1 уже существует. Хотите заменить его? - %1 File not found. Please verify the correct file name was given. @@ -3134,25 +2492,18 @@ Проверьте правильность указанного имени файла. - My Computer Мой компьютер - - Parent Directory Родительский каталог - - Files of type: Типы файлов: - - %1 Directory not found. Please verify the correct directory name was given. @@ -3161,97 +2512,74 @@ Проверьте правильность указанного имени каталога. - Are sure you want to delete '%1'? Вы действительно хотите удалить "%1"? - Could not delete directory. Не удалось удалить каталог. - Drive Диск - Unknown Неизвестный - Show Показать - - Forward Вперёд - &New Folder &Новая папка - - &Choose &Выбрать - Remove Удалить - - File &name: &Имя файла: - - Look in: Перейти к: - - Create New Folder Создать папку - Go back Назад - Go forward Вперёд - Go to the parent directory Перейти в родительский каталог - Create a New Folder Создать новую папку - Change to list view mode Переключить в режим списка - Change to detail view mode Переключить в подробный режим @@ -3259,83 +2587,64 @@ QFileSystemModel - - %1 TB %1 Тб - - %1 GB %1 Гб - - %1 MB %1 Мб - - %1 KB %1 Кб - %1 bytes %1 байт - Invalid filename Некорректное имя файла - <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. <b>Имя "%1" не может быть использовано.</b><p>Попробуйте использовать имя меньшей длины и/или без символов пунктуации. - Name Имя - Size Размер - Kind Match OS X Finder Вид - Type All other platforms Тип - Date Modified Дата изменения - My Computer Мой компьютер - Computer Компьютер - %1 byte(s) %1 байт @@ -3343,221 +2652,170 @@ QFontDatabase - - Normal Обычный - - - Bold Жирный - - Demi Bold Полужирный - - - Black Чёрный - Demi Средний - - Light Светлый - - Italic Курсив - - Oblique Наклонный - Any Любая - Latin Латиница - Greek Греческая - Cyrillic Кириллица - Armenian Армянская - Hebrew Иврит - Arabic Арабская - Syriac Сирийская - Thaana Таана - Devanagari Деванагири - Bengali Бенгальская - Gurmukhi Гурмукхи - Gujarati Гуджарати - Oriya Ория - Tamil Тамильская - Telugu Телугу - Kannada Каннада - Malayalam Малайялам - Sinhala Сингальская - Thai Тайская - Lao Лаосская - Tibetan Тибетская - Myanmar Мьянма - Georgian Грузинская - Khmer Кхмерская - Simplified Chinese Китайская упрощённая - Traditional Chinese Китайская традиционная - Japanese Японская - Korean Корейская - Vietnamese Вьетнамская - Symbol Символьная - Ogham Огамическая - Runic Руническая - N'Ko Нко @@ -3565,47 +2823,38 @@ QFontDialog - &Font &Шрифт - Font st&yle &Начертание - &Size &Размер - Effects Эффекты - Stri&keout Зачёр&кнутый - &Underline П&одчёркнутый - Sample Пример - Select Font Выбор шрифта - Wr&iting System &Система письма @@ -3613,145 +2862,104 @@ QFtp - Host %1 found Узел %1 найден - Host found Узел найден - - - Connected to host %1 Установлено соединение с узлом %1 - Connected to host Соединение с узлом установлено - Connection to %1 closed Соединение с %1 закрыто - - - Connection closed Соединение закрыто - - Host %1 not found Узел %1 не найден - - Connection refused to host %1 В соединении с узлом %1 отказано - Connection timed out to host %1 Время на соединение с узлом %1 истекло - - - - Unknown error Неизвестная ошибка - - Connecting to host failed: %1 Не удалось соединиться с узлом: %1 - - Login failed: %1 Не удалось авторизоваться: %1 - - Listing directory failed: %1 Не удалось прочитать каталог: %1 - - Changing directory failed: %1 Не удалось сменить каталог: %1 - - Downloading file failed: %1 Не удалось загрузить файл: %1 - - Uploading file failed: %1 Не удалось отгрузить файл: %1 - - Removing file failed: %1 Не удалось удалить файл: %1 - - Creating directory failed: %1 Не удалось создать каталог: %1 - - Removing directory failed: %1 Не удалось удалить каталог: %1 - - Not connected Соединение не установлено - - Connection refused for data connection Отказ в соединении для передачи данных @@ -3759,12 +2967,10 @@ QHostInfo - Unknown error Неизвестная ошибка - No host name given Имя узла не задано @@ -3772,37 +2978,22 @@ QHostInfoAgent - - - - Host not found Узел не найден - - - - Unknown address type Неизвестный тип адреса - - - Unknown error Неизвестная ошибка - - No host name given Имя узла не задано - - Invalid hostname Некорректное имя узла @@ -3810,153 +3001,110 @@ QHttp - - Connection refused Отказано в соединении - - - Host %1 not found Узел %1 не найден - - Wrong content length Неверная длина содержимого - - HTTP request failed HTTP-запрос не удался - Host %1 found Узел %1 найден - Host found Узел найден - Connected to host %1 Установлено соединение с узлом %1 - Connected to host Соединение с узлом установлено - Connection to %1 closed Соединение с узлом %1 закрыто - - Connection closed Соединение закрыто - - - - Unknown error Неизвестная ошибка - - Request aborted Запрос прерван - - No server set to connect to Не указан сервер для подключения - - Server closed connection unexpectedly Сервер неожиданно разорвал соединение - - Invalid HTTP response header Некорректный HTTP-заголовок ответа - Unknown authentication method Неизвестный метод авторизации - - - - Invalid HTTP chunked body Некорректное HTTP-фрагментирование данных - Error writing response to device Ошибка записи ответа на устройство - Proxy authentication required Требуется авторизация на прокси-сервере - Authentication required Требуется авторизация - Proxy requires authentication Прокси-сервер требует авторизацию - Host requires authentication Узел требует авторизацию - Data corrupted Данные повреждены - SSL handshake failed Квитирование SSL не удалось - Unknown protocol specified Указан неизвестный протокол - Connection refused (or timed out) В соединении отказано (или время ожидания истекло) - HTTPS connection requested but SSL support not compiled in Запрошено соединение по протоколу HTTPS, но поддержка SSL не скомпилирована @@ -3964,47 +3112,38 @@ QHttpSocketEngine - Did not receive HTTP response from proxy Не получен HTTP-ответ от прокси-сервера - Error parsing authentication request from proxy Ошибка разбора запроса авторизации от прокси-сервера - Authentication required Требуется авторизация - Proxy denied connection Прокси-сервер запретил соединение - Error communicating with HTTP proxy Ошибка обмена данными с прокси-сервером HTTP - Proxy server not found Прокси-сервер не найден - Proxy connection refused В соединении прокси-сервером отказано - Proxy server connection timed out Время на соединение с прокси-сервером истекло - Proxy connection closed prematurely Соединение с прокси-сервером неожиданно закрыто @@ -4012,22 +3151,18 @@ QIBaseDriver - Error opening database Ошибка открытия базы данных - Could not start transaction Не удалось начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию @@ -4035,89 +3170,70 @@ QIBaseResult - Unable to create BLOB Невозможно создать BLOB - Unable to write BLOB Невозможно записать BLOB - Unable to open BLOB Невозможно открыть BLOB - Unable to read BLOB Невозможно прочитать BLOB - - Could not find array Не удалось найти массив - Could not get array data Не удалось найти данные массива - Could not get query info Не удалось найти информацию о запросе - Could not start transaction Не удалось начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Could not allocate statement Не удалось получить ресурсы для создания выражения - Could not prepare statement Не удалось подготовить выражение - - Could not describe input statement Не удалось описать входящее выражение - Could not describe statement Не удалось описать выражение - Unable to close statement Невозможно закрыть выражение - Unable to execute query Невозможно выполнить запрос - Could not fetch next item Не удалось получить следующий элемент - Could not get statement info Не удалось найти информацию о выражении @@ -4125,27 +3241,22 @@ QIODevice - Permission denied Доступ запрещён - Too many open files Слишком много открытых файлов - No such file or directory Файл или каталог не существует - No space left on device Нет свободного места на устройстве - Unknown error Неизвестная ошибка @@ -4153,32 +3264,26 @@ QInputContext - XIM Метод ввода X-сервера - FEP Метод ввода S60 FEP - XIM input method Метод ввода X-сервера - Windows input method Метод ввода Windows - Mac OS X input method Метод ввода Mac OS X - S60 FEP input method Метод ввода S60 FEP @@ -4186,7 +3291,6 @@ QInputDialog - Enter a value: Укажите значение: @@ -4194,67 +3298,50 @@ QLibrary - Could not mmap '%1': %2 Не удалось выполнить mmap "%1": %2 - Plugin verification data mismatch in '%1' Проверочная информация для модуля "%1" не совпадает - Could not unmap '%1': %2 Не удалось выполнить unmap "%1": %2 - The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] Модуль "%1" использует несоместимую библиотеку Qt. (%2.%3.%4) [%5] - The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" Модуль "%1" использует несоместимую библиотеку Qt. Ожидается ключ "%2", но получен ключ "%3" - Unknown error Неизвестная ошибка - - - The shared library was not found. Динамическая библиотека не найдена. - The file '%1' is not a valid Qt plugin. Файл "%1" - не является корректным модулем Qt. - The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) Модуль "%1" использует несоместимую библиотеку Qt. (Невозможно совместить релизные и отладочные библиотеки.) - - Cannot load library %1: %2 Невозможно загрузить библиотеку %1: %2 - - Cannot unload library %1: %2 Невозможно выгрузить библиотеку %1: %2 - - Cannot resolve symbol "%1" in %2: %3 Невозможно разрешить символ "%1" в %2: %3 @@ -4262,37 +3349,30 @@ QLineEdit - Select All Выделить всё - &Undo &Отменить действие - &Redo &Повторить действие - Cu&t &Вырезать - &Copy &Копировать - &Paste В&ставить - Delete Удалить @@ -4300,23 +3380,18 @@ QLocalServer - - %1: Name error %1: Некорректное имя - %1: Permission denied %1: Доступ запрещён - %1: Address in use %1: Адрес используется - %1: Unknown error %2 %1: Неизвестная ошибка %2 @@ -4324,70 +3399,46 @@ QLocalSocket - - %1: Connection refused %1: Отказано в соединении - - %1: Remote closed %1: Закрыто удаленной стороной - - - - %1: Invalid name %1: Некорректное имя - - %1: Socket access error %1: Ошибка обращения к сокету - - %1: Socket resource error %1: Ошибка выделения ресурсов сокета - - %1: Socket operation timed out %1: Время на операцию с сокетом истекло - - %1: Datagram too large %1: Датаграмма слишком большая - - - %1: Connection error %1: Ошибка соединения - - %1: The socket operation is not supported %1: Операция с сокетом не поддерживается - %1: Unknown error %1: Неизвестная ошибка - - %1: Unknown error %2 %1: Неизвестная ошибка %2 @@ -4395,27 +3446,22 @@ QMYSQLDriver - Unable to open database ' Невозможно открыть базу данных ' - Unable to connect Невозможно соединиться - Unable to begin transaction Невозможно начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию @@ -4423,60 +3469,46 @@ QMYSQLResult - - Unable to fetch data Невозможно получить данные - Unable to execute query Невозможно выполнить запрос - Unable to store result Невозможно сохранить результат - - Unable to prepare statement Невозможно подготовить выражение - Unable to reset statement Невозможно сбросить выражение - Unable to bind value Невозможно привязать значение - Unable to execute statement Невозможно выполнить выражение - - Unable to bind outvalues Невозможно привязать результирующие значения - Unable to store statement results Невозможно сохранить результаты выполнения выражения - Unable to execute next query Невозможно выполнить следующий запрос - Unable to store next result Невозможно сохранить следующий результат @@ -4484,7 +3516,6 @@ QMdiArea - (Untitled) (Неозаглавлено) @@ -4492,92 +3523,74 @@ QMdiSubWindow - %1 - [%2] %1 - [%2] - Close Закрыть - Minimize Свернуть - Restore Down Восстановить - &Restore &Восстановить - &Move &Переместить - &Size &Размер - Mi&nimize &Свернуть - Ma&ximize Р&аспахнуть - Stay on &Top Оставаться &сверху - &Close &Закрыть - Maximize Распахнуть - Unshade Восстановить из заголовка - Shade Свернуть в заголовок - Restore Восстановить - Help Справка - Menu Меню - - [%1] - [%1] @@ -4585,21 +3598,14 @@ QMenu - - Close Закрыть - - Open Открыть - - - Execute Выполнить @@ -4607,7 +3613,6 @@ QMenuBar - Actions Действия @@ -4615,40 +3620,30 @@ QMessageBox - - - - OK Закрыть - <h3>About Qt</h3><p>This program uses Qt version %1.</p> <h3>О Qt</h3><p>Данная программа использует Qt версии %1.</p> - <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> <p>Qt - это инструментарий для разработки кроссплатформенных приложений на C++.</p><p>Qt предоставляет совместимость на уровне исходных текстов между MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux и всеми популярными коммерческими вариантами Unix. Также Qt доступна для встраиваемых устройств в виде Qt для Embedded Linux и Qt для Windows CE.</p><p>Qt доступна под тремя различными лицензиями, разработанными для удовлетворения различных требований.</p><p>Qt под нашей коммерческой лицензией предназначена для развития проприетарного/коммерческого программного обеспечения, когда Вы не желаете предоставлять исходные тексты третьим сторонам, или в случае невозможности принятия условий лицензий GNU LGPL версии 2.1 или GNU GPL версии 3.0.</p><p>Qt под лицензией GNU LGPL версии 2.1 предназначена для разработки программного обеспечения с открытыми исходными текстами или коммерческого программного обеспечения при соблюдении условий лицензии GNU LGPL версии 2.1.</p><p>Qt под лицензией GNU General Public License версии 3.0 предназначена для разработки программных приложений в тех случаях, когда Вы хотели бы использовать такие приложения в сочетании с программным обеспечением на условиях лицензии GNU GPL с версии 3.0 или если Вы готовы соблюдать условия лицензии GNU GPL версии 3.0.</p><p>Обратитесь к <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> для обзора лицензий Qt.</p><p>Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения.</p><p>Qt - продукт компании Nokia. Обратитесь к <a href="http://qt.nokia.com/">qt.nokia.com</a> для получения дополнительной информации.</p> - About Qt О Qt - Help Справка - Show Details... Показать подробности... - Hide Details... Скрыть подробности... @@ -4656,7 +3651,6 @@ QMultiInputContext - Select IM Выбор режима ввода @@ -4664,12 +3658,10 @@ QMultiInputContextPlugin - Multiple input method switcher Переключатель режима множественного ввода - Multiple input method switcher that uses the context menu of the text widgets Переключатель режима множественного ввода, используемый в контекстном меню текстовых редакторов @@ -4677,132 +3669,106 @@ QNativeSocketEngine - The remote host closed the connection Удалённый узел закрыл соединение - Network operation timed out Время на сетевую операцию истекло - Out of resources Недостаточно ресурсов - Unsupported socket operation Операция с сокетом не поддерживается - Protocol type not supported Протокол не поддерживается - Invalid socket descriptor Некорректный дескриптор сокета - Network unreachable Сеть недоступна - Permission denied Доступ запрещён - Connection timed out Время на соединение истекло - Connection refused Отказано в соединении - The bound address is already in use Адрес уже используется - The address is not available Адрес недоступен - The address is protected Адрес защищён - Unable to send a message Невозможно отправить сообщение - Unable to receive a message Невозможно получить сообщение - Unable to write Невозможно записать - Network error Ошибка сети - Another socket is already listening on the same port Другой сокет уже прослушивает этот порт - Unable to initialize non-blocking socket Невозможно инициализировать не-блочный сокет - Unable to initialize broadcast socket Невозможно инициализировать широковещательный сокет - Attempt to use IPv6 socket on a platform with no IPv6 support Попытка использовать IPv6 на платформе, не поддерживающей IPv6 - Host unreachable Узел недоступен - Datagram was too large to send Датаграмма слишком большая для отправки - Operation on non-socket Операция с не-сокетом - Unknown error Неизвестная ошибка - The proxy type is invalid for this operation Некорректный тип прокси-сервера для данной операции @@ -4810,7 +3776,6 @@ QNetworkAccessCacheBackend - Error opening %1 Ошибка открытия %1 @@ -4818,12 +3783,10 @@ QNetworkAccessDataBackend - Operation not supported on %1 Операция не поддерживается для %1 - Invalid URI: %1 Некорректный URI: %1 @@ -4831,17 +3794,14 @@ QNetworkAccessDebugPipeBackend - Write error writing to %1: %2 Ошибка записи в %1: %2 - Socket error on %1: %2 Ошика сокета для %1: %2 - Remote host closed the connection prematurely on %1 Удалённый узел неожиданно прервал соединение для %1 @@ -4849,30 +3809,22 @@ QNetworkAccessFileBackend - - Request for opening non-local file %1 Запрос на открытие файла вне файловой системы %1 - - Error opening %1: %2 Ошибка открытия %1: %2 - Write error writing to %1: %2 Ошибка записи в %1: %2 - - Cannot open %1: Path is a directory Невозможно открыть %1: Указан путь к каталогу - Read error reading from %1: %2 Ошибка чтения из %1: %2 @@ -4880,27 +3832,22 @@ QNetworkAccessFtpBackend - No suitable proxy found Подходящий прокси-сервер не найден - Cannot open %1: is a directory Невозможно открыть %1: Указан путь к каталогу - Logging in to %1 failed: authentication required Соединение с %1 не удалось: требуется авторизация - Error while downloading %1: %2 Ошибка в процессе загрузки %1: %2 - Error while uploading %1: %2 Ошибка в процессе отгрузки %1: %2 @@ -4908,7 +3855,6 @@ QNetworkAccessHttpBackend - No suitable proxy found Подходящий прокси-сервер не найден @@ -4916,7 +3862,6 @@ QNetworkAccessManager - Network access is disabled. Доступ в сеть отключён. @@ -4924,22 +3869,18 @@ QNetworkReply - Error downloading %1 - server replied: %2 Ошибка загрузки %1 - ответ сервера: %2 - Protocol "%1" is unknown Неизвестный протокол "%1" - Network session error. Ошибка сетевой сессии. - Temporary network failure. Временная ошибка сети. @@ -4947,8 +3888,6 @@ QNetworkReplyImpl - - Operation canceled Операция отменена @@ -4956,7 +3895,6 @@ QNetworkSession - Invalid configuration. Некорректная конфигурация. @@ -4964,48 +3902,35 @@ QNetworkSessionPrivateImpl - Roaming error или перемещения? Ошибка роуминга - Session aborted by user or system Сессия прервана пользователем или системой - Unidentified Error Неопределённая ошибка - - Unknown session error. Неизвестная ошибка сессии. - - The session was aborted by the user or system. Сессия была прервана пользователем или системой. - - The requested operation is not supported by the system. Требуемая операция не поддерживается системой. - - The specified configuration cannot be used. Невозможно использовать указанную конфигурацию. - - Roaming was aborted or is not possible. Роуминг прерван или невозможен. @@ -5013,28 +3938,23 @@ QOCIDriver - Unable to initialize QOCIDriver Невозможно инициализировать - Unable to logon Невозможно авторизоваться - Unable to begin transaction Невозможно начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию @@ -5042,44 +3962,34 @@ QOCIResult - - - Unable to bind column for batch execute Невозможно привязать столбец для пакетного выполнения - Unable to execute batch statement Невозможно выполнить пакетное выражение - Unable to goto next Невозможно перейти к следующей строке - Unable to alloc statement Невозможно создать выражение - Unable to prepare statement Невозможно подготовить выражение - Unable to get statement type Невозможно определить тип выражения - Unable to bind value Невозможно привязать результирующие значения - Unable to execute statement Невозможно выполнить выражение @@ -5087,32 +3997,26 @@ QODBCDriver - Unable to connect Невозможно соединиться - Unable to disable autocommit Невозможно отключить автозавершение транзакций - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию - Unable to enable autocommit Невозможно включить автозавершение транзакций - Unable to connect - Driver doesn't support all functionality required Невозможно соединиться - Драйвер не поддерживает требуемый функционал @@ -5120,51 +4024,38 @@ QODBCResult - - QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Невозможно установить "SQL_CURSOR_STATIC" атрибутом выражение. Проверьте настройки драйвера ODBC - - Unable to execute statement Невозможно выполнить выражение - Unable to fetch next Невозможно получить следующую строку - Unable to prepare statement Невозможно подготовить выражение - Unable to bind variable Невозможно привязать значение - - - Unable to fetch last Невозможно получить последнюю строку - Unable to fetch Невозможно получить данные - Unable to fetch first Невозможно получить первую строку - Unable to fetch previous Невозможно получить предыдущую строку @@ -5172,19 +4063,14 @@ QObject - "%1" duplicates a previous role name and will be disabled. "%1" повторяет имя предыдущей роли и не будет использовано. - - invalid query: "%1" Некорректный запрос: "%1" - - PulseAudio Sound Server Звуковой сервер PulseAudio @@ -5192,12 +4078,10 @@ QPPDOptionsModel - Name Имя - Value Значение @@ -5205,32 +4089,26 @@ QPSQLDriver - Unable to connect Невозможно соединиться - Could not begin transaction Не удалось начать транзакцию - Could not commit transaction Не удалось завершить транзакцию - Could not rollback transaction Не удалось отозвать транзакцию - Unable to subscribe Невозможно подписаться - Unable to unsubscribe Невозможно отписаться @@ -5238,12 +4116,10 @@ QPSQLResult - Unable to create query Невозможно создать запрос - Unable to prepare statement Невозможно подготовить выражение @@ -5251,102 +4127,82 @@ QPageSetupWidget - Centimeters (cm) Сантиметры (cm) - Millimeters (mm) Миллиметры (mm) - Inches (in) Дюймы (in) - Points (pt) Точки (pt) - Form Форма - Paper Бумага - Page size: Размер страницы: - Width: Ширина: - Height: Высота: - Paper source: Источник бумаги: - Orientation Ориентация - Portrait Книжная - Landscape Альбомная - Reverse landscape Перевёрнутая альбомная - Reverse portrait Перевёрнутая книжная - Margins Поля - top margin верхнее поле - left margin левое поле - right margin правое поле - bottom margin нижнее поле @@ -5354,12 +4210,10 @@ QPluginLoader - Unknown error Неизвестная ошибка - The plugin was not loaded. Модуль не был загружен. @@ -5367,433 +4221,344 @@ QPrintDialog - locally connected соединено локально - - Aliases: %1 Псевдонимы: %1 - - unknown неизвестно - OK Закрыть - Print all Все страницы - Print range Диапазон страниц - A0 (841 x 1189 mm) A0 (841 x 1189 мм) - A1 (594 x 841 mm) A1 (594 x 841 мм) - A2 (420 x 594 mm) A2 (420 x 594 мм) - A3 (297 x 420 mm) A3 (297 x 420 мм) - A5 (148 x 210 mm) A5 (148 x 210 мм) - A6 (105 x 148 mm) A6 (105 x 148 мм) - A7 (74 x 105 mm) A7 (74 x 105 мм) - A8 (52 x 74 mm) A8 (52 x 74 мм) - A9 (37 x 52 mm) A9 (37 x 52 мм) - B0 (1000 x 1414 mm) B0 (1000 x 1414 мм) - B1 (707 x 1000 mm) B1 (707 x 1000 мм) - B2 (500 x 707 mm) B2 (500 x 707 мм) - B3 (353 x 500 mm) B3 (353 x 500 мм) - B4 (250 x 353 mm) B4 (250 x 353 мм) - B6 (125 x 176 mm) B6 (125 x 176 мм) - B7 (88 x 125 mm) B7 (88 x 125 мм) - B8 (62 x 88 mm) B8 (62 x 88 мм) - B9 (44 x 62 mm) B9 (44 x 62 мм) - B10 (31 x 44 mm) B10 (31 x 44 мм) - C5E (163 x 229 mm) C5E (163 x 229 мм) - DLE (110 x 220 mm) DLE (110 x 220 мм) - Folio (210 x 330 mm) Folio (210 x 330 мм) - Ledger (432 x 279 mm) Ledger (432 x 279 мм) - Tabloid (279 x 432 mm) Tabloid (279 x 432 мм) - US Common #10 Envelope (105 x 241 mm) Конверт US #10 (105x241 мм) - Print current page Текущая страница - A4 (210 x 297 mm, 8.26 x 11.7 inches) A4 (210 x 297 мм, 8.26 x 11.7 дюймов) - B5 (176 x 250 mm, 6.93 x 9.84 inches) B5 (176 x 250 мм, 6.93 x 9.84 дюймов) - Executive (7.5 x 10 inches, 191 x 254 mm) Executive (191 x 254 мм, 7.5 x 10 дюймов) - Legal (8.5 x 14 inches, 216 x 356 mm) Legal (216 x 356 мм, 8.5 x 14 дюймов) - Letter (8.5 x 11 inches, 216 x 279 mm) Letter (216 x 279 мм, 8.5 x 11 дюймов) - Print selection Выделенный фрагмент - - - Print Печать - Print To File ... Печать в файл ... - File %1 is not writable. Please choose a different file name. %1 недоступен для записи. Выберите другое имя файла. - %1 already exists. Do you want to overwrite it? %1 уже существует. Хотите заменить его? - File exists Файл существует - <qt>Do you want to overwrite it?</qt> <qt>Хотите заменить?</qt> - %1 is a directory. Please choose a different file name. %1 - это каталог. Выберите другое имя файла. - The 'From' value cannot be greater than the 'To' value. Значение "с" не может быть больше значения "по". - A0 A0 - A1 A1 - A2 A2 - A3 A3 - A4 A4 - A5 A5 - A6 A6 - A7 A7 - A8 A8 - A9 A9 - B0 B0 - B1 B1 - B2 B2 - B3 B3 - B4 B4 - B5 B5 - B6 B6 - B7 B7 - B8 B8 - B9 B9 - B10 B10 - C5E C5E - DLE DLE - Executive Executive - Folio Folio - Ledger Ledger - Legal Legal - Letter Letter - Tabloid Tabloid - US Common #10 Envelope US Common #10 Envelope - Custom Пользовательский - - &Options >> &Параметры >> - &Options << &Параметры << - Print to File (PDF) Печать в файл (PDF) - Print to File (Postscript) Печать в файл (Postscript) - Local file Локальный файл - Write %1 file Запись %1 файла - &Print &Печать @@ -5801,108 +4566,86 @@ QPrintPreviewDialog - %1% %1% - Print Preview Просмотр печати - Next page Следующая страница - Previous page Предыдущая страница - First page Первая страница - Last page Последняя страница - Fit width По ширине - Fit page На всю страницу - Zoom in Увеличить - Zoom out Уменьшить - Portrait Книжная - Landscape Альбомная - Show single page Показать одну страницу - Show facing pages Показать титульные страницы - Show overview of all pages Показать обзор всех страниц - Print Печать - Page setup Параметры страницы - Close Закрыть - Export to PDF Экспорт в PDF - Export to PostScript Экспорт в Postscript - - Page Setup Параметры страницы @@ -5910,17 +4653,14 @@ QPrintPropertiesWidget - Form Форма - Page Страница - Advanced Дополнительно @@ -5928,102 +4668,82 @@ QPrintSettingsOutput - Form Форма - Copies Копии - Print range Диапазон печати - Print all Все - Pages from Страницы с - to по - Selection Выделенный фрагмент - Output Settings Настройки вывода - Copies: Количество копий: - Collate - Разобрать про копиям - - - + Разобрать по копиям + + Reverse Обратный порядок - Options Параметры - Color Mode Режим цвета - Color Цвет - Grayscale Оттенки серого - Duplex Printing Двусторонняя печать - None Нет - Long side По длинной стороне - Short side По короткой стороне - Current Page Текущая страница @@ -6031,47 +4751,38 @@ QPrintWidget - Form Форма - Printer Принтер - &Name: &Название: - P&roperties С&войства - Location: Расположение: - Preview Просмотр - Type: Тип: - Output &file: Вывод в &файл: - ... ... @@ -6079,62 +4790,38 @@ QProcess - - Could not open input redirection for reading Не удалось открыть перенаправление ввода для чтения - - Could not open output redirection for writing Не удалось открыть перенаправление вывода для записи - Resource error (fork failure): %1 Ошибка выделения ресурсов (сбой fork): %1 - - - - - - - - - Process operation timed out Время на операцию с процессом истекло - - - - Error reading from process Ошибка получения данных от процесса - - - Error writing to process Ошибка отправки данных процессу - Process crashed Процесс завершился с ошибкой - No program defined Программа не указана - Process failed to start: %1 Не удалось запустить процесс: %1 @@ -6142,7 +4829,6 @@ QProgressDialog - Cancel Отмена @@ -6150,7 +4836,6 @@ QPushButton - Open Открыть @@ -6158,7 +4843,6 @@ QRadioButton - Check Отметить @@ -6166,57 +4850,46 @@ QRegExp - no error occurred ошибки отсутствуют - disabled feature used использование отключённых возможностей - bad char class syntax неправильный синтаксис класса символов - bad lookahead syntax неправильный предварительный синтаксис - bad repetition syntax неправильный синтаксис повторения - invalid octal value некорректное восьмеричное значение - missing left delim отсутствует левый разделитель - unexpected end неожиданный конец - met internal limit достигнуто внутреннее ограничение - invalid interval некорректный интервал - invalid category некорректная категория @@ -6224,22 +4897,18 @@ QSQLite2Driver - Error opening database Ошибка открытия базы данных - Unable to begin transaction Невозможно начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию @@ -6247,12 +4916,10 @@ QSQLite2Result - Unable to fetch results Невозможно получить результаты - Unable to execute statement Невозможно выполнить выражение @@ -6260,27 +4927,22 @@ QSQLiteDriver - Error opening database Ошибка открытия базы данных - Error closing database Ошибка закрытия базы данных - Unable to begin transaction Невозможно начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию @@ -6288,34 +4950,26 @@ QSQLiteResult - - - Unable to fetch row Невозможно получить строку - Unable to execute statement Невозможно выполнить выражение - Unable to reset statement Невозможно сбросить выражение - Unable to bind parameters Невозможно привязать параметр - Parameter count mismatch Количество параметров не совпадает - No query Отсутствует запрос @@ -6323,32 +4977,26 @@ QScriptBreakpointsModel - ID ID - Location Размещение - Condition Условие - Ignore-count Пропущено - Single-shot Однократно - Hit-count Совпадений @@ -6356,12 +5004,10 @@ QScriptBreakpointsWidget - New Новая - Delete Удалить @@ -6369,143 +5015,114 @@ QScriptDebugger - - Go to Line Перейти к строке - Line: Строка: - Interrupt Прервать - Shift+F5 Shift+F5 - Continue Продолжить - F5 F5 - Step Into Войти в - F11 F11 - Step Over Перейти через - F10 F10 - Step Out Выйти из функции - Shift+F11 Shift+F11 - Run to Cursor Выполнить до курсора - Ctrl+F10 Ctrl+F10 - Run to New Script Выполнить до нового сценария - Toggle Breakpoint Установить/убрать точку останова - F9 F9 - Clear Debug Output Очистить отладочный вывод - Clear Error Log Очистить журнал ошибок - Clear Console Очистить консоль - &Find in Script... &Найти в сценарии... - Ctrl+F Ctrl+F - Find &Next Найти &следующее - F3 F3 - Find &Previous Найти &предыдущее - Shift+F3 Shift+F3 - Ctrl+G Ctrl+G - Debug Отладка @@ -6513,32 +5130,26 @@ QScriptDebuggerCodeFinderWidget - Close Закрыть - Previous Предыдущий - Next Следующий - Case Sensitive Учитывать регистр - Whole words Слова целиком - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Поиск с начала @@ -6546,12 +5157,10 @@ QScriptDebuggerLocalsModel - Name Название - Value Значение @@ -6559,17 +5168,14 @@ QScriptDebuggerStackModel - Level Уровень - Name Название - Location Размещение @@ -6577,22 +5183,18 @@ QScriptEdit - Toggle Breakpoint Установить/убрать точку останова - Disable Breakpoint Убрать точку останова - Enable Breakpoint Установить точку останова - Breakpoint Condition: Условие точки останова: @@ -6600,52 +5202,42 @@ QScriptEngineDebugger - Loaded Scripts Загруженные сценарии - Breakpoints Точки останова - Stack Стек - Locals Локальные переменные - Console Консоль - Debug Output Отладочный вывод - Error Log Журнал ошибок - Search Поиск - View Вид - Qt Script Debugger Отладчик сценариев Qt @@ -6653,7 +5245,6 @@ QScriptNewBreakpointWidget - Close Закрыть @@ -6661,84 +5252,66 @@ QScrollBar - Scroll here Прокрутить сюда - Left edge К левой границе - Top Вверх - Right edge К правой границе - Bottom Вниз - Page left На страницу влево - - Page up На страницу вверх - Page right На страницу вправо - - Page down На страницу вниз - Scroll left Прокрутить влево - Scroll up Прокрутить вверх - Scroll right Прокрутить вправо - Scroll down Прокрутить вниз - Line up На строку вверх - Position Положение - Line down На строку вниз @@ -6746,111 +5319,78 @@ QSharedMemory - %1: create size is less then 0 %1: размер меньше нуля - - %1: unable to lock %1: невозможно заблокировать - %1: unable to unlock %1: невозможно разблокировать - - - %1: permission denied %1: доступ запрещён - - - %1: already exists %1: уже существует - %1: doesn't exists %1: не существует - - - %1: out of resources %1: недостаточно ресурсов - - - %1: unknown error %2 %1: неизвестная ошибка %2 - %1: key is empty %1: пустой ключ - %1: ftok failed %1: ошибка ftok - - - %1: unable to make key %1: невозможно создать ключ - - %1: doesn't exist %1: не существует - %1: UNIX key file doesn't exist %1: специфический ключ UNIX не существует - %1: system-imposed size restrictions %1: системой наложены ограничения на размер - %1: not attached %1: не приложенный - - %1: invalid size %1: некорректный размер - - %1: key error %1: некорректный ключ - %1: size query failed %1: не удалось запросить размер - %1: unable to set key on lock %1: невозможно установить ключ блокировки @@ -6858,1063 +5398,884 @@ QShortcut - Space This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. Пробел - Esc Esc - Tab Tab - Backtab Backtab - Backspace Backspace - Return Return - Enter Enter - Ins Ins - Del Del - Pause Pause - Print Print - SysReq SysReq - Home Home - End End - Left Влево - Up Вверх - Right Вправо - Down Вниз - PgUp PgUp - PgDown PgDown - CapsLock CapsLock - NumLock NumLock - ScrollLock ScrollLock - Menu Меню - Help Справка - Back Назад - Forward Вперёд - Stop Остановить - Refresh Обновить - Volume Down Тише - Volume Mute Выключить звук - Volume Up Громче - Bass Boost Усиление басов - Bass Up Басы выше - Bass Down Басы ниже - Treble Up ВЧ выше - Treble Down ВЧ ниже - Media Play - Воспроизведение - - - + Начать воспроизведение + + Media Stop Остановить воспроизведение - Media Previous Воспроизвести предыдущее - Media Next Воспроизвести следующее - Media Record - Запись - - - + Начать запись + + + Media Pause + Media player pause button + Приостановить воспроизведение + + + Toggle Media Play/Pause + Media player button to toggle between playing and paused + Приостановить/продолжить воспроизведение + + Favorites Избранное - Search Поиск - Standby Режим ожидания - Open URL Открыть URL - Launch Mail Почта - Launch Media Проигрыватель - Launch (0) Запустить (0) - Launch (1) Запустить (1) - Launch (2) Запустить (2) - Launch (3) Запустить (3) - Launch (4) Запустить (4) - Launch (5) Запустить (5) - Launch (6) Запустить (6) - Launch (7) Запустить (7) - Launch (8) Запустить (8) - Launch (9) Запустить (9) - Launch (A) Запустить (A) - Launch (B) Запустить (B) - Launch (C) Запустить (C) - Launch (D) Запустить (D) - Launch (E) Запустить (E) - Launch (F) Запустить (F) - Monitor Brightness Up Увеличить яркость монитора - Monitor Brightness Down Уменьшить яркость монитора - Keyboard Light On/Off Вкл./Откл. подсветку клавиатуры - Keyboard Brightness Up Увеличить яркость подсветки клавиатуры - Keyboard Brightness Down Уменьшить яркость подсветки клавиатуры - Power Off Отключение питания - Wake Up Пробуждение - Eject Извлечь - Screensaver Экранная заставка - WWW WWW - Sleep Спящий режим - LightBulb Лампочка - Shop Магазин - History История - Add Favorite Добавить в избранное - Hot Links Горячие ссылки - Adjust Brightness Настройка яркости - Finance Финансы - Community Сообщество - Audio Rewind Перемотка аудио назад - Back Forward - Application Left - Application Right - Book Книга - CD CD - Calculator Калькулятор - Clear Очистить - Clear Grab - Close Закрыть - Copy Копировать - Cut Вырезать - Display - DOS DOS - Documents Документы - Spreadsheet Электронная таблицы - Browser Обозреватель - Game Игра - Go Перейти - iTouch iTouch - Logoff Выйти из системы - Market Рынок - Meeting Встреча - Keyboard Menu Клавиатурное меню - Menu PB - My Sites Мои сайты - News Новости - Home Office Домашний офис - Option Опция - Paste Вставить - Phone Телефон - Reply Ответить - Reload Перезагрузить - Rotate Windows Повернуть окна - Rotation PB - Rotation KB - Save Сохранить - Send Отправить - Spellchecker Проверка орфографии - Split Screen Разделить экран - Support Поддержка - Task Panel Панель задач - Terminal Терминал - Tools Инструменты - Travel Путешествие - Video Видео - Word Processor Текстовый редактор - XFer - Zoom In Увеличить - Zoom Out Уменьшить - Away Ушёл - Messenger Клиент обмена мгновенными сообщениями - WebCam Вэб-камера - Mail Forward Переслать письмо - Pictures Изображения - Music Музыка - Battery Батарея - Bluetooth Bluetooth - Wireless Беспроводная сеть - Ultra Wide Band - - - - + Сверхширокополосная связь + + Audio Forward - - - - + Последовательное воспроизведение + + Audio Repeat - - - - + Воспроизведение по кругу + + Audio Random Play - - - - + Случайное воспроизведение + + Subtitle Субтитры - Audio Cycle Track - - - - + Зацикленное воспроизведение дорожки + + Time Время - View Вид - Top Menu Главное меню - Suspend - - - - + Приостановить + + Hibernate - - - - + Усыпить + + Print Screen Печать экрана - Page Up На страницу вверх - Page Down На страницу вниз - Caps Lock Верний регистр - Num Lock Цифровые клавиши - Number Lock Цифровые клавиши - Scroll Lock Scroll Lock - Insert Вставить - Delete Удалить - Escape Escape - System Request Системный запрос - + Toggle Call/Hangup + Button that will hang up if we're in call, or make a call if we're not. + Снять/положить трубку + + + Voice Dial + Button to trigger voice dialling + Голосовой вызов + + + Last Number Redial + Button to redial the last number called + Повторный набор + + + Camera Shutter + Button to trigger the camera shutter (take a picture) + Затвор камеры + + + Camera Focus + Button to focus the camera + Фокусировка камеры + + Kanji - Muhenkan - Henkan - Romaji - Hiragana - Katakana - Hiragana Katakana - Zenkaku - Hankaku - Zenkaku Hankaku - Touroku - Massyo - Kana Lock - Kana Shift - Eisu Shift - Eisu toggle - Code input - Multiple Candidate - Previous Candidate - Hangul - Hangul Start - Hangul End - Hangul Hanja - Hangul Jamo - Hangul Romaja - Hangul Jeonja - Hangul Banja - Hangul PreHanja - Hangul PostHanja - Hangul Special - - Select Выбрать - Yes Да - No Нет - Context1 - Context2 - Context3 - Context4 - Call + Button to start a call (note: a separate button is used to end the call) Позвонить - Hangup + Button to end a call (note: a separate button is used to start the call) Положить трубку - Flip - - Ctrl Ctrl - - Shift Shift - - Alt Alt - - Meta Meta - + + - F%1 F%1 - Home Page Домашняя страница @@ -7922,27 +6283,22 @@ QSlider - Page left Страница влево - Page up Страница вверх - Position Положение - Page right Страница вправо - Page down Страница вниз @@ -7950,72 +6306,58 @@ QSocks5SocketEngine - Connection to proxy refused В соединении с прокси-сервером отказано - Connection to proxy closed prematurely Соединение с прокси-сервером неожиданно закрыто - Proxy host not found Прокси-сервер не найден - Connection to proxy timed out Время на соединение с прокси-сервером истекло - Proxy authentication failed Не удалось авторизоваться на прокси-сервере - Proxy authentication failed: %1 Не удалось авторизоваться на прокси-сервере: %1 - SOCKS version 5 protocol error Ошибка протокола SOCKSv5 - General SOCKSv5 server failure Ошибка сервере SOCKSv5 - Connection not allowed by SOCKSv5 server Соединение не разрешено сервером SOCKSv5 - TTL expired TTL истекло - SOCKSv5 command not supported Команда SOCKSv5 не поддерживается - Address type not supported Тип адреса не поддерживается - Unknown SOCKSv5 proxy error code 0x%1 Неизвестная ошибка SOCKSv5 прокси (код 0x%1) - Network operation timed out Время на сетевую операцию истекло @@ -8023,32 +6365,26 @@ QSoftKeyManager - Ok ОК - Select Выбрать - Done Готово - Options Параметры - Cancel Отмена - Exit Выход @@ -8056,12 +6392,10 @@ QSpinBox - More Больше - Less Меньше @@ -8069,56 +6403,42 @@ QSql - Delete Удалить - Delete this record? Удалить данную запись? - - - Yes Да - - - No Нет - Insert Вставить - Update Обновить - Save edits? Сохранить изменения? - Cancel Отмена - Confirm Подтверждение - Cancel your edits? Отменить изменения? @@ -8126,177 +6446,142 @@ QSslSocket - Unable to write data: %1 Невозможно записать данные: %1 - Unable to decrypt data: %1 Невозможно расшифровать данные: %1 - Error while reading: %1 Ошибка чтения: %1 - Error during SSL handshake: %1 Ошибка квитирования SSL: %1 - Error creating SSL context (%1) Ошибка создания контекста SSL: (%1) - Invalid or empty cipher list (%1) Некорректный или пустой список шифров (%1) - Private key does not certify public key, %1 Закрытый ключ не соответствует открытому ключу, %1 - Error creating SSL session, %1 Ошибка создания сессии SSL, %1 - Error creating SSL session: %1 Ошибка создания сессии SSL: %1 - Cannot provide a certificate with no key, %1 Невозможно предоставить сертификат без ключа, %1 - Error loading local certificate, %1 Ошибка загрузки локального сертификата, %1 - Error loading private key, %1 Ошибка загрузки закрытого ключа, %1 - No error Нет ошибки - The issuer certificate could not be found Не удалось найти сертификат издателя - The certificate signature could not be decrypted Не удалось расшифровать подпись сертификата - The public key in the certificate could not be read Не удалось прочитать открытый ключ сертификата - The signature of the certificate is invalid Некорректная подпись сертификата - The certificate is not yet valid Срок действия сертификата ещё не наступил - The certificate has expired Срок действия сертификата истёк - The certificate's notBefore field contains an invalid time Поле notBefore сертификата содержит некорректное время - The certificate's notAfter field contains an invalid time Поле notAfter сертификата содержит некорректное время - The certificate is self-signed, and untrusted Сертификат самоподписанный и не является заверенным - The root certificate of the certificate chain is self-signed, and untrusted Корневой сертификат цепочки сертификатов самоподписанный и не является заверенным - The issuer certificate of a locally looked up certificate could not be found Не удалось найти сертификат издателя локального сертификата - No certificates could be verified Не удалось проверить сертификаты - One of the CA certificates is invalid Один из сертификатов центра сертификации некорректен - The basicConstraints path length parameter has been exceeded Превышено значение параметра длины пути поля basicConstraints сертификата - The supplied certificate is unsuitable for this purpose Представленный сертификат непригоден для данной цели - The root CA certificate is not trusted for this purpose Корневой сертификат центра сертификации не является заверенным для данной цели - The root CA certificate is marked to reject the specified purpose Корневой сертификат центра сертификации отмечен на отклонение для данной цели - The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate Текущий сертификат издателя был отклонён, так как название темы не совпадает с названием издателя сертификата - The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate Текущий сертификат издателя был отклонён, так как название издателя и серийный номер не совпадают с идентификатором ключа сертификата - The peer did not present any certificate Сертификат не был предоставлен - The host name did not match any of the valid hosts for this certificate Название узла не совпадает с допустимыми названиями узлов сертификата - Unknown error Неизвестная ошибка @@ -8304,22 +6589,18 @@ QStateMachine - Missing initial state in compound state '%1' Отсутствует исходное состояние в составном состоянии "%1" - Missing default state in history state '%1' Отсутствует состояние по умолчанию в историческом состоянии "%1" - No common ancestor for targets and source of transition from state '%1' Нет общего предка у источника и цели перехода из состояния "%1" - Unknown error Неизвестная ошибка @@ -8327,30 +6608,22 @@ QSystemSemaphore - %1: does not exist %1: не существует - - %1: out of resources %1: недостаточно ресурсов - - %1: permission denied %1: доступ запрещён - %1: already exists %1: уже существует - - %1: unknown error %2 %1: неизвестная ошибка %2 @@ -8358,12 +6631,10 @@ QTDSDriver - Unable to open connection Невозможно открыть соединение - Unable to use database Невозможно использовать базу данных @@ -8371,12 +6642,10 @@ QTabBar - Scroll Left Прокрутить влево - Scroll Right Прокрутить вправо @@ -8384,7 +6653,6 @@ QTcpServer - Operation on socket is not supported Операция с сокетом не поддерживается @@ -8392,42 +6660,34 @@ QTextControl - &Undo &Отменить действие - &Redo &Повторить действие - Cu&t &Вырезать - &Copy &Копировать - Copy &Link Location Скопировать &адрес ссылки - &Paste В&ставить - Delete Удалить - Select All Выделить всё @@ -8435,14 +6695,10 @@ QToolButton - - Press Нажать - - Open Открыть @@ -8450,7 +6706,6 @@ QUdpSocket - This platform does not support IPv6 Данная платформа не поддерживает IPv6 @@ -8458,12 +6713,10 @@ QUndoGroup - Undo Отменить действие - Redo Повторить действие @@ -8471,7 +6724,6 @@ QUndoModel - <empty> <пусто> @@ -8479,12 +6731,10 @@ QUndoStack - Undo Отменить действие - Redo Повторить действие @@ -8492,57 +6742,46 @@ QUnicodeControlCharacterMenu - LRM Left-to-right mark LRM Признак написания слева направо - RLM Right-to-left mark RLM Признак написания справа налево - ZWJ Zero width joiner ZWJ Объединяющий символ нулевой ширины - ZWNJ Zero width non-joiner ZWNJ Необъединяющий символ нулевой ширины - ZWSP Zero width space ZWSP Пробел нулевой ширины - LRE Start of left-to-right embedding LRE Начало встраивания написания слева направо - RLE Start of right-to-left embedding LRE Начало встраивания написания справа налево - LRO Start of left-to-right override LRO Начало замены написания слева направо - RLO Start of right-to-left override RLO Начало замены написания справа налево - PDF Pop directional formatting PDF Признак окончания написания с другим направлением - Insert Unicode control character Вставить управляющий символ Unicode @@ -8550,32 +6789,26 @@ QWebFrame - Request cancelled Запрос отменён - Request blocked Запрос блокирован - Cannot show URL Невозможно отобразить URL - Frame load interrupted by policy change Загрузка фрейма прервана изменением политики - Cannot show mimetype Невозможно отобразить тип MIME - File does not exist Файл не существует @@ -8583,858 +6816,705 @@ QWebPage - Web Inspector - %2 Web-инспектор - %2 - Redirection limit reached Достигнут предел переадресации - Bad HTTP request Некорректный HTTP-запрос - Scroll here Прокрутить сюда - Left edge К левой границе - Top Вверх - Right edge К правой границе - Bottom Вниз - Page left На страницу влево - Page up На страницу вверх - Page right На страницу вправо - Page down На страницу вниз - Scroll left Прокрутить влево - Scroll up Прокрутить вверх - Scroll right Прокрутить вправо - Scroll down Прокрутить вниз - JavaScript Alert - %1 JavaScript: Предупреждение - %1 - JavaScript Confirm - %1 JavaScript: Подтверждение - %1 - JavaScript Prompt - %1 JavaScript: Запрос - %1 - JavaScript Problem - %1 JavaScript: Проблема - %1 - The script on this page appears to have a problem. Do you want to stop the script? Сбой выполнения сценария на данной странице. Желаете остановить выполение сценария? - Move the cursor to the next character Переместить указатель к следующему символу - Move the cursor to the previous character Переместить указатель к предыдущему символу - Move the cursor to the next word Переместить указатель к следующему слову - Move the cursor to the previous word Переместить указатель к предыдущему слову - Move the cursor to the next line Переместить указатель на следующую строку - Move the cursor to the previous line Переместить указатель на предыдущую строку - Move the cursor to the start of the line Переместить указатель в начало строки - Move the cursor to the end of the line Переместить указатель в конец строки - Move the cursor to the start of the block Переместить указатель в начало блока - Move the cursor to the end of the block Переместить указатель в конец блока - Move the cursor to the start of the document Переместить указатель в начало документа - Move the cursor to the end of the document Переместить указатель в конец документа - Select all Выделить всё - Select to the next character Выделить до следующего символа - Select to the previous character Выделить до предыдущего символа - Select to the next word Выделить до следующего слова - Select to the previous word Выделить до предыдущего слова - Select to the next line Выделить до следующей строки - Select to the previous line Выделить до предыдущей строки - Select to the start of the line Выделить до начала строки - Select to the end of the line Выделить до конца строки - Select to the start of the block Выделить до начала блока - Select to the end of the block Выделить до конца блока - Select to the start of the document Выделить до начала документа - Select to the end of the document Выделить до конца документа - Delete to the start of the word Удалить до начала слова - Delete to the end of the word Удалить до конца слова - Insert a new paragraph Вставить новый параграф - Insert a new line Вставить новую строку - Paste and Match Style Вставить, сохранив стиль - Remove formatting Удалить форматирование - Strikethrough Зачёркнутый - Subscript Подстрочный - Superscript Надстрочный - Insert Bulleted List Вставить маркированный список - Insert Numbered List Вставить нумерованный список - Indent Увеличить отступ - Outdent Уменьшить отступ - Center По центру - Justify По ширине - Align Left По левому краю - Align Right По правому краю - Submit default label for Submit buttons in forms on web pages Отправить - Submit Submit (input element) alt text for <input> elements with no alt, title, or value Отправить - Reset default label for Reset buttons in forms on web pages Сбросить - This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' Индекс поиска. Введите ключевые слова для поиска: - Choose File title for file button used in HTML forms Обзор... - No file selected text to display in file button used in HTML forms when no file is selected Файл не указан - Open in New Window Open in New Window context menu item Открыть в новом окне - Save Link... Download Linked File context menu item Сохранить по ссылке как... - Copy Link Copy Link context menu item Копировать адрес ссылки - Open Image Open Image in New Window context menu item Открыть изображение - Save Image Download Image context menu item Сохранить изображение - Copy Image Copy Link context menu item - Копировать изображение в буффер обмена - - - + Копировать изображение + + Open Frame Open Frame in New Window context menu item Открыть фрейм - Copy Copy context menu item Копировать - Go Back Back context menu item Назад - Go Forward Forward context menu item Вперёд - Stop Stop context menu item Остановить - Reload Reload context menu item Обновить - Cut Cut context menu item Вырезать - Paste Paste context menu item Вставить - No Guesses Found No Guesses Found context menu item Совпадений не найдено - Ignore Ignore Spelling context menu item ?Пропускать Пропустить - Add To Dictionary Learn Spelling context menu item Добавить в словарь - Search The Web Search The Web context menu item Искать в Интернет - Look Up In Dictionary Look Up in Dictionary context menu item Искать в словаре - Open Link Open Link context menu item Открыть ссылку - Ignore Ignore Grammar context menu item ?Пропускать Пропустить - Spelling Spelling and Grammar context sub-menu item Орфография - Show Spelling and Grammar menu item title Показать панель проверки правописания - Hide Spelling and Grammar menu item title Скрыть панель проверки правописания - Check Spelling Check spelling context menu item Проверка орфографии - Check Spelling While Typing Check spelling while typing context menu item Проверять орфографию при наборе текста - Check Grammar With Spelling Check grammar with spelling context menu item Проверять грамматику с орфографией - Fonts Font context sub-menu item Шрифты - Bold Bold context menu item Жирный - Italic Italic context menu item Курсив - Underline Underline context menu item Подчёркнутый - Outline Outline context menu item Перечёркнутый - Direction Writing direction context sub-menu item Направление письма - Text Direction Text direction context sub-menu item Направление текста - Default Default writing direction context menu item По умолчанию - Left to Right Left to Right context menu item Слева направо - Right to Left Right to Left context menu item Справа налево - Inspect Inspect Element context menu item Проверить - No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed История поиска пуста - Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title История поиска - Clear recent searches menu item in Recent Searches menu that empties menu's contents Очистить историю поиска - Missing Plug-in Label text to be used when a plug-in is missing Модуль отсутствует - Unknown Unknown filesize FTP directory listing item Неизвестно - %1 (%2x%3 pixels) Title string for images %1 (%2x%3 px) - Loading... Media controller status message when the media is loading Загрузка... - Live Broadcast Media controller status message when watching a live broadcast Потоковое вещание - Audio Element Media controller element Аудио-элемент - Video Element Media controller element Видео-элемент - Mute Button Media controller element Кнопка "Отключить звук" - Unmute Button Media controller element Кнопка "Включить звук" - Play Button Media controller element Кнопка "Воспроизведение" - Pause Button Media controller element Кнопка "Пауза" - Slider Media controller element Регулятор - Slider Thumb Media controller element Указатель регулятора - Rewind Button Media controller element Кнопка "Перемотка назад" - Return to Real-time Button Media controller element Кнопка "Вернуть в реальное время" - Elapsed Time Media controller element Прошло времени - Remaining Time Media controller element Осталось времени - Status Display Media controller element Отображение состояния - Fullscreen Button Media controller element Кнопка "На весь экран" - Seek Forward Button Media controller element Кнопка "Перемотка вперёд" - Seek Back Button Media controller element Кнопка "Перемотка назад" - Audio element playback controls and status display Media controller element Элементы управления воспроизведением звука и отображением состояния - Video element playback controls and status display Media controller element Элементы управления воспроизведением видео и отображением состояния - Mute audio tracks Media controller element Отключить звуковые дорожки - Unmute audio tracks Media controller element Включить звуковые дорожки - Begin playback Media controller element Начать воспроизведение - Pause playback Media controller element Приостановить воспроизведение - Movie time scrubber Media controller element Перемотка - Movie time scrubber thumb Media controller element Позиция перемотки - Rewind movie Media controller element Перемотка в начало - Return streaming movie to real-time Media controller element Возвращает потоковое видео к воспроизведению в реальном времени - Current movie time Media controller element Текущее время фильма - Remaining movie time Media controller element Оставшееся время фильма - Current movie status Media controller element Текущее состояние фильма - Play movie in full-screen mode Media controller element - Воспроизведение фильма в режиме отображения на весь экран - - - + Воспроизведение в режиме отображения на весь экран + + Seek quickly back Media controller element Быстрая перемотка назад - Seek quickly forward Media controller element Быстрая перемотка вперёд - Indefinite time Media time description Время не определено - %1 days %2 hours %3 minutes %4 seconds Media time description %1 дней %2 часов %3 минут %4 секунд - %1 hours %2 minutes %3 seconds Media time description %1 часов %2 минут %3 секунд - %1 minutes %2 seconds Media time description %1 минут %2 секунд - %1 seconds Media time description %1 секунд - %n file(s) number of chosen file @@ -9447,7 +7527,6 @@ QWhatsThisAction - What's This? Что это? @@ -9455,7 +7534,6 @@ QWidget - * * @@ -9463,57 +7541,46 @@ QWizard - Cancel Отмена - Help Справка - < &Back < &Назад - &Finish &Завершить - &Help &Справка - Go Back Назад - Continue Продолжить - Commit Передать - Done Готово - &Next &Далее - &Next > &Далее > @@ -9521,69 +7588,54 @@ QWorkspace - &Restore &Восстановить - &Move &Переместить - &Size &Размер - Mi&nimize &Свернуть - Ma&ximize Р&аспахнуть - &Close &Закрыть - Stay on &Top Оставаться &сверху - Minimize Свернуть - Restore Down Восстановить - Close Закрыть - - Sh&ade Св&ернуть в заголовок - - %1 - [%2] %1 - [%2] - &Unshade В&осстановить из заголовка @@ -9591,117 +7643,94 @@ QXml - no error occurred ошибки отсутствуют - error triggered by consumer ошибка вызвана пользователем - unexpected end of file неожиданный конец файла - more than one document type definition указано более одного типа документа - error occurred while parsing element ошибка разбора элемента - tag mismatch тэг не совпадает - error occurred while parsing content ошибка разбора документа - unexpected character неожиданный символ - invalid name for processing instruction некорректное имя директивы разбора - version expected while reading the XML declaration в объявлении XML ожидается параметр version - wrong value for standalone declaration некорректное значение параметра standalone - error occurred while parsing document type definition ошибка разбора объявления типа документа - letter is expected ожидалась буква - error occurred while parsing comment ошибка разбора комментария - error occurred while parsing reference ошибка разбора ссылки - internal general entity reference not allowed in DTD внутренняя ссылка на общий объект недопустима в DTD - external parsed general entity reference not allowed in attribute value внешняя ссылка на общий объект недопустима в значении атрибута - external parsed general entity reference not allowed in DTD внешняя ссылка на общий объект недопустима в DTD - unparsed entity reference in wrong context неразобранная ссылка на объект в неправильном контексте - recursive entities рекурсивные объекты - error in the text declaration of an external entity ошибка в объявлении внешнего объекта - encoding declaration or standalone declaration expected while reading the XML declaration в объявлении XML ожидаются параметры encoding или standalone - standalone declaration expected while reading the XML declaration в объявлении XML ожидается параметр standalone @@ -9709,27 +7738,22 @@ QXmlPatternistCLI - Warning in %1, at line %2, column %3: %4 Предупреждение в %1, в строке %2, столбце %3: %4 - Warning in %1: %2 Предупреждение в %1: %2 - Unknown location Неизвестное расположение - Error %1 in %2, at line %3, column %4: %5 Ошибка %1 в %2, в строке %3, столбце %4: %5 - Error %1 in %2: %3 Ошибка %1 в %2: %3 @@ -9737,184 +7761,142 @@ QXmlStream - - Extra content at end of document. Лишние данные в конце документа. - Invalid entity value. Некорректное значение объекта. - Invalid XML character. Некорректный символ XML. - Sequence ']]>' not allowed in content. Последовательность "]]>" недопустима в содержимом. - Namespace prefix '%1' not declared Префикс пространства имён "%1" не объявлен - Attribute redefined. Атрибут переопределён. - Unexpected character '%1' in public id literal. Неожиданный символ "%1" в литерале открытого идентификатора. - Invalid XML version string. Некорректная строка версии XML. - Unsupported XML version. Неподдерживаемая версия XML. - %1 is an invalid encoding name. %1 - не является корректным названием кодировки. - Encoding %1 is unsupported Кодировка %1 не поддерживается - Standalone accepts only yes or no. Псевдоатрибут "standalone" может принимать только значения "yes" или "no". - Invalid attribute in XML declaration. Некорректный атрибут в объявлении XML. - Premature end of document. Неожиданный конец документа. - Invalid document. Некорректный документ. - Expected Ожидалось - , but got ' , получили ' - Unexpected ' Неожиданное ' - Expected character data. Ожидаются символьные данные. - Recursive entity detected. Обнаружен рекурсивный объект. - Start tag expected. Ожидается открывающий тэг. - XML declaration not at start of document. Объявление XML находится не в начале документа. - NDATA in parameter entity declaration. NDATA в объявлении параметра. - %1 is an invalid processing instruction name. %1 не является корректным названием обрабатываемой инструкции. - Invalid processing instruction name. Некорректное название обрабатываемой инструкции. - - - - Illegal namespace declaration. Некорректное объявление пространства имён. - Invalid XML name. Некорректное имя XML. - Opening and ending tag mismatch. Открывающий тэг не совпадает с закрывающим. - Reference to unparsed entity '%1'. Ссылка на необработанный объект "%1". - - - Entity '%1' not declared. Объект "%1" не объявлен. - Reference to external entity '%1' in attribute value. Ссылка на внешний объект "%1" в значении атрибута. - Invalid character reference. Некорректная символьная ссылка. - - Encountered incorrectly encoded content. Обнаружено некорректно закодированное содержимое. - The standalone pseudo attribute must appear after the encoding. Псевдоатрибут "standalone" должен находиться после указания кодировки. - %1 is an invalid PUBLIC identifier. %1 - некорректный идентификатор PUBLIC. @@ -9922,702 +7904,558 @@ QtXmlPatterns - - At least one component must be present. Должна присутствовать как минимум одна компонента. - %1 is not a valid value of type %2. %1 не является правильным значением типа %2. - When casting to %1 from %2, the source value cannot be %3. При преобразовании %2 в %1 исходное значение не может быть %3. - Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Булево значение не может быть вычислено для последовательностей, которые содержат два и более атомарных значения. - The data of a processing instruction cannot contain the string %1 Данные обрабатываемой инструкции не могут содержать строку "%1" - - %1 is an invalid %2 %1 некоррекно для %2 - %1 is not a valid XML 1.0 character. Символ %1 недопустим для XML 1.0. - %1 was called. %1 было вызвано. - In the replacement string, %1 must be followed by at least one digit when not escaped. В замещаемой строке "%1" должно сопровождаться как минимум одной цифрой, если неэкранировано. - In the replacement string, %1 can only be used to escape itself or %2, not %3 В замещаемой строке символ "%1" может использоваться только для экранирования самого себя или "%2", но не "%3" - %1 matches newline characters %1 соответствует символам конца строки - Matches are case insensitive Соответствия регистронезависимы - %1 is an invalid regular expression pattern: %2 %1 - некорректный шаблон регулярного выражения: %2 - It will not be possible to retrieve %1. Будет невозможно восстановить %1. - The default collection is undefined Набор по умолчанию не определён - %1 cannot be retrieved %1 не может быть восстановлен - The item %1 did not match the required type %2. Элемент %1 не соответствует необходимому типу %2. - - %1 is an unknown schema type. %1 является схемой неизвестного типа. - A template with name %1 has already been declared. Шаблон с именем %1 уже был объявлен. - Only one %1 declaration can occur in the query prolog. Только одно объявление %1 может присутствовать в прологе запроса. - The initialization of variable %1 depends on itself Инициализация переменной %1 зависит от себя самой - The variable %1 is unused Переменная %1 не используется - Version %1 is not supported. The supported XQuery version is 1.0. Версия %1 не поддерживается. Поддерживается XQuery версии 1.0. - No function with signature %1 is available Функция с сигнатурой %1 отсутствует - It is not possible to redeclare prefix %1. Невозможно переопределить префикс %1. - Prefix %1 is already declared in the prolog. Префикс %1 уже объявлен в прологе. - The name of an option must have a prefix. There is no default namespace for options. Название опции должно содержать префикс. Нет пространства имён по умолчанию для опций. - The Schema Import feature is not supported, and therefore %1 declarations cannot occur. Возможность импорта схем не поддерживается, следовательно, объявлений %1 быть не должно. - The target namespace of a %1 cannot be empty. Целевое пространство имён %1 не может быть пустым. - The module import feature is not supported Возможность импорта модулей не поддерживается - The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 Пространство имён пользовательской функции в модуле библиотеки должен соответствовать пространству имён модуля. Другими словами, он должен быть %1 вместо %2 - A function already exists with the signature %1. Функция с сигнатурой %1 уже существует. - No external functions are supported. All supported functions can be used directly, without first declaring them as external Внешние функции не поддерживаются. Все поддерживаемые функции могут использоваться напрямую без первоначального объявления их в качестве внешних - The %1-axis is unsupported in XQuery Ось %1 не поддерживается в XQuery - The namespace URI cannot be the empty string when binding to a prefix, %1. URI пространства имён не может быть пустой строкой при связывании с префиксом %1. - %1 is an invalid namespace URI. %1 - некорректный URI пространства имён. - It is not possible to bind to the prefix %1 Невозможно связать с префиксом %1 - Two namespace declaration attributes have the same name: %1. Два атрибута объявления пространств имён имеют одинаковое имя: %1. - The namespace URI must be a constant and cannot use enclosed expressions. URI пространства имён должен быть константой и не может содержать выражений. - - %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. %1 является объявлением атрибута вне области объявлений. Имейте в виду, возможность импорта схем не поддерживается. - empty пусто - zero or one нуль или один - exactly one ровно один - one or more один или более - zero or more нуль или более - The focus is undefined. Фокус не определён. - An attribute by name %1 has already been created. Атрибут с именем %1 уже существует. - Network timeout. Время ожидания сети истекло. - Element %1 can't be serialized because it appears outside the document element. Элемент %1 не может быть сериализован, так как расположен вне документа. - Year %1 is invalid because it begins with %2. Год %1 неверен, так как начинается с %2. - Day %1 is outside the range %2..%3. День %1 вне диапазона %2..%3. - Month %1 is outside the range %2..%3. Месяц %1 вне диапазона %2..%3. - Overflow: Can't represent date %1. Переполнение: Не удаётся представить дату %1. - Day %1 is invalid for month %2. День %1 неверен для месяца %2. - Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; Время 24:%1:%2.%3 некорректно. 24 часа, но минуты, секунды и/или миллисекунды отличны от 0; - Time %1:%2:%3.%4 is invalid. Время %1:%2:%3.%4 некорректно. - Overflow: Date can't be represented. Переполнение: невозможно представить дату. - At least one time component must appear after the %1-delimiter. Как минимум одна компонента времени должна следовать за разделителем '%1'. - - Dividing a value of type %1 by %2 (not-a-number) is not allowed. Деление числа типа %1 на %2 (не числовое выражение) недопустимо. - Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. Деление числа типа %1 на %2 или %3 (плюс или минус нуль) недопустимо. - Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. Умножение числа типа %1 на %2 или %3 (плюс-минус бесконечность) недопустимо. - A value of type %1 cannot have an Effective Boolean Value. Значение типа %1 не может быть булевым значением. - Value %1 of type %2 exceeds maximum (%3). Значение %1 типа %2 больше максимума (%3). - Value %1 of type %2 is below minimum (%3). Значение %1 типа %2 меньше минимума (%3). - A value of type %1 must contain an even number of digits. The value %2 does not. Значение типа %1 должно содержать четное количество цифр. Значение %2 этому требованию не удовлетворяет. - %1 is not valid as a value of type %2. Значение %1 некорректно для типа %2. - Operator %1 cannot be used on type %2. Оператор %1 не может использоваться для типа %2. - Operator %1 cannot be used on atomic values of type %2 and %3. Оператор %1 не может использоваться для атомарных значений типов %2 и %3. - The namespace URI in the name for a computed attribute cannot be %1. URI пространства имён в названии рассчитываемого атрибута не может быть %1. - The name for a computed attribute cannot have the namespace URI %1 with the local name %2. Название расчитываемого атрибута не может иметь URI пространства имён %1 с локальным именем %2. - Type error in cast, expected %1, received %2. Ошибка типов в преобразовании, ожидалось %1, получено %2. - When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. При преобразовании в %1 или производные от него типы исходное значение должно быть того же типа или строковым литералом. Тип %2 недопустим. - A comment cannot contain %1 Комментарий не может содержать %1 - A comment cannot end with a %1. Комментарий не может оканчиваться на %1. - An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. Узел-атрибут не может быть потомком узла-документа. Атрибут %1 неуместен. - A library module cannot be evaluated directly. It must be imported from a main module. Модуль библиотеки не может использоваться напрямую. Он должен быть импортирован из основного модуля. - No template by name %1 exists. Шаблон с именем %1 отсутствует. - A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Значение типа %1 не может быть условием. Условием могут являться числовой и булевый типы. - A positional predicate must evaluate to a single numeric value. Позиционный предикат должен вычисляться как числовое выражение. - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. Целевое имя в обрабатываемой инструкции не может быть %1 в любой комбинации нижнего и верхнего регистров. Имя %2 некорректно. - %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 некорректное целевое имя в обрабатываемой инструкции. Имя должно быть значением типа %2, например: %3. - The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. Последняя часть пути должна содержать узлы или атомарные значения, но не может содержать и то, и другое одновременно. - No namespace binding exists for the prefix %1 Отсутствует привязка к пространству имён для префикса %1 - No namespace binding exists for the prefix %1 in %2 Отсутствует привязка к пространству имён для префикса %1 в %2 - The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Первый аргумент %1 не может быть типа %2. Он должен быть числового типа, типа xs:yearMonthDuration или типа xs:dayTimeDuration. - The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Первый аргумент %1 не может быть типа %2. Он должен быть типа %3, %4 или %5. - The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Второй аргумент %1 не может быть типа %2. Он должен быть типа %3, %4 или %5. - If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. Если оба значения имеют региональные смещения, смещения должны быть одинаковы. %1 и %2 не одинаковы. - %1 must be followed by %2 or %3, not at the end of the replacement string. "%1" должно сопровождаться "%2" или "%3", но не в конце замещаемой строки. - %1 and %2 match the start and end of a line. %1 и %2 соответствуют началу и концу строки. - Whitespace characters are removed, except when they appear in character classes Символы пробелов удалены (за исключением тех, что были в символах классов) - %1 is an invalid flag for regular expressions. Valid flags are: %1 - некорректный флаг регулярного выражения. Допустимые флаги: - If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. Префикс не должен быть указан, если первый параметр - пустая последовательность или пустая строка (вне пространства имён). Был указан префикс %1. - The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Форма нормализации %1 не поддерживается. Поддерживаются только %2, %3, %4, %5 и пустая, т.е. пустая строка (без нормализации). - A zone offset must be in the range %1..%2 inclusive. %3 is out of range. Региональное смещение должно быть в переделах от %1 до %2 включительно. %3 выходит за допустимые пределы. - Required cardinality is %1; got cardinality %2. Необходимо %1 элементов, получено %2. - The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. Имя кодировки %1 некорректно. Имя кодировки должно содержать только символы латиницы без пробелов и должно удовлетворять регулярному выражению %2. - The keyword %1 cannot occur with any other mode name. Ключевое слово %1 не может встречаться с любым другим названием режима. - No variable with name %1 exists Переменная с именем %1 отсутствует - The value of attribute %1 must be of type %2, which %3 isn't. Значение атрибута %1 должно быть типа %2, но %3 не соответствует данному типу. - The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. Не удаётся связать префикс %1. По умолчанию префикс связан с пространством имён %2. - A variable with name %1 has already been declared. Переменная с именем %1 уже объявлена. - No value is available for the external variable with name %1. Отсутствует значение для внешней переменной с именем %1. - A stylesheet function must have a prefixed name. Функция стилей должна иметь имя с префиксом. - The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. Пространтсво имён %1 зарезервировано, поэтому пользовательские функции не могут его использовать. Попробуйте предопределённый префикс %2, который существует для подобных ситуаций. - An argument with name %1 has already been declared. Every argument name must be unique. Аргумент с именем %1 уже объявлен. Имя каждого аргумента должно быть уникальным. - When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. Если функция %1 используется для сравнения внутри шаблона, аргумент должен быть ссылкой на переменную или строковым литералом. - In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. В шаблоне XSL-T первый аргумент функции %1 должен быть строковым литералом, если функция используется для сравнения. - In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. В шаблоне XSL-T первый аргумент функции %1 должен быть литералом или ссылкой на переменную, если функция используется для сравнения. - In an XSL-T pattern, function %1 cannot have a third argument. В шаблоне XSL-T у функции %1 не должно быть третьего аргумента. - In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. В шаблоне XSL-T только функции %1 и %2 могут использоваться для сравнения, но не %3. - In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. В шаблоне XSL-T не может быть использована ось %1 - только оси %2 или %3. - %1 is an invalid template mode name. %1 не является корректным шаблоном имени режима. - The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. Имя переменной, связанной с выражением for, должно отличаться от позиционной переменной. Две переменные с именем %1 конфликтуют. - The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. Возможность проверки по схеме не поддерживается. Выражения %1 не могут использоваться. - None of the pragma expressions are supported. Therefore, a fallback expression must be present Ни одно из выражений pragma не поддерживается. Должно существовать запасное выражение - Each name of a template parameter must be unique; %1 is duplicated. Имя каждого параметра шаблона должно быть уникальным, но %1 повторяется. - No function with name %1 is available. Функция с именем %1 отсутствует. - %1 is not a valid numeric literal. %1 не является корректным числовым литералом. - W3C XML Schema identity constraint selector - W3C XML Schema identity constraint field - A construct was encountered which is disallowed in the current language(%1). Встречена конструкция, запрещённая для текущего языка (%1). - Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). Пространство имён %1 может быть связано только с %2 (в данном случае уже предопределено). - Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). Префикс %1 может быть связан только с %2 (в данном случае уже предопределено). - An attribute with name %1 has already appeared on this element. Атрибут с именем %1 уже существует для данного элемента. - A direct element constructor is not well-formed. %1 is ended with %2. Прямой конструктор элемента составлен некорректно. %1 заканчивается на %2. - The name %1 does not refer to any schema type. Название %1 не соответствует ни одному типу схемы. - %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. %1 - сложный тип. Преобразование к сложным типам невозможно. Однако, преобразование к атомарным типам как %2 работает. - %1 is not an atomic type. Casting is only possible to atomic types. %1 - не атомарный тип. Преобразование возможно только к атомарным типам. - %1 is not a valid name for a processing-instruction. %1 не является корректным названием инструкции обработки. - The name of an extension expression must be in a namespace. Название выражения расширения должно быть в пространстве имён. - Required type is %1, but %2 was found. Требуется тип %1, но обнаружен %2. - Promoting %1 to %2 may cause loss of precision. Преобразование %1 к %2 может снизить точность. - It's not possible to add attributes after any other kind of node. Невозможно добавлять атрибуты после любого другого вида узла. - Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. Поддерживается только Unicode Codepoint Collation (%1). %2 не поддерживается. - Integer division (%1) by zero (%2) is undefined. Целочисленное деление (%1) на нуль (%2) не определено. - Division (%1) by zero (%2) is undefined. Деление (%1) на нуль (%2) не определено. - Modulus division (%1) by zero (%2) is undefined. Деление по модулю (%1) на нуль (%2) не определено. - %1 takes at most %n argument(s). %2 is therefore invalid. %1 принимает не более %n аргумента. Следовательно, %2 некорректно. @@ -10626,7 +8464,6 @@ - %1 requires at least %n argument(s). %2 is therefore invalid. %1 принимает не менее %n аргумента. Следовательно, %2 некорректно. @@ -10635,1655 +8472,1258 @@ - The root node of the second argument to function %1 must be a document node. %2 is not a document node. Корневой узел второго аргумента функции %1 должен быть документом. %2 не является документом. - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) Пространство имён для пользовательских функций не может быть пустым (попробуйте предопределённый префикс %1, который существует для подобных ситуаций) - - A default namespace declaration must occur before function, variable, and option declarations. Объявление пространство имён по умолчанию должно быть до объявления функций, переменных и опций. - Namespace declarations must occur before function, variable, and option declarations. Объявление пространства имён должно быть до объявления функций, переменных и опций. - Module imports must occur before function, variable, and option declarations. Импортируемые модули должны быть указаны до объявления функций, переменных и опций. - %1 is not a whole number of minutes. %1 не является полным количеством минут. - Attribute %1 can't be serialized because it appears at the top level. Атрибут %1 не может быть сериализован, так как присутствует на верхнем уровне. - %1 is an unsupported encoding. Кодировка %1 не поддерживается. - %1 contains octets which are disallowed in the requested encoding %2. %1 содержит октеты, которые недопустимы в требуемой кодировке %2. - The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. Символ с кодом %1, присутствующий в %2 при использовании кодировки %3, не является допустимым символом XML. - Ambiguous rule match. Неоднозначное соответствие правилу. - In a namespace constructor, the value for a namespace cannot be an empty string. В конструкторе пространства имён значение пространства имён не может быть пустой строкой. - The prefix must be a valid %1, which %2 is not. Префикс должен быть корректным %1, но %2 им не является. - The prefix %1 cannot be bound. Префикс%1 не может быть связан. - Only the prefix %1 can be bound to %2 and vice versa. Только префикс %1 может быть связан с %2 и наоборот. - The parameter %1 is required, but no corresponding %2 is supplied. Необходим параметр %1 , но соответствующего %2 не передано. - The parameter %1 is passed, but no corresponding %2 exists. Передан параметр %1 , но соответствующего %2 не существует. - The URI cannot have a fragment URI не может содержать фрагмент - Element %1 is not allowed at this location. Элемент %1 недопустим в этом месте. - Text nodes are not allowed at this location. Текстовые узлы недопустимы в этом месте. - Parse error: %1 Ошибка разбора: %1 - The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. Значение атрибута версии XSL-T должно быть типа %1, но %2 им не является. - Running an XSL-T 1.0 stylesheet with a 2.0 processor. Выполняется таблица стилей XSL-T 1.0 с обработчиком версии 2.0. - Unknown XSL-T attribute %1. Неизвествный атрибут XSL-T %1. - Attribute %1 and %2 are mutually exclusive. Атрибуты %1 и %2 взаимоисключающие. - In a simplified stylesheet module, attribute %1 must be present. В модуле упрощённой таблицы стилей обязан присутствовать атрибут %1. - If element %1 has no attribute %2, it cannot have attribute %3 or %4. Если элемент %1 не имеет атрибут %2, у него не может быть атрибутов %3 и %4. - Element %1 must have at least one of the attributes %2 or %3. Элемент %1 должен иметь как минимум один из атрибутов %2 или %3. - At least one mode must be specified in the %1-attribute on element %2. Как минимум один режим должен быть указан в атрибуте %1 элемента %2. - Element %1 must come last. Элемент %1 должен идти последним. - At least one %1-element must occur before %2. Как минимум один элемент %1 должен быть перед %2. - Only one %1-element can appear. Должен быть только один элемент %1. - At least one %1-element must occur inside %2. Как минимум один элемент %1 должен быть внутри %2. - When attribute %1 is present on %2, a sequence constructor cannot be used. Если %2 содержит атрибут %1, конструктор последовательности не может быть использован. - Element %1 must have either a %2-attribute or a sequence constructor. Элемент %1 должен иметь атрибут %2 или конструктор последовательности. - When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. Если параметр необходим, значение по умолчание не может быть передано через атрибут %1 или конструктор последовательности. - Element %1 cannot have children. Элемент %1 не может иметь потомков. - Element %1 cannot have a sequence constructor. Элемент %1 не может иметь конструктор последовательности. - - The attribute %1 cannot appear on %2, when it is a child of %3. У %2 не может быть атрибута %1, когда он является потомком %3. - A parameter in a function cannot be declared to be a tunnel. Параметр функции не может быть объявлен туннелем. - This processor is not Schema-aware and therefore %1 cannot be used. Данный обработчик не работает со схемами, следовательно, %1 не может использоваться. - Top level stylesheet elements must be in a non-null namespace, which %1 isn't. Элементы верхнего уровня таблицы стилей должны быть в пространстве имен, которым %1 не является. - The value for attribute %1 on element %2 must either be %3 or %4, not %5. Значение атрибута %1 элемента %2 должно быть или %3, или %4, но не %5. - Attribute %1 cannot have the value %2. Атрибут %1 не может принимать значение %2. - The attribute %1 can only appear on the first %2 element. Атрибут %1 может быть только у первого элемента %2. - At least one %1 element must appear as child of %2. Как минимум один элемент %1 должен быть в %2. - %1 has inheritance loop in its base type %2. - - Circular inheritance of base type %1. - Circular inheritance of union %1. - %1 is not allowed to derive from %2 by restriction as the latter defines it as final. - %1 is not allowed to derive from %2 by extension as the latter defines it as final. - Base type of simple type %1 cannot be complex type %2. - Simple type %1 cannot have direct base type %2. - - Simple type %1 is not allowed to have base type %2. - Simple type %1 can only have simple atomic type as base type. - Simple type %1 cannot derive from %2 as the latter defines restriction as final. - - Variety of item type of %1 must be either atomic or union. - - Variety of member types of %1 must be atomic. - - %1 is not allowed to derive from %2 by list as the latter defines it as final. - Simple type %1 is only allowed to have %2 facet. - Base type of simple type %1 must have variety of type list. - Base type of simple type %1 has defined derivation by restriction as final. - Item type of base type does not match item type of %1. - - Simple type %1 contains not allowed facet type %2. - - %1 is not allowed to derive from %2 by union as the latter defines it as final. - %1 is not allowed to have any facets. - Base type %1 of simple type %2 must have variety of union. - Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. - Member type %1 cannot be derived from member type %2 of %3's base type %4. - Derivation method of %1 must be extension because the base type %2 is a simple type. - Complex type %1 has duplicated element %2 in its content model. - Complex type %1 has non-deterministic content. - Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. - Content model of complex type %1 is not a valid extension of content model of %2. - Complex type %1 must have simple content. - Complex type %1 must have the same simple type as its base class %2. - Complex type %1 cannot be derived from base type %2%3. - Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. - Complex type %1 with simple content cannot be derived from complex base type %2. - Item type of simple type %1 cannot be a complex type. - Member type of simple type %1 cannot be a complex type. - %1 is not allowed to have a member type with the same name as itself. - - - %1 facet collides with %2 facet. - %1 facet must have the same value as %2 facet of base type. - %1 facet must be equal or greater than %2 facet of base type. - - - - - - - - %1 facet must be less than or equal to %2 facet of base type. - %1 facet contains invalid regular expression - Unknown notation %1 used in %2 facet. - %1 facet contains invalid value %2: %3. - %1 facet cannot be %2 or %3 if %4 facet of base type is %5. - %1 facet cannot be %2 if %3 facet of base type is %4. - - - %1 facet must be less than or equal to %2 facet. - - - %1 facet must be less than %2 facet of base type. - - %1 facet and %2 facet cannot appear together. - - - %1 facet must be greater than %2 facet of base type. - - %1 facet must be less than %2 facet. - - %1 facet must be greater than or equal to %2 facet of base type. - Simple type contains not allowed facet %1. - %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. - Only %1 and %2 facets are allowed when derived by union. - - %1 contains %2 facet with invalid data: %3. - Attribute group %1 contains attribute %2 twice. - Attribute group %1 contains two different attributes that both have types derived from %2. - Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. - Complex type %1 contains attribute %2 twice. - Complex type %1 contains two different attributes that both have types derived from %2. - Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. - Element %1 is not allowed to have a value constraint if its base type is complex. - Element %1 is not allowed to have a value constraint if its type is derived from %2. - - Value constraint of element %1 is not of elements type: %2. - Element %1 is not allowed to have substitution group affiliation as it is no global element. - Type of element %1 cannot be derived from type of substitution group affiliation. - Value constraint of attribute %1 is not of attributes type: %2. - Attribute %1 has value constraint but has type derived from %2. - %1 attribute in derived complex type must be %2 like in base type. - Attribute %1 in derived complex type must have %2 value constraint like in base type. - Attribute %1 in derived complex type must have the same %2 value constraint like in base type. - Attribute %1 in derived complex type must have %2 value constraint. - processContent of base wildcard must be weaker than derived wildcard. - - Element %1 exists twice with different types. - Particle contains non-deterministic wildcards. - - Base attribute %1 is required but derived attribute is not. - Type of derived attribute %1 cannot be validly derived from type of base attribute. - Value constraint of derived attribute %1 does not match value constraint of base attribute. - Derived attribute %1 does not exist in the base definition. - Derived attribute %1 does not match the wildcard in the base definition. - Base attribute %1 is required but missing in derived definition. - Derived definition contains an %1 element that does not exists in the base definition - Derived wildcard is not a subset of the base wildcard. - %1 of derived wildcard is not a valid restriction of %2 of base wildcard - Attribute %1 from base type is missing in derived type. - Type of derived attribute %1 differs from type of base attribute. - Base definition contains an %1 element that is missing in the derived definition - %1 references unknown %2 or %3 element %4. - %1 references identity constraint %2 that is no %3 or %4 element. - %1 has a different number of fields from the identity constraint %2 that it references. - Base type %1 of %2 element cannot be resolved. - Item type %1 of %2 element cannot be resolved. - Member type %1 of %2 element cannot be resolved. - - - Type %1 of %2 element cannot be resolved. - Base type %1 of complex type cannot be resolved. - %1 cannot have complex base type that has a %2. - Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. - Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. - Type of %1 element must be a simple type, %2 is not. - Substitution group %1 of %2 element cannot be resolved. - Substitution group %1 has circular definition. - - Duplicated element names %1 in %2 element. - - - - Reference %1 of %2 element cannot be resolved. - Circular group reference for %1. - %1 element is not allowed in this scope - %1 element cannot have %2 attribute with value other than %3. - %1 element cannot have %2 attribute with value other than %3 or %4. - %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. - Attribute group %1 has circular reference. - %1 attribute in %2 must have %3 use like in base type %4. - Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. - %1 has attribute wildcard but its base type %2 has not. - Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. - Enumeration facet contains invalid content: {%1} is not a value of type %2. - Namespace prefix of qualified name %1 is not defined. - - %1 element %2 is not a valid restriction of the %3 element it redefines: %4. - Empty particle cannot be derived from non-empty particle. - Derived particle is missing element %1. - Derived element %1 is missing value constraint as defined in base particle. - Derived element %1 has weaker value constraint than base particle. - Fixed value constraint of element %1 differs from value constraint in base particle. - Derived element %1 cannot be nillable as base element is not nillable. - Block constraints of derived element %1 must not be more weaker than in the base element. - Simple type of derived element %1 cannot be validly derived from base element. - Complex type of derived element %1 cannot be validly derived from base element. - Element %1 is missing in derived particle. - Element %1 does not match namespace constraint of wildcard in base particle. - Wildcard in derived particle is not a valid subset of wildcard in base particle. - processContent of wildcard in derived particle is weaker than wildcard in base particle. - Derived particle allows content that is not allowed in the base particle. - Can not process unknown element %1, expected elements are: %2. - Element %1 is not allowed in this scope, possible elements are: %2. - Child element is missing in that scope, possible child elements are: %1. - Document is not a XML schema. - %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. - %1 attribute of %2 element contains invalid content: {%3}. - Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. - - Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. - %1 element is not allowed to have the same %2 attribute value as the target namespace %3. - %1 element without %2 attribute is not allowed inside schema without target namespace. - - %1 element is not allowed inside %2 element if %3 attribute is present. - - - %1 element has neither %2 attribute nor %3 child element. - - - - - - - - - - - - - - %1 element with %2 child element must not have a %3 attribute. - %1 attribute of %2 element must be %3 or %4. - %1 attribute of %2 element must have a value of %3. - - %1 attribute of %2 element must have a value of %3 or %4. - - - - - - - - - - - - - - %1 element must not have %2 and %3 attribute together. - - Content of %1 attribute of %2 element must not be from namespace %3. - - %1 attribute of %2 element must not be %3. - %1 attribute of %2 element must have the value %3 because the %4 attribute is set. - Specifying use='prohibited' inside an attribute group has no effect. - %1 element must have either %2 or %3 attribute. - %1 element must have either %2 attribute or %3 or %4 as child element. - %1 element requires either %2 or %3 attribute. - Text or entity references not allowed inside %1 element Текст или ссылка на объект недопустимы в качестве содержимого элемента %1 - - %1 attribute of %2 element must contain %3, %4 or a list of URIs. - %1 element is not allowed in this context. - %1 attribute of %2 element has larger value than %3 attribute. - Prefix of qualified name %1 is not defined. - - %1 attribute of %2 element must either contain %3 or the other values. - Component with ID %1 has been defined previously. - Element %1 already defined. Элемент %1 уже определён. - Attribute %1 already defined. Атрибут %1 уже определён. - Type %1 already defined. Тип %1 уже определён. - Attribute group %1 already defined. - Element group %1 already defined. Группа элементов %1 уже определёна. - Notation %1 already defined. - Identity constraint %1 already defined. - Duplicated facets in simple type %1. - - - %1 is not valid according to %2. %1 некорректно в соответствии с %2. - String content does not match the length facet. - String content does not match the minLength facet. - String content does not match the maxLength facet. - String content does not match pattern facet. - String content is not listed in the enumeration facet. - Signed integer content does not match the maxInclusive facet. - Signed integer content does not match the maxExclusive facet. - Signed integer content does not match the minInclusive facet. - Signed integer content does not match the minExclusive facet. - Signed integer content is not listed in the enumeration facet. - Signed integer content does not match pattern facet. - Signed integer content does not match in the totalDigits facet. - Unsigned integer content does not match the maxInclusive facet. - Unsigned integer content does not match the maxExclusive facet. - Unsigned integer content does not match the minInclusive facet. - Unsigned integer content does not match the minExclusive facet. - Unsigned integer content is not listed in the enumeration facet. - Unsigned integer content does not match pattern facet. - Unsigned integer content does not match in the totalDigits facet. - Double content does not match the maxInclusive facet. - Double content does not match the maxExclusive facet. - Double content does not match the minInclusive facet. - Double content does not match the minExclusive facet. - Double content is not listed in the enumeration facet. - Double content does not match pattern facet. - Decimal content does not match in the fractionDigits facet. - Decimal content does not match in the totalDigits facet. - Date time content does not match the maxInclusive facet. - Date time content does not match the maxExclusive facet. - Date time content does not match the minInclusive facet. - Date time content does not match the minExclusive facet. - Date time content is not listed in the enumeration facet. - Date time content does not match pattern facet. - Duration content does not match the maxInclusive facet. - Duration content does not match the maxExclusive facet. - Duration content does not match the minInclusive facet. - Duration content does not match the minExclusive facet. - Duration content is not listed in the enumeration facet. - Duration content does not match pattern facet. - Boolean content does not match pattern facet. - Binary content does not match the length facet. - Binary content does not match the minLength facet. - Binary content does not match the maxLength facet. - Binary content is not listed in the enumeration facet. - Invalid QName content: %1. Некорректное содержимое QName: %1. - QName content is not listed in the enumeration facet. - QName content does not match pattern facet. - Notation content is not listed in the enumeration facet. - List content does not match length facet. - List content does not match minLength facet. - List content does not match maxLength facet. - List content is not listed in the enumeration facet. - List content does not match pattern facet. - Union content is not listed in the enumeration facet. - Union content does not match pattern facet. - Data of type %1 are not allowed to be empty. - Element %1 is missing child element. - There is one IDREF value with no corresponding ID: %1. - Loaded schema file is invalid. Загруженный файл схемы некорректен. - %1 contains invalid data. %1 содержит некорректные данные. - xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. Пространство имён xsi:schemaLocation %1 уже встречалось ранее в данном документе. - xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. xsi:noNamespaceSchemaLocation не может встречаться после первого не-`namespace` элемента или атрибута. - No schema defined for validation. Схема для проверки не определена. - No definition for element %1 available. Отсутствует определение элемента %1. - - - Specified type %1 is not known to the schema. - Element %1 is not defined in this scope. Элемент %1 не определён в данном контексте. - Declaration for element %1 does not exist. - Element %1 contains invalid content. - Element %1 is declared as abstract. - Element %1 is not nillable. Элемент %1 необнуляемый. - Attribute %1 contains invalid data: %2 - Element contains content although it is nillable. Элемент необнуляемый, т.к. имеет содержимое. - Fixed value constraint not allowed if element is nillable. - Element %1 cannot contain other elements, as it has a fixed content. Элемент %1 не может содержать другие элементы, т.к. имеет статическое содержимое. - Specified type %1 is not validly substitutable with element type %2. - Complex type %1 is not allowed to be abstract. - Element %1 contains not allowed attributes. - - Element %1 contains not allowed child element. - - Content of element %1 does not match its type definition: %2. - - - Content of element %1 does not match defined value constraint. - Element %1 contains not allowed child content. - Element %1 contains not allowed text content. - Element %1 is missing required attribute %2. - Attribute %1 does not match the attribute wildcard. - Declaration for attribute %1 does not exist. - Element %1 contains two attributes of type %2. - Attribute %1 contains invalid content. - Element %1 contains unknown attribute %2. - - Content of attribute %1 does not match its type definition: %2. - - Content of attribute %1 does not match defined value constraint. - Non-unique value found for constraint %1. - Key constraint %1 contains absent fields. - Key constraint %1 contains references nillable element %2. - No referenced value found for key reference %1. - More than one value found for field %1. Для поля %1 найдено более одного значения. - Field %1 has no simple type. - ID value '%1' is not unique. Значение ID "%1" неуникально. - '%1' attribute contains invalid QName content: %2. Атрибут `%1` имеет некорректное содержимое QName: %2. diff -r ef0373b55136 -r 758a864f9613 translations/qt_sl.ts --- a/translations/qt_sl.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qt_sl.ts Mon Oct 04 01:19:32 2010 +0300 @@ -1,10 +1,16 @@ + 2010-08-29 00:26+0200 + MIME-Version,Content-Type,Content-Transfer-Encoding,Plural-Forms,X-Language,X-Qt-Contexts,Last-Translator,PO-Revision-Date,Project-Id-Version,Language-Team,X-Generator + Lokalize 1.1 + Slovenian <lugos-slo@lugos.si> + + # Jure Repinc <jlp@holodeck1.com>, 2010. + Jure Repinc <jlp@holodeck1.com> CloseButton - Close Tab Zapri zavihek @@ -12,45 +18,68 @@ FakeReply - Fake error ! Lažna napaka. - Invalid URL Neveljaven URL + MAC_APPLICATION_MENU + + Services + Storitve + + + Hide %1 + Skrij %1 + + + Hide Others + Skrij druge + + + Show All + Prikaži vse + + + Preferences... + Nastavitve ... + + + Quit %1 + Končaj %1 + + + About %1 + O %1 + + + Phonon:: - Notifications Obvestila - Music Glasba - Video Video - Communication Komunikacija - Games Igre - Accessibility Dostopnost @@ -58,32 +87,31 @@ Phonon::AudioOutput - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Naprava za predvajanje zvoka <b>%1</b> ne deluje.<br/>Preklapljanje na <b>%2</b>.</html> - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> <html>Preklapljanje na napravo za predvajanje zvoka <b>%1</b>,<br/>ki je ravnokar postala dostopna in ima višjo preferenco.</html> - Revert back to device '%1' Povrni nazaj na napravo »%1« + + <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> + <html>Preklapljanje na napravo za predvajanje zvoka <b>%1</b>,<br/>ki ima višjo preferenco ali pa je posebej nastavljena za ta tok.</html> + Phonon::Gstreamer::Backend - Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. Opozorilo: kot kaže paket gstreamer0.10-plugins-good ni nameščen. Nekatere možnosti predvajanja videa so onemogočene. - Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled Opozorilo: kot kaže osnovni vstavki za GStreamer niso nameščeni. @@ -93,10 +121,9 @@ Phonon::Gstreamer::MediaObject - Cannot start playback. -Check your Gstreamer installation and make sure you +Check your GStreamer installation and make sure you have libgstreamer-plugins-base installed. Ni moč začeti predvajanja. @@ -104,39 +131,34 @@ da je nameščen paket libgstreamer-plugins-base. - + Missing codec helper script assistant. + Manjka pomožni skript pomočnika za kodeke. + + + Plugin codec installation failed for codec: %0 + Namesitev vstavka s kodekom ni uspela: %0 + + A required codec is missing. You need to install the following codec(s) to play this content: %0 Manjka potreben kodek. Za predvajanje te vsebine morate namestiti sledeče kodeke: %0 - - - - - - - - Could not open media source. Ni moč odpreti večpredstavnostnega vira. - Invalid source type. Neveljavna vrsta vira. - Could not locate media source. Ni moč najti večpredstavnostnega vira. - Could not open audio device. The device is already in use. Ni moč odpreti zvočne naprave. Naprava je že v uporabi. - Could not decode media source. Ni moč dekodirati večpredstavnostnega vira. @@ -144,82 +166,323 @@ Phonon::MMF - Audio Output Predvajanje zvoka - The audio output device Naprava za predvajanje zvoka + + No error + Brez napake + + + Not found + Ni najdeno + + + Out of memory + Zmanjkalo pomnilnika + + + Not supported + Ni podprto + + + Overflow + Prekoračitev zgornje meje + + + Underflow + Prekoračitev spodnje meje + + + Already exists + Že obstaja + + + Path not found + Pot ni najdena + + + In use + V uporabi + + + Not ready + Ni pripravljeno + + + Access denied + Dostop zavrnjen + + + Could not connect + Povezava ni mogoča + + + Disconnected + Povezava prekinjena + + + Permission denied + Ni dovoljenja + + + Insufficient bandwidth + Pasovna širina ni zadostna + + + Network unavailable + Omrežje ni na voljo + + + Network communication error + Napaka komunikacije prek omrežja + + + Streaming not supported + Pretakanje ni podprto + + + Server alert + Opozorilo strežnika + + + Invalid protocol + Neveljaven protokol + + + Invalid URL + Neveljaven URL + + + Multicast error + Napaka oddajanja večim + + + Proxy server error + Napaka posredniškega strežnika + + + Proxy server not supported + Posredniški strežnik ni podprt + + + Audio output error + Napaka predvajanja zvoka + + + Video output error + Napaka prevajanja videa + + + Decoder error + Napaka dekodirnika + + + Audio or video components could not be played + Zvočne ali video komponente ni bilo moč predvajati + + + DRM error + Napaka upravljanja z omejitvami + + + Unknown error (%1) + Neznana napaka (%1) + + + + Phonon::MMF::AbstractMediaPlayer + + Not ready to play + Ni pripravljen na predvajanje + + + Error opening file + Napaka pri odpiranju datoteke + + + Error opening URL + Napaka pri odpiranju URL-ja + + + Error opening resource + Napaka pri odpiranju vira + + + Error opening source: resource not opened + Napaka pri odporanju vira: vir ni bil odprt + + + Setting volume failed + Nastavljanje glasnosti ni uspelo + + + Loading clip failed + Nalaganje posnetka ni uspelo + + + Playback complete + Predvajanje je zaključeno + + + + Phonon::MMF::AbstractVideoPlayer + + Pause failed + Prekinitev ni uspela + + + Seek failed + Pomik ni uspel + + + Getting position failed + Pridobivanje položaja ni uspelo + + + Opening clip failed + Odpiranje posnetka ni uspelo + Phonon::MMF::AudioEqualizer - - Frequency band, %1 Hz - Frekvenčni pas, %1 Hz + %1 Hz + %1 Hz + + + + Phonon::MMF::AudioPlayer + + Getting position failed + Pridobivanje položaja ni uspelo + + + + Phonon::MMF::DsaVideoPlayer + + Video display error + Napaka prikaza videa Phonon::MMF::EffectFactory - - audio equalizer - izenačevalnik zvoka - - - - Bass boost - Ojačanje basov - - - - Distance Attenuation - Utišanje zaradi razdalje - - - - - Environmental Reverb - Okoljsko odmevanje - - - - Loudness - Glasnost - - - - Source Orientation - Usmerjenost vira - - - - Stereo Widening - Razširitev sterea + Enabled + Omogočeno + + + + Phonon::MMF::EnvironmentalReverb + + Decay HF ratio (%) + DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. + + + + + Decay time (ms) + DecayTime: Time over which reverberation is diminished. + + + + + Density (%) + Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. + + Gostota (%) + + + Diffusion (%) + Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. + + Razpršitev (%) + + + Reflections delay (ms) + ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. + + Zamik odbojev (ms) + + + Reflections level (mB) + ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. + + Glasnost odbojev (mB) + + + Reverb delay (ms) + ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. + + Zamik odmeva (ms) + + + Reverb level (mB) + ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. + + Glasnost odmeva (ms) + + + Room HF level + RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. + + VF glasnost prostora + + + Room level (mB) + RoomLevel: Master volume control for all reflected sound. + + Glasnost prostora (mB) + + + + Phonon::MMF::MediaObject + + Error opening source: type not supported + Napaka pri odpiranju vira: vrsta ni podprta + + + Error opening source: resource is compressed + Napaka pri odporanju vira: vir je stisnjen + + + Error opening source: resource not valid + Napaka pri odporanju vira: vir ni veljaven + + + Error opening source: media type could not be determined + Napaka pri odpiranju vira: ni bilo moč ugotoviti vrste večpredstavnostne datoteke + + + + Phonon::MMF::StereoWidening + + Level (%) + Stopnja (%) + + + + Phonon::MMF::SurfaceVideoPlayer + + Video display error + Napaka prikaza videa Phonon::VolumeSlider - - - - Volume: %1% Glasnost: %1 % - - - Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% Uporabite ta drsnik, da nastavite glasnost. Skrajno levi položaj je 0 %, skrajno desni pa %1 %. - Muted Utišan @@ -227,12 +490,10 @@ Q3Accel - %1, %2 not defined %1, %2 ni definiran - Ambiguous %1 not handled Brez rokovanja z dvoumnim %1 @@ -240,27 +501,22 @@ Q3DataTable - True Pravilno - False Napačno - Insert Vstavi - Update Posodobi - Delete Izbriši @@ -268,313 +524,238 @@ Q3FileDialog - Copy or Move a File Skopiraj ali premakni datoteko - Read: %1 Branje: %1 - - Write: %1 Pisanje: %1 - - Cancel Prekliči - - - - All Files (*) Vse datoteke (*) - Name Ime - Size Velikost - Type Vrsta - Date Datum - Attributes Lastnosti - - &OK &V redu - Look &in: Išči &v: - - - File &name: Ime &datoteke: - File &type: &Vrsta datoteke: - Back Nazaj - One directory up Za eno mapo navzgor - Create New Folder Ustvari novo mapo - List View Prikaz seznama - Detail View Prikaz podrobnosti - Preview File Info Podatki ogleda datoteke - Preview File Contents Vsebina ogleda datoteke - Read-write Branje in pisanje - Read-only Samo za branje - Write-only Samo za pisanje - Inaccessible Nedostopno - Symlink to File Simbolna povezava do datoteke - Symlink to Directory Simbolna povezava do mape - Symlink to Special Simbolna povezava do posebnega - File Datoteka - Dir Mapa - Special Posebno - - - Open Odpri - - Save As Shrani kot - - - &Open &Odpri - - &Save &Shrani - &Rename Pre&imenuj - &Delete &Izbriši - R&eload &Znova naloži - Sort by &Name Razvrsti po &imenu - Sort by &Size Razvrsti po &velikosti - Sort by &Date Razvrsti po &datumu - &Unsorted &Brez razvrščanja - Sort Razvrsti - Show &hidden files Prikaži &skrite datoteke - the file datoteko - the directory mapo - the symlink simbolno povezavo - Delete %1 Izbriši %1 - <qt>Are you sure you wish to delete %1 "%2"?</qt> <qt>Ali res želite izbrisati %1 »%2«?</qt> - &Yes &Da - &No &Ne - New Folder 1 Nova mapa 1 - New Folder Nova mapa - New Folder %1 Nova mapa %1 - Find Directory Najdi mapo - - Directories Mape - Directory: Mapa: - - Error Napaka - %1 File not found. Check path and filename. @@ -583,17 +764,14 @@ Preverite pot in ime datoteke. - All Files (*.*) Vse datoteke (*.*) - Open Odpri - Select a Directory Izberite mapo @@ -601,29 +779,24 @@ Q3LocalFs - - Could not read directory %1 Ni bilo moč brati mape %1 - Could not create directory %1 Ni bilo moč ustvariti mape %1 - Could not remove file or directory %1 Ni bilo moč odstraniti datoteke ali mape %1 - Could not rename %1 to @@ -634,14 +807,12 @@ %2 - Could not open %1 Ni moč odpreti %1 - Could not write %1 Ni bilo moč zapisati @@ -651,12 +822,10 @@ Q3MainWindow - Line up V vrsto - Customize... Prilagodi ... @@ -664,7 +833,6 @@ Q3NetworkProtocol - Operation stopped by the user Dejanje zaustavil uporabnik @@ -672,8 +840,6 @@ Q3ProgressDialog - - Cancel Prekliči @@ -681,28 +847,22 @@ Q3TabDialog - - OK V redu - Apply Uveljavi - Help Pomoč - Defaults Privzetosti - Cancel Prekliči @@ -710,38 +870,30 @@ Q3TextEdit - &Undo &Razveljavi - &Redo &Uveljavi - Cu&t &Izreži - &Copy S&kopiraj - &Paste Pri&lepi - Clear Počisti - - Select All Izberi vse @@ -749,67 +901,54 @@ Q3TitleBar - System Sistem - Restore up Obnovi - Minimize Pomanjšaj - Restore down Obnovi - Maximize Razpni - Close Zapri - Contains commands to manipulate the window Vsebuje ukaze za upravljanje z oknom - Puts a minimized window back to normal Obnovi pomanjšano okno na običajno velikost - Moves the window out of the way Umakne okno, da ni v napoto - Puts a maximized window back to normal Obnovi razpeto okno - Makes the window full screen Razpne okno čez ves zaslon - Closes the window Zapre okno - Displays the name of the window and contains controls to manipulate it Prikazuje ime okna in vsebuje gumbe za nadzor okna @@ -817,7 +956,6 @@ Q3ToolBar - More... Več ... @@ -825,51 +963,38 @@ Q3UrlOperator - - - The protocol `%1' is not supported Protokol »%1« ni podprt. - The protocol `%1' does not support listing directories Protokol »%1« ne podpira izpisa seznama map. - The protocol `%1' does not support creating new directories Protokol »%1« ne podpira ustvarjanja novih map. - The protocol `%1' does not support removing files or directories Protokol »%1« ne podpira odstranjevanja datotek ali map. - The protocol `%1' does not support renaming files or directories Protokol »%1« ne podpira preimenovanja datotek ali map. - The protocol `%1' does not support getting files Protokol »%1« ne podpira prejemanja datotek. - The protocol `%1' does not support putting files Protokol »%1« ne podpira pošiljanja datotek. - - The protocol `%1' does not support copying or moving files or directories Protokol »%1« ne podpira kopiranja ali premikanja datotek ali map. - - (unknown) (neznano) @@ -877,27 +1002,22 @@ Q3Wizard - &Cancel &Prekliči - < &Back < Na&zaj - &Next > &Naprej > - &Finish &Končaj - &Help &Pomoč @@ -905,44 +1025,30 @@ QAbstractSocket - - - - Host not found Ni moč najti gostitelja - - - Connection refused Povezava je zavrnjena - Connection timed out Čas za povezavo je potekel - - - Operation on socket is not supported Dejanje na vtičnici ni podprto - Socket operation timed out Čas za dejanje na vtičnici je potekel - Socket is not connected Vtičnica ni povezana. - Network unreachable Omrežje ni dosegljivo @@ -950,17 +1056,14 @@ QAbstractSpinBox - &Step up Korak &gor - Step &down Korak &dol - &Select All Izberi &vse @@ -968,7 +1071,6 @@ QAccessibleButton - Press Pritisni @@ -976,28 +1078,23 @@ QApplication - Activate Aktiviraj - Executable '%1' requires Qt %2, found Qt %3. Izvršljiva datoteka »%1« potrebuje Qt %2, najden pa je bil Qt %3. - Incompatible Qt Library Error Napaka nezdružljivosti knjižnice Qt - QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - Activates the program's main window Aktivira glavno okno programa @@ -1005,22 +1102,18 @@ QAxSelect - Select ActiveX Control Izberite kontrolnik ActiveX - OK V redu - &Cancel &Prekliči - COM &Object: &Objekt COM: @@ -1028,17 +1121,14 @@ QCheckBox - Uncheck Odznači - Check Označi - Toggle Preklopi @@ -1046,57 +1136,46 @@ QColorDialog - Hu&e: &Odtenek: - &Sat: &Zasičenost: - &Val: &Vrednost: - &Red: &Rdeča: - &Green: &Zelena: - Bl&ue: &Modra: - A&lpha channel: Kanal &alfa: - Select Color Izberite barvo - &Basic colors &Osnovne barve - &Custom colors Barve po &meri - &Add to Custom Colors &Dodaj lastnim barvam @@ -1104,23 +1183,18 @@ QComboBox - - Open Odpri - False Napačno - True Pravilno - Close Zapri @@ -1128,43 +1202,36 @@ QCoreApplication - %1: key is empty QSystemSemaphore %1: ključ je prazen - %1: unable to make key QSystemSemaphore %1: ni moč ustvariti ključa - %1: ftok failed QSystemSemaphore %1: funkcija ftok ni uspela - %1: already exists QSystemSemaphore %1: že obstaja - %1: does not exist QSystemSemaphore %1: ne obstaja - %1: out of resources QSystemSemaphore %1: zmanjkalo je virov - %1: unknown error %2 QSystemSemaphore %1: neznana napaka %2 @@ -1173,22 +1240,18 @@ QDB2Driver - Unable to connect Ni moč vzpostaviti povezave - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije - Unable to set autocommit Ni moč nastaviti samodejnega udejanjanja @@ -1196,33 +1259,26 @@ QDB2Result - - Unable to execute statement Ni moč izvesti izjave - Unable to prepare statement Ni moč pripraviti izjave - Unable to bind variable Ni moč prikleniti spremenljivke - Unable to fetch record %1 Ni moč pridobiti zapisa %1 - Unable to fetch next Ni moč pridobiti sledečega - Unable to fetch first Ni moč pridobiti prvega @@ -1230,40 +1286,910 @@ QDateTimeEdit - AM dop. - am dop. - PM pop. - pm pop. + QDeclarativeAbstractAnimation + + Cannot animate non-existent property "%1" + Neobstoječe lastnosti »%1« ni moč animirati + + + Cannot animate read-only property "%1" + Lastnosti »%1«, ki je samo za branje, ni moč animirati + + + Animation is an abstract class + Animacija je abstrakten razred + + + + QDeclarativeAnchorAnimation + + Cannot set a duration of < 0 + Trajanja, ki je krajše od 0, ni moč nastaviti + + + + QDeclarativeAnchors + + Possible anchor loop detected on fill. + Ob zapolnjevanju je bila zaznana možna zanka sidra. + + + Possible anchor loop detected on centerIn. + Ob usrediščanju je bila zaznana možna zanka sidra. + + + Cannot anchor to an item that isn't a parent or sibling. + Na objekt, ki ni nadrejen ali enakovreden, se ni moč zasidrati. + + + Possible anchor loop detected on vertical anchor. + Ob navpičnem sidru je bila zaznana možna zanka sidra. + + + Possible anchor loop detected on horizontal anchor. + Ob vodoravnem sidru je bila zaznana možna zanka sidra. + + + Cannot specify left, right, and hcenter anchors. + Levih, desnih in vodoravno sredinskih sider ni moč določiti. + + + Cannot anchor to a null item. + Na neobstoječ objekt se ni moč zasidrati. + + + Cannot anchor a horizontal edge to a vertical edge. + Vodoravnega roba ni moč zasidrati na navpični rob. + + + Cannot anchor item to self. + Objekta ni moč zasidrati samega nase. + + + Cannot specify top, bottom, and vcenter anchors. + Vrhnjih, spodnjih in navpično sredinskih sider ni moč določiti. + + + Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. + Sidra na osnovnici ni moč uporabiti skupaj z vrhnjimi, spodnjimi ali navpično sredinskimi sidri. + + + Cannot anchor a vertical edge to a horizontal edge. + Navpičnega roba ni moč zasidrati na vodoravni rob. + + + + QDeclarativeAnimatedImage + + Qt was built without support for QMovie + Qt je bil zgrajen brez podpore za QMovie + + + + QDeclarativeBehavior + + Cannot change the animation assigned to a Behavior. + Animacije, ki je prirejena obnašanju, ni moč spremeniti. + + + + QDeclarativeBinding + + Binding loop detected for property "%1" + Za lastnost »%1« je bila zaznana zanka vezave + + + + QDeclarativeCompiledBindings + + Binding loop detected for property "%1" + Za lastnost »%1« je bila zaznana zanka vezave + + + + QDeclarativeCompiler + + Invalid property assignment: "%1" is a read-only property + Neveljavna prireditev lastnosti: »%1« je lastnost, ki je samo za branje + + + Invalid property assignment: unknown enumeration + Neveljavna prireditev lastnosti: neznano oštevilčenje + + + Invalid property assignment: string expected + Neveljavna prireditev lastnosti: pričakovan je niz + + + Invalid property assignment: url expected + Neveljavna prireditev lastnosti: pričakovan je URL + + + Invalid property assignment: unsigned int expected + Neveljavna prireditev lastnosti: pričakovano je nepredznačeno celo število + + + Invalid property assignment: int expected + Neveljavna prireditev lastnosti: pričakovano je celo število + + + Invalid property assignment: number expected + Neveljavna prireditev lastnosti: pričakovano je število + + + Invalid property assignment: color expected + Neveljavna prireditev lastnosti: pričakovana je barva + + + Invalid property assignment: date expected + Neveljavna prireditev lastnosti: pričakovan je datum + + + Invalid property assignment: time expected + Neveljavna prireditev lastnosti: pričakovan je čas + + + Invalid property assignment: datetime expected + Neveljavna prireditev lastnosti: pričakovana sta datum in čas + + + Invalid property assignment: point expected + Neveljavna prireditev lastnosti: pričakovana je točka + + + Invalid property assignment: size expected + Neveljavna prireditev lastnosti: pričakovana je velikost + + + Invalid property assignment: rect expected + Neveljavna prireditev lastnosti: pričakovan je pravokotnik + + + Invalid property assignment: boolean expected + Neveljavna prireditev lastnosti: pričakovana je logična vrednost + + + Invalid property assignment: 3D vector expected + Neveljavna prireditev lastnosti: pričakovan je 3D vektor + + + Invalid property assignment: unsupported type "%1" + Neveljavna prireditev lastnosti: nepodprta vrsta »%1« + + + Element is not creatable. + Elementa ni moč ustvariti. + + + Component elements may not contain properties other than id + Elementi komponent ne smejo vsebovati drugih lastnosti kot ID + + + Invalid component id specification + Neveljavno določen ID komponente + + + id is not unique + ID ni edinstven + + + Invalid component body specification + Neveljavno določeno telo komponente + + + Component objects cannot declare new properties. + Objekti komponent ne morejo deklarirati novih lastnosti. + + + Component objects cannot declare new signals. + Objekti komponent ne morejo deklarirati novih signalov. + + + Component objects cannot declare new functions. + Objekti komponent ne morejo deklarirati novih funkcij. + + + Cannot create empty component specification + Prazne specifikacije komponente ni moč ustvariti + + + Incorrectly specified signal assignment + Napačno določena prireditev signalu + + + Cannot assign a value to a signal (expecting a script to be run) + Signalu ni moč prirediti vrednosti (pričakovan je skript, ki bo zagnan) + + + Empty signal assignment + Prazna prireditev signalu + + + Empty property assignment + Prazna prireditev lastnosti + + + Attached properties cannot be used here + Pripete lastnosti tu ne morejo biti uporabljene + + + Non-existent attached object + Neobstoječ pripet objekt + + + Invalid attached object assignment + Neveljavna prireditev pripetega objekta + + + Cannot assign to non-existent default property + Neobstoječi privzeti lastnosti ni moč prirediti + + + Cannot assign to non-existent property "%1" + Neobstoječi lastnosti »%1« ni moč prirediti + + + Invalid use of namespace + Napačna raba imenskega prostora + + + Not an attached property name + Ni ime pripete lastnosti + + + Invalid use of id property + Napačna raba lastnosti ID + + + Property has already been assigned a value + Lastnosti je že bila prirejena vrednost + + + Invalid grouped property access + Neveljaven dostop do skupinske lastnosti + + + Cannot assign a value directly to a grouped property + Skupinski lastnosti ni moč neposredno prirediti vrednosti + + + Invalid property use + Neveljavna raba lastnosti + + + Property assignment expected + Pričakovana je prireditev lastnosti + + + Single property assignment expected + Pričakovana je enojna prireditev lastnosti + + + Unexpected object assignment + Nepričakovana prireditev objekta + + + Cannot assign object to list + Objekta ni moč prirediti seznamu + + + Can only assign one binding to lists + Seznamom je moč prirediti le eno vezavo + + + Cannot assign primitives to lists + Seznamom ni moč prirediti osnovnih tipov + + + Cannot assign multiple values to a script property + Lastnosti »script« ni moč prirediti več vrednosti + + + Invalid property assignment: script expected + Neveljavna prireditev lastnosti: pričakovan je skript + + + Cannot assign object to property + Objekta ni moč prirediti lastnosti + + + "%1" cannot operate on "%2" + »%1« ne more delovati na »%2« + + + Duplicate default property + Podvojena privzeta lastnost + + + Duplicate property name + Podvojeno ime lastnosti + + + Property names cannot begin with an upper case letter + Imena lastnosti se ne smejo začeti z veliko črko + + + Illegal property name + Neveljavno ime lastnosti + + + Duplicate signal name + Podvojeno ime signala + + + Signal names cannot begin with an upper case letter + Imena signalov se ne smejo začeti z veliko črko + + + Illegal signal name + Neveljavno ime signala + + + Duplicate method name + Podvojeno ime metode + + + Method names cannot begin with an upper case letter + Imena metod se ne smejo začeti z veliko črko + + + Illegal method name + Neveljavno ime metode + + + Property value set multiple times + Vrednost lastnosti je bila nastavljena večkrat + + + Invalid property nesting + Neveljavno gnezdenje lastnosti + + + Cannot override FINAL property + Lastnosti FINAL ni moč povoziti + + + Invalid property type + Neveljavna vrsta lastnosti + + + Invalid empty ID + Neveljaven prazen ID + + + IDs cannot start with an uppercase letter + ID-ji se ne smejo začeti z veliko črko + + + IDs must start with a letter or underscore + ID-ji se morajo začeti s črko ali podčrtajem + + + IDs must contain only letters, numbers, and underscores + ID-ji lahko vsebujejo le črke, števke in podčrtaje + + + ID illegally masks global JavaScript property + ID neveljavno zakriva globalno lastnost JavaScripta + + + No property alias location + Brez lokacije aliasa lastnosti + + + Invalid alias location + Neveljavna lokacija aliasa + + + Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> + Neveljavna referenca aliasa. Referenca aliasa mora biti določena kot <id> ali <id>.<lastnost> + + + Invalid alias reference. Unable to find id "%1" + Neveljavna referenca aliasa. ID-ja »%1« ni moč najti + + + + QDeclarativeComponent + + Invalid empty URL + Neveljaven prazen URL + + + + QDeclarativeCompositeTypeManager + + Resource %1 unavailable + Vir %1 ni na voljo + + + Namespace %1 cannot be used as a type + Imenskega prostora %1 ni moč uporabiti kot vrste + + + %1 %2 + %1 %2 + + + Type %1 unavailable + Vrsta %1 ni na voljo + + + + QDeclarativeConnections + + Cannot assign to non-existent property "%1" + Neobstoječi lastnosti »%1« ni moč prirediti + + + Connections: nested objects not allowed + Povezave: gnezdeni objekti niso dovoljeni + + + Connections: syntax error + Povezave: napaka v skladnji + + + Connections: script expected + Povezave: pričakovan je skript + + + + QDeclarativeEngine + + executeSql called outside transaction() + executeSql je bil klican izven transaction() + + + Read-only Transaction + Transakcija samo za branje + + + Version mismatch: expected %1, found %2 + Neujemanje različic: pričakovana %1, najdena %2 + + + SQL transaction failed + Transakcija SQL ni uspela + + + transaction: missing callback + transaction: manjka povratni klic + + + SQL: database version mismatch + SQL: neujemanje različice podatkovne zbirke + + + + QDeclarativeFlipable + + front is a write-once property + front je lastnost, ki se jo lahko zapiše samo enkrat + + + back is a write-once property + back je lastnost, ki se jo lahko zapiše samo enkrat + + + + QDeclarativeImportDatabase + + module "%1" definition "%2" not readable + definicije »%2« modula »%1« ni moč brati + + + plugin cannot be loaded for module "%1": %2 + vstavka za modul »%1« ni moč naložiti: %2 + + + module "%1" plugin "%2" not found + vstavek »%2« modula »%1« ni bil najden + + + module "%1" version %2.%3 is not installed + modul »%1« različice %2.%3 ni nameščen + + + module "%1" is not installed + modul »%1« ni nameščen + + + "%1": no such directory + »%1«: mapa ne obstaja + + + import "%1" has no qmldir and no namespace + uvoz »%1« nima niti qmldir-a niti imenskega prostora + + + - %1 is not a namespace + – %1 ni imenski prostor + + + - nested namespaces not allowed + – gnezdeni imenski prostori niso dovoljeni + + + local directory + krajevna mapa + + + is ambiguous. Found in %1 and in %2 + je dvoumno. Najdeno v %1 in %2 + + + is ambiguous. Found in %1 in version %2.%3 and %4.%5 + je dvoumno. Najdeno v %1 v različicah %2.%3 in %4.%5 + + + is instantiated recursively + je instanciran rekurzivno + + + is not a type + ni vrsta + + + + QDeclarativeKeyNavigationAttached + + KeyNavigation is only available via attached properties + KeyNavigation je na voljo samo s pripetimi lastnostmi + + + + QDeclarativeKeysAttached + + Keys is only available via attached properties + Keys je na voljo samo s pripetimi lastnostmi + + + + QDeclarativeListModel + + remove: index %1 out of range + remove: indeks %1 je izven obsega + + + insert: value is not an object + insert: vrednost ni objekt + + + insert: index %1 out of range + insert: indeks %1 je izven obsega + + + move: out of range + move: izven obsega + + + append: value is not an object + append: vrednost ni objekt + + + set: value is not an object + set: vrednost ni objekt + + + set: index %1 out of range + set: indeks %1 je izven obsega + + + ListElement: cannot contain nested elements + ListElement: ni moč vsebovati gnezdenih elementov + + + ListElement: cannot use reserved "id" property + ListElement: ne more uporabiti rezervirane lastnosti »id« + + + ListElement: cannot use script for property value + ListElement: ne more uporabiti skripta za vrednost lastnosti + + + ListModel: undefined property '%1' + ListModel: nedoločena lastnost »%1« + + + + QDeclarativeLoader + + Loader does not support loading non-visual elements. + Loader ne podpira nalaganja elementov, ki niso vidni. + + + + QDeclarativeParentAnimation + + Unable to preserve appearance under complex transform + Pod kompleksnim preoblikovanjem ni moč obdržati videza + + + Unable to preserve appearance under non-uniform scale + Pod ne-enakovrednim povečevanjem ni moč obdržati videza + + + Unable to preserve appearance under scale of 0 + Pod povečavo 0 ni moč obdržati videza + + + + QDeclarativeParentChange + + Unable to preserve appearance under complex transform + Pod kompleksnim preoblikovanjem ni moč obdržati videza + + + Unable to preserve appearance under non-uniform scale + Pod ne-enakovrednim povečevanjem ni moč obdržati videza + + + Unable to preserve appearance under scale of 0 + Pod povečavo 0 ni moč obdržati videza + + + + QDeclarativeParser + + Illegal unicode escape sequence + Neveljavno ubežno zaporedje Unicode + + + Illegal character + Neveljaven znak + + + Unclosed string at end of line + Nezaprt niz na koncu vrstice + + + Illegal escape squence + Neveljavno ubežno zaporedje + + + Unclosed comment at end of file + Nezaprt komentar na koncu datoteke + + + Illegal syntax for exponential number + Neveljavna skladnja za eksponentno število + + + Identifier cannot start with numeric literal + Identifikator se ne sme začeti s številskim literalom + + + Unterminated regular expression literal + Nezaključen literal regularnega izraza + + + Invalid regular expression flag '%0' + Neveljavna zastavica »%0« regularnega izraza + + + Unterminated regular expression backslash sequence + Nezaključeno zaporedij poševnic nazaj v regularnem izrazu + + + Unterminated regular expression class + Nezaključen razred regularnega izraza + + + Syntax error + Skladenjska napaka + + + Unexpected token `%1' + Nepričakovan žeton »%1« + + + Expected token `%1' + Pričakovan žeton »%1« + + + Property value set multiple times + Vrednost lastnosti je bila nastavljena večkrat + + + Expected type name + Pričakovano ime vrste + + + Invalid import qualifier ID + Neveljaven ID kvalifikatorja uvoza + + + Reserved name "Qt" cannot be used as an qualifier + Rezerviranega imena »Qt« ni moč uporabiti kot kvalifikatorja + + + Script import qualifiers must be unique. + Kvalifikatorji uvozov skriptov morajo biti edinstveni. + + + Script import requires a qualifier + Uvozi skriptov potrebujejo kvalifikator + + + Library import requires a version + Uvozi knjižnic potrebujejo različico + + + Expected parameter type + Pričakovana vrsta parametra + + + Invalid property type modifier + Neveljaven modifikator vrste lastnosti + + + Unexpected property type modifier + Nepričakovan modifikator vrste lastnosti + + + Expected property type + Pričakovana vrsta lastnosti + + + Readonly not yet supported + Tisti, ki so samo za branje, še niso podprti + + + JavaScript declaration outside Script element + Deklaracija JavaScripta izven elementa Script + + + + QDeclarativePauseAnimation + + Cannot set a duration of < 0 + Trajanja, ki je krajše od 0, ni moč nastaviti + + + + QDeclarativePixmap + + Error decoding: %1: %2 + Napaka dekodiranja: %1: %2 + + + Failed to get image from provider: %1 + Od ponudnika ni bilo moč dobiti slike: %1 + + + Cannot open: %1 + Ni moč odpreti %1: + + + + QDeclarativePropertyAnimation + + Cannot set a duration of < 0 + Trajanja, ki je krajše od 0, ni moč nastaviti + + + + QDeclarativePropertyChanges + + PropertyChanges does not support creating state-specific objects. + PropertyChanges ne podpira ustvarjanja objektov sprecifičnih za stanje. + + + Cannot assign to non-existent property "%1" + Neobstoječi lastnosti »%1« ni moč prirediti + + + Cannot assign to read-only property "%1" + Ni moč prirediti lastnosti »%1«, ki je samo za branje + + + + QDeclarativeTextInput + + Could not load cursor delegate + Ni bilo moč naložiti delegata za kazalec + + + Could not instantiate cursor delegate + Ni bilo moč instancirati delegata za kazalec + + + + QDeclarativeVME + + Unable to create object of type %1 + Ni moč ustvariti objekta vrste %1 + + + Cannot assign value %1 to property %2 + Lastnosti %2 ni moč prirediti vrednosti %1 + + + Cannot assign object type %1 with no default method + Ni moč prirediti objekta vrste %1 brez privzete metode + + + Cannot connect mismatched signal/slot %1 %vs. %2 + Ni moč povezati neujemajočih signalov in rež: %1 in %2 + + + Cannot assign an object to signal property %1 + Objekta ni moč prirediti lastnosi signala %1 + + + Cannot assign object to list + Objekta ni moč prirediti seznamu + + + Cannot assign object to interface property + Objekta ni moč prirediti lastnosti vmesnika + + + Unable to create attached object + Ni moč ustvariti pripetega objekta + + + Cannot set properties on %1 as it is null + Ni moč nastaviti lastnosti za %1, saj ne obstaja + + + + QDeclarativeVisualDataModel + + Delegate component must be Item type. + Komponenta delegata mora biti vrste Item. + + + + QDeclarativeXmlListModel + + Qt was built without support for xmlpatterns + Qt je bil zgrajen brez podpore za xmlpatterns + + + + QDeclarativeXmlListModelRole + + An XmlRole query must not start with '/' + Poizvedba XmlRole se ne sme začeti z »/« + + + + QDeclarativeXmlRoleList + + An XmlListModel query must start with '/' or "//" + Poizvedba XmlListModel se mora začeti z »/« ali »//« + + + QDial - QDial QDial - SpeedoMeter SpeedoMeter - SliderHandle SliderHandle @@ -1271,12 +2197,10 @@ QDialog - What's This? Kaj je to? - Done Opravljeno @@ -1284,124 +2208,98 @@ QDialogButtonBox - - - OK V redu - &OK &V redu - &Save &Shrani - Save Shrani - Open Odpri - &Cancel &Prekliči - Cancel Prekliči - &Close &Zapri - Close Zapri - Apply Uveljavi - Reset Ponastavi - Help Pomoč - Don't Save Ne shrani - Discard Zavrzi - &Yes &Da - Yes to &All Da za &vse - &No &Ne - N&o to All N&e za vse - Save All Shrani vse - Abort Prekini - Retry Poskusi znova - Ignore Spreglej - Restore Defaults Obnovi privzete vrednosti - Close without Saving Zapri brez shranjevanja @@ -1409,29 +2307,24 @@ QDirModel - Name Ime - Size Velikost - Kind Match OS X Finder Vrste - Type All other platforms Vrsta - Date Modified Datum spremembe @@ -1439,17 +2332,14 @@ QDockWidget - Close Zapri - Dock Zasidraj - Float Naj lebdi @@ -1457,12 +2347,10 @@ QDoubleSpinBox - More Več - Less Manj @@ -1470,27 +2358,22 @@ QErrorMessage - Debug Message: Sporočilo razhroščevanja: - Warning: Opozorilo: - Fatal Error: Usodna napaka: - &Show this message again &To sporočilo naslednjič spet prikaži - &OK &V redu @@ -1498,38 +2381,30 @@ QFile - - Destination file exists Ciljna datoteka obstaja - Will not rename sequential file using block copy Sekvenčna datoteka ne bo preimenovana z uporabo kopiranja blokov - Cannot remove source file Ni moč odstraniti izvorne datoteke - Cannot open %1 for input Ni moč odpreti %1 za vhod - Cannot open for output Ni moč odpreti za izhod - Failure to write block Neuspeh pri zapisovanju bloka - Cannot create %1 for output Ni moč ustvariti %1 za izhod @@ -1537,43 +2412,32 @@ QFileDialog - - All Files (*) Vse datoteke (*) - Directories Mape - - - &Open &Odpri - - &Save &Shrani - Open Odpri - %1 already exists. Do you want to replace it? %1 že obstaja. Ali jo želite nadomestiti? - %1 File not found. Please verify the correct file name was given. @@ -1582,64 +2446,46 @@ Preverite, ali je bilo podano pravilno ime datoteke. - My Computer Moj računalnik - &Rename Pre&imenuj - &Delete &Izbriši - Show &hidden files Prikaži &skrite datoteke - - Back Nazaj - - Parent Directory Matična mapa - - List View Prikaz seznama - - Detail View Prikaz podrobnosti - - Files of type: Datoteke vrste: - - Directory: Mapa: - - %1 Directory not found. Please verify the correct directory name was given. @@ -1648,475 +2494,399 @@ Preverite, ali je bilo podano pravilno ime mape. - '%1' is write protected. Do you want to delete it anyway? »%1« je zaščitena pred pisanjem. Ali jo kljub temu želite izbrisati? - Are sure you want to delete '%1'? Ali res želite izbrisati »%1«? - Could not delete directory. Ni bilo moč izbrisati mape. - Recent Places Nedavna mesta - All Files (*.*) Vse datoteke (*.*) - Save As Shrani kot - Drive Pogon - - File Datoteka - File Folder Match Windows Explorer Mapa z datotekami - Folder All other platforms Mapa - Alias Mac OS X Finder Drugo ime - Shortcut All other platforms Bližnjica - Unknown Neznano - Find Directory Najdi mapo - Show Prikaži - - Forward Naprej - New Folder Nova mapa - &New Folder &Nova mapa - - &Choose Iz&berite - Remove Odstrani - - File &name: Ime &datoteke: - - Look in: Išči v: - - Create New Folder Ustvari novo mapo + + Go back + Vrni se nazaj + + + Go forward + Napreduj naprej + + + Go to the parent directory + Pojdi v matično mapo + + + Create a New Folder + Ustvari novo mapo + + + Change to list view mode + Preklopi v način prikaza seznama + + + Change to detail view mode + Preklopi v način prikaza podrobnosti + QFileSystemModel - Invalid filename Napačno ime datoteke - <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. <b>Imena »%1« ne morete uporabiti.</b><p>Poskusite z drugim imenom, ki vsebuje manj znakov ali pa ne vsebuje ločil. - Name Ime - Size Velikost - Kind Match OS X Finder Vrste - Type All other platforms Vrsta - Date Modified Datum spremembe - My Computer Moj računalnik - Computer Računalnik - - %1 TB %1 TiB - - %1 GB %1 GiB - - %1 MB %1 MiB - - %1 KB %1 KiB - - %1 bytes %1 B + + %1 byte(s) + %1 B + QFontDatabase - - Normal Normalno - - - Bold Polkrepko - - Demi Bold - - - Black - Črni - - - + + + Demi - - Light Lahko - - Italic Ležeče - - Oblique Nagnjeno - Any Katerikoli - Latin Latinska - Greek Grška - Cyrillic Cirilica - Armenian Armenska - Hebrew Hebrejska - Arabic Arabska - Syriac Sirijska - Thaana Thaana - Devanagari Devanagari - Bengali Bengalska - Gurmukhi Gurmukhi - Gujarati Gujarati - Oriya - oriya - - - + Oriya + + Tamil Tamilska - Telugu Teluška - Kannada - kannada - - - + Kannada + + Malayalam - malayalam - - - + Malayalam + + Sinhala - Sinhala - - - + Sinhala + + Thai Tajska - Lao Laoška - Tibetan Tibetanska - Myanmar Mjanmarska - Georgian Gruzijska - Khmer Kmerska - Simplified Chinese Poenostavljena kitajska - Traditional Chinese Tradicionalna kitajska - Japanese Japonska - Korean Korejska - Vietnamese Vietnamska - Symbol Simbol - Ogham Oghamska - Runic Runska + + N'Ko + N'Ko + QFontDialog - &Font &Pisava - Font st&yle &Slog pisave - &Size &Velikost - Effects Učinki - Stri&keout P&rečrtaj - &Underline Po&dčrtaj - Sample Vzorec - Wr&iting System S&istem pisanja - - Select Font Izberite pisavo @@ -2124,145 +2894,104 @@ QFtp - - Not connected Brez povezave - - Host %1 not found Gostitelj %1 ni bil najden - - Connection refused to host %1 Povezava z gostiteljem %1 je bila zavrnjena - Connection timed out to host %1 Čas za povezavo z gostiteljem %1 je potekel - - - Connected to host %1 Povezan z gostiteljem %1 - - Connection refused for data connection Podatkovna povezava je bila zavrnjena - - - - Unknown error Neznana napaka - - Connecting to host failed: %1 Povezovanje z gostiteljem %1 ni uspelo: %1 - - Login failed: %1 Prijava ni uspela: %1 - - Listing directory failed: %1 Izpis seznama map ni uspel: %1 - - Changing directory failed: %1 Spreminjanje mape ni uspelo: %1 - - Downloading file failed: %1 Prejemanje datoteke ni uspelo: %1 - - Uploading file failed: %1 Pošiljanje datoteke ni uspelo: %1 - - Removing file failed: %1 Odstranjevanje datoteke ni uspelo: %1 - - Creating directory failed: %1 Ustvarjanje mape ni uspelo: %1 - - Removing directory failed: %1 Odstranjevanje mape ni uspelo: %1 - - - Connection closed Povezava je bila prekinjena - Host %1 found Gostitelj %1 je bil najden - Connection to %1 closed Povezava s %1 je bila prekinjena - Host found Gostitelj je bil najden - Connected to host Povezan z gostiteljem @@ -2270,43 +2999,33 @@ QHostInfo - Unknown error Neznana napaka + + No host name given + Podano ni bilo nobeno ime gostitelja + QHostInfoAgent - - - - Host not found Ni moč najti gostitelja - - - - Unknown address type Neznana vrsta naslova - - - Unknown error Neznana napaka - No host name given Podano ni bilo nobeno ime gostitelja - Invalid hostname Neveljavno ime gostitelja @@ -2314,155 +3033,110 @@ QHttp - - - - Unknown error Neznana napaka - - Request aborted Zahteva prekinjena - - No server set to connect to Strežnik za povezavo ni nastavljen - - Wrong content length Napačna dolžina vsebine - - Server closed connection unexpectedly Strežnik je nepričakovano prekinil povezavo - Unknown authentication method Neznan način overjanja - Error writing response to device Napaka pri pisanju odziva na napravo - - Connection refused Povezava je zavrnjena - - - Host %1 not found Gostitelj %1 ni bil najden - - - - HTTP request failed Zahtevek HTTP ni uspel - - Invalid HTTP response header Neveljavna glava odgovora HTTP - - - - Invalid HTTP chunked body Neveljavno razdeljeno telo HTTP - Host %1 found Gostitelj %1 je bil najden - Connected to host %1 Povezan z gostiteljem %1 - Connection to %1 closed Povezava s %1 je bila prekinjena - Host found Gostitelj je bil najden - Connected to host Povezan z gostiteljem - - Connection closed Povezava je bila prekinjena - Proxy authentication required Potrebna je overitev pri posredniku - Authentication required Potrebna je overitev - Connection refused (or timed out) Povezava je bila zavrnjena (ali pa je potekel čas) - Proxy requires authentication Posrednik zahteva overitev - Host requires authentication Gostitelj zahteva overitev - Data corrupted Podatki so okvarjeni - Unknown protocol specified Naveden je bil neznan protokol - SSL handshake failed Rokovanje SSL ni uspelo - HTTPS connection requested but SSL support not compiled in Zahtevana je bila povezava HTTPS, a podpora za SSL ni bila vgrajena @@ -2470,47 +3144,38 @@ QHttpSocketEngine - Did not receive HTTP response from proxy Od posrednika ni bil prejet odgovor HTTP - Error parsing authentication request from proxy Napaka pri razčlenjevanju overitvenega zahtevka od posrednika - Authentication required Potrebna je overitev - Proxy denied connection Posrednik je zavrnil povezavo - Error communicating with HTTP proxy Napaka pri komunikaciji s posrednikom HTTP - Proxy server not found Posredniški strežnik ni bil najden - Proxy connection refused Povezava s posrednikom je bila zavrnjena - Proxy server connection timed out Čas za povezavo s posredniškim strežnikom je potekel - Proxy connection closed prematurely Povezava s posrednikom je bila prekinjena predčasno @@ -2518,22 +3183,18 @@ QIBaseDriver - Error opening database Napaka pri odpiranju podatkovne zbirke - Could not start transaction Ni bilo moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije @@ -2541,89 +3202,70 @@ QIBaseResult - Unable to create BLOB Ni moč ustvariti BLOB-a - Unable to write BLOB Ni moč zapisati BLOB-a - Unable to open BLOB Ni moč odpreti BLOB-a - Unable to read BLOB Ni moč prebrati BLOB-a - - Could not find array Ni bilo moč najti polja - Could not get array data Ni bilo moč pridobiti podatkov iz polja - Could not get query info Ni bilo moč pridobiti podatkov o poizvedbi - Could not start transaction Ni bilo moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Could not allocate statement Ni bilo moč dodeliti prostora za izjavo - Could not prepare statement Ni bilo moč pripraviti izjave - - Could not describe input statement Ni bilo moč opisati vhodne izjave - Could not describe statement Ni bilo moč opisati izjave - Unable to close statement Ni moč zaključiti izjave - Unable to execute query Ni moč izvesti poizvedbe - Could not fetch next item Ni bilo moč pridobiti sledeče postavke - Could not get statement info Ni bilo moč pridobiti podatkov o izjavi @@ -2631,27 +3273,22 @@ QIODevice - Permission denied Nimate dovoljenja - Too many open files Preveč odprtih datotek - No such file or directory Ta datoteka ali mapa ne obstaja - No space left on device Ni prostora na napravi - Unknown error Neznana napaka @@ -2659,32 +3296,26 @@ QInputContext - XIM XIM - FEP FEP - XIM input method Način za vnašanje XIM - Windows input method Način za vnašanje Windows - Mac OS X input method Način za vnašanje Mac OS X - S60 FEP input method Način za vnašanje S60 FEP @@ -2692,7 +3323,6 @@ QInputDialog - Enter a value: Vnesite vrednost: @@ -2700,66 +3330,50 @@ QLibrary - Could not mmap '%1': %2 Ni bilo moč izvesti funkcije mmap za »%1«: %2 - Plugin verification data mismatch in '%1' Neujemanje podatkov za potrjevanje vstavkov v »%1« - Could not unmap '%1': %2 Ni bilo moč izvesti funkcije unmap za »%1«: %2 - The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] Vstavek »%1« uporablja nezdružljivo knjižnico Qt. (%2.%3.%4) [%5] - The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" Vstavek »%1« uporablja nezdružljivo knjižnico Qt. Pričakovan je bil ključ gradnje »%2«, dobljen je bil »%3« - Unknown error Neznana napaka - - The shared library was not found. Deljena knjižnica ni bila najdena. - The file '%1' is not a valid Qt plugin. Datoteka »%1« ni veljaven vstavek Qt. - The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) Vstavek »%1« uporablja nezdružljivo knjižnico Qt. (Ni moč mešati knjižnic za razhroščevanje in izdajo.) - - Cannot load library %1: %2 Ni moč naložiti knjižnice %1: %2 - - Cannot unload library %1: %2 Ni moč odstraniti knjižnice %1: %2 - - Cannot resolve symbol "%1" in %2: %3 Ni moč razrešiti simbola »%1« v %2: %3 @@ -2767,37 +3381,30 @@ QLineEdit - &Undo &Razveljavi - &Redo &Uveljavi - Cu&t &Izreži - &Copy S&kopiraj - &Paste Pri&lepi - Delete Izbriši - Select All Izberi vse @@ -2805,23 +3412,18 @@ QLocalServer - - %1: Name error %1: napaka v imenu - %1: Permission denied %1: nimate dovoljenja - %1: Address in use %1: naslov je že v uporabi - %1: Unknown error %2 %1: neznana napaka %2 @@ -2829,70 +3431,46 @@ QLocalSocket - - %1: Connection refused %1: povezava je bila zavrnjena - - %1: Remote closed %1: oddaljeni je prekinil - - - - %1: Invalid name %1: neveljavno ime - - %1: Socket access error %1: napaka pri dostopu do vtičnice - - %1: Socket resource error %1: napaka vira vtičnice - - %1: Socket operation timed out %1: čas za dejanje na vtičnici je potekel - - %1: Datagram too large %1: datagram je prevelik - - - %1: Connection error %1: napaka povezave - - %1: The socket operation is not supported %1: dejanje na vtičnici ni podprto - %1: Unknown error %1: neznana napaka - - %1: Unknown error %2 %1: neznana napaka %2 @@ -2900,27 +3478,22 @@ QMYSQLDriver - Unable to open database ' Ni moč odpreti podatkovne zbirke » - Unable to connect Ni moč vzpostaviti povezave - Unable to begin transaction Ni moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije @@ -2928,59 +3501,46 @@ QMYSQLResult - Unable to fetch data Ni moč pridobiti podatkov - Unable to execute query Ni moč izvesti poizvedbe - Unable to store result Ni moč shraniti rezultata - - Unable to prepare statement Ni moč pripraviti izjave - Unable to reset statement Ni moč ponastaviti izjave - Unable to bind value Ni moč prikleniti vrednosti - Unable to execute statement Ni moč izvesti izjave - - Unable to bind outvalues Ni moč prikleniti izhodnih vrednosti - Unable to store statement results Ni moč shraniti rezultatov izjave - Unable to execute next query Ni moč izvesti sledeče poizvedbe - Unable to store next result Ni moč shraniti sledečega rezultata @@ -2988,7 +3548,6 @@ QMdiArea - (Untitled) (neimenovano) @@ -2996,92 +3555,74 @@ QMdiSubWindow - %1 - [%2] %1 - [%2] - Close Zapri - Minimize Pomanjšaj - Restore Down Obnovi navzdol - &Restore &Obnovi - &Move &Premakni - &Size &Velikost - Mi&nimize Po&manjšaj - Ma&ximize &Razpni - Stay on &Top Ostani na &vrhu - &Close &Zapri - - [%1] - [%1] - Maximize Razpni - Unshade Razvij - Shade Zvij - Restore Obnovi - Help Pomoč - Menu Meni @@ -3089,21 +3630,14 @@ QMenu - - Close Zapri - - Open Odpri - - - Execute Izvedi @@ -3111,7 +3645,6 @@ QMenuBar - Actions Dejanja @@ -3119,40 +3652,30 @@ QMessageBox - Help Pomoč - - - - OK V redu - <h3>About Qt</h3><p>This program uses Qt version %1.</p> <h3>O Qt</h3><p>Ta program uporablja Qt različice %1.</p> - <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <p>Qt je skupek gradnikov C++ za razvoj programov, ki tečejo na več platformah.</p><p>Qt omogoča isto kodo prenašati med platformami Linux, Mac&nbsp;OS&nbsp;X, Windows in vsemi večjimi variantami UNIX-a. Qt je na voljo tudi za vgrajene naprave in sicer kot Qt for Embedded Linux in Qt for Windows CE.</p><p>Qt je na voljo pod tremi možnimi licenčnimi pogoji, ki ustrezajo različnim željam uporabnikov.</p><p>Qt pod licenco GNU General Public License različice 3.0 (<a href="http://www.gnu.org/licenses/gpl-3.0.html">GPLv3.0</a>) je primeren za razvoj programov Qt, ki so povsem <a href="http://www.gnu.org/philosophy/free-sw.html">prosti in odprto-kodni</a>. S to licenco se uporabnikom programa zagotovijo vse pravice in svoboščine, kot jih je imel izdelovalec programa.</p><p>Qt pod licenco GNU Lesser General Public License različice 2.1 (<a href="http://www.gnu.org/licenses/lgpl-2.1.html">LGPLv2.1</a>) omogoča tudi razvoj programov, ki uporabnikom ne zagotavljajo vseh pravic in svoboščin, kot jih je imel izdelovalec. Omogoča na primer tudi razvoj zaprto-kodnih programov.</p><p>Qt pod posebno komercialno licenco je namenjen razvoju lastniških in zaprto-kodnih programov, kjer izdelovalec z uporabniki noče deliti nič izvorne kode ter pravic in svoboščin, ali pa ne more ustreči pogojem licenc GPLv3.0 ali LGPLv2.1.</p><p>Za pregled licenčnih možnosti si oglejte spletno stran <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a>.</p><p>Avtorske pravice © 2009 Nokia Corporation in/ali podružnice ter zunanji prispevajoči.</p><p>Qt je proizvod podjetja Nokia. Za dodatne podatke si oglejte <a href="http://qt.nokia.com/">qt.nokia.com</a>.</p> - - - + <p>Qt je skupek gradnikov C++ za razvoj programov, ki tečejo na več platformah.</p><p>Qt omogoča isto kodo prenašati med platformami Linux, Mac&nbsp;OS&nbsp;X, Windows in vsemi večjimi variantami UNIX-a. Qt je na voljo tudi za vgrajene naprave in sicer kot Qt for Embedded Linux in Qt for Windows CE.</p><p>Qt je na voljo pod tremi možnimi licenčnimi pogoji, ki ustrezajo različnim željam uporabnikov.</p><p>Qt pod licenco GNU General Public License različice 3.0 (<a href="http://www.gnu.org/licenses/gpl-3.0.html">GPLv3.0</a>) je primeren za razvoj programov Qt, ki so povsem <a href="http://www.gnu.org/philosophy/free-sw.html">prosti in odprto-kodni</a>. S to licenco se uporabnikom programa zagotovijo vse pravice in svoboščine, kot jih je imel izdelovalec programa.</p><p>Qt pod licenco GNU Lesser General Public License različice 2.1 (<a href="http://www.gnu.org/licenses/lgpl-2.1.html">LGPLv2.1</a>) omogoča tudi razvoj programov, ki uporabnikom ne zagotavljajo vseh pravic in svoboščin, kot jih je imel izdelovalec. Omogoča na primer tudi razvoj zaprto-kodnih programov.</p><p>Qt pod posebno komercialno licenco je namenjen razvoju lastniških in zaprto-kodnih programov, kjer izdelovalec z uporabniki noče deliti nič izvorne kode ter pravic in svoboščin, ali pa ne more ustreči pogojem licenc GPLv3.0 ali LGPLv2.1.</p><p>Za pregled licenčnih možnosti si oglejte spletno stran <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a>.</p><p>Avtorske pravice © 2009 Nokia Corporation in/ali podružnice ter zunanji prispevajoči.</p><p>Qt je proizvod podjetja Nokia. Za dodatne podatke si oglejte <a href="http://qt.nokia.com/">qt.nokia.com</a>.</p><p>Prevedel: <a href="mailto:jlp@holodeck1.com">Jure Repinc</a>, <a href="http://www.lugos.si/">LUGOS</a></p> + + About Qt O Qt - Show Details... Prikaži podrobnosti ... - Hide Details... Skrij podrobnosti ... @@ -3160,7 +3683,6 @@ QMultiInputContext - Select IM Izberite način vnašanja @@ -3168,12 +3690,10 @@ QMultiInputContextPlugin - Multiple input method switcher Orodje za preklop med načini vnašanja - Multiple input method switcher that uses the context menu of the text widgets Orodje za preklop med več načini vnašanja, ki uporablja priročni meni besedilnih gradnikov @@ -3181,132 +3701,106 @@ QNativeSocketEngine - The remote host closed the connection Oddaljen gostitelj je prekinil povezavo - Network operation timed out Čas za omrežni postopek je potekel - Out of resources Zmanjkalo je virov - Unsupported socket operation Nepodprto dejanje za vtičnico - Protocol type not supported Vrsta protokola ni podprta - Invalid socket descriptor Neveljaven opisnik vtičnice - Network unreachable Omrežje ni dosegljivo - Permission denied Nimate dovoljenja - Connection timed out Čas za povezavo je potekel - Connection refused Povezava je zavrnjena - The bound address is already in use Naslov za vezavo je že v uporabi - The address is not available Naslov ni na voljo - The address is protected Naslov je zaščiten - Unable to send a message Ni moč poslati sporočila - Unable to receive a message Ni moč prejeti sporočila - Unable to write Ni moč zapisovati - Network error Napaka v omrežju - Another socket is already listening on the same port Druga vtičnica že posluša na istih vratih - Unable to initialize non-blocking socket Ni moč inicializirati ne-blokirne vtičnice - Unable to initialize broadcast socket Ni moč inicializirati vtičnice za oddajanje - Attempt to use IPv6 socket on a platform with no IPv6 support Poskus uporabe vtičnice IPv6 na platformi brez podpore za IPv6 - Host unreachable Gostitelj ni dosegljiv - Datagram was too large to send Datagram je bil prevelik za pošiljanje - Operation on non-socket Dejanje na ne-vtičnici - Unknown error Neznana napaka - The proxy type is invalid for this operation Vrsta posrednika za to dejanje ni veljavna @@ -3314,43 +3808,55 @@ QNetworkAccessCacheBackend - Error opening %1 Napaka pri odpiranju %1 + QNetworkAccessDataBackend + + Operation not supported on %1 + Dejanje na %1 ni podprto + + + Invalid URI: %1 + Neveljaven URI: %1 + + + QNetworkAccessDebugPipeBackend - Write error writing to %1: %2 Napaka pri zapisovanju v %1: %2 + + Socket error on %1: %2 + Napaka vtičnice na %1: %2 + + + Remote host closed the connection prematurely on %1 + Oddaljen gostitelj je predčasno prekinil povezavo na %1 + QNetworkAccessFileBackend - Request for opening non-local file %1 Zahtevek za odprtje ne-krajevne datoteke %1 - Error opening %1: %2 Napaka pri odpiranju %1: %2 - Write error writing to %1: %2 Napaka pri zapisovanju v %1: %2 - Cannot open %1: Path is a directory Ni moč odpreti %1: pot je mapa - Read error reading from %1: %2 Napaka pri branju iz %1: %2 @@ -3358,27 +3864,22 @@ QNetworkAccessFtpBackend - No suitable proxy found Najden ni bil noben primeren posrednik - Cannot open %1: is a directory Ni moč odpreti %1: to je mapa - Logging in to %1 failed: authentication required Prijava v %1 ni uspela: potrebna je overitev - Error while downloading %1: %2 Napaka med prejemanjem %1: %2 - Error while uploading %1: %2 Napaka med pošiljanjem %1: %2 @@ -3386,58 +3887,105 @@ QNetworkAccessHttpBackend - No suitable proxy found Najden ni bil noben primeren posrednik + QNetworkAccessManager + + Network access is disabled. + Omrežni dostop je onemogočen. + + + QNetworkReply - Error downloading %1 - server replied: %2 Napaka med prejemanjem %1 - strežnikov odgovor: %2 - Protocol "%1" is unknown Neznan protokol »%1« + + Network session error. + Napaka omrežne seje. + + + Temporary network failure. + Začasna omrežna napaka. + QNetworkReplyImpl - - Operation canceled Postopek je bil preklican + QNetworkSession + + Invalid configuration. + Neveljavna nastavitev. + + + + QNetworkSessionPrivateImpl + + Roaming error + Napaka potovanja + + + Session aborted by user or system + Sejo je preklical uporabnik ali pa sistem + + + Unidentified Error + Neznana napaka + + + Unknown session error. + Neznana napaka seje. + + + The session was aborted by the user or system. + Sejo je preklical uporabnik ali pa sistem. + + + The requested operation is not supported by the system. + Sistem ne podpira zahtevanega dejanja. + + + The specified configuration cannot be used. + Navedenih nastavitev ni moč uporabiti. + + + Roaming was aborted or is not possible. + Potovanje je bilo preklicano ali pa ni možno. + + + QOCIDriver - Unable to logon Ni se moč prijaviti - Unable to initialize QOCIDriver Ni moč inicializirati - Unable to begin transaction Ni moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije @@ -3445,44 +3993,34 @@ QOCIResult - - - Unable to bind column for batch execute Ni moč prikleniti stolpca za paketno izvršitev - Unable to execute batch statement Ni moč izvesti paketne izjave - Unable to goto next Ni se moč prestaviti na naslednjega - Unable to alloc statement Ni moč dodeliti izjave - Unable to prepare statement Ni moč pripraviti izjave - Unable to get statement type Ni moč pridobiti vrste izjave - Unable to bind value Ni moč prikleniti vrednosti - Unable to execute statement Ni moč izvesti izjave @@ -3490,32 +4028,26 @@ QODBCDriver - Unable to connect Ni moč vzpostaviti povezave - Unable to disable autocommit Ni moč onemogočiti samodejnega udejanjanja - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije - Unable to enable autocommit Ni moč omogočiti samodejnega udejanjanja - Unable to connect - Driver doesn't support all functionality required Ni se moč povezati - gonilnik ne podpira vseh potrebnih zmožnosti @@ -3523,51 +4055,38 @@ QODBCResult - - QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: ni moč nastaviti 'SQL_CURSOR_STATIC' kot lastnosti izjave. Preverite nastavitve gonilnika ODBC - - Unable to execute statement Ni moč izvesti izjave - Unable to fetch next Ni moč pridobiti sledečega - Unable to prepare statement Ni moč pripraviti izjave - Unable to bind variable Ni moč prikleniti spremenljivke - - - Unable to fetch last Ni moč pridobiti zadnjega - Unable to fetch Ni moč pridobiti - Unable to fetch first Ni moč pridobiti prvega - Unable to fetch previous Ni moč pridobiti predhodnega @@ -3575,46 +4094,25 @@ QObject - - Invalid hostname - Neveljavno ime gostitelja - - - - Operation not supported on %1 - Dejanje na %1 ni podprto - - - - Invalid URI: %1 - Neveljaven URI: %1 - - - - Socket error on %1: %2 - Napaka vtičnice na %1: %2 - - - - Remote host closed the connection prematurely on %1 - Oddaljen gostitelj je predčasno prekinil povezavo na %1 - - - - - No host name given - Podano ni bilo nobeno ime gostitelja + PulseAudio Sound Server + Zvočni strežnik PulseAudio + + + "%1" duplicates a previous role name and will be disabled. + »%1« podvaja obstoječe ime vloge in bo onemogočena. + + + invalid query: "%1" + neveljavna poizvedba: »%1« QPPDOptionsModel - Name Ime - Value Vrednost @@ -3622,32 +4120,26 @@ QPSQLDriver - Unable to connect Ni moč vzpostaviti povezave - Could not begin transaction Ni bilo moč začeti transakcije - Could not commit transaction Ni bilo moč udejaniti transakcije - Could not rollback transaction Ni bilo moč razveljaviti transakcije - Unable to subscribe Ni se moč naročiti - Unable to unsubscribe Ni moč preklicati naročnine @@ -3655,12 +4147,10 @@ QPSQLResult - Unable to create query Ni moč ustvariti poizvedbe - Unable to prepare statement Ni moč pripraviti izjave @@ -3668,102 +4158,82 @@ QPageSetupWidget - Centimeters (cm) Centimetri (cm) - Millimeters (mm) Milimetri (mm) - Inches (in) Palci (in) - Points (pt) Pike (pt) - Form Obrazec - Paper Papir - Page size: Velikost strani: - Width: Širina: - Height: Višina: - Paper source: Vir papirja: - Orientation Usmeritev - Portrait Pokončno - Landscape Ležeče - Reverse landscape Obrnjeno ležeče - Reverse portrait Obrnjeno pokončno - Margins Robovi - top margin vrhnji rob - left margin levi rob - right margin desni rob - bottom margin spodnji rob @@ -3771,12 +4241,10 @@ QPluginLoader - Unknown error Neznana napaka - The plugin was not loaded. Vstavek ni bil naložen. @@ -3784,428 +4252,344 @@ QPrintDialog - locally connected krajevno povezan - - Aliases: %1 Vzdevki: %1 - - unknown neznano - A0 (841 x 1189 mm) A0 (841 x 1189 mm) - A1 (594 x 841 mm) A1 (594 x 841 mm) - A2 (420 x 594 mm) A2 (420 x 594 mm) - A3 (297 x 420 mm) A3 (297 x 420 mm) - A4 (210 x 297 mm, 8.26 x 11.7 inches) A4 (210 x 297 mm, 8,26 x 11,7 palcev) - A5 (148 x 210 mm) A5 (148 x 210 mm) - A6 (105 x 148 mm) A6 (105 x 148 mm) - A7 (74 x 105 mm) A7 (74 x 105 mm) - A8 (52 x 74 mm) A8 (52 x 74 mm) - A9 (37 x 52 mm) A9 (37 x 52 mm) - B0 (1000 x 1414 mm) B0 (1000 x 1414 mm) - B1 (707 x 1000 mm) B1 (707 x 1000 mm) - B2 (500 x 707 mm) B2 (500 x 707 mm) - B3 (353 x 500 mm) B3 (353 x 500 mm) - B4 (250 x 353 mm) B4 (250 x 353 mm) - B5 (176 x 250 mm, 6.93 x 9.84 inches) B5 (176 x 250 mm, 6,93 x 9,84 palcev) - B6 (125 x 176 mm) B6 (125 x 176 mm) - B7 (88 x 125 mm) B7 (88 x 125 mm) - B8 (62 x 88 mm) B8 (62 x 88 mm) - B9 (44 x 62 mm) B9 (44 x 62 mm) - B10 (31 x 44 mm) B10 (31 x 44 mm) - C5E (163 x 229 mm) C5E (163 x 229 mm) - DLE (110 x 220 mm) DLE (110 x 220 mm) - Executive (7.5 x 10 inches, 191 x 254 mm) Executive (7,5 x 10 palcev, 191 x 254 mm) - Folio (210 x 330 mm) Folio (210 x 330 mm) - Ledger (432 x 279 mm) Ledger (432 x 279 mm) - Legal (8.5 x 14 inches, 216 x 356 mm) Legal (8,5 x 14 palcev, 216 x 356 mm) - Letter (8.5 x 11 inches, 216 x 279 mm) Letter (8,5 x 11 palcev, 216 x 279 mm) - Tabloid (279 x 432 mm) Tabloid (279 x 432 mm) - US Common #10 Envelope (105 x 241 mm) US Common #10 Envelope (105 x 241 mm) - + Print current page + Natisni trenutno stran + + OK V redu - - - Print Natisni - Print To File ... Natisni v datoteko ... - Print range Natisni obseg - Print all Natisni vse - File %1 is not writable. Please choose a different file name. V datoteko %1 ni moč pisati. Izberite drugo ime datoteke. - %1 already exists. Do you want to overwrite it? %1 že obstaja. Ali jo želite nadomestiti? - File exists Datoteka obstaja - <qt>Do you want to overwrite it?</qt> <qt>Ali jo želite nadomestiti?</qt> - Print selection Natisni izbor - %1 is a directory. Please choose a different file name. %1 je mapa. Izberite drugo ime datoteke. - A0 A0 - A1 A1 - A2 A2 - A3 A3 - A4 A4 - A5 A5 - A6 A6 - A7 A7 - A8 A8 - A9 A9 - B0 B0 - B1 B1 - B2 B2 - B3 B3 - B4 B4 - B5 B5 - B6 B6 - B7 B7 - B8 B8 - B9 B9 - B10 B10 - C5E C5E - DLE DLE - Executive Executive - Folio Folio - Ledger Ledger - Legal Legal - Letter Letter - Tabloid Tabloid - US Common #10 Envelope US Common #10 Envelope - Custom Po meri - - &Options >> &Možnosti » - &Print Na&tisni - &Options << &Možnosti « - Print to File (PDF) Natisni v datoteko (PDF) - Print to File (Postscript) Natisni v datoteko (PostScript) - Local file Krajevna datoteka - Write %1 file Zapiši datoteko %1 - The 'From' value cannot be greater than the 'To' value. Vrednost »Od« ne more biti večja od vrednosti »Do«. @@ -4213,103 +4597,86 @@ QPrintPreviewDialog - - Page Setup Nastavitve strani - %1% %1 % - Print Preview Ogled tiskanja - Next page Naslednja stran - Previous page Predhodna stran - First page &Prva stran - Last page &Zadnja stran - Fit width Prilagodi &širini - Fit page Prilagodi strani - Zoom in Povečaj - Zoom out Zmanjšaj - Portrait Pokončno - Landscape Ležeče - Show single page Prikaži enojno stran - Show facing pages Prikaži dve strani - Show overview of all pages Prikaži ogled vseh strani - Print Natisni - Page setup Nastavitve strani - + Close + Zapri + + Export to PDF Izvozi v PDF - Export to PostScript Izvozi v PostScript @@ -4317,17 +4684,14 @@ QPrintPropertiesWidget - Form Obrazec - Page Stran - Advanced Napredno @@ -4335,145 +4699,121 @@ QPrintSettingsOutput - Form Obrazec - Copies Izvodi - Print range Obseg tiskanja - Print all Natisni vse - Pages from Strani od - to do - Selection Izbor - Output Settings Nastavitve izpisa - Copies: Izvodi: - Collate Združi - Reverse V nasprotno smer - Options Možnosti - Color Mode Barvni način - Color Barva - Grayscale Sivinsko - Duplex Printing Dvostransko tiskanje - None Brez - Long side Dolga stranica - Short side Kratka stranica + + Current Page + Trenutna stran + QPrintWidget - Form Obrazec - Printer Tiskalnik - &Name: &Ime: - P&roperties &Lastnosti ... - Location: Lokacija: - Preview Ogled - Type: Vrsta: - Output &file: Izhodna d&atoteka: - ... ... @@ -4481,62 +4821,38 @@ QProcess - - Could not open input redirection for reading Preusmeritve vhoda ni bilo moč odpreti za branje - - Could not open output redirection for writing Preusmeritve izhoda ni bilo moč odpreti za pisanje - Resource error (fork failure): %1 Napaka vira (spodletela odcepitev): %1 - - - - - - - - - Process operation timed out Čas za dejanje procesa je potekel - - - - Error reading from process Napaka pri branju iz procesa - - - Error writing to process Napak pri pisanju v proces - Process crashed Program se je sesul - No program defined Določenega ni nobenega programa - Process failed to start: %1 Proces se ni uspel zagnati: %1 @@ -4544,7 +4860,6 @@ QProgressDialog - Cancel Prekliči @@ -4552,7 +4867,6 @@ QPushButton - Open Odpri @@ -4560,7 +4874,6 @@ QRadioButton - Check Označi @@ -4568,57 +4881,46 @@ QRegExp - no error occurred ni nobene napake - disabled feature used uporabljena onemogočena zmožnost - bad char class syntax napačna sintaksa znakovnega razreda - bad lookahead syntax napačna sintaksa pogleda naprej - bad repetition syntax napačna sintaksa ponavljanja - invalid octal value neveljavna osmiška vrednost - missing left delim manjkajoč levi razmejitelj - unexpected end nepričakovan konece - met internal limit dosežena notranja omejitev - invalid interval neveljaven interval - invalid category neveljavna kategorija @@ -4626,22 +4928,18 @@ QSQLite2Driver - Error opening database Napaka pri odpiranju podatkovne zbirke - Unable to begin transaction Ni moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije @@ -4649,12 +4947,10 @@ QSQLite2Result - Unable to fetch results Ni moč pridobiti rezultatov - Unable to execute statement Ni moč izvesti izjave @@ -4662,27 +4958,22 @@ QSQLiteDriver - Error opening database Napaka pri odpiranju podatkovne zbirke - Error closing database Napaka pri zapiranju podatkovne zbirke - Unable to begin transaction Ni moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije @@ -4690,34 +4981,26 @@ QSQLiteResult - - - Unable to fetch row Ni moč pridobiti vrstice - Unable to execute statement Ni moč izvesti izjave - Unable to reset statement Ni moč ponastaviti izjave - Unable to bind parameters Ni moč prikleniti parametrov - Parameter count mismatch Neujemanje v številu parametrov - No query Brez poizvedbe @@ -4725,32 +5008,26 @@ QScriptBreakpointsModel - ID ID - Location Lokacija - Condition Pogoj - Ignore-count Število prezrtij - Single-shot Enojen zadetek - Hit-count Število zadetkov @@ -4758,12 +5035,10 @@ QScriptBreakpointsWidget - New Nova - Delete Izbriši @@ -4771,143 +5046,114 @@ QScriptDebugger - - Go to Line Pojdi v vrstico - Line: Vrstica: - Interrupt Prekini - Shift+F5 - - - - + Shift+F5 + + Continue Nadaljuj - F5 - - - - + F5 + + Step Into Vstopi - F11 - - - - + F11 + + Step Over Prestopi - F10 - - - - + F10 + + Step Out Izstopi - Shift+F11 - - - - + Shift+F11 + + Run to Cursor Zaženi do kazalca - Ctrl+F10 - - - - + Ctrl+F10 + + Run to New Script Zaženi do novega skripta - Toggle Breakpoint Preklopi prekinitveno točko - F9 - - - - + F9 + + Clear Debug Output Počisti razhroščevalni izhod - Clear Error Log Počisti dnevnik napak - Clear Console Počisti konzolo - &Find in Script... Najdi v &skriptu ... - Ctrl+F - - - - + Ctrl+F + + Find &Next Najdi &naslednje - F3 - - - - + F3 + + Find &Previous Najdi &predhodno - Shift+F3 - - - - + Shift+F3 + + Ctrl+G - - - - + Ctrl+G + + Debug Razhrošči @@ -4915,32 +5161,26 @@ QScriptDebuggerCodeFinderWidget - Close Zapri - Previous Predhodno - Next Naslednje - Case Sensitive Občutljivo na velikost črk - Whole words Cele besede - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Iskanje se nadaljuje na drugem koncu @@ -4948,12 +5188,10 @@ QScriptDebuggerLocalsModel - Name Ime - Value Vrednost @@ -4961,17 +5199,14 @@ QScriptDebuggerStackModel - Level Stopnja - Name Ime - Location Lokacija @@ -4979,22 +5214,18 @@ QScriptEdit - Toggle Breakpoint Preklopi prekinitveno točko - Disable Breakpoint Onemogoči prekinitveno točko - Enable Breakpoint Omogoči prekinitveno točko - Breakpoint Condition: Pogoj za prelomno točko: @@ -5002,52 +5233,42 @@ QScriptEngineDebugger - Loaded Scripts Naloženi skripti - Breakpoints Prelomne točke - Stack Sklad - Locals Krajevno - Console Konzola - Debug Output Razhroščevalni izhod - Error Log Dnevnik napak - Search Išči - View Videz - Qt Script Debugger Razhroščevalnik za Qt Script @@ -5055,7 +5276,6 @@ QScriptNewBreakpointWidget - Close Zapri @@ -5063,84 +5283,66 @@ QScrollBar - Scroll here Premakni sem - Left edge Levi rob - Top Vrh - Right edge Desni rob - Bottom Dno - Page left Za stran levo - - Page up Za stran gor - Page right Za stran desno - - Page down Za stran dol - Scroll left Premakni levo - Scroll up Premakni gor - Scroll right Premakni desno - Scroll down Premakni dol - Line up V vrsto - Position Položaj - Line down Za vrstico dol @@ -5148,111 +5350,78 @@ QSharedMemory - %1: unable to set key on lock %1: ni moč nastaviti ključa na zaklep - %1: create size is less then 0 %1: velikost je manjša od 0 - - %1: unable to lock %1: ni moč zakleniti - %1: unable to unlock %1: ni moč odkleniti - - - %1: permission denied %1: nimate dovoljenja - - - %1: already exists %1: že obstaja - %1: doesn't exists %1: ne obstaja - - - %1: out of resources %1: zmanjkalo je virov - - - %1: unknown error %2 %1: neznana napaka %2 - %1: key is empty %1: ključ je prazen - %1: ftok failed %1: funkcija ftok ni uspela - - - %1: unable to make key %1: ni moč ustvariti ključa - - %1: doesn't exist %1: ne obstaja - %1: UNIX key file doesn't exist %1: UNIX-ova zaklepna datoteka ne obstaja - %1: system-imposed size restrictions %1: sistemsko vsiljene omejitve velikosti - %1: not attached %1: ni pripeto - - %1: invalid size %1: neveljavna velikost - - %1: key error %1: napaka ključa - %1: size query failed %1: poizvedba po velikosti ni uspela @@ -5260,466 +5429,894 @@ QShortcut - Space + This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. + Preslednica - Esc Esc - Tab Tabulator - Backtab - - - - + Tabulator nazaj + + Backspace Vračalka - Return Return - Enter Vnesi - Ins Ins - Del Del - Pause Premor - Print Natisni - SysReq SysReq - Home Začetek - End Konec - Left Levo - Up Gor - Right Desno - Down Dol - PgUp PgUp - PgDown PgDown - CapsLock CapsLock - NumLock NumLock - ScrollLock ScrollLock - Menu Meni - Help Pomoč - Back Predhodna - Forward Naslednja - Stop Ustavi - Refresh Osveži - Volume Down Tiše - Volume Mute Tiho - Volume Up Glasneje - Bass Boost Ojačanje basov - Bass Up Več basov - Bass Down Manj basov - Treble Up Več visokih tonov - Treble Down Manj visokih tonov - Media Play Predvajaj večpredstavnost - Media Stop Ustavi večpredstavnost - Media Previous Predhodna večpredstavnost - Media Next Naslednja večpredstavnost - Media Record Snemaj večpredstavnost - + Media Pause + Media player pause button + + Prekini večpredstavnost + + + Toggle Media Play/Pause + Media player button to toggle between playing and paused + + Preklopi predvajanje/prekinitev večpredstavnosti + + Favorites Priljubljeno - Search Išči - Standby V pripravljenost - Open URL Odpri URL - Launch Mail Zaženi pošto - Launch Media Zaženi večpredstavnost - Launch (0) Zaženi (0) - Launch (1) Zaženi (1) - Launch (2) Zaženi (2) - Launch (3) Zaženi (3) - Launch (4) Zaženi (4) - Launch (5) Zaženi (5) - Launch (6) Zaženi (6) - Launch (7) Zaženi (7) - Launch (8) Zaženi (8) - Launch (9) Zaženi (9) - Launch (A) Zaženi (A) - Launch (B) Zaženi (B) - Launch (C) Zaženi (C) - Launch (D) Zaženi (D) - Launch (E) Zaženi (E) - Launch (F) Zaženi (F) - + Monitor Brightness Up + Povečaj svetlost zaslona + + + Monitor Brightness Down + Zmanjšaj svetlost zaslona + + + Keyboard Light On/Off + Vklop/izklop lučk na tipkovnici + + + Keyboard Brightness Up + Povečaj svetlost tipkovnice + + + Keyboard Brightness Down + Zmanjšaj svetlost tipkovnice + + + Power Off + Izklopi + + + Wake Up + Zbudi + + + Eject + Izvrzi + + + Screensaver + Ohranjevalnik zaslona + + + WWW + Svetovni splet + + + Sleep + V pripravljenost + + + LightBulb + Žarnica + + + Shop + Trgovina + + + History + Zgodovina + + + Add Favorite + Dodaj priljubljeno + + + Hot Links + Vroče povezave + + + Adjust Brightness + Prilagodi svetlost + + + Finance + Finance + + + Community + Skupnost + + + Audio Rewind + Previj zvok + + + Back Forward + Nazaj naprej + + + Application Left + Program levo + + + Application Right + Program desno + + + Book + Knjiga + + + CD + CD + + + Calculator + Računalo + + + Clear + Počisti + + + Clear Grab + + + + Close + Zapri + + + Copy + Skopiraj + + + Cut + Izreži + + + Display + Prikaz + + + DOS + DOS + + + Documents + Dokumenti + + + Spreadsheet + Preglednica + + + Browser + Brskalnik + + + Game + Igra + + + Go + Pojdi + + + iTouch + iTouch + + + Logoff + Odjavi + + + Market + Trg + + + Meeting + Srečanje + + + Keyboard Menu + Meni tipkovnice + + + Menu PB + + + + My Sites + Moje strani + + + News + Novice + + + Home Office + Domača pisarna + + + Option + Možnost + + + Paste + Prilepi + + + Phone + Telefon + + + Reply + Odgovori + + + Reload + Znova naloži + + + Rotate Windows + Zavrti okna + + + Rotation PB + + + + Rotation KB + + + + Save + Shrani + + + Send + Pošlji + + + Spellchecker + Črkovalnik + + + Split Screen + Razdeli zaslon + + + Support + Podpora + + + Task Panel + Opravilna vrstica + + + Terminal + Konzola + + + Tools + Orodja + + + Travel + Potovanje + + + Video + Video + + + Word Processor + Urejevalnik besedil + + + XFer + + + + Zoom In + Povečaj + + + Zoom Out + Zmanjšaj + + + Away + Odsoten + + + Messenger + Sporočilnik + + + WebCam + Spletna kamera + + + Mail Forward + Posreduj sporočilo + + + Pictures + Slike + + + Music + Glasba + + + Battery + Baterija + + + Bluetooth + Bluetooth + + + Wireless + Brezžično + + + Ultra Wide Band + + + + Audio Forward + Zvok naprej + + + Audio Repeat + Zvok ponavljanje + + + Audio Random Play + Zvok naključno + + + Subtitle + Podnaslov + + + Audio Cycle Track + + + + Time + Čas + + + View + Prikaz + + + Top Menu + Vrhnji meni + + + Suspend + Ustavi + + + Hibernate + V hibernacijo + + Print Screen Natisni zaslon - Page Up Za stran gor - Page Down Za stran dol - Caps Lock Caps Lock - Num Lock Num Lock - Number Lock - Scroll Lock - - - - + Scroll Lock + + Insert Vstavi - Delete Izbriši - Escape Escape - System Request Sistemska zahteva - Select Izberi - Yes Da - No Ne - Context1 Kontekst1 - Context2 Kontekst2 - Context3 Kontekst3 - Context4 Kontekst4 - Call + Button to start a call (note: a separate button is used to end the call) + Pokliči - Hangup + Button to end a call (note: a separate button is used to start the call) + Odloži - + Toggle Call/Hangup + Button that will hang up if we're in call, or make a call if we're not. + + Preklopi pokliči/odloži + + Flip Obrni - - + Voice Dial + Button to trigger voice dialling + + Glasovni klic + + + Last Number Redial + Button to redial the last number called + + Ponovni klic zadnje številke + + + Camera Shutter + Button to trigger the camera shutter (take a picture) + + + + + Camera Focus + Button to focus the camera + + Fokus fotoaparata + + + Kanji + Kanji + + + Muhenkan + + + + Henkan + + + + Romaji + + + + Hiragana + Hiragana + + + Katakana + Katakana + + + Hiragana Katakana + + + + Zenkaku + + + + Hankaku + + + + Zenkaku Hankaku + + + + Touroku + + + + Massyo + + + + Kana Lock + + + + Kana Shift + + + + Eisu Shift + + + + Eisu toggle + + + + Code input + Vnos kode + + + Multiple Candidate + + + + Previous Candidate + + + + Hangul + + + + Hangul Start + + + + Hangul End + + + + Hangul Hanja + + + + Hangul Jamo + Hangul Jamo + + + Hangul Romaja + + + + Hangul Jeonja + + + + Hangul Banja + + + + Hangul PreHanja + + + + Hangul PostHanja + + + + Hangul Special + + + Ctrl Ctrl - - Shift Shift - - Alt Alt - - Meta Meta - + + - F%1 F%1 - Home Page Domača stran @@ -5727,27 +6324,22 @@ QSlider - Page left Za stran levo - Page up Za stran gor - Position Položaj - Page right Za stran desno - Page down Za stran dol @@ -5755,72 +6347,58 @@ QSocks5SocketEngine - Connection to proxy refused Povezava s posrednikom je bila zavrnjena - Connection to proxy closed prematurely Povezava s posrednikom je bila prekinjena predčasno - Proxy host not found Ni moč najti gostitelja posrednika - Connection to proxy timed out Čas za povezavo s posrednikom je potekel - Proxy authentication failed Neuspešno overjanje posrednika - Proxy authentication failed: %1 Neuspešno overjanje posrednika: %1 - SOCKS version 5 protocol error Napaka protokola SOCKS različice 5 - General SOCKSv5 server failure Splošna napaka strežnika SOCKSv5 - Connection not allowed by SOCKSv5 server Strežnik SOCKSv5 ne dovoljuje povezave - TTL expired TTL je zapadel - SOCKSv5 command not supported Ukaz SOCKSv5 ni podprt - Address type not supported Vrsta naslova ni podprta - Unknown SOCKSv5 proxy error code 0x%1 Neznana koda napake posrednika SOCKSv5: 0x%1 - Network operation timed out Čas za omrežni postopek je potekel @@ -5828,32 +6406,26 @@ QSoftKeyManager - Ok V redu - Select Izbor - Done Opravljeno - Options Možnosti - Cancel Prekliči - Exit Končaj @@ -5861,12 +6433,10 @@ QSpinBox - More Več - Less Manj @@ -5874,56 +6444,42 @@ QSql - Delete Izbriši - Delete this record? Ali izbrišem ta zapis? - - - Yes Da - - - No Ne - Insert Vstavi - Update Posodobi - Save edits? &Shranmi urejan?. - Cancel Prekliči - Confirm Potrdi - Cancel your edits? Ali želite preklicati urejanja? @@ -5931,80 +6487,161 @@ QSslSocket - Unable to write data: %1 Ni moč zapisati podatkov: %1 - + Unable to decrypt data: %1 + Ni moč dešifrirati podatkov: %1 + + Error while reading: %1 Napaka med branjem: %1 - Error during SSL handshake: %1 Napaka med rokovanjem SSL: %1 - Error creating SSL context (%1) Napaka pri ustvarjanju konteksta SSL (%1) - Invalid or empty cipher list (%1) Neveljaven ali prazen seznam šifer (%1) - + Private key does not certify public key, %1 + Zasebni ključ ne potrjuje javnega ključa: %1 + + Error creating SSL session, %1 Napaka pri ustvarjanju seje SSL: %1 - Error creating SSL session: %1 Napaka pri ustvarjanju seje SSL: %1 - Cannot provide a certificate with no key, %1 Ni moč priskrbeti potrdila brez ključa, %1 - Error loading local certificate, %1 Napaka pri nalaganju krajevnega potrdila, %1 - Error loading private key, %1 Napaka pri nalaganju zasebnega ključa, %1 - - Private key does not certificate public key, %1 - Zasebni ključ ne potrjuje javnega ključa, %1 + No error + Brez napake + + + The issuer certificate could not be found + Potrdila izdajatelja ni bilo moč najti + + + The certificate signature could not be decrypted + Podpisa potrdila ni bilo moč dešifrirati + + + The public key in the certificate could not be read + Javnega ključa iz potrdila ni bilo moč prebrati + + + The signature of the certificate is invalid + Podpis potrdila ni veljaven + + + The certificate is not yet valid + Potrdilo še ni veljavno + + + The certificate has expired + Potrdilo je preteklo + + + The certificate's notBefore field contains an invalid time + Polje notBefore (ne pred) potrdila vsebuje neveljaven čas + + + The certificate's notAfter field contains an invalid time + Polje notAfter (ne po) potrdila vsebuje neveljaven čas + + + The certificate is self-signed, and untrusted + Potrdilo je samo-podpisano in nezaupano + + + The root certificate of the certificate chain is self-signed, and untrusted + Vrhnje potrdilo verige potrdil je samo-podpisano in nezaupano + + + The issuer certificate of a locally looked up certificate could not be found + Potrdila izdajatelja za krajevno najdeno potrdilo ni bilo moč najti + + + No certificates could be verified + Preveriti ni bilo moč nobenega potrdila + + + One of the CA certificates is invalid + Eno izmed potrdil avtoritete za potrdila ni veljavno + + + The basicConstraints path length parameter has been exceeded + + + + The supplied certificate is unsuitable for this purpose + Predloženo potrdilo ni primerno za ta namen + + + The root CA certificate is not trusted for this purpose + Potrdilo vrhovne avtoritete za potrdila ni zaupano za ta namen + + + The root CA certificate is marked to reject the specified purpose + Potrdilo vrhovne avtoritete za potrdila je označeno za zavrnitev navedenega namena + + + The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate + + + + The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate + + + + The peer did not present any certificate + Vrstnik ni predložil nobenega potrdila + + + The host name did not match any of the valid hosts for this certificate + Ime gostitelja se ne ujema z nobenim izmed veljavnih gostiteljev za to potrdilo + + + Unknown error + Neznana napaka QStateMachine - Missing initial state in compound state '%1' V sestavljenem stanju »%1« manjka začetno stanje - Missing default state in history state '%1' V zgodovinskem stanju »%1« manjka privzeto stanje - No common ancestor for targets and source of transition from state '%1' Za cilje in začetek prehoda iz stanja »%1« ni skupnega prednika - Unknown error Neznana napaka @@ -6012,30 +6649,22 @@ QSystemSemaphore - - %1: out of resources %1: zmanjkalo je virov - - %1: permission denied %1: nimate dovoljenja - %1: already exists %1: že obstaja - %1: does not exist %1: ne obstaja - - %1: unknown error %2 %1: neznana napaka %2 @@ -6043,12 +6672,10 @@ QTDSDriver - Unable to open connection Ni moč vzpostaviti povezave - Unable to use database Podatkovne zbirke ni moč uporabljati @@ -6056,12 +6683,10 @@ QTabBar - Scroll Left Premakni levo - Scroll Right Premakni desno @@ -6069,7 +6694,6 @@ QTcpServer - Operation on socket is not supported Dejanje na vtičnici ni podprto @@ -6077,42 +6701,34 @@ QTextControl - &Undo &Razveljavi - &Redo &Uveljavi - Cu&t &Izreži - &Copy S&kopiraj - Copy &Link Location Skopiraj &povezavo do lokacije - &Paste Pri&lepi - Delete Izbriši - Select All Izberi vse @@ -6120,14 +6736,10 @@ QToolButton - - Press Pritisni - - Open Odpri @@ -6135,7 +6747,6 @@ QUdpSocket - This platform does not support IPv6 Ta platforma ne podpira IPv6 @@ -6143,12 +6754,10 @@ QUndoGroup - Undo Razveljavi - Redo Uveljavi @@ -6156,7 +6765,6 @@ QUndoModel - <empty> <prazno> @@ -6164,12 +6772,10 @@ QUndoStack - Undo Razveljavi - Redo Uveljavi @@ -6177,57 +6783,46 @@ QUnicodeControlCharacterMenu - LRM Left-to-right mark LRM (oznaka z-leve-na-desno) - RLM Right-to-left mark RLM (oznaka z-desne-na-levo) - ZWJ Zero width joiner ZWJ (združevalec s širino nič) - ZWNJ Zero width non-joiner ZWNJ (ne-združevalec s širino nič) - ZWSP Zero width space ZWSP (presledek s širino nič) - LRE Start of left-to-right embedding LRE (začetek vgrajevanja z leve na desno) - RLE Start of right-to-left embedding RLE (začetek vgrajevanja z desne na levo) - LRO Start of left-to-right override LRO (začetek nadomeščanja z leve na desno) - RLO Start of right-to-left override RLO (začetek nadomeščanja z desne na levo) - PDF Pop directional formatting PDF (odstrani oblikovanje usmerjenosti) - Insert Unicode control character Vstavi kontrolni znak Unicode @@ -6235,32 +6830,26 @@ QWebFrame - Request cancelled Zahtevek je bil preklican - Request blocked Zahtevek je bil blokiran - Cannot show URL Lokacije ni moč prikazati - Frame load interrupted by policy change Nalaganje okvirja je bilo prekinjeno zaradi spremembe pravil - Cannot show mimetype Vrste MIME ni moč prikazati - File does not exist Datoteka ne obstaja @@ -6268,610 +6857,515 @@ QWebPage - + Redirection limit reached + Dosežena je bila omejitev preusmeritev + + Bad HTTP request Napačen zahtevek HTTP - Submit default label for Submit buttons in forms on web pages Pošlji - Submit Submit (input element) alt text for <input> elements with no alt, title, or value Pošlji - Reset default label for Reset buttons in forms on web pages Ponastavi - This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' To je stvarno kazalo z iskanjem. Vnesite iskane besede: - Choose File title for file button used in HTML forms Izberite datoteko - No file selected text to display in file button used in HTML forms when no file is selected Datoteka ni izbrana - Open in New Window Open in New Window context menu item Odpri v novem oknu - Save Link... Download Linked File context menu item Shrani povezavo ... - Copy Link Copy Link context menu item Skopiraj povezavo - Open Image Open Image in New Window context menu item Odpri sliko - Save Image Download Image context menu item Shrani sliko - Copy Image Copy Link context menu item Kopiraj sliko - Open Frame Open Frame in New Window context menu item Odpri okvir - Copy Copy context menu item Skopiraj - Go Back Back context menu item Pojdi nazaj - Go Forward Forward context menu item Pojdi naprej - Stop Stop context menu item Ustavi - Reload Reload context menu item Znova naloži - Cut Cut context menu item Izreži - Paste Paste context menu item Prilepi - No Guesses Found No Guesses Found context menu item Najdenega ni nobenega ugibanja - Ignore Ignore Spelling context menu item Prezri - Add To Dictionary Learn Spelling context menu item Dodaj v slovar - Search The Web Search The Web context menu item Iščite po spletu - Look Up In Dictionary Look Up in Dictionary context menu item Poišči v slovarju - Open Link Open Link context menu item Odpri povezavo - Ignore Ignore Grammar context menu item Prezri - Spelling Spelling and Grammar context sub-menu item Črkovanje - Show Spelling and Grammar menu item title Prikaži črkovanje in slovnico - Hide Spelling and Grammar menu item title Skrij črkovanje in slovnico - Check Spelling Check spelling context menu item Preveri črkovanje - Check Spelling While Typing Check spelling while typing context menu item Preveri črkovanje med tipkanjem - Check Grammar With Spelling Check grammar with spelling context menu item Preveri slovnico in črkovanje - Fonts Font context sub-menu item Pisave - Bold Bold context menu item Polkrepko - Italic Italic context menu item Ležeče - Underline Underline context menu item Podčrtano - Outline Outline context menu item Obris - Direction Writing direction context sub-menu item Smer - Text Direction Text direction context sub-menu item Smer besedila - Default Default writing direction context menu item Privzeta - Left to Right Left to Right context menu item Z leve na desno - Right to Left Right to Left context menu item Z desne na levo - + Missing Plug-in + Label text to be used when a plug-in is missing + Manjkajoč vstavek + + Loading... Media controller status message when the media is loading Nalaganje ... - Live Broadcast Media controller status message when watching a live broadcast Prenos v živo - Audio Element Media controller element Zvočni element - Video Element Media controller element Video element - Mute Button Media controller element Gumb za utišanje - Unmute Button Media controller element Gumb za preklic utišanja - Play Button Media controller element Gumb za predvajanje - Pause Button Media controller element Gumb za premor - Slider Media controller element Drsnik - Slider Thumb Media controller element Ročka na drsniku - Rewind Button Media controller element Gumb za previjanje - Return to Real-time Button Media controller element Gumb za vrnitev na resnični čas - Elapsed Time Media controller element Pretečeni čas - Remaining Time Media controller element Preostali čas - Status Display Media controller element Prikaz stanja - Fullscreen Button Media controller element Gumb za cel zaslon - Seek Forward Button Media controller element Gumb za pomik naprej - Seek Back Button Media controller element Gumb za pomik nazaj - Audio element playback controls and status display Media controller element Nadzor in prikaz stanja elementa za predvajanje zvoka - Video element playback controls and status display Media controller element Nadzor in prikaz stanja elementa za predvajanje videa - Mute audio tracks Media controller element Utišaj zvočne sledi - Unmute audio tracks Media controller element Prekliči utišanje zvočnih sledi - Begin playback Media controller element Začni predvajanje - Pause playback Media controller element Prekini predvajanje - Movie time scrubber Media controller element - - - - + Drsnik za mesto v posnetku + + Movie time scrubber thumb Media controller element - - - - + Drsnik za mesto v posnetku + + Rewind movie Media controller element Previj film - Return streaming movie to real-time Media controller element Povrni film na resnični čas - Current movie time Media controller element Trenutni čas filma - Remaining movie time Media controller element Preostali čas filma - Current movie status Media controller element Trenutno stanje filma - Play movie in full-screen mode Media controller element Predvajaj film čez ves zaslon - Seek quickly back Media controller element Hitro se pomakni nazaj - Seek quickly forward Media controller element Hitro se pomakni naprej - Indefinite time Media time description Nedoločen čas - %1 days %2 hours %3 minutes %4 seconds Media time description %1 dni %2 ur %3 minut %4 sekund - %1 hours %2 minutes %3 seconds Media time description %1 ur %2 minut %3 sekund - %1 minutes %2 seconds Media time description %1 minut %2 sekund - %1 seconds Media time description %1 sekund - Inspect Inspect Element context menu item Preglej. - No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed Ni nedavnih iskanj - Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title Nedavna iskanja - Clear recent searches menu item in Recent Searches menu that empties menu's contents Počisti nedavna iskanja - Unknown Unknown filesize FTP directory listing item Neznana - %1 (%2x%3 pixels) Title string for images %1 (%2×%3 pik) - Web Inspector - %2 Web Inspector - %2 - Scroll here Premakni sem - Left edge Levi rob - Top Vrh - Right edge Desni rob - Bottom Dno - Page left Za stran levo - Page up Za stran gor - Page right Za stran desno - Page down Za stran dol - Scroll left Premakni levo - Scroll up Premakni gor - Scroll right Premakni desno - Scroll down Premakni dol - %n file(s) number of chosen file @@ -6882,251 +7376,197 @@ - JavaScript Alert - %1 Opozorilo JavaScript - %1 - JavaScript Confirm - %1 Potrditev JavaScript - %1 - JavaScript Prompt - %1 Poziv JavaScript - %1 - JavaScript Problem - %1 Težava JavaScript - %1 - The script on this page appears to have a problem. Do you want to stop the script? Kot kaže ima skript na tej strani težavo. Ali želite ustaviti skript? - Move the cursor to the next character Premakni kazalec na naslednji znak - Move the cursor to the previous character Premakni kazalec na prejšnji znak - Move the cursor to the next word Premakni kazalec v naslednjo besedo - Move the cursor to the previous word Premakni kazalec v prejšnjo besedo - Move the cursor to the next line Premakni kazalec v naslednjo vrstico - Move the cursor to the previous line Premakni kazalec v prejšnjo vrstico - Move the cursor to the start of the line Premakni kazalec na začetek vrstice - Move the cursor to the end of the line Premakni kazalec na konec vrstice - Move the cursor to the start of the block Premakni kazalec na začetek bloka - Move the cursor to the end of the block Premakni kazalec na konec bloka - Move the cursor to the start of the document Premakni kazalec na začetek dokumenta - Move the cursor to the end of the document Premakni kazalec na konec dokumenta - Select all Izberi vse - Select to the next character Izberi do naslednjega znaka - Select to the previous character Izberi do prejšnjega znaka - Select to the next word Izberi do naslednje besede - Select to the previous word Izberi do prejšnje besede - Select to the next line Izberi do naslednje vrstice - Select to the previous line Izberi do prejšnje vrstice - Select to the start of the line Izberi do začetka vrstice - Select to the end of the line Izberi do konca vrstice - Select to the start of the block Izberi do začetka bloka - Select to the end of the block Izberi do konca bloka - Select to the start of the document Izberi do začetka dokumenta - Select to the end of the document Izberi do konca dokumenta - Delete to the start of the word Izbriši do začetka besede - Delete to the end of the word Izbriši do konca besede - Insert a new paragraph Vstavi nov odstavek - Insert a new line Vstavi novo vrstico - Paste and Match Style Prilepi in uskladi slog - Remove formatting Odstrani oblikovanje - Strikethrough Prečrtano - Subscript Podpisano - Superscript Nadpisano - Insert Bulleted List Vstavi navadni seznam - Insert Numbered List Vstavi oštevilčeni seznam - Indent Zamakni - Outdent Odzamakni - Center Sredinsko - Justify Obojestransko - Align Left Poravnaj levo - Align Right Poravnaj desno - - - Remaining move time - Media controller element - Preostali čas filma - QWhatsThisAction - What's This? Kaj je to? @@ -7134,7 +7574,6 @@ QWidget - * * @@ -7142,57 +7581,46 @@ QWizard - Go Back Pojdi nazaj - Continue Nadaljuj - Commit Uveljavi - Done Opravljeno - Help Pomoč - < &Back < Na&zaj - &Finish &Zaključi - Cancel Prekliči - &Help &Pomoč - &Next &Naprej - &Next > &Naprej > @@ -7200,69 +7628,54 @@ QWorkspace - &Restore &Obnovi - &Move &Premakni - &Size &Velikost - Mi&nimize Po&manjšaj - Ma&ximize &Razpni - &Close &Zapri - Stay on &Top Ostani na &vrhu - - Sh&ade Zvi&j - - %1 - [%2] %1 - [%2] - Minimize Pomanjšaj - Restore Down Obnovi navzdol - Close Zapri - &Unshade Razv&ij @@ -7270,543 +7683,451 @@ QXml - no error occurred ni nobene napake - error triggered by consumer napako povzročil uporabnik - unexpected end of file nepričakovan konec datoteke - more than one document type definition več kot ena definicija vrste dokumenta - error occurred while parsing element napaka med analiziranjem elementa - tag mismatch neprimerna oznaka - error occurred while parsing content napaka med analiziranje vsebine - unexpected character nepričakovan znak - invalid name for processing instruction nepravilno ime za ukaz obdelave - version expected while reading the XML declaration pričakovana različica med branjem deklaracije XML - wrong value for standalone declaration napačna vrednost za samostojno deklaracijo - encoding declaration or standalone declaration expected while reading the XML declaration deklaracija kodiranja ali samostojna deklaracija je bila pričakovana med branjem deklaracije XML - standalone declaration expected while reading the XML declaration samostojna deklaracija pričakovana med branjem deklaracije XML - error occurred while parsing document type definition napaka med analiziranjem vrste definicije dokumenta - letter is expected pričakovana je črka - error occurred while parsing comment napaka med analiziranjem komentarja - error occurred while parsing reference napaka med analiziranjem reference - internal general entity reference not allowed in DTD referenca notranje splošne entitete ni dovoljena v DTD - external parsed general entity reference not allowed in attribute value referenca zunanje analizirane splošne entitete ni dovoljena v vrednosti atributa - external parsed general entity reference not allowed in DTD referenca zunanje analizirane splošne entitete ni dovoljena v DTD - unparsed entity reference in wrong context referenca neanalizirane entitete v napačnem kontekstu - recursive entities rekurzivne entitete - error in the text declaration of an external entity napaka v besedilni deklaraciji zunanje entitete + QXmlPatternistCLI + + Warning in %1, at line %2, column %3: %4 + Opozorilo v %1, vrstica %2, stolpec %3: %4 + + + Warning in %1: %2 + Opozorilo v %1: %2 + + + Unknown location + Neznana lokacija + + + Error %1 in %2, at line %3, column %4: %5 + Napaka %1 v %2, vrstica %3, stolpec %4: %5 + + + Error %1 in %2: %3 + Napaka %1 v %2: %3 + + + QXmlStream - - Extra content at end of document. Dodatna vsebina na koncu dokumenta. - Invalid entity value. Neveljavna vrednost entitete. - Invalid XML character. Neveljaven znak XML. - Sequence ']]>' not allowed in content. Zaporedje »]]>« v vsebini ni dovoljeno. - Namespace prefix '%1' not declared Predpona imenskega prostora »%1« ni deklarirana - Attribute redefined. Atribut je redefiniran. - Unexpected character '%1' in public id literal. - - - - + Nepričakovan znak »%1« v javnem literalu ID-ja. + + Invalid XML version string. Neveljaven niz različice XML. - Unsupported XML version. Nepodprta različica XML. - %1 is an invalid encoding name. %1 ni veljavno ime kodiranja. - Encoding %1 is unsupported Kodiranje %1 ni podprto - Standalone accepts only yes or no. - - - - + Samostojni (standalone) sprejema samo da (yes) ali ne (no). + + Invalid attribute in XML declaration. Neveljaven atribut v deklaraciji XML. - Premature end of document. Predčasen konec dokumenta. - Invalid document. Neveljaven dokument.. - Expected Pričakovan - , but got ' , vendar prejel ' - Unexpected ' Nepričakovan ' - Expected character data. Pričakoval znakovne podatke. - Recursive entity detected. Zaznana je bila rekurzivna entiteta. - Start tag expected. Pričakovana je bila začetna oznaka. - XML declaration not at start of document. Deklaracija XML ni na začetku dokumenta. - NDATA in parameter entity declaration. - - - - + NDATA v parametru deklaracije entitete. + + %1 is an invalid processing instruction name. %1 ni veljavno ime ukaza obdelave. - Invalid processing instruction name. Neveljavno ime ukaza obdelave. - - - - Illegal namespace declaration. Neveljavna deklaracija imenskega prostora. - Invalid XML name. Neveljavno ime XML. - Opening and ending tag mismatch. Začetni in zaključni oznaki se ne ujemata. - Reference to unparsed entity '%1'. Referenca na nerazčlenjeno entiteto »%1«. - - - Entity '%1' not declared. Entiteta »%1« ni deklarirana. - Reference to external entity '%1' in attribute value. Referenca na zunanjo entiteto »%1« v vrednosti lastnosti. - Invalid character reference. Neveljavna znakovna referenca. - - Encountered incorrectly encoded content. Naletel na napačno zakodirano vsebino. - The standalone pseudo attribute must appear after the encoding. Samostojni psevdo-atribut se mora pojaviti za kodiranjem. - %1 is an invalid PUBLIC identifier. - + %1 ni veljaven javni identifikator. QtXmlPatterns - Network timeout. Čas za omrežje je potekel. - Element %1 can't be serialized because it appears outside the document element. - - - - + Elementa %1 ni moč serializirati, ker se nahaja zunaj elementa dokumenta. + + Year %1 is invalid because it begins with %2. Leto %1 ni veljavno, ker se začne z %2. - Day %1 is outside the range %2..%3. Dan %1 je izven obsega %2..%3. - Month %1 is outside the range %2..%3. Mesec %1 je izven obsega %2..%3. - Overflow: Can't represent date %1. Prekoračitev: ni moč predstaviti datuma %1. - Day %1 is invalid for month %2. Dan %1 za mesec %2 ni veljaven. - Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; Čas 24:%1:%2.%3 ni veljaven. Ura je 24, vendar minute, sekunde in milisekunde niso vse 0; - Time %1:%2:%3.%4 is invalid. Čas %1:%2:%3.%4 ni veljaven. - Overflow: Date can't be represented. Prekoračitev: datuma ni moč predstaviti. - - At least one component must be present. Prisotna mora biti vsaj ena komponenta. - At least one time component must appear after the %1-delimiter. Za razmejiteljem %1 se mora pojaviti vsaj ena časovna komponenta. - %1 is not a valid value of type %2. %1 ni veljavna vrednost vrste %2. - When casting to %1 from %2, the source value cannot be %3. - Integer division (%1) by zero (%2) is undefined. Deljenje celega števila (%1) z nič (%2) ni določeno. - Division (%1) by zero (%2) is undefined. Deljenje (%1) z nič (%2) ni določeno. - Modulus division (%1) by zero (%2) is undefined. Ostanek deljenja (%1) z nič (%2) ni določen. - - Dividing a value of type %1 by %2 (not-a-number) is not allowed. Deljenje vrednosti vrste %1 z %2 (ni število) ni dovoljeno. - Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. Deljenje vrednosti vrste %1 z %2 ali %3 (pozitivna ali negativna nič) ni dovoljeno. - Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. Množenje vrednosti vrste %1 z %2 ali %3 (pozitivna ali negativna neskončnost) ni dovoljeno. - A value of type %1 cannot have an Effective Boolean Value. Vrednost vrste %1 ne more imeti dejanske logične vrednosti. - Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Dejanske logične vrednosti ni moč izračunati za zaporedje, ki vsebuje dve ali več atomičnih vrednosti. - Value %1 of type %2 exceeds maximum (%3). Vrednost %1 vrste %2 presega maksimum (%3). - Value %1 of type %2 is below minimum (%3). Vrednost %1 vrste %2 je pod minimumom (%3). - A value of type %1 must contain an even number of digits. The value %2 does not. Vrednost vrste %1 mora vsebovati sodo število števk. Vrednost %2 temu ne zadošča. - %1 is not valid as a value of type %2. %1 ni veljavna kot vrednost vrste %2. - Operator %1 cannot be used on type %2. Operatorja %1 ni moč uporabiti na vrsti %2. - Operator %1 cannot be used on atomic values of type %2 and %3. Operatorja %1 ni moč uporabiti na atomičnih vrednostih vrst %2 in %3. - The namespace URI in the name for a computed attribute cannot be %1. URI imenskega prostora v imenu izračunane lastnosti ne more biti %1. - The name for a computed attribute cannot have the namespace URI %1 with the local name %2. Ime izračunane lastnosti ne more imeti URI-ja imenskega prostora %1 s krajevnim imenom %2. - Type error in cast, expected %1, received %2. - When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. - A comment cannot contain %1 Komentar ne more vsebovati %1 - A comment cannot end with a %1. Komentar se ne more končati z %1. - An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - A library module cannot be evaluated directly. It must be imported from a main module. Modula knjižnice ni moč ovrednotiti neposredno. Uvoziti ga je potrebno iz glavnega modula. - No template by name %1 exists. Predloga z imenom %1 ne obstaja. - A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. - A positional predicate must evaluate to a single numeric value. - - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. - - - - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. + + + %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. - The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - The data of a processing instruction cannot contain the string %1 Podatki ukaza za obdelavo ne morejo vsebovati niza %1 - No namespace binding exists for the prefix %1 - No namespace binding exists for the prefix %1 in %2 - - %1 is an invalid %2 %1 ni veljaven %2 - %1 takes at most %n argument(s). %2 is therefore invalid. %1 potrebuje največ %n argument. %2 zato ni veljavno. @@ -7816,7 +8137,6 @@ - %1 requires at least %n argument(s). %2 is therefore invalid. %1 potrebuje najmanj %n argument. %2 zato ni veljavno. @@ -7826,2399 +8146,2052 @@ - The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Prvi argument za %1 ne more biti vrste %2. Mora biti številčne vrste, xs:yearMonthDuration ali xs:dayTimeDuration. - The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Prvi argument za %1 ne more biti vrste %2. Mora biti vrste %3, %4 ali %5. - The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Drugi argument za %1 ne more biti vrste %2. Mora biti vrste %3, %4 ali %5. - %1 is not a valid XML 1.0 character. %1 ni veljaven znak XML 1.0. - If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - %1 was called. %1 je bila klicana. - %1 must be followed by %2 or %3, not at the end of the replacement string. - In the replacement string, %1 must be followed by at least one digit when not escaped. - In the replacement string, %1 can only be used to escape itself or %2, not %3 - %1 matches newline characters %1 se ujema z znaki za novo vrstico - %1 and %2 match the start and end of a line. %1 in %2 se ujemata z začetkom in koncem vrstice. - Matches are case insensitive Ujemanja niso občutljiva na velikost črk - Whitespace characters are removed, except when they appear in character classes Znaki za presledke so odstranjeni, razen ko se pojavijo v znakovnih razredih - %1 is an invalid regular expression pattern: %2 %1 ni veljaven vzorec regularnega izraza: %2 - %1 is an invalid flag for regular expressions. Valid flags are: - If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. Če je prvi argument prazno zaporedje, ali pa niz z dolžino nič (brez imenskega prostora), predpone ni moč določiti. Določena je bila predpona %1. - It will not be possible to retrieve %1. %1 ne bo možno pridobiti. - The root node of the second argument to function %1 must be a document node. %2 is not a document node. - The default collection is undefined Privzeta zbirka ni določena. - %1 cannot be retrieved %1 ni moč pridobiti - The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - A zone offset must be in the range %1..%2 inclusive. %3 is out of range. - %1 is not a whole number of minutes. - - - - + %1 ni celovito število minut. + + Required cardinality is %1; got cardinality %2. - The item %1 did not match the required type %2. Postavka %1 se ne ujema z zahtevano vrsto %2. - - %1 is an unknown schema type. %1 ni znana vrsta sheme. - + A template with name %1 has already been declared. + + + Only one %1 declaration can occur in the query prolog. - The initialization of variable %1 depends on itself Inicializacija spremenljivke %1 je odvisna od same sebe. - - No variable by name %1 exists - Spremenljivka z imenom %1 ne obstaja - - - The variable %1 is unused Spremenljivka %1 ni uporabljena - Version %1 is not supported. The supported XQuery version is 1.0. Različica %1 ni podprta. Podpra različica XQuery je 1.0. - The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. Kodiranje %1 ni veljavno. Vsebovati mora le znake latinske abecede, ne sme vsebovati presledkov in se mora ujemati z regularnim izrazom %2. - No function with signature %1 is available Na voljo ni nobene funkcije s podpisom %1 - - A default namespace declaration must occur before function, variable, and option declarations. Deklaracije privzetega imenskega prostora se mora pojaviti pred deklaracijami funkcij, spremenljivk in možnosti. - Namespace declarations must occur before function, variable, and option declarations. Deklaracije imenskih prostorov se morajo pojaviti pred deklaracijami funkcij, spremenljivk in možnosti. - Module imports must occur before function, variable, and option declarations. Uvozi modulov se morajo pojaviti pred deklaracijami funkcij, spremenljivk in možnosti. - It is not possible to redeclare prefix %1. Predpone %1 ni moč znova deklarirati. - Prefix %1 is already declared in the prolog. - The name of an option must have a prefix. There is no default namespace for options. Ime možnosti mora vsebovati predpono. Privzeti imenski prostor za možnosti ne obstaja. - The Schema Import feature is not supported, and therefore %1 declarations cannot occur. - The target namespace of a %1 cannot be empty. Ciljni imenski prostor za %1 ne sme biti prazen. - The module import feature is not supported Zmožnost uvažanja modulov ni podprta - - No value is available for the external variable by name %1. - Za zunanjo spremenljivko z imenom %1 ni na voljo nobene vrednosti. - - - - A template by name %1 has already been declared. - Predloga z imenom %1 je že bila deklarirana. - - - The keyword %1 cannot occur with any other mode name. - - The value of attribute %1 must of type %2, which %3 isn't. - Vrednost lastnosti %1 mora biti vrste %2, %3 pa to ni. - - - - The prefix %1 can not be bound. By default, it is already bound to the namespace %2. - - - - - A variable by name %1 has already been declared. - Spremenljivka z imenom %1 je že bila deklarirana. - - - A stylesheet function must have a prefixed name. - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) Imenski prostor za uporabniško določeno funkcijo ne sme biti prazen (poskusite z vnaprej določeno predpono %1, ki obstaja za take primere) - The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. Imenski prostor %1 je rezerviran, zato ga uporabniško določene funkcije ne smejo uporabiti. Poskusite z vnaprej določeno predpono %2, ki obstaja za take primere. - The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 Imenski prostor uporabniško določene funkcije v modulu knjižnice mora biti enak imenskemu prostoru modula. Z drugimi besedami, moral bi biti %1, namesto %2. - A function already exists with the signature %1. Funkcija s podpisom %1 že obstaja. - No external functions are supported. All supported functions can be used directly, without first declaring them as external Zunanje funkcije niso podprte. Vse podprte funkcije je moč uporabiti neposredno, brez da bi jih najprej deklarirali kot zunanje. - - An argument by name %1 has already been declared. Every argument name must be unique. - Argument z imenom %1 je že bil deklariran. Vsako ime argumenta mora biti edinstveno. - - - + No variable with name %1 exists + + + + The value of attribute %1 must be of type %2, which %3 isn't. + + + + The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. + + + + A variable with name %1 has already been declared. + + + + No value is available for the external variable with name %1. + + + + An argument with name %1 has already been declared. Every argument name must be unique. + + + When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. - In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. - In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. - In an XSL-T pattern, function %1 cannot have a third argument. V XSL-T vzorcu funkcija %1 ne more imeti tretjega argumenta. - In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. - In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. - %1 is an invalid template mode name. - The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. Ime spremenljivke priklenjene v izrazu »for« se mora razlikovati od spremenljivke položaja. Spremenljivki z imenom %1 zato trčita. - The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. - None of the pragma expressions are supported. Therefore, a fallback expression must be present - Each name of a template parameter must be unique; %1 is duplicated. - The %1-axis is unsupported in XQuery Os %1 v XQuery ni podprta - + No function with name %1 is available. + + + + An attribute with name %1 has already appeared on this element. + + + %1 is not a valid name for a processing-instruction. - %1 is not a valid numeric literal. - W3C XML Schema identity constraint selector - W3C XML Schema identity constraint field - A construct was encountered which is disallowed in the current language(%1). - - No function by name %1 is available. - Na voljo ni nobene funkcije z imenom %1. - - - The namespace URI cannot be the empty string when binding to a prefix, %1. - %1 is an invalid namespace URI. %1 ni veljaven URI imenskega prostora. - It is not possible to bind to the prefix %1 - Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). Imenski prostor %1 je lahko navezan le na %2 (in je, v vsakem primeru, preddeklariran) - Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). Predpona %1 je lahko navezana le na %2 (in je, v vsakem primeru, preddeklarirana) - Two namespace declaration attributes have the same name: %1. Dva atributa deklaracije imenskega prostora imata isto ime: %1 - The namespace URI must be a constant and cannot use enclosed expressions. - - An attribute by name %1 has already appeared on this element. - Atribut z imenom %1 se je v tem elementu že pojavil. - - - A direct element constructor is not well-formed. %1 is ended with %2. - The name %1 does not refer to any schema type. Ime %1 se ne nanaša na nobeno vrsto sheme. - %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. - %1 is not an atomic type. Casting is only possible to atomic types. - - %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. - The name of an extension expression must be in a namespace. Ime razširitvenega izraza mora biti v imenskem prostoru. - empty prazno - zero or one nič ali en - exactly one točno en - one or more en ali več - zero or more nič ali več - Required type is %1, but %2 was found. Zahtevana vrsta je %1, najdena pa je bila %2. - Promoting %1 to %2 may cause loss of precision. Povišanje %1 v %2 lahko povzroči izgubo natančnosti. - The focus is undefined. Fokus ni definiran. - It's not possible to add attributes after any other kind of node. - An attribute by name %1 has already been created. Atribut z imenom %1 je že bil ustvarjen. - Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - Attribute %1 can't be serialized because it appears at the top level. - %1 is an unsupported encoding. %1 ni podprto kodiranje. - %1 contains octets which are disallowed in the requested encoding %2. - The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. - Ambiguous rule match. Dvoumno ujemanje s pravilom. - In a namespace constructor, the value for a namespace cannot be an empty string. - The prefix must be a valid %1, which %2 is not. - - - - + + + The prefix %1 cannot be bound. Predpone %1 ni moč navezati. - Only the prefix %1 can be bound to %2 and vice versa. Na %2 je lahko navezana le predpona %1 in obratno. - The parameter %1 is required, but no corresponding %2 is supplied. Potreben je parameter %1, vendar ustrezen %2 ni bil podan. - The parameter %1 is passed, but no corresponding %2 exists. Podan je bil parameter %1, vendar ustrezen %2 ne obstaja. - The URI cannot have a fragment - Element %1 is not allowed at this location. Element %1 na tej lokaciji ni dovoljen. - Text nodes are not allowed at this location. Besedilna vozlišča na tej lokaciji niso dovoljena. - Parse error: %1 Napaka pri razčlenjevanju: %1 - The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. Vrednost lastnosti različice XSL-T mora biti vrednost vrste %1, %2 pa to ni. - Running an XSL-T 1.0 stylesheet with a 2.0 processor. - Unknown XSL-T attribute %1. Neznana XSL-T lastnost %1. - Attribute %1 and %2 are mutually exclusive. Lastnosti %1 in %2 sta medsebojno izključujoči. - In a simplified stylesheet module, attribute %1 must be present. - If element %1 has no attribute %2, it cannot have attribute %3 or %4. Če element %1 nima lastnosti %2, ne more imeti lastnosti %3 ali %4. - Element %1 must have at least one of the attributes %2 or %3. Element %1 mora imeti vsaj eno izmed lastnosti %2 in %3. - At least one mode must be specified in the %1-attribute on element %2. - Element %1 must come last. Element %1 mora biti zadnji. - At least one %1-element must occur before %2. - Only one %1-element can appear. - At least one %1-element must occur inside %2. - - - - + + + When attribute %1 is present on %2, a sequence constructor cannot be used. - Element %1 must have either a %2-attribute or a sequence constructor. - When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. - Element %1 cannot have children. Element %1 ne more imeti podelementov. - Element %1 cannot have a sequence constructor. - - The attribute %1 cannot appear on %2, when it is a child of %3. - A parameter in a function cannot be declared to be a tunnel. - This processor is not Schema-aware and therefore %1 cannot be used. - Top level stylesheet elements must be in a non-null namespace, which %1 isn't. - The value for attribute %1 on element %2 must either be %3 or %4, not %5. Vrednost lastnosti %1 elementa %2 mora biti %3 ali %4 in ne %5. - Attribute %1 cannot have the value %2. Lastnost %1 ne more imeti vrednosti %2. - The attribute %1 can only appear on the first %2 element. Lastnost %1 se lahko pojavi le pri prvem elementu %2. - At least one %1 element must appear as child of %2. - %1 has inheritance loop in its base type %2. - - Circular inheritance of base type %1. - Circular inheritance of union %1. - %1 is not allowed to derive from %2 by restriction as the latter defines it as final. - %1 is not allowed to derive from %2 by extension as the latter defines it as final. - Base type of simple type %1 cannot be complex type %2. - Simple type %1 cannot have direct base type %2. - - Simple type %1 is not allowed to have base type %2. - Simple type %1 can only have simple atomic type as base type. - Simple type %1 cannot derive from %2 as the latter defines restriction as final. - - Variety of item type of %1 must be either atomic or union. - - Variety of member types of %1 must be atomic. - - %1 is not allowed to derive from %2 by list as the latter defines it as final. - Simple type %1 is only allowed to have %2 facet. - Base type of simple type %1 must have variety of type list. - Base type of simple type %1 has defined derivation by restriction as final. - Item type of base type does not match item type of %1. - - Simple type %1 contains not allowed facet type %2. - - %1 is not allowed to derive from %2 by union as the latter defines it as final. - %1 is not allowed to have any facets. - Base type %1 of simple type %2 must have variety of union. - Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. - Member type %1 cannot be derived from member type %2 of %3's base type %4. - Derivation method of %1 must be extension because the base type %2 is a simple type. - Complex type %1 has duplicated element %2 in its content model. - Complex type %1 has non-deterministic content. - Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. - Content model of complex type %1 is not a valid extension of content model of %2. - Complex type %1 must have simple content. - Complex type %1 must have the same simple type as its base class %2. - Complex type %1 cannot be derived from base type %2%3. - Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. - Complex type %1 with simple content cannot be derived from complex base type %2. - Item type of simple type %1 cannot be a complex type. - Member type of simple type %1 cannot be a complex type. - %1 is not allowed to have a member type with the same name as itself. - - - %1 facet collides with %2 facet. - %1 facet must have the same value as %2 facet of base type. - %1 facet must be equal or greater than %2 facet of base type. - - - - - - - - %1 facet must be less than or equal to %2 facet of base type. - %1 facet contains invalid regular expression - Unknown notation %1 used in %2 facet. - %1 facet contains invalid value %2: %3. - %1 facet cannot be %2 or %3 if %4 facet of base type is %5. - %1 facet cannot be %2 if %3 facet of base type is %4. - - - %1 facet must be less than or equal to %2 facet. - - - %1 facet must be less than %2 facet of base type. - - %1 facet and %2 facet cannot appear together. - - - %1 facet must be greater than %2 facet of base type. - - %1 facet must be less than %2 facet. - - %1 facet must be greater than or equal to %2 facet of base type. - Simple type contains not allowed facet %1. - %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. - Only %1 and %2 facets are allowed when derived by union. - - %1 contains %2 facet with invalid data: %3. - Attribute group %1 contains attribute %2 twice. Skupina lastnosti %1 dvakrat vsebuje lastnost %2. - Attribute group %1 contains two different attributes that both have types derived from %2. - Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. - Complex type %1 contains attribute %2 twice. Kompleksna vrsta %1 dvakrat vsebuje lastnost %2. - Complex type %1 contains two different attributes that both have types derived from %2. - Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. - Element %1 is not allowed to have a value constraint if its base type is complex. - Element %1 is not allowed to have a value constraint if its type is derived from %2. - - Value constraint of element %1 is not of elements type: %2. - Element %1 is not allowed to have substitution group affiliation as it is no global element. - Type of element %1 cannot be derived from type of substitution group affiliation. - Value constraint of attribute %1 is not of attributes type: %2. - Attribute %1 has value constraint but has type derived from %2. - %1 attribute in derived complex type must be %2 like in base type. - Attribute %1 in derived complex type must have %2 value constraint like in base type. - Attribute %1 in derived complex type must have the same %2 value constraint like in base type. - Attribute %1 in derived complex type must have %2 value constraint. - processContent of base wildcard must be weaker than derived wildcard. - - Element %1 exists twice with different types. Element %1 obstaja dvakrat, z različnima vrstama. - Particle contains non-deterministic wildcards. - - Base attribute %1 is required but derived attribute is not. - Type of derived attribute %1 cannot be validly derived from type of base attribute. - Value constraint of derived attribute %1 does not match value constraint of base attribute. - - Derived attribute %1 does not exists in the base definition. - - - - + Derived attribute %1 does not exist in the base definition. + + + Derived attribute %1 does not match the wildcard in the base definition. - Base attribute %1 is required but missing in derived definition. - Derived definition contains an %1 element that does not exists in the base definition - Derived wildcard is not a subset of the base wildcard. - %1 of derived wildcard is not a valid restriction of %2 of base wildcard - Attribute %1 from base type is missing in derived type. - Type of derived attribute %1 differs from type of base attribute. - Base definition contains an %1 element that is missing in the derived definition - %1 references unknown %2 or %3 element %4. - %1 references identity constraint %2 that is no %3 or %4 element. - %1 has a different number of fields from the identity constraint %2 that it references. - Base type %1 of %2 element cannot be resolved. - Item type %1 of %2 element cannot be resolved. - Member type %1 of %2 element cannot be resolved. - - - Type %1 of %2 element cannot be resolved. - Base type %1 of complex type cannot be resolved. - %1 cannot have complex base type that has a %2. - Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. - Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. - Type of %1 element must be a simple type, %2 is not. Vrsta elementa %1 mora biti preprosta, %2 to ni. - Substitution group %1 of %2 element cannot be resolved. - Substitution group %1 has circular definition. - - Duplicated element names %1 in %2 element. Podvojeni imeni elementov %1 v elementu %2. - - - - Reference %1 of %2 element cannot be resolved. - Circular group reference for %1. - %1 element is not allowed in this scope Element %1 v tem obsegu ni dovoljen - %1 element cannot have %2 attribute with value other than %3. - %1 element cannot have %2 attribute with value other than %3 or %4. - %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. - Attribute group %1 has circular reference. - %1 attribute in %2 must have %3 use like in base type %4. - Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. - %1 has attribute wildcard but its base type %2 has not. - Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. - Enumeration facet contains invalid content: {%1} is not a value of type %2. - Namespace prefix of qualified name %1 is not defined. - - %1 element %2 is not a valid restriction of the %3 element it redefines: %4. - Empty particle cannot be derived from non-empty particle. - Derived particle is missing element %1. - Derived element %1 is missing value constraint as defined in base particle. - Derived element %1 has weaker value constraint than base particle. - Fixed value constraint of element %1 differs from value constraint in base particle. - Derived element %1 cannot be nillable as base element is not nillable. - Block constraints of derived element %1 must not be more weaker than in the base element. - Simple type of derived element %1 cannot be validly derived from base element. - - - - + Preproste vrste izpeljanega elementa %1 ni moč veljavno izpeljati iz osnovnega elementa. + + Complex type of derived element %1 cannot be validly derived from base element. - - - - + Kompleksne vrste izpeljanega elementa %1 ni moč veljavno izpeljati iz osnovnega elementa. + + Element %1 is missing in derived particle. - - - - + Element %1 v izpeljanem delcu manjka. + + Element %1 does not match namespace constraint of wildcard in base particle. - Wildcard in derived particle is not a valid subset of wildcard in base particle. - - - - + Vzorec v izpeljanem delcu ni veljavna podmnoživa vzorca iz osnovnega razreda. + + processContent of wildcard in derived particle is weaker than wildcard in base particle. - - - - + processContent vzorca v izpeljanem delcu je šibkejši kot vzorec v osnovnem delcu. + + Derived particle allows content that is not allowed in the base particle. - - - - + Izpeljani delec dovoljuje vsebino, ki v osnovnem delcu ni dovoljena. + + Can not process unknown element %1, expected elements are: %2. Ni moč obdelati neznanega elementa %1, pričakovani elementi so: %2. - Element %1 is not allowed in this scope, possible elements are: %2. Element %1 v tem obsegu ni dovoljen, možni elementi so: %2. - Child element is missing in that scope, possible child elements are: %1. V tem obsegu manjka podelement, možni podelementi so: %1. - Document is not a XML schema. Dokument ni shema XML. - %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. Lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3} ni vrednost vrste %4. - %1 attribute of %2 element contains invalid content: {%3}. Lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3}. - Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. - - Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. - %1 element is not allowed to have the same %2 attribute value as the target namespace %3. - %1 element without %2 attribute is not allowed inside schema without target namespace. - - %1 element is not allowed inside %2 element if %3 attribute is present. Element %1 znotraj elementa %2 ni dovoljen, če je prisotna lastnost %3. - - - %1 element has neither %2 attribute nor %3 child element. Element %1 nima niti lastnosti %2 niti podelementa %3. - - - - - - - - - - - - - - %1 element with %2 child element must not have a %3 attribute. Element %1 s podelementom %2 ne sme imeti lastnosti %3. - %1 attribute of %2 element must be %3 or %4. Lastnost %1 elementa %2 mora biti %3 ali %4. - %1 attribute of %2 element must have a value of %3. Lastnost %1 elementa %2 mora imeti vrednost %3. - - %1 attribute of %2 element must have a value of %3 or %4. Lastnost %1 elementa %2 mora imeti vrednost %3 ali %4. - - - - - - - - - - - - - - %1 element must not have %2 and %3 attribute together. Element %1 hkrati ne sme imeti lastnosti %2 in %3. - - Content of %1 attribute of %2 element must not be from namespace %3. Vsebina lastnosti %1 elementa %2 ne sme biti iz imenskega prostora %3. - - %1 attribute of %2 element must not be %3. Lastnost %1 elementa %2 ne sme biti %3. - %1 attribute of %2 element must have the value %3 because the %4 attribute is set. - - - - + Lastnost %1 elementa %2 mora imeti vrednost %3, ker je nastavljena lastnost %4. + + Specifying use='prohibited' inside an attribute group has no effect. - - - - + Določitev use='prohibited' znotraj skupine lastnosti nima nobenega učinka. + + %1 element must have either %2 or %3 attribute. Element %1 mora imeti lastnost %2 ali %3. - %1 element must have either %2 attribute or %3 or %4 as child element. - - - - + Element %1 mora imeti bodisi lastnost %2 bodisi vsebovati %3 ali %4 kot podelement. + + %1 element requires either %2 or %3 attribute. Element %1 potrebuje vsaj lastnost %2 ali %3. - Text or entity references not allowed inside %1 element - - - - - + Sklici na besedilo ali entiteto znotraj elementa %1 niso dovoljeni. + + %1 attribute of %2 element must contain %3, %4 or a list of URIs. - - - - + Lastnost %1 elementa %2 mora vsebovati %3, %4 ali pa seznam URI-jev. + + %1 element is not allowed in this context. Element %1 v tem kontekstu ni dovoljen. - %1 attribute of %2 element has larger value than %3 attribute. - - - - + Lastnost %1 elementa %2 ima višjo vrednost kot lastnost %3. + + Prefix of qualified name %1 is not defined. - - - - - + Predpona kvalificiranega imena %1 ni določena. + + %1 attribute of %2 element must either contain %3 or the other values. - - - - - Component with id %1 has been defined previously. + Lastnost %1 elementa %2 mora vsebovati bodisi %3 bodisi druge vrednosti. + + + Component with ID %1 has been defined previously. Komponenta z ID-jem %1 je že bila definirana. - Element %1 already defined. Element %1 je že definiran. - Attribute %1 already defined. Lastnost %1 je že definirana. - Type %1 already defined. Vrsta %1 je že definirana. - Attribute group %1 already defined. Skupina lastnosti %1 je že definirana. - Element group %1 already defined. Skupina elementov %1 je že definirana. - Notation %1 already defined. Zapis %1 je že definiran. - Identity constraint %1 already defined. - - - - + Omejitev identitete %1 je že določena. + + Duplicated facets in simple type %1. - - - %1 is not valid according to %2. %1 glede na %2 ni veljaven. - String content does not match the length facet. - String content does not match the minLength facet. - String content does not match the maxLength facet. - String content does not match pattern facet. - String content is not listed in the enumeration facet. - Signed integer content does not match the maxInclusive facet. - Signed integer content does not match the maxExclusive facet. - Signed integer content does not match the minInclusive facet. - Signed integer content does not match the minExclusive facet. - Signed integer content is not listed in the enumeration facet. - Signed integer content does not match pattern facet. - Signed integer content does not match in the totalDigits facet. - Unsigned integer content does not match the maxInclusive facet. - Unsigned integer content does not match the maxExclusive facet. - Unsigned integer content does not match the minInclusive facet. - Unsigned integer content does not match the minExclusive facet. - Unsigned integer content is not listed in the enumeration facet. - Unsigned integer content does not match pattern facet. - Unsigned integer content does not match in the totalDigits facet. - Double content does not match the maxInclusive facet. - Double content does not match the maxExclusive facet. - Double content does not match the minInclusive facet. - Double content does not match the minExclusive facet. - Double content is not listed in the enumeration facet. - Double content does not match pattern facet. - Decimal content does not match in the fractionDigits facet. - Decimal content does not match in the totalDigits facet. - Date time content does not match the maxInclusive facet. - Date time content does not match the maxExclusive facet. - Date time content does not match the minInclusive facet. - Date time content does not match the minExclusive facet. - Date time content is not listed in the enumeration facet. - Date time content does not match pattern facet. - Duration content does not match the maxInclusive facet. - Duration content does not match the maxExclusive facet. - Duration content does not match the minInclusive facet. - Duration content does not match the minExclusive facet. - Duration content is not listed in the enumeration facet. - Duration content does not match pattern facet. - Boolean content does not match pattern facet. - Binary content does not match the length facet. - Binary content does not match the minLength facet. - Binary content does not match the maxLength facet. - Binary content is not listed in the enumeration facet. - Invalid QName content: %1. Neveljavna vsebina QName: %1. - QName content is not listed in the enumeration facet. - QName content does not match pattern facet. - Notation content is not listed in the enumeration facet. - List content does not match length facet. - List content does not match minLength facet. - List content does not match maxLength facet. - List content is not listed in the enumeration facet. - List content does not match pattern facet. - Union content is not listed in the enumeration facet. - Union content does not match pattern facet. - Data of type %1 are not allowed to be empty. Podatki vrste %1 ne smejo biti prazni. - Element %1 is missing child element. Elementu %1 manjka podelement. - There is one IDREF value with no corresponding ID: %1. - - - - + Obstaja ena vrednost IDREF brez ustreznega ID-ja: %1 + + Loaded schema file is invalid. - - - - + Naložena datoteka s shemo ni veljavna. + + %1 contains invalid data. %1 vsebuje neveljavne podatke. - xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. - xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. - No schema defined for validation. - - - - + Določene ni nobene sheme za potrjevanje. + + No definition for element %1 available. Definicija za element %1 ni na voljo. - - - Specified type %1 is not known to the schema. - - - - + Določena vrsta %1 shemi ni znana. + + Element %1 is not defined in this scope. Element %1 v tem obsegu ni definiran. - Declaration for element %1 does not exist. Deklaracija elementa %1 ne obstaja. - Element %1 contains invalid content. Element %1 vsebuje neveljavno vsebino. - Element %1 is declared as abstract. Element %1 je deklariran kot abstrakten. - Element %1 is not nillable. - Attribute %1 contains invalid data: %2 Lastnost %1 vsebuje neveljavne podatke: %2 - Element contains content although it is nillable. - - Fixed value constrained not allowed if element is nillable. - - - - + Fixed value constraint not allowed if element is nillable. + + + + Element %1 cannot contain other elements, as it has a fixed content. + + + Specified type %1 is not validly substitutable with element type %2. - Complex type %1 is not allowed to be abstract. Kompleksna vrsta %1 ne sme biti abstraktna. - Element %1 contains not allowed attributes. Element %1 vsebuje nedovoljene lastnosti. - - Element %1 contains not allowed child element. Element %1 vsebuje nedovoljen podelement. - - Content of element %1 does not match its type definition: %2. Vsebina elementa %1 ne ustreza zanj določeni vrsti: %2. - - - Content of element %1 does not match defined value constraint. - - - - + Vsebina elementa %1 ne ustreza določeni omejitvi vrednosti. + + Element %1 contains not allowed child content. Element %1 vsebuje nedovoljeno vsebino v podelementih. - Element %1 contains not allowed text content. Element %1 vsebuje nedovoljeno besedilno vsebino. - - Element %1 can not contain other elements, as it has a fixed content. - Element %1 ne more vsebovati drugih elementov, ker ima fiksno vsebino. - - - Element %1 is missing required attribute %2. Elementu %1 manjka obvezna lastnost %2. - Attribute %1 does not match the attribute wildcard. - - - - + Lastnost %1 ne ustreza vzorcu za lastnost. + + Declaration for attribute %1 does not exist. Deklaracija lastnosti %1 ne obstaja. - Element %1 contains two attributes of type %2. Element %1 vsebuje dve lastnosti vrste %2. - Attribute %1 contains invalid content. Lastnost %1 vsebuje neveljavno vsebino. - Element %1 contains unknown attribute %2. Element %1 vsebuje neznano lastnost %2. - - Content of attribute %1 does not match its type definition: %2. - - - - - + Vsebina lastnosti %1 ne ustreza zanjo določeni vrsti: %2. + + Content of attribute %1 does not match defined value constraint. - - - - + Vsebina lastnosti %1 ne ustreza zanjo določeni omejitvi vrednosti. + + Non-unique value found for constraint %1. - - - - + Za omejitev %1 je bila najdena ne-edinstvena vrednost. + + Key constraint %1 contains absent fields. - - - - + Omejitev ključa %1 vsebuje manjkajoča polja. + + Key constraint %1 contains references nillable element %2. - No referenced value found for key reference %1. - More than one value found for field %1. Za polje %1 je bila najdena več kot ena vrednost. - Field %1 has no simple type. Polje %1 nima preproste vrste. - ID value '%1' is not unique. Vrednost ID »%1« ni edinstvena. - '%1' attribute contains invalid QName content: %2. Lastnost »%1« vsebuje neveljavno vsebino QName: %2. - - + + + + + Remaining move time + QWebPage~|Media controller element + Preostali čas filma + + attribute group %1 contains attribute %2 twice + QtXmlPatterns~| skupina lastnosti %1 dvakrat vsebuje lastnost %2 - complex type %1 contains attribute %2 twice + QtXmlPatterns~| kompleksna vrsta %1 dvakrat vsebuje lastnost %2 - element %1 exists twice with different types + QtXmlPatterns~| element %1 obstaja dvakrat, z različnima vrstama - can not process unknown element %1, expected elements are: %2 + QtXmlPatterns~| ni moč obdelati neznanega elementa %1, pričakovani elementi so: %2 - element %1 is not allowed in this scope, possible elements are: %2 + QtXmlPatterns~| element %1 v tem obsegu ni dovoljen, možni elementi so: %2 - child element is missing in that scope, possible child elements are: %1 + QtXmlPatterns~| v tem obsegu manjka podelement, možni podelementi so: %1 - document is not a XML schema + QtXmlPatterns~| dokument ni shema XML - %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4 + QtXmlPatterns~| lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3} ni vrednost vrste %4 - %1 attribute of %2 element contains invalid content: {%3} + QtXmlPatterns~| lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3} - %1 element is not allowed inside %2 element if %3 attribute is present + QtXmlPatterns~| element %1 znotraj elementa %2 ni dovoljen, če je prisotna lastnost %3 - %1 element has neither %2 attribute nor %3 child element + QtXmlPatterns~| element %1 nima niti lastnosti %2 niti podelementa %3 - %1 element with %2 child element must not have a %3 attribute + QtXmlPatterns~| element %1 s podelementom %2 ne sme imeti lastnosti %3 - %1 attribute of %2 element must be %3 or %4 + QtXmlPatterns~| lastnost %1 elementa %2 mora biti %3 ali %4 - %1 attribute of %2 element must have a value of %3 + QtXmlPatterns~| lastnost %1 elementa %2 mora imeti vrednost %3 - %1 attribute of %2 element must have a value of %3 or %4 + QtXmlPatterns~| lastnost %1 elementa %2 mora imeti vrednost %3 ali %4 - %1 element must not have %2 and %3 attribute together + QtXmlPatterns~| element %1 hkrati ne sme imeti lastnosti %2 in %3 - content of %1 attribute of %2 element must not be from namespace %3 + QtXmlPatterns~| vsebina lastnosti %1 elementa %2 ne sme biti iz imenskega prostora %3 - %1 attribute of %2 element must not be %3 + QtXmlPatterns~| lastnost %1 elementa %2 ne sme biti %3 - %1 element must have either %2 or %3 attribute + QtXmlPatterns~| element %1 mora imeti lastnost %2 ali %3 - %1 element requires either %2 or %3 attribute + QtXmlPatterns~| element %1 potrebuje vsaj lastnost %2 ali %3 - %1 element is not allowed in this context + QtXmlPatterns~| element %1 v tem kontekstu ni dovoljen - component with id %1 has been defined previously + QtXmlPatterns~| komponenta z ID-jem %1 je že bila definirana - element %1 already defined + QtXmlPatterns~| element %1 je že definiran - attribute %1 already defined + QtXmlPatterns~| lastnost %1 je že definirana - type %1 already defined + QtXmlPatterns~| vrsta %1 je že definirana - attribute group %1 already defined + QtXmlPatterns~| skupina lastnosti %1 je že definirana - element group %1 already defined + QtXmlPatterns~| skupina elementov %1 je že definirana - notation %1 already defined + QtXmlPatterns~| zapis %1 je že definiran - type of %1 element must be a simple type, %2 is not + QtXmlPatterns~| vrsta elementa %1 mora biti preprosta, %2 to ni - duplicated element names %1 in %2 element + QtXmlPatterns~| podvojeni imeni elementov %1 v elementu %2 - %1 is not valid according to %2 + QtXmlPatterns~| %1 glede na %2 ni veljaven - invalid QName content: %1 + QtXmlPatterns~| neveljavna vsebina QName: %1 - data of type %1 are not allowed to be empty + QtXmlPatterns~| podatki vrste %1 ne smejo biti prazni - element %1 is missing child element + QtXmlPatterns~| elementu %1 manjka podelement - %1 contains invalid data + QtXmlPatterns~| %1 vsebuje neveljavne podatke - no definition for element %1 available + QtXmlPatterns~| definicija za element %1 ni na voljo - element %1 is not defined in this scope + QtXmlPatterns~| element %1 v tem obsegu ni definiran - declaration for element %1 does not exist + QtXmlPatterns~| deklaracija elementa %1 ne obstaja - element %1 contains invalid content + QtXmlPatterns~| element %1 vsebuje neveljavno vsebino - element %1 is declared as abstract + QtXmlPatterns~| element %1 je deklariran kot abstrakten - complex type %1 is not allowed to be abstract + QtXmlPatterns~| kompleksna vrsta %1 ne sme biti abstraktna - element %1 contains not allowed attributes + QtXmlPatterns~| element %1 vsebuje nedovoljene lastnosti - element %1 contains not allowed child element + QtXmlPatterns~| element %1 vsebuje nedovoljen podelement - content of element %1 does not match its type definition: %2 + QtXmlPatterns~| vsebina elementa %1 ne ustreza zanj določeni vrsti: %2 - element %1 contains not allowed child content + QtXmlPatterns~| element %1 vsebuje nedovoljeno vsebino v podelementih - element %1 contains not allowed text content + QtXmlPatterns~| element %1 vsebuje nedovoljeno besedilno vsebino - element %1 can not contain other elements, as it has a fixed content + QtXmlPatterns~| element %1 ne more vsebovati drugih elementov, ker ima fiksno vsebino - element %1 is missing required attribute %2 + QtXmlPatterns~| elementu %1 manjka obvezna lastnost %2 - declaration for attribute %1 does not exist + QtXmlPatterns~| deklaracija lastnosti %1 ne obstaja - element %1 contains two attributes of type %2 + QtXmlPatterns~| element %1 vsebuje dve lastnosti vrste %2 - attribute %1 contains invalid content + QtXmlPatterns~| lastnost %1 vsebuje neveljavno vsebino - element %1 contains unknown attribute %2 + QtXmlPatterns~| element %1 vsebuje neznano lastnost %2 - more than one value found for field %1 + QtXmlPatterns~| za polje %1 je bila najdena več kot ena vrednost - field %1 has no simple type + QtXmlPatterns~| polje %1 nima preproste vrste - ID value '%1' is not unique + QtXmlPatterns~| Vrednost ID »%1« ni edinstvena - '%1' attribute contains invalid QName content: %2 + QtXmlPatterns~| Lastnost »%1« vsebuje neveljavno vsebino QName: %2 + + Cannot start playback. + +Check your Gstreamer installation and make sure you +have libgstreamer-plugins-base installed. + Phonon::Gstreamer::MediaObject| + Ni moč začeti predvajanja. + +Preverite namestitev GStreamerja in se prepričajte, +da je nameščen paket libgstreamer-plugins-base. + + + Frequency band, %1 Hz + Phonon::MMF::AudioEqualizer| + Frekvenčni pas, %1 Hz + + + audio equalizer + Phonon::MMF::EffectFactory| + izenačevalnik zvoka + + + Bass boost + Phonon::MMF::EffectFactory| + Ojačanje basov + + + Distance Attenuation + Phonon::MMF::EffectFactory| + Utišanje zaradi razdalje + + + Environmental Reverb + Phonon::MMF::EffectFactory| + Okoljsko odmevanje + + + Loudness + Phonon::MMF::EffectFactory| + Glasnost + + + Source Orientation + Phonon::MMF::EffectFactory| + Usmerjenost vira + + + Stereo Widening + Phonon::MMF::EffectFactory| + Razširitev sterea + + + Invalid hostname + QObject| + Neveljavno ime gostitelja + + + Operation not supported on %1 + QObject| + Dejanje na %1 ni podprto + + + Invalid URI: %1 + QObject| + Neveljaven URI: %1 + + + Socket error on %1: %2 + QObject| + Napaka vtičnice na %1: %2 + + + Remote host closed the connection prematurely on %1 + QObject| + Oddaljen gostitelj je predčasno prekinil povezavo na %1 + + + No host name given + QObject| + Podano ni bilo nobeno ime gostitelja + + + Private key does not certificate public key, %1 + QSslSocket| + Zasebni ključ ne potrjuje javnega ključa, %1 + + + No variable by name %1 exists + QtXmlPatterns| + Spremenljivka z imenom %1 ne obstaja + + + No value is available for the external variable by name %1. + QtXmlPatterns| + Za zunanjo spremenljivko z imenom %1 ni na voljo nobene vrednosti. + + + A template by name %1 has already been declared. + QtXmlPatterns| + Predloga z imenom %1 je že bila deklarirana. + + + The value of attribute %1 must of type %2, which %3 isn't. + QtXmlPatterns| + Vrednost lastnosti %1 mora biti vrste %2, %3 pa to ni. + + + A variable by name %1 has already been declared. + QtXmlPatterns| + Spremenljivka z imenom %1 je že bila deklarirana. + + + An argument by name %1 has already been declared. Every argument name must be unique. + QtXmlPatterns| + Argument z imenom %1 je že bil deklariran. Vsako ime argumenta mora biti edinstveno. + + + No function by name %1 is available. + QtXmlPatterns| + Na voljo ni nobene funkcije z imenom %1. + + + An attribute by name %1 has already appeared on this element. + QtXmlPatterns| + Atribut z imenom %1 se je v tem elementu že pojavil. + + + Component with id %1 has been defined previously. + QtXmlPatterns| + Komponenta z ID-jem %1 je že bila definirana. + + + Element %1 can not contain other elements, as it has a fixed content. + QtXmlPatterns| + Element %1 ne more vsebovati drugih elementov, ker ima fiksno vsebino. + diff -r ef0373b55136 -r 758a864f9613 translations/qt_uk.ts --- a/translations/qt_uk.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qt_uk.ts Mon Oct 04 01:19:32 2010 +0300 @@ -2,610 +2,827 @@ - AudioOutput - - - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> - - - - - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> - - - - - Revert back to device '%1' - - - - CloseButton - Close Tab - - - - - MainWindow - - Print - Друкувати - - - - PPDOptionsModel - - Name - Ім'я - - - Value - Значення + Закрити вкладку + + + + FakeReply + + Fake error ! + Несправжня помилка ! + + + Invalid URL + Неправильний URL + + + + MAC_APPLICATION_MENU + + Services + Служби + + + Hide %1 + Сховати %1 + + + Hide Others + Сховати інші + + + Show All + Показати всі + + + Preferences... + Налаштування... + + + Quit %1 + Вийти з %1 + + + About %1 + Про %1 Phonon:: - Notifications - - - - + Сповіщення + + Music - - - - + Музика + + Video - - - - + Відео + + Communication - - - - + Спілкування + + Games - - - - + Ігри + + Accessibility - + Доступність + + + + Phonon::AudioOutput + + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> + <html>Пристрій відтворення звуку <b>%1</b> не працює.<br/>Буде використовуватись <b>%2</b>.</html> + + + <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> + <html>Перемикання на пристрій відтворення звуку <b>%1</b><br/>, який став доступний та має вищий пріоритет.</html> + + + Revert back to device '%1' + Повернення до пристрою ’%1' + + + <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> + <html>Перемикання на пристрій відтворення звуку <b>%1</b><br/>, який має вищий пріоритет чи спеціально налаштований для цього потоку.</html> Phonon::Gstreamer::Backend - Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. - - - - + Попередження: Схоже, що у вас не встановлено пакунок gstreamer0.10-plugins-good. + Деякі можливості відео були вимкнені. + + Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled - + Попередження: Схоже, що у вас не встановлено базові додатки Gstreamer. + Уся підтримка звуку та відео була вимкнена Phonon::Gstreamer::MediaObject - Cannot start playback. -Check your Gstreamer installation and make sure you +Check your GStreamer installation and make sure you have libgstreamer-plugins-base installed. - - - - + Неможливо почати відтворення. + +Перевірте ваше встановлення GStreamer та переконайтесь, +що у вас встановлено libgstreamer-plugins-base. + + + Missing codec helper script assistant. + Відсутній допоміжний скрипт встановлення кодека. + + + Plugin codec installation failed for codec: %0 + Збій встановлення додатку кодека: %0 + + A required codec is missing. You need to install the following codec(s) to play this content: %0 - - - - - - - - - - - + Відсутній необхідний кодек. Вам потрібно встановити наступні кодеки для відтворення цього вмісту: %0 + + Could not open media source. - - - - + Не вдалося відкрити джерело медіа-даних. + + Invalid source type. - - - - + Неправильний тип джерела. + + Could not locate media source. - - - - + Не вдалося знайти джерело медіа-даних. + + Could not open audio device. The device is already in use. - - - - + Не вдалося відкрити звуковий пристрій. Пристрій вже використовується. + + Could not decode media source. - + Не вдалося декодувати джерело медіа-даних. + + + + Phonon::MMF + + Audio Output + Звуковий вихід + + + The audio output device + Пристрій виведення звуку + + + No error + Немає помилки + + + Not found + Не знайдено + + + Out of memory + Недостатньо пам’яті + + + Not supported + Не підтримується + + + Overflow + Переповнення + + + Underflow + Недостача + + + Already exists + Вже існує + + + Path not found + Шлях не знайдено + + + In use + Використовується + + + Not ready + Не готово + + + Access denied + Доступ заборонено + + + Could not connect + Не вдалося з’єднатись + + + Disconnected + Від’єднано + + + Permission denied + Доступ заборонено + + + Insufficient bandwidth + Недостатня пропускна здатність + + + Network unavailable + Мережа недоступна + + + Network communication error + Комунікаційна помилка мережі + + + Streaming not supported + Потокова передача не підтримується + + + Server alert + Сповіщення сервера + + + Invalid protocol + Неправильний протокол + + + Invalid URL + Неправильний URL + + + Multicast error + Помилка групової передачі + + + Proxy server error + Помилка проксі-сервера + + + Proxy server not supported + Проксі-сервер не підтримується + + + Audio output error + Помилка виведення звуку + + + Video output error + Помилка виведення відео + + + Decoder error + Помилка декодера + + + Audio or video components could not be played + Не вдалося відтворити аудіо- чи відео-компонент + + + DRM error + Помилка DRM + + + Unknown error (%1) + Невідома помилка (%1) + + + + Phonon::MMF::AbstractMediaPlayer + + Not ready to play + Не готовий до відтворення + + + Error opening file + Помилка відкриття файлу + + + Error opening URL + Помилка відкриття URL + + + Error opening resource + Помилка відкриття ресурсу + + + Error opening source: resource not opened + Помилка відкриття джерела: ресурс не відкрито + + + Setting volume failed + Збій встановлення гучності + + + Loading clip failed + Збій завантаження кліпу + + + Playback complete + Відтворення завершене + + + + Phonon::MMF::AbstractVideoPlayer + + Pause failed + Збій паузи + + + Seek failed + Збій прокрутки + + + Getting position failed + Збій отримання позиції + + + Opening clip failed + Збій відкриття кліпу + + + + Phonon::MMF::AudioEqualizer + + %1 Hz + %1 Гц + + + + Phonon::MMF::AudioPlayer + + Getting position failed + Збій отримання позиції + + + + Phonon::MMF::DsaVideoPlayer + + Video display error + Помилка відображення відео + + + + Phonon::MMF::EffectFactory + + Enabled + Увімкнено + + + + Phonon::MMF::EnvironmentalReverb + + Decay HF ratio (%) + DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. + Коефіцієнт послаблення ВЧ (%) + + + Decay time (ms) + DecayTime: Time over which reverberation is diminished. + Час послаблення (мс) + + + Density (%) + Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. + Щільність (%) + + + Diffusion (%) + Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. + Розсіювання (%) + + + Reflections delay (ms) + ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. + Затримка відбиття (мс) + + + Reflections level (mB) + ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. + Рівень відбиття (мБ) + + + Reverb delay (ms) + ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. + Затримка луни (мс) + + + Reverb level (mB) + ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. + Рівень луни (мБ) + + + Room HF level + RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. + Рівень ВЧ відбиття + + + Room level (mB) + RoomLevel: Master volume control for all reflected sound. + Рівень відбиття (мБ) + + + + Phonon::MMF::MediaObject + + Error opening source: type not supported + Помилка відкриття джерела: тип не підтримується + + + Error opening source: resource is compressed + Помилка відкриття джерела: ресурс стиснутий + + + Error opening source: resource not valid + Помилка відкриття джерела: ресурс неправильний + + + Error opening source: media type could not be determined + Помилка відкриття джерела: не вдалося визначити тип медіа-даних + + + + Phonon::MMF::StereoWidening + + Level (%) + Рівень (%) + + + + Phonon::MMF::SurfaceVideoPlayer + + Video display error + Помилка відображення відео Phonon::VolumeSlider - - Volume: %1% - - - - - - + Гучність: %1% + + Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% - + Використовуйте цей повзунок для регулювання гучності. Крайня ліва позиція - 0%, крайня права - %1% + + + Muted + Без звуку Q3Accel - %1, %2 not defined %1, %2 не визначено - Ambiguous %1 not handled - Неоднозначний %1 не оброблюється + Неоднозначний %1 не оброблено Q3DataTable - True - Так - - - + Істинно + + False - Ні - - - + Хибно + + Insert Вставити - Update Оновити - Delete - Вилучити + Видалити Q3FileDialog - Copy or Move a File - Копіювати або пересунути файл - - - + Копіювати або перемістити файл + + Read: %1 Читання: %1 - - Write: %1 Запис: %1 - - Cancel Скасувати - - - - All Files (*) - Всі файли (*) - - - + Усі файли (*) + + Name Ім'я - Size Розмір - Type Тип - Date Дата - Attributes Атрибути - - &OK - &Гаразд - - - + &OK + + Look &in: - Перегляд &в: - - - - - + Пере&гляд в: + + File &name: &Ім'я файлу: - File &type: &Тип файлу: - Back Назад - One directory up - Один каталог угору - - - + На теку вище + + Create New Folder Створити нову теку - List View - Вигляд списком - - - + Списком + + Detail View - Вигляд з подробицями - - - + Детально + + Preview File Info - Перегляд відомостей про файл - - - + Попередній перегляд інформації про файл + + Preview File Contents - Перегляд вмісту файла - - - + Попередній перегляд змісту файлу + + Read-write - Читання-запис - - - + Читання та запис + + Read-only - Тільки для читання - - - + Лише читання + + Write-only - Тільки для запису - - - + Лише запис + + Inaccessible Недоступний - Symlink to File Символьне посилання на файл - Symlink to Directory - Символьне посилання на каталог - - - + Символьне посилання на теку + + Symlink to Special - Символьне посилання на спеціальний файл - - - + Символьне посилання на спецфайл + + File Файл - Dir - Каталог - - - + Тека + + Special - Спеціальний файл - - - - - + Спецфайл + + Open Відкрити - - Save As - Зберегти, як - - - - - + Зберегти як + + &Open &Відкрити - - &Save &Зберегти - &Rename &Перейменувати - &Delete - &Витерти - - - + Ви&далити + + R&eload - О&новити - - - + &Оновити + + Sort by &Name - Впорядкувати за &ім'ям - - - + Сортувати по &імені + + Sort by &Size - Впорядкувати за &розміром - - - + Сортувати по &розміру + + Sort by &Date - Впорядкувати за &датою - - - + Сортувати по &даті + + &Unsorted - &Невпорядковано - - - + &Без сортування + + Sort - Впорядкувати - - - + Сортувати + + Show &hidden files - Показати &приховані файли - - - + Показувати при&ховані файли + + the file файл - the directory - каталог - - - + тека + + the symlink символьне посилання - Delete %1 - Вилучити %1 - - - + Видалити %1 + + <qt>Are you sure you wish to delete %1 "%2"?</qt> - <qt>Ви дійсно хочете вилучити %1 "%2"?</qt> - - - + <qt>Ви впевнені, що бажаєте видалити %1 "%2"?</qt> + + &Yes - &Так - - - + Т&ак + + &No &Ні - New Folder 1 Нова тека 1 - New Folder Нова тека - New Folder %1 Нова тека %1 - Find Directory - Знайти каталог - - - - + Пошук теки + + Directories - Каталоги - - - + Теки + + Directory: - Каталог: - - - - + Тека: + + Error Помилка - %1 File not found. Check path and filename. %1 Файл не знайдено. -Перевірте шлях та ім'я файла. - - - +Перевірте шлях та назву файлу. + + All Files (*.*) - Всі файли (*.*) - - - + Усі файли (*) + + Open Відкрити - Select a Directory - Виберіть каталог + Оберіть теку Q3LocalFs - - Could not read directory %1 - Неможливо прочитати каталог + Не вдалося прочитати теку %1 - Could not create directory %1 - Неможливо створити каталог%1 - - - + Не вдалося створити теку +%1 + + Could not remove file or directory %1 - Неможливо вилучити файли або каталог + Не вдалося видалити файл або теку %1 - Could not rename %1 to %2 - Неможливо перейменувати + Не вдалося перейменувати %1 в %2 - Could not open %1 - Неможливо відкрити + Не вдалося відкрити %1 - Could not write %1 - Неможливо записати + Не вдалося записати %1 Q3MainWindow - Line up Вирівняти - Customize... - Підлаштувати... + Налаштувати... Q3NetworkProtocol - Operation stopped by the user - Дію зупинено користувачем + Операція зупинена користувачем Q3ProgressDialog - - Cancel Скасувати @@ -613,28 +830,22 @@ Q3TabDialog - - OK - Гаразд - - - + OK + + Apply Застосувати - Help Довідка - Defaults - Типові значення - - - + Типово + + Cancel Скасувати @@ -642,166 +853,131 @@ Q3TextEdit - &Undo &Повернути - &Redo П&овторити - Cu&t Ви&різати - &Copy &Копіювати - &Paste &Вставити - Clear Очистити - - Select All - Вибрати все + Виділити все Q3TitleBar - System Система - Restore up - Відновити вгору - - - + Відновити + + Minimize Мінімізувати - Restore down - Відновити додолу - - - + Відновити + + Maximize Максимізувати - Close Закрити - Contains commands to manipulate the window - Містить команди для дій над вікном - - - - Puts a minimized back to normal - Повертає мінімізоване в нормальний стан - - - + Містить команди для маніпуляцій з вікном + + + Puts a minimized window back to normal + Повертає мінімізоване вікно назад до нормального + + Moves the window out of the way - Відсуває вікно з дороги - - - + Прибирає вікно з очей + + Puts a maximized window back to normal - Повертає максимізоване в нормальний стан - - - + Повертає максимізоване вікно назад до нормального + + Makes the window full screen - Показує вікно на весь екран - - - + Розгортає вікно на весь екран + + Closes the window Закриває вікно - Displays the name of the window and contains controls to manipulate it - Показує ім'я вікна та містить елементи керування ним + Показує назву вікна та містить команди для маніпуляцій з ним Q3ToolBar - More... - Додатково... + Більше... Q3UrlOperator - - - The protocol `%1' is not supported - Протокол "%1" не підтримується - - - + Протокол ’%1’ не підтримується + + The protocol `%1' does not support listing directories - Протокол "%1" не підтримує перегляд списку каталогів - - - + Протокол ’%1’ не підтримує перегляд тек + + The protocol `%1' does not support creating new directories - Протокол "%1" не підтримує створення каталогів - - - + Протокол ’%1’ не підтримує створення нових тек + + The protocol `%1' does not support removing files or directories - Протокол "%1" не підтримує вилучення файлів або каталогів - - - + Протокол ’%1’ не підтримує видалення файлів чи тек + + The protocol `%1' does not support renaming files or directories - Протокол "%1" не підтримує перейменування файлів та каталогів - - - + Протокол ’%1’ не підтримує перейменування файлів чи тек + + The protocol `%1' does not support getting files - Протокол "%1" не підтримує отримання файлів - - - + Протокол ’%1’ не підтримує отримання файлів + + The protocol `%1' does not support putting files - Протокол "%1" не підтримує викладення файлів - - - - + Протокол ’%1’ не підтримує відправлення файлів + + The protocol `%1' does not support copying or moving files or directories - Протокол "%1" не підтримує копіювання або пересування файлів та каталогів - - - - + Протокол ’%1’ не підтримує копіювання або переміщення файлів чи тек + + (unknown) (невідомо) @@ -809,27 +985,22 @@ Q3Wizard - &Cancel &Скасувати - < &Back < &Назад - &Next > - &Вперед > - - - + &Далі > + + &Finish - &Закінчити - - - + &Завершити + + &Help &Довідка @@ -837,230 +1008,176 @@ QAbstractSocket - - - - + Socket operation timed out + Час на операцію з сокетом вичерпано + + + Operation on socket is not supported + Непідтримувана для сокета операція + + Host not found Вузол не знайдено - - - Connection refused - Відмовлено у зв'язку - - - + У з'єднанні відмовлено + + Connection timed out - Перевищено термін очікування для з'єднання - - - - - - Operation on socket is not supported - - - - - Socket operation timed out - Дія з сокетом перевищила термін очікування - - - + Час на з’єднання вичерпано + + Socket is not connected - Сокет не є під'єднаним - - - + Сокет не під’єднано + + Network unreachable - Мережа недосяжна + Мережа недоступна QAbstractSpinBox - + &Select All + &Виділити все + + &Step up - &Крок вгору - - - + Крок в&гору + + Step &down - Крок &додолу - - - - &Select All - &Вибрати все + Крок до&низу + + + + QAccessibleButton + + Press + Натисніть QApplication - Activate Активувати - + Activates the program's main window + Активує головне вікно програми + + Executable '%1' requires Qt %2, found Qt %3. - Програма "%1" потребує Qt %2, але знайдено Qt %3. - - - + Виконуваний модуль '%1' вимагає Qt %2, знайдено Qt %3. + + Incompatible Qt Library Error - Помилка несумісності бібліотеки Qt - - - + Несумісна бібліотека Qt + + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - - - Activates the program's main window - Активує головне вікно програми - QAxSelect - Select ActiveX Control - Виберіть елемент ActiveX - - - + Виберіть елемент керування ActiveX + + OK - Гаразд - - - + OK + + &Cancel &Скасувати - COM &Object: - &Об'єкт COM: + COM-&об'єкт: QCheckBox - Uncheck - Зняти позначку - - - + Зняти відмітку + + Check - Поставити позначку - - - + Відмітити + + Toggle - Перемикнути + Перемкнути QColorDialog - Hu&e: - Від&тінок: - - - + &Відтінок: + + &Sat: &Насиченість: - &Val: - &Значення: - - - + Зна&чення: + + &Red: &Червоний: - &Green: &Зелений: - Bl&ue: - С&иній: - - - + &Блакитний: + + A&lpha channel: - Канал а&льфа: - - - + &Альфа-канал: + + Select Color - - - - + Оберіть колір + + &Basic colors - &Базові кольори - - - + Баз&ові кольори + + &Custom colors - &Нетипові кольори - - - &Define Custom Colors >> - &Налаштувати нетипові кольори >> - - - OK - Гаразд - - - Cancel - Скасувати - - - + &Кольори користувача + + &Add to Custom Colors - &Додати до нетипових кольорів - - - Select color - Виберіть колір + &Додати до кольорів користувача QComboBox - - + False + Хибно + + + True + Істинно + + Open Відкрити - - False - Ні - - - - True - Так - - - Close Закрити @@ -1068,43 +1185,56 @@ QCoreApplication - + %1: already exists + QSystemSemaphore + %1: вже існує + + + %1: does not exist + QSystemSemaphore + %1: не існує + + + %1: out of resources + QSystemSemaphore + %1: недостатньо ресурсів + + + %1: unknown error %2 + QSystemSemaphore + %1: невідома помилка %2 + + %1: key is empty QSystemSemaphore - - - - + %1: порожній ключ + + %1: unable to make key QSystemSemaphore - - - - + %1: неможливо створити ключ + + %1: ftok failed QSystemSemaphore - + %1: помилка ftok QDB2Driver - Unable to connect - Неможливо з'єднатися - - - + Неможливо з'єднатись + + Unable to commit transaction Неможливо завершити транзакцію - Unable to rollback transaction Неможливо відкотити транзакцію - Unable to set autocommit Неможливо встановити автозавершення транзакцій @@ -1112,242 +1242,1072 @@ QDB2Result - - Unable to execute statement - Неможливо виконати оператор - - - + Неможливо виконати вираз + + Unable to prepare statement - Неможливо підготувати оператор - - - + Неможливо підготувати вираз + + Unable to bind variable Неможливо прив'язати змінну - Unable to fetch record %1 - Неможливо вибрати запис %1 - - - + Неможливо отримати запис %1 + + Unable to fetch next - Неможливо вибрати наступний - - - + Неможливо отримати наступний запис + + Unable to fetch first - Неможливо вибрати перший + Неможливо отримати перший запис QDateTimeEdit - AM AM - am am - PM PM - pm pm + QDeclarativeAbstractAnimation + + Cannot animate non-existent property "%1" + Неможливо анімувати неіснуючу властивість "%1" + + + Cannot animate read-only property "%1" + Неможливо анімувати властивість лише для читання "%1" + + + Animation is an abstract class + Animation - це абстрактний клас + + + + QDeclarativeAnchorAnimation + + Cannot set a duration of < 0 + Не можу встановити тривалість < 0 + + + + QDeclarativeAnchors + + Possible anchor loop detected on fill. + Виявлено імовірну циклічну прив'язку до fill. + + + Possible anchor loop detected on centerIn. + Виявлено імовірну циклічну прив'язку до centerIn. + + + Cannot anchor to an item that isn't a parent or sibling. + Неможливо прив'язати до елемента, що не є батьківським чи сусіднім. + + + Possible anchor loop detected on vertical anchor. + Виявлено імовірну циклічну прив'язку до вертикальної прив'язки. + + + Possible anchor loop detected on horizontal anchor. + Виявлено імовірну циклічну прив'язку до горизонтальної прив'язки. + + + Cannot specify left, right, and hcenter anchors. + Неможливо задати прив'язки зліва, справа та центру по горизонталі. + + + Cannot anchor to a null item. + Неможливо прив'язати до нульового елемента. + + + Cannot anchor a horizontal edge to a vertical edge. + Неможливо прив'язати горизонтальний край до вертикального. + + + Cannot anchor item to self. + Неможливо прив'язати елемент до самого себе. + + + Cannot specify top, bottom, and vcenter anchors. + Неможливо задати прив'язки верху, низу та центру по вертикалі. + + + Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. + Неможливо використати базову прив'язку разом з верхньої, нижньою чи центральною по вертикалі. + + + Cannot anchor a vertical edge to a horizontal edge. + Неможливо прив'язати вертикальний край до горизонтального. + + + + QDeclarativeAnimatedImage + + Qt was built without support for QMovie + Бібліотека Qt була зібрана без підтримки QMovie + + + + QDeclarativeBehavior + + Cannot change the animation assigned to a Behavior. + Неможливо змінити анімацію, призначену до поведінки. + + + + QDeclarativeBinding + + Binding loop detected for property "%1" + Знайдено циклічну прив’язку для властивості "%1" + + + + QDeclarativeCompiledBindings + + Binding loop detected for property "%1" + Знайдено циклічну прив’язку для властивості "%1" + + + + QDeclarativeCompiler + + Invalid property assignment: "%1" is a read-only property + Неправильне присвоєння властивості: властивість "%1" лише для читання + + + Invalid property assignment: unknown enumeration + Неправильне присвоєння властивості: невідомий перелік + + + Invalid property assignment: string expected + Неправильне присвоєння властивості: очікувався рядок + + + Invalid property assignment: url expected + Неправильне присвоєння властивості: очікувався URL + + + Invalid property assignment: unsigned int expected + Неправильне присвоєння властивості: очікувалось беззнакове ціле + + + Invalid property assignment: int expected + Неправильне присвоєння властивості: очікувалось ціле + + + Invalid property assignment: number expected + Неправильне присвоєння властивості: очікувалось число + + + Invalid property assignment: color expected + Неправильне присвоєння властивості: очікувався колір + + + Invalid property assignment: date expected + Неправильне присвоєння властивості: очікувалась дата + + + Invalid property assignment: time expected + Неправильне присвоєння властивості: очікувався час + + + Invalid property assignment: datetime expected + Неправильне присвоєння властивості: очікувались дата та час + + + Invalid property assignment: point expected + Неправильне присвоєння властивості: очікувалась точка + + + Invalid property assignment: size expected + Неправильне присвоєння властивості: очікувався розмір + + + Invalid property assignment: rect expected + Неправильне присвоєння властивості: очікувався прямокутник + + + Invalid property assignment: boolean expected + Неправильне присвоєння властивості: очікувалось булеве + + + Invalid property assignment: 3D vector expected + Неправильне присвоєння властивості: очікувався тривимірний вектор + + + Invalid property assignment: unsupported type "%1" + Неправильне присвоєння властивості: непідтримуваний тип "%1" + + + Element is not creatable. + Елемент не є створюваним. + + + Component elements may not contain properties other than id + Елементи Component не можуть містити властивостей окрім id + + + Invalid component id specification + Неправильна специфікація ідентифікатора компоненти + + + id is not unique + ідентифікатор не унікальний + + + Invalid component body specification + Неправильна специфікація тіла компоненти + + + Component objects cannot declare new properties. + Об'єкти Component не можуть оголошувати нові властивості. + + + Component objects cannot declare new signals. + Об'єкти Component не можуть оголошувати нові сигнали. + + + Component objects cannot declare new functions. + Об'єкти Component не можуть оголошувати нові функції. + + + Cannot create empty component specification + Неможливо створити порожню специфікацію компоненти + + + Incorrectly specified signal assignment + Неправильно вказане призначення сигналу + + + Cannot assign a value to a signal (expecting a script to be run) + Неможливо призначити значення сигналу (очікується скрипт для виконання) + + + Empty signal assignment + Порожнє призначення сигналу + + + Empty property assignment + Порожнє призначення властивості + + + Attached properties cannot be used here + Прикріплені властивості не можуть бути тут використані + + + Non-existent attached object + Неіснуючий прикріплений об'єкт + + + Invalid attached object assignment + Неправильне призначення прикріпленого об'єкта + + + Cannot assign to non-existent default property + Неможливо призначити до неіснуючої типової властивості + + + Cannot assign to non-existent property "%1" + Неможливо призначити неіснуючій властивості "%1" + + + Invalid use of namespace + Неправильне використання простору імен + + + Not an attached property name + Не є назвою прикріпленої властивості + + + Invalid use of id property + Неправильне використання властивості id + + + Property has already been assigned a value + Властивості вже призначено значення + + + Invalid grouped property access + Неправильний доступ до згрупованої властивості + + + Cannot assign a value directly to a grouped property + Неможливо призначити значення безпосередньо до згрупованої властивості + + + Invalid property use + Неправильне використання властивості + + + Property assignment expected + Очікувалось призначення властивості + + + Single property assignment expected + Очікується одиночне призначення властивості + + + Unexpected object assignment + Неочікуване призначення об'єкта + + + Cannot assign object to list + Неможливо призначити об'єкт списку + + + Can only assign one binding to lists + Можна призначити лише один зв'язок до списків + + + Cannot assign primitives to lists + Неможливо призначити примітиви до списків + + + Cannot assign multiple values to a script property + Неможливо призначити декілька значень властивості скрипту + + + Invalid property assignment: script expected + Неправильне присвоєння властивості: очікувався скрипт + + + Cannot assign object to property + Неможливо призначити об'єкт властивості + + + "%1" cannot operate on "%2" + "%1" не може оперувати над "%2" + + + Duplicate default property + Дубльована типова властивість + + + Duplicate property name + Дубльована назва властивості + + + Property names cannot begin with an upper case letter + Назви властивостей не можуть починатись з великої літери + + + Illegal property name + Неприпустима назва властивості + + + Duplicate signal name + Дубльована назва сигналу + + + Signal names cannot begin with an upper case letter + Назви сигналів не можуть починатись з великої літери + + + Illegal signal name + Неприпустима назва сигналу + + + Duplicate method name + Дубльована назва методу + + + Method names cannot begin with an upper case letter + Назви методів не можуть починатись з великої літери + + + Illegal method name + Неприпустима назва методу + + + Property value set multiple times + Значення властивості встановлено декілька разів + + + Invalid property nesting + Неправильне вкладення властивостей + + + Cannot override FINAL property + Неможливо перевизначити властивість FINAL + + + Invalid property type + Неправильне тип властивості + + + Invalid empty ID + Неправильний порожній ID + + + IDs cannot start with an uppercase letter + Ідентифікатори не можуть починатись з великої літери + + + IDs must start with a letter or underscore + Ідентифікатори повинні починатись з літери чи підкреслення + + + IDs must contain only letters, numbers, and underscores + Ідентифікатори повинні містити лише літери, цифри та підкреслення + + + ID illegally masks global JavaScript property + Ідентифікатор неправильно маскує глобальну властивість JavaScript + + + No property alias location + Відсутня позиція псевдоніма властивості + + + Invalid alias location + Непраильна позиція псевдоніму + + + Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> + Неправильне посилання на псевдонім. Посилання на псевдонім має бути вказане, як <id> або <id>.<property> + + + Invalid alias reference. Unable to find id "%1" + Неправильне посилання на псевдонім. Неможливо знайти id "%1" + + + + QDeclarativeComponent + + Invalid empty URL + Неправильний порожній URL + + + + QDeclarativeConnections + + Cannot assign to non-existent property "%1" + Неможливо призначити неіснуючій властивості "%1" + + + Connections: nested objects not allowed + З’єднання: вкладені об’єкти не дозволяються + + + Connections: syntax error + З’єднання: синтаксична помилка + + + Connections: script expected + З’єднання: очікувався скрипт + + + + QDeclarativeEngine + + executeSql called outside transaction() + executeSql було викликано поза transaction() + + + Read-only Transaction + Транзакція лише для читання + + + Version mismatch: expected %1, found %2 + Розбіжність версій: очікувалась %1, знайдена %2 + + + SQL transaction failed + Збій транзакції SQL + + + transaction: missing callback + транзакція: відсутній зворотній виклик + + + SQL: database version mismatch + SQL: розбіжність версій бази даних + + + + QDeclarativeFlipable + + front is a write-once property + Властивість front лише для одноразового запису + + + back is a write-once property + Властивість back лише для одноразового запису + + + + QDeclarativeImportDatabase + + module "%1" definition "%2" not readable + неможливо прочитати визначення "%2" модуля "%1" + + + plugin cannot be loaded for module "%1": %2 + неможливо завантажити додаток для модуля "%1": %2 + + + module "%1" plugin "%2" not found + не знайдено додаток "%2" модуля "%1" + + + module "%1" version %2.%3 is not installed + модуль "%1" версії %2.%3 не встановлено + + + module "%1" is not installed + модуль "%1" не встановлено + + + "%1": no such directory + "%1": тека не існує + + + import "%1" has no qmldir and no namespace + import "%1" не має ні qmldir, ні namespace + + + - %1 is not a namespace + - %1 не є простором імен + + + - nested namespaces not allowed + - вкладені простори імен не дозволяються + + + local directory + локальна тека + + + is ambiguous. Found in %1 and in %2 + є неоднозначним. Знайдено в %1 та в %2 + + + is ambiguous. Found in %1 in version %2.%3 and %4.%5 + є неоднозначним. Знайдено в %1 версії %2.%3 та %4.%5 + + + is instantiated recursively + інстанціюється рекурсивно + + + is not a type + не є типом + + + + QDeclarativeKeyNavigationAttached + + KeyNavigation is only available via attached properties + KeyNavigation доступна лише через прикріплені властивості + + + + QDeclarativeKeysAttached + + Keys is only available via attached properties + Keys доступні лише через прикріплені властивості + + + + QDeclarativeListModel + + remove: index %1 out of range + remove: індекс %1 поза межами діапазону + + + insert: value is not an object + insert: значення не є об’єктом + + + insert: index %1 out of range + insert: індекс %1 поза межами діапазону + + + move: out of range + move: поза межами діапазону + + + append: value is not an object + append: значення не є об’єктом + + + set: value is not an object + set: значення не є об’єктом + + + set: index %1 out of range + set: індекс %1 поза межами діапазону + + + ListElement: cannot contain nested elements + ListElement: не може містити вкладені елементи + + + ListElement: cannot use reserved "id" property + ListElement: не може використовувати зарезервовану властивість "id" + + + ListElement: cannot use script for property value + ListElement: неможливо використовувати скрипт в якості значення властивості + + + ListModel: undefined property '%1' + ListModel: невизначена властивість '%1' + + + + QDeclarativeLoader + + Loader does not support loading non-visual elements. + Завантажувач не підтримує завантаження невізуальних елементів. + + + + QDeclarativeParentAnimation + + Unable to preserve appearance under complex transform + Неможливо зберегти зовнішній вигляд при складному перетворенні + + + Unable to preserve appearance under non-uniform scale + Неможливо зберегти зовнішній вигляд при неоднорідному масштабі + + + Unable to preserve appearance under scale of 0 + Неможливо зберегти зовнішній вигляд при нульовому масштабі + + + + QDeclarativeParentChange + + Unable to preserve appearance under complex transform + Неможливо зберегти зовнішній вигляд при складному перетворенні + + + Unable to preserve appearance under non-uniform scale + Неможливо зберегти зовнішній вигляд при неоднорідному масштабі + + + Unable to preserve appearance under scale of 0 + Неможливо зберегти зовнішній вигляд при нульовому масштабі + + + + QDeclarativeParser + + Illegal unicode escape sequence + Неприпустима керуюча послідовність Unicode + + + Illegal character + Неприпустимий символ + + + Unclosed string at end of line + Незакритий рядок в кінці файлу + + + Illegal escape squence + Неприпустима керуюча послідовність + + + Unclosed comment at end of file + Незакритий коментар в кінці файлу + + + Illegal syntax for exponential number + Неприпустимий синтаксис для експоненційного числа + + + Identifier cannot start with numeric literal + Ідентифікатор не може починатись за чисельного літералу + + + Unterminated regular expression literal + Незавершений літерал регулярного виразу + + + Invalid regular expression flag '%0' + Неправильний прапорець регулярного виразу ’%0’ + + + Unterminated regular expression backslash sequence + Незавершена екранована послідовність регулярного виразу + + + Unterminated regular expression class + Незавершений клас регулярного виразу + + + Syntax error + Синтаксична помилка + + + Unexpected token `%1' + Неочікуваний токен `%1' + + + Expected token `%1' + Очікувався токен `%1' + + + Property value set multiple times + Значення властивості встановлено декілька разів + + + Expected type name + Очікувалась назва типу + + + Invalid import qualifier ID + Неправильний ID специфікатору імпорту + + + Reserved name "Qt" cannot be used as an qualifier + Зарезервоване ім’я "Qt" не може бути застосоване в якості специфікатора + + + Script import qualifiers must be unique. + Специфікатори імпорту скрипту мають бути унікальними. + + + Script import requires a qualifier + Імпорт скрипту вимагає специфікатора + + + Library import requires a version + Імпорт бібліотеки вимагає версії + + + Expected parameter type + Очікувався тип параметра + + + Invalid property type modifier + Неправильний модифікатор типу властивості + + + Unexpected property type modifier + Неочікуваний модифікатор типу властивості + + + Expected property type + Очікувався тип властивості + + + Readonly not yet supported + "Тільки для читання" ще не підтримується + + + JavaScript declaration outside Script element + Декларація JavaScript поза межами елемента Script + + + + QDeclarativePauseAnimation + + Cannot set a duration of < 0 + Не можу встановити тривалість < 0 + + + + QDeclarativePixmap + + Error decoding: %1: %2 + Помилка декодування: %1: %2 + + + Failed to get image from provider: %1 + Збій отримання зображення від постачальника: %1 + + + Cannot open: %1 + Неможливо відкрити: %1 + + + + QDeclarativePropertyAnimation + + Cannot set a duration of < 0 + Не можу встановити тривалість < 0 + + + + QDeclarativePropertyChanges + + PropertyChanges does not support creating state-specific objects. + PropertyChanges не підтримує створення об’єктів специфічних до стану. + + + Cannot assign to non-existent property "%1" + Неможливо призначити неіснуючій властивості "%1" + + + Cannot assign to read-only property "%1" + Неможливо призначити властивості лише для читання "%1" + + + + QDeclarativeTextInput + + Could not load cursor delegate + Не вдалося завантажити делегат курсору + + + Could not instantiate cursor delegate + Не вдалося інстанціювати делегат курсору + + + + QDeclarativeTypeData + + Script %1 unavailable + + + + Type %1 unavailable + Тип %1 недоступний + + + Namespace %1 cannot be used as a type + Простір імен %1 не може бути використаний як тип + + + %1 %2 + %1 %2 + + + + QDeclarativeVME + + Unable to create object of type %1 + Неможливо створити об’єкт типу %1 + + + Cannot assign value %1 to property %2 + Неможливо призначити властивості %2 значення %1 + + + Cannot assign object type %1 with no default method + Неможливо призначити об’єкт типу %1 без методу за замовчуванням + + + Cannot connect mismatched signal/slot %1 %vs. %2 + Неможливо з’єднати несумісний сигнал/слот (%1 проти %2) + + + Cannot assign an object to signal property %1 + Неможливо призначити об’єкт до властивості сигналу %1 + + + Cannot assign object to list + Неможливо призначити об’єкт до списку + + + Cannot assign object to interface property + Неможливо призначити об’єкт до властивості інтерфейсу + + + Unable to create attached object + Неможливо створити прикріплений об’єкт + + + Cannot set properties on %1 as it is null + Неможливо встановити властивості для %1, оскільки він нульовий + + + + QDeclarativeVisualDataModel + + Delegate component must be Item type. + Компонент делегату має бути типу Item. + + + + QDeclarativeXmlListModel + + Qt was built without support for xmlpatterns + Бібліотека Qt була зібрана без підтримки xmlpatterns + + + + QDeclarativeXmlListModelRole + + An XmlRole query must not start with '/' + Запит XmlRole не повинен починатись з '/' + + + + QDeclarativeXmlRoleList + + An XmlListModel query must start with '/' or "//" + Запит XmlListModel не повинен починатись з '/' або "//" + + + QDial - QDial - QDial - - - + + + SpeedoMeter - Спідометр - - - + + + SliderHandle - ДержакПовзунка + QDialog - + Done + Завершено + + What's This? Що це? - - - Done - Зроблено - QDialogButtonBox - - - OK - Гаразд - - - + + + + &OK + &OK + + + &Save + &Зберегти + + Save - Зберегти - - - - &Save - &Зберегти - - - + Зберегти + + Open Відкрити - + &Cancel + &Скасувати + + Cancel - Скасувати - - - - &Cancel - &Скасувати - - - + Скасувати + + + &Close + Закри&ти + + Close - Закрити - - - - &Close - &Закрити - - - + Закрити + + Apply Застосувати - Reset Скинути - Help Довідка - Don't Save Не зберігати - + Close without Saving + Закрити без збереження + + Discard - Відкинути - - - + Відхилити + + &Yes - &Так - - - + Т&ак + + Yes to &All - Так для &всіх - - - + Так &для всіх + + &No &Ні - N&o to All - Н&і для всіх - - - + Ні для вс&іх + + Save All - Зберегти всі - - - + Зберегти все + + Abort Перервати - Retry - Повторна спроба - - - + Повторити + + Ignore - Пропустити - - - + Ігнорувати + + Restore Defaults - Відновити типові - - - - Close without Saving - Закрити без збереження - - - - &OK - &Гаразд + Відновити типово QDirModel - Name - Ім'я - - - + Назва + + Size Розмір - Kind Match OS X Finder Тип - Type All other platforms Тип - Date Modified Дата зміни @@ -1355,30 +2315,25 @@ QDockWidget - Close Закрити - Dock - Пришвартувати - - - + Закріпити + + Float - Відшвартувати + Відкріпити QDoubleSpinBox - More Більше - Less Менше @@ -1386,787 +2341,651 @@ QErrorMessage - Debug Message: - Повідомлення зневадження: - - - + Зневаджувальне повідомлення: + + Warning: Попередження: - Fatal Error: Фатальна помилка: - &Show this message again &Показувати це повідомлення знову - &OK - &Гаразд + &OK QFile - - Destination file exists - - - - + Файл-отримувач існує + + + Will not rename sequential file using block copy + Послідовний файл не буде перейменовано за допомогою блочного копіювання + + Cannot remove source file - - - - + Неможливо видалити початковий файл + + Cannot open %1 for input - - - - + Неможливо відкрити %1 для введення + + Cannot open for output - - - - + Неможливо відкрити для виводу + + Failure to write block - - - - + Збій запису блока + + Cannot create %1 for output - + Неможливо створити %1 для виводу QFileDialog - - - All Files (*) - Всі файли (*) - - - - Directories - Каталоги - - - - - - - &Open - &Відкрити - - - - - &Save - &Зберегти - - - + Look in: + Перегляд в: + + + Back + Назад + + + Go back + Йти назад + + + Forward + Вперед + + + Go forward + Йти вперед + + + Parent Directory + Батьківська тека + + + Go to the parent directory + Перейти до батьківської теки + + + Create New Folder + Створити нову теку + + + Create a New Folder + Створити нову теку + + + List View + Списком + + + Change to list view mode + Перейти до перегляду списком + + + Detail View + Детально + + + Change to detail view mode + Перейти до детального перегляду + + + Files of type: + Тип файлів: + + + Find Directory + Пошук теки + + Open Відкрити - - %1 already exists. -Do you want to replace it? - %1 вже існує. -Перезаписати? - - - - %1 -File not found. -Please verify the correct file name was given. - %1. -Файл не знайдено. -Переконайтеся, що введено правильне ім'я файлу. - - - - My Computer - Мій комп'ютер - - - + Save As + Зберегти як + + + All Files (*) + Усі файли (*) + + + Show + Показати + + &Rename &Перейменувати - &Delete - &Витерти - - - + &Видалити + + Show &hidden files - Показати &приховані файли - - - - - Back - Назад - - - - - Parent Directory - Батьківський каталог - - - - - List View - Вигляд списком - - - - - Detail View - Вигляд з подробицями - - - - - Files of type: - Тип файлів: - - - - + Показувати при&ховані файли + + + &New Folder + &Нова тека + + Directory: - Каталог: - - - -File not found. -Please verify the correct file name was given - -Файл не знайдено. -Переконайтеся, що введено правильне ім'я файлу - - - - + Тека: + + + File &name: + &Ім'я файлу: + + + &Open + &Відкрити + + + &Save + &Зберегти + + + Directories + Теки + + + &Choose + &Обрати + + %1 Directory not found. Please verify the correct directory name was given. - %1. -Каталог не знайдено. -Переконайтеся, що введено правильне ім'я каталогу. - - - + %1 +Тека не знайдена. +Будь ласка, перевірте, що вказане правильне ім'я теки. + + + %1 already exists. +Do you want to replace it? + %1 вже існує. +Бажаєте перезаписати його? + + + %1 +File not found. +Please verify the correct file name was given. + %1 +Файл не знайдено. +Будь ласка, перевірте, що вказане правильне ім'я файлу. + + + New Folder + Нова тека + + '%1' is write protected. Do you want to delete it anyway? - "%1" захищено від запису. -Дійсно вилучити? - - - + '%1' захищено від запису. +Бажаєте видалити незважаючи на це? + + Are sure you want to delete '%1'? - Дійсно вилучити "%1"? - - - + Ви впевнені, що хочете видалити '%1'? + + Could not delete directory. - Неможливо вилучити каталог. - - - + Не вдалося видалити теку. + + Recent Places - - - - + Нещодавні місця + + All Files (*.*) - Всі файли (*.*) - - - - Save As - Зберегти, як - - - + Усі файли (*) + + + Remove + Видалити + + + My Computer + Мій комп'ютер + + Drive Диск - - File Файл - + File Folder + Match Windows Explorer + Тека + + + Folder + All other platforms + Тека + + + Alias + Mac OS X Finder + Псевдонім + + + Shortcut + All other platforms + Скорочення + + Unknown Невідомо - - - Find Directory - Знайти каталог - - - Where: - Де: - - - - Show - Показати - - - - - Forward - Вперед - - - - New Folder - Нова тека - - - - &New Folder - &Нова тека - - - - - &Choose - &Вибрати - - - Save &as: - Зберегти, &як: - - - - Remove - Вилучити - - - - - File &name: - &Ім'я файлу: - - - - - Look in: - Пошук в: - - - - - Create New Folder - Створити нову теку - QFileSystemModel - + %1 TB + %1 Тб + + + %1 GB + %1 Гб + + + %1 MB + %1 Мб + + + %1 KB + %1 Кб + + + %1 bytes + %1 байт + + Invalid filename Неправильне ім'я файлу - <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. - <b>Неможливо використати ім'я "%1".</b><p>Спробуйте інше ім'я, меншої довжини або без знаків пунктуації. - - - + <b>Ім'я "%1" не може бути використане.</b><p>Спробуйте використати інше ім'я, меншої довжини або без знаків пунктуації. + + Name Ім'я - Size Розмір - Kind Match OS X Finder Тип - Type All other platforms Тип - Date Modified Дата зміни - My Computer Мій комп'ютер - Computer Комп'ютер - - %1 TB - %1 ТБ - - - - %1 GB - %1 ГБ - - - - %1 MB - %1 МБ - - - - %1 KB - %1 КБ - - - - %1 bytes - %1 байтів + %1 byte(s) + %1 байт QFontDatabase - - Normal - - - - - - + Звичайний + + Bold - - - - - + Жирний + + Demi Bold - - - - - - + Напівжирний + + Black - - - - + Чорний + + Demi - - - - - + Середній + + Light - - - - - + Світлий + + Italic - - - - - + Курсив + + Oblique - - - - + Нахилений + + Any - - - - + Будь-яка + + Latin - - - - + Латиниця + + Greek - - - - + Грецька + + Cyrillic - - - - + Кирилиця + + Armenian - - - - + Вірменська + + Hebrew - - - - + Іврит + + Arabic - - - - + Арабська + + Syriac - - - - + Сирійська + + Thaana - - - - + Тана + + Devanagari - - - - + Деванагарі + + Bengali - - - - + Бенгальська + + Gurmukhi - - - - + Гурмукхі + + Gujarati - - - - + Гуджараті + + Oriya - - - - + Орія + + Tamil - - - - + Тамільська + + Telugu - - - - + Телугу + + Kannada - - - - + Каннада + + Malayalam - - - - + Малаялам + + Sinhala - - - - + Сингальська + + Thai - - - - + Тайська + + Lao - - - - + Лаоська + + Tibetan - - - - + Тибетська + + Myanmar - - - - + М'янма + + Georgian - - - - + Грузинська + + Khmer - - - - + Кхмерська + + Simplified Chinese - - - - + Китайська спрощена + + Traditional Chinese - - - - + Китайська традиційна + + Japanese - - - - + Японська + + Korean - - - - + Корейська + + Vietnamese - - - - + В'єтнамська + + Symbol - - - - + Символьна + + Ogham - - - - + Огам + + Runic - + Рунічна + + + N'Ko + Нко QFontDialog - + Select Font + Виберіть шрифт + + &Font &Шрифт - Font st&yle - Ст&иль шрифту - - - + &Стиль шрифту + + &Size &Розмір - Effects Ефекти - Stri&keout - Пере&креслити - - - + П&ерекреслений + + &Underline - &Підкреслити - - - + П&ідкреслений + + Sample Зразок - Wr&iting System - Система з&апису - - - - - Select Font - Виберіть шрифт + Система &писемності QFtp - - Not connected - Не з'єднано - - - - + Не під'єднано + + Host %1 not found Вузол %1 не знайдено - - Connection refused to host %1 - Відмовлено в з'єднанні до вузла %1 - - - + Відмова у з’єднанні з вузлом %1 + + Connection timed out to host %1 - - - - - - + Час на з’єднання з вузлом %1 вичерпано + + Connected to host %1 - З'єднано з вузлом %1 - - - - + З’єднано з вузлом %1 + + Connection refused for data connection - Відмовлено в з'єднанні для каналу даних - - - - - - + Відмова у з’єднанні для передачі даних + + Unknown error Невідома помилка - - Connecting to host failed: %1 - Помилка з'єднання до вузла: + Відмова у з’єднанні з вузлом: %1 - - Login failed: %1 - Помилка входження: + Збій входу: %1 - - Listing directory failed: %1 - Помилка отримання списку каталогів:%1 - - - - + Збій перегляду теки: +%1 + + Changing directory failed: %1 - Помилка переходу в каталог: + Збій зміни теки: %1 - - Downloading file failed: %1 - Помилка звантаження файлу: + Збій звантаження файлу: %1 - - Uploading file failed: %1 - Помилка відвантаження файлу: + Збій вивантаження файлу: %1 - - Removing file failed: %1 - Помилка вилучення файлу:%1 - - - - + Збій видалення файлу: +%1 + + Creating directory failed: %1 - Помилка створення каталогу:%1 - - - - + Збій створення теки: +%1 + + Removing directory failed: %1 - Помилка вилучення каталогу: + Збій видалення теки: %1 - - - Connection closed З'єднання закрито - Host %1 found - Знайдено вузол %1 - - - + Вузол %1 не знайдено + + Connection to %1 closed З'єднання з %1 закрито - Host found - Знайдено вузол - - - + Вузол не знайдено + + Connected to host - З'єднано з вузлом + З’єднано з вузлом QHostInfo - + No host name given + Ім'я вузла не задано + + Unknown error Невідома помилка @@ -2174,29 +2993,22 @@ QHostInfoAgent - - - - - - - - + No host name given + Ім'я вузла не задано + + + Invalid hostname + Неправильне ім'я вузла + + + Unknown address type + Невідомий тип адреси + + Host not found Вузол не знайдено - - - - - Unknown address type - Невідомий тип адреси - - - - - Unknown error Невідома помилка @@ -2204,226 +3016,168 @@ QHttp - HTTPS connection requested but SSL support not compiled in - - - - - - - + Запитане з’єднання HTTPS, але підтримка SSL не вкомпільована + + Unknown error Невідома помилка - - Request aborted Запит перервано - - No server set to connect to - Не вказано сервер для з'єднання - - - - + Не встановлено сервер для з’єднання + + Wrong content length Неправильна довжина вмісту - - Server closed connection unexpectedly - Сервер несподівано закрив з'єднання - - - - Unknown authentication method - - - - - Error writing response to device - - - - - - Connection refused - Відмовлено у зв'язку - - - - - + Сервер несподівано закрив з’єднання + + + Connection refused (or timed out) + У з’єднанні відмовлено (або час очікування вичерпано) + + Host %1 not found Вузол %1 не знайдено - - - - HTTP request failed - Помилка запиту HTTP - - - - + Збій запиту HTTP + + Invalid HTTP response header Неправильний заголовок відповіді HTTP - - - - + Unknown authentication method + Невідомий метод авторизації + + + Proxy authentication required + Необхідна авторизація на проксі-сервері + + + Authentication required + Необхідна авторизація + + Invalid HTTP chunked body - Неправильно розділене тіло HTTP - - - - Host %1 found - Знайдено вузол %1 - - - - Connected to host %1 - З'єднано з вузлом %1 - - - - Connection to %1 closed - З'єднання з %1 закрито - - - - Host found - Знайдено вузол - - - - Connected to host - З'єднано з вузлом - - - - + Неправильно фрагментовані дані HTTP + + + Error writing response to device + Помилка запису відповіді до пристрою + + + Connection refused + У з'єднанні відмовлено + + Connection closed З'єднання закрито - - Proxy authentication required - Проксі потребує автентифікації - - - - Authentication required - Автентифікація обов'язкова - - - - Connection refused (or timed out) - - - - Proxy requires authentication - - - - + Необхідна авторизація на проксі-сервері + + Host requires authentication - - - - + Необхідна авторизація на вузлі + + Data corrupted - - - - + Дані пошкоджено + + Unknown protocol specified - - - - + Вказано невідомий протокол + + SSL handshake failed - + Збій рукостискання SSL + + + Host %1 found + Вузол %1 не знайдено + + + Connected to host %1 + З’єднано з вузлом %1 + + + Connection to %1 closed + З'єднання з %1 закрито + + + Host found + Вузол не знайдено + + + Connected to host + З’єднано з вузлом QHttpSocketEngine - Did not receive HTTP response from proxy - - - - + Не отримано HTTP-відповідь від проксі-сервера + + Error parsing authentication request from proxy - - - - + Помилка розбору запиту авторизації від проксі-сервера + + Authentication required - Автентифікація обов'язкова - - - + Необхідна авторизація + + Proxy denied connection - - - - + Проксі-сервер відмовив у з’єднанні + + Error communicating with HTTP proxy - - - - + Помилка обміну даними з проксі-сервером HTTP + + Proxy server not found - - - - + Не знайдено проксі-сервер + + Proxy connection refused - - - - + Проксі-сервер відмовив у з’єднанні + + Proxy server connection timed out - - - - + Час на з’єднання з проксі-сервером вичерпано + + Proxy connection closed prematurely - + З’єднання з проксі-сервером було несподівано закрите QIBaseDriver - Error opening database - Неможливо відкрити базу даних - - - + Помилка відкриття бази даних + + Could not start transaction - Неможливо почати транзакцію - - - + Не вдалося почати транзакцію + + Unable to commit transaction Неможливо завершити транзакцію - Unable to rollback transaction Неможливо відкотити транзакцію @@ -2431,117 +3185,93 @@ QIBaseResult - Unable to create BLOB Неможливо створити BLOB - Unable to write BLOB Неможливо записати BLOB - Unable to open BLOB Неможливо відкрити BLOB - Unable to read BLOB Неможливо прочитати BLOB - - Could not find array - Неможливо знайти масив - - - + Не вдалося знайти масив + + Could not get array data - Неможливо отримати дані масиву - - - + Не вдалося отримати дані масиву + + Could not get query info - Неможливо отримати дані запиту - - - + Не вдалося отримати інформацію про запит + + Could not start transaction - Неможливо почати транзакцію - - - + Не вдалося почати транзакцію + + Unable to commit transaction Неможливо завершити транзакцію - Could not allocate statement - Неможливо розмістити оператор - - - + Не вдалося виділити вираз + + Could not prepare statement - Неможливо підготувати оператор - - - - + Не вдалося підготувати вираз + + Could not describe input statement - Неможливо описати вхідний оператор - - - + Не вдалося описати вхідний вираз + + Could not describe statement - Неможливо описати оператор - - - + Не вдалося описати вираз + + Unable to close statement - Неможливо закрити оператор - - - + Неможливо закрити вираз + + Unable to execute query Неможливо виконати запит - Could not fetch next item - Неможливо вибрати наступний елемент - - - + Не вдалося отримати наступний елемент + + Could not get statement info - Неможливо отримати дані оператора + Не вдалося отримати інформацію про вираз QIODevice - Permission denied - Відмовлено у доступі - - - + Доступ заборонено + + Too many open files Забагато відкритих файлів - No such file or directory - Немає такого файлу або каталогу - - - + Файл чи тека не існують + + No space left on device - На пристрої не лишилось місця - - - + На пристрої немає вільного місця + + Unknown error Невідома помилка @@ -2549,271 +3279,196 @@ QInputContext - XIM XIM - + FEP + FEP + + XIM input method Метод введення XIM - Windows input method Метод введення Windows - Mac OS X input method Метод введення Mac OS X + + S60 FEP input method + Метод введення S60 FEP + QInputDialog - Enter a value: - + Введіть значення: QLibrary - QLibrary::load_sys: Cannot load %1 (%2) - QLibrary::load_sys: неможливо завантажити %1 (%2) - - - QLibrary::unload_sys: Cannot unload %1 (%2) - QLibrary::unload_sys: неможливо вивантажити %1 (%2) - - - QLibrary::resolve_sys: Symbol "%1" undefined in %2 (%3) - QLibrary::resolve_sys: символ "%1" не є визначеним в %2 (%3) - - - - Could not mmap '%1': %2 - Помилка виконання mmap "%1": %2 - - - Plugin verification data mismatch in '%1' - Дані перевірки додатку не збігаються в "%1" - - - - Could not unmap '%1': %2 - Помилка виконання unmap "%1": %2 - - - + Дані верифікації додатку не збігаються для ’%1’ + + + The shared library was not found. + Динамічна бібліотека не знайдена. + + + The file '%1' is not a valid Qt plugin. + Файл '%1' не є правильний додатком Qt. + + The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] - Додаток "%1" використовує несумісну бібліотеку Qt. (%2.%3.%4) [%5] - - - + Додаток '%1' використовує несумісну версію бібліотеки Qt. (%2.%3.%4) [%5] + + The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" - Додаток "%1" використовує несумісну бібліотеку Qt. Очікувався ключ побудови "%2", отримано "%3" - - - + Додаток '%1' використовує несумісну версію бібліотеки Qt. Очікувався ключ збірки "%2", отримано "%3" + + + The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) + Додаток '%1' використовує несумісну версію бібліотеки Qt. (Неможливо змішувати зневаджувальні та релізні бібліотеки.) + + Unknown error Невідома помилка - - - The shared library was not found. - Спільну бібліотеку не знайдено. - - - - The file '%1' is not a valid Qt plugin. - Файл "%1" не є правильним додатком Qt. - - - - The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) - Додаток "%1" використовує несумісну бібліотеку Qt. (Не дозволяється змішувати версію бібліотеки для зневадження і версію випуску.) - - - - Cannot load library %1: %2 - - - - - + Неможливо завантажити бібліотеку %1: %2 + + Cannot unload library %1: %2 - - - - - + Неможливо вивантажити бібліотеку %1: %2 + + Cannot resolve symbol "%1" in %2: %3 - + Неможливо розв’язати символ "%1" в %2: %3 QLineEdit - &Undo &Повернути - &Redo П&овторити - Cu&t Ви&різати - &Copy &Копіювати - &Paste &Вставити - Delete - Вилучити - - - + Видалити + + Select All - Вибрати все + Виділити все QLocalServer - - %1: Name error - - - - + %1: Помилка імені + + %1: Permission denied - - - - + %1: Доступ заборонено + + %1: Address in use - - - - - + %1: Адреса використовується + + %1: Unknown error %2 - + %1: Невідома помилка %2 QLocalSocket - - %1: Connection refused - - - - - + %1: У з'єднанні відмовлено + + %1: Remote closed - - - - - - - + %1: Віддалений кінець закрито + + %1: Invalid name - - - - - + %1: Неправильне ім'я + + %1: Socket access error - - - - - + %1: Помилка доступу до сокета + + %1: Socket resource error - - - - - + %1: Помилка ресурсу сокета + + %1: Socket operation timed out - - - - - + %1: Час на операцію з сокетом вичерпано + + %1: Datagram too large - - - - - - + %1: Завелика датаграма + + %1: Connection error - - - - - + %1: Помилка з'єднання + + %1: The socket operation is not supported - - - - + %1: Непідтримувана для сокета операція + + %1: Unknown error - - - - - + %1: Невідома помилка + + %1: Unknown error %2 - + %1: Невідома помилка %2 QMYSQLDriver - Unable to open database ' - Неможливо відкрити базу даних - - - + Неможливо відкрити базу даних ' + + Unable to connect - Неможливо з'єднатися - - - + Неможливо з'єднатись + + Unable to begin transaction Неможливо почати транзакцію - Unable to commit transaction Неможливо завершити транзакцію - Unable to rollback transaction Неможливо відкотити транзакцію @@ -2821,182 +3476,143 @@ QMYSQLResult - Unable to fetch data - Неможливо вибрати дані - - - + Неможливо отримати дані + + Unable to execute query Неможливо виконати запит - Unable to store result - Неможливо записати результат - - - - + Неможливо зберегти результат + + + Unable to execute next query + Неможливо виконати наступний запит + + + Unable to store next result + Неможливо зберегти наступний результат + + Unable to prepare statement - Неможливо підготувати оператор - - - + Неможливо підготувати вираз + + Unable to reset statement - Неможливо скинути оператор - - - + Неможливо скинути вираз + + Unable to bind value Неможливо прив'язати значення - Unable to execute statement - Неможливо виконати оператор - - - - + Неможливо виконати вираз + + Unable to bind outvalues Неможливо прив'язати вихідні значення - Unable to store statement results - Неможливо зберегти результати оператора - - - - Unable to execute next query - - - - - Unable to store next result - + Неможливо зберегти результати виразу QMdiArea - (Untitled) - + (Без назви) QMdiSubWindow - + - [%1] + + + %1 - [%2] %1 - [%2] - - Close - Закрити - - - Minimize Мінімізувати - + Maximize + Максимізувати + + + Unshade + Розгорнути із заголовка + + + Shade + Згорнути в заголовок + + Restore Down - Відновити додолу - - - + Відновити + + + Restore + Відновити + + + Close + Закрити + + + Help + Довідка + + + Menu + Меню + + &Restore &Відновити - &Move &Пересунути - &Size &Розмір - Mi&nimize - Мі&німізувати - - - + М&інімізувати + + Ma&ximize - Ма&ксимізувати - - - + М&аксимізувати + + Stay on &Top - Лишатися над &іншими - - - + Залишатись на &горі + + &Close - &Закрити - - - - - [%1] - - - - - Maximize - Максимізувати - - - - Unshade - - - - - Shade - - - - - Restore - - - - - Help - Довідка - - - - Menu - Menu + Закри&ти QMenu - - Close Закрити - - Open Відкрити - - - Execute Виконати @@ -3004,1615 +3620,1221 @@ QMenuBar - About - Про - - - Config - Конфігурація - - - Preference - Вподобання - - - Options - Опції - - - Setting - Параметри - - - Setup - Встановлення - - - Quit - Вийти - - - Exit - Вийти - - - About %1 - Про %1 - - - About Qt - Про Qt - - - Preferences - Вподобання - - - Quit %1 - Вийти %1 + Actions + Дії QMessageBox - + Show Details... + Показати деталі... + + + Hide Details... + Приховати деталі... + + + OK + OK + + Help Довідка - - - - - OK - Гаразд - - - + <h3>About Qt</h3><p>This program uses Qt version %1.</p> + <h3>Про Qt</h3><p>Ця програма використовує Qt версії %1.</p> + + + <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> + <p>Qt - це інструментарій для крос-платформної розробки програм на C++.</p><p>Qt надає переносимість єдиного коду між MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux та усіма іншими головними комерційними варіантами Unix. Також, Qt доступна для вбудованих пристроїв у вигляді Qt для Embedded Linux та Qt для Windows CE.</p><p>Qt доступна на умовах трьох різних опцій ліцензування з метою задоволення потреб усіх наших різноманітних користувачів.</p><p>Qt ліцензована на умовах нашої комерційної ліцензійної угоди придатна для розробки пропієтарного/комерційного програмного забезпечення тоді, коли ви не бажаєте надавати будь-який код чи коли не можете прийняти умови ліцензій GNU LGPL версії 2.1 чи GNU GPL версії 3.0.</p><p>Qt ліцензована на умовах GNU LGPL версії 2.1 придатна для розробки програм на базі Qt (пропієтарних або з відкритим кодом) за умови, що ви можете погодитись з вимогами та умовами GNU LGPL версії 2.1.</p><p>Qt ліцензована на умовах GNU General Public License версії 3.0 придатна для розробки програм на базі Qt, коли ви бажаєте використовувати такі програми у поєднанні з програмним забезпеченням, що підпадає під вимоги GNU GPL версії 3.0 або коли ви бажаєте дотримуватись вимог GNU GPL версії 3.0.</p><p>Будь ласка, перегляньте <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> для огляду ліцензування Qt.</p><p>Copyright (C) 2010 Корпорація Nokia та/або її дочірні компанії.</p><p>Qt - це продукт Nokia. Подивіться <a href="http://qt.nokia.com/">qt.nokia.com</a> для додаткової інформації.</p> + + About Qt Про Qt - - <p>This program uses Qt version %1.</p> - <p>Ця програма використовує Qt версії %1.</p> - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - <h3>Про Qt</h3>%1<p>Qt - це інструментарій C++ для міжплатформової розробки.</p><p>Qt забезпечує мобільність єдиних джерельних текстів між MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux та всіма основними комерційними версіями Unix. Qt існує також для вбудованих пристроїв, таких, як Qtopia Core.</p><p>Qt - це продукт компанії Trolltech. Більше інформації можна знайти на <a href="http://qt.nokia.com/">qt.nokia.com</a>.</p> - - - - Show Details... - Показати подробиці... - - - - Hide Details... - Сховати подробиці... - - - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Ця програма використовує Qt Open Source Edition версії %1.</p><p>Qt Open Source Edition призначено для розробки відкритих програмних засобів. Для розробки власницьких (закритих) програм вам потрібна комерційна ліцензія для Qt.</p><p>Перегляньте <a href="http://qt.nokia.com/company/model/">qt.nokia.com/company/model/</a> щодо огляду ліцензій Qt.</p> - QMultiInputContext - Select IM - Вибрати метод вводу + Виберіть метод введення QMultiInputContextPlugin - Multiple input method switcher - Перемикач методів вводу - - - + Перемикач методів введення + + Multiple input method switcher that uses the context menu of the text widgets - Перемикач методів вводу, що використовує контекстне меню текстових віджетів + Перемикач методів введення, що використовує контекстне меню текстових віджетів QNativeSocketEngine - + Unable to initialize non-blocking socket + Неможливо ініціалізувати неблокувальний сокет + + + Unable to initialize broadcast socket + Неможливо ініціалізувати широкомовний сокет + + + Attempt to use IPv6 socket on a platform with no IPv6 support + Спроба використати сокет IPv6 на платформі без підтримки IPv6 + + The remote host closed the connection - Віддалений вузол закрив з'єднання - - - + Віддалений вузол закрив з’єднання + + Network operation timed out - Перевищено термін очікування мережевої дії - - - + Час на мережеву операцію вичерпано + + Out of resources - Вичерпано всі ресурси - - - + Недостатньо ресурсів + + Unsupported socket operation - Непідтримувана дія сокетів - - - + Непідтримувана для сокета операція + + Protocol type not supported Тип протоколу не підтримується - Invalid socket descriptor - Неправильний опис сокету - - - + Неправильний дескриптор сокета + + + Host unreachable + Вузол недоступний + + Network unreachable - Мережа недосяжна - - - + Мережа недоступна + + Permission denied - Відмовлено у доступі - - - + Доступ заборонено + + Connection timed out - Перевищено термін очікування для з'єднання - - - + Час на з’єднання вичерпано + + Connection refused - Відмовлено у зв'язку - - - + У з'єднанні відмовлено + + The bound address is already in use - Прив'язана адреса вже використовується - - - + Адреса вже використовується + + The address is not available - Адреса недоступна - - - + Адреса не доступна + + The address is protected Адреса захищена - + Datagram was too large to send + Датаграма завелика, щоб надіслати + + Unable to send a message - Неможливо відіслати повідомлення - - - + Неможливо надіслати повідомлення + + Unable to receive a message Неможливо отримати повідомлення - Unable to write Неможливо записати - Network error Помилка мережі - Another socket is already listening on the same port - Інший сокет вже слухає цей порт - - - - Unable to initialize non-blocking socket - Неможливо ініціалізувати неблокувальний сокет - - - - Unable to initialize broadcast socket - Неможливо ініціалізувати широкомовний сокет - - - - Attempt to use IPv6 socket on a platform with no IPv6 support - Спроба використати сокет IPv6 на платформі без підтримки IPv6 - - - - Host unreachable - Вузол недосяжний - - - - Datagram was too large to send - Дейтаграма є завеликою для відсилання - - - + Інший сокет вже слухає цей самий порт + + Operation on non-socket - Дія на об'єкті, що не є сокетом - - - + Операція з не-сокетом + + + The proxy type is invalid for this operation + Неправильний тип проксі-серверу для цієї операції + + Unknown error Невідома помилка - - - The proxy type is invalid for this operation - - QNetworkAccessCacheBackend - Error opening %1 - + Помилка відкриття %1 + + + + QNetworkAccessDataBackend + + Operation not supported on %1 + Непідтримувана для %1 операція + + + Invalid URI: %1 + Неправильний URI: %1 + + + + QNetworkAccessDebugPipeBackend + + Write error writing to %1: %2 + Помилка запису в %1: %2 + + + Socket error on %1: %2 + Помилка сокета для %1: %2 + + + Remote host closed the connection prematurely on %1 + Віддалений вузол несподівано закрив з’єднання для %1 QNetworkAccessFileBackend - Request for opening non-local file %1 - - - - + Запит на відкриття нелокального файлу %1 + + + Cannot open %1: Path is a directory + Неможливо відкрити %1: Шлях є текою + + Error opening %1: %2 - - - - + Помилка відкриття %1: %2 + + Write error writing to %1: %2 - - - - - Cannot open %1: Path is a directory - - - - + Помилка запису в %1: %2 + + Read error reading from %1: %2 - + Помилка читання з %1: %2 QNetworkAccessFtpBackend - No suitable proxy found - - - - + Не знайдено придатного проксі-сервера + + Cannot open %1: is a directory - - - - + Неможливо відкрити %1: шлях є текою + + Logging in to %1 failed: authentication required - - - - + Збій входу до %1: необхідна авторизація + + Error while downloading %1: %2 - - - - + Помилка звантаження %1: %2 + + Error while uploading %1: %2 - + Помилка вивантаження %1: %2 QNetworkAccessHttpBackend - No suitable proxy found - + Не знайдено придатного проксі-сервера + + + + QNetworkAccessManager + + Network access is disabled. + Доступ до мережі вимкнено. QNetworkReply - Error downloading %1 - server replied: %2 - - - - + Помилка звантаження %1 - сервер відповів: %2 + + Protocol "%1" is unknown - + Невідомий протокол "%1" + + + Network session error. + Помилка мережевої сесії. + + + Temporary network failure. + Тимчасовий збій мережі. QNetworkReplyImpl - - Operation canceled - + Операція скасована + + + + QNetworkSession + + Invalid configuration. + Неправильні налаштування. + + + + QNetworkSessionPrivateImpl + + Roaming error + Помилка переміщення + + + Session aborted by user or system + Сесія перервана користувачем або системою + + + Unidentified Error + Невизначена помилка + + + Unknown session error. + Невідома помилка сесії. + + + The session was aborted by the user or system. + Сесія перервана користувачем або системою. + + + The requested operation is not supported by the system. + Операція, що запитується, не підтримується системою. + + + The specified configuration cannot be used. + Неможливо використати вказані налаштування. + + + Roaming was aborted or is not possible. + Переміщення було перерване або неможливе. QOCIDriver - - Unable to logon - Неможливо зайти - - - Unable to initialize QOCIDriver - Неможливо ініціалізуватиQOCIDriver - - - + Неможливо ініціалізувати + + + Unable to logon + Неможливо авторизуватись + + Unable to begin transaction - Неможливо почати транзакцію - - - + Неможливо почати транзакцію + + Unable to commit transaction - Неможливо завершити транзакцію - - - + Неможливо завершити транзакцію + + Unable to rollback transaction - Неможливо відкотити транзакцію + Неможливо відкотити транзакцію QOCIResult - - - Unable to bind column for batch execute - Неможливо прив'язати стовпчик для пакетного виконання - - - + Неможливо прив’язати стовпець для пакетного виконання + + Unable to execute batch statement - Неможливо виконати пакетний оператор - - - + Неможливо виконати пакетний вираз + + Unable to goto next Неможливо перейти до наступного - Unable to alloc statement - Неможливо розмістити оператор - - - + Неможливо виділити вираз + + Unable to prepare statement - Неможливо підготувати оператор - - - + Неможливо підготувати вираз + + + Unable to get statement type + Неможливо визначити тип виразу + + Unable to bind value Неможливо прив'язати значення - Unable to execute select statement - Неможливо виконати оператор вибирання - - - Unable to execute statement - Неможливо виконати оператор + Неможливо виконати вираз QODBCDriver - Unable to connect - Неможливо з'єднатися - - - - Unable to connect - Driver doesn't support all needed functionality - Неможливо з'єднатися - драйвер не підтримує всіх потрібних функцій - - - + Неможливо з'єднатись + + + Unable to connect - Driver doesn't support all functionality required + Неможливо з'єднатись - Драйвер не підтримує усю необхідну функціональність + + Unable to disable autocommit Неможливо вимкнути автозавершення транзакцій - Unable to commit transaction Неможливо завершити транзакцію - Unable to rollback transaction Неможливо відкотити транзакцію - Unable to enable autocommit - Неможливо ввімкнути автозавершення транзакцій + Неможливо увімкнути автозавершення транзакцій QODBCResult - - + Unable to fetch last + Неможливо отримати останній запис + + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - QODBCResult::reset: неможливо встановити 'SQL_CURSOR_STATIC', як атрибут оператора. Будь ласка, перевірте налаштування драйвера ODBC - - - - + QODBCResult::reset: Неможливо встановити 'SQL_CURSOR_STATIC', як атрибут виразу. Будь ласка, перевірте налаштування вашого драйверу ODBC + + Unable to execute statement - Неможливо виконати оператор - - - + Неможливо виконати вираз + + + Unable to fetch + Неможливо отримати + + Unable to fetch next - Неможливо вибрати наступний - - - + Неможливо отримати наступний запис + + + Unable to fetch first + Неможливо отримати перший запис + + + Unable to fetch previous + Неможливо отримати попередній запис + + Unable to prepare statement - Неможливо підготувати оператор - - - + Неможливо підготувати вираз + + Unable to bind variable Неможливо прив'язати змінну - - - - - Unable to fetch last - - - - - Unable to fetch - - - - - Unable to fetch first - Неможливо вибрати перший - - - - Unable to fetch previous - - QObject - - Home - Home - - - - Operation not supported on %1 - - - - - Invalid URI: %1 - - - - - Write error writing to %1: %2 - - - - - Read error reading from %1: %2 - - - - - Socket error on %1: %2 - - - - - Remote host closed the connection prematurely on %1 - - - - - Protocol error: packet of size 0 received - - - - - - No host name given - + PulseAudio Sound Server + Звуковий сервер PulseAudio + + + "%1" duplicates a previous role name and will be disabled. + "%1" повторює назву попередньої ролі та буде вимкнене. + + + invalid query: "%1" + неправильний запит "%1" QPPDOptionsModel - Name - Ім'я - - - + Назва + + Value - Значення + Значення QPSQLDriver - Unable to connect - Неможливо з'єднатися - - - + Неможливо з'єднатись + + Could not begin transaction - Неможливо почати транзакцію - - - + Не вдалося почати транзакцію + + Could not commit transaction - Неможливо завершити транзакцію - - - + Не вдалося завершити транзакцію + + Could not rollback transaction - Неможливо відкотити транзакцію - - - + Не вдалося відкотити транзакцію + + Unable to subscribe - - - - + Неможливо підписатись + + Unable to unsubscribe - + Неможливо відписатись QPSQLResult - Unable to create query Неможливо створити запит - Unable to prepare statement - Неможливо підготувати оператор + Неможливо підготувати вираз QPageSetupWidget - - Centimeters (cm) - - - - - Millimeters (mm) - - - - - Inches (in) - - - - - Points (pt) - - - - Form - - - - + Форма + + Paper - - - - + Папір + + Page size: - Розмір сторінки: - - - + Розмір сторінки: + + Width: - - - - + Ширина: + + Height: - - - - + Висота: + + Paper source: - Джерело паперу: - - - + Джерело паперу: + + Orientation - - - - + Орієнтація + + Portrait - Книжкове - - - + Портрет + + Landscape - Альбомне - - - + Ландшафт + + Reverse landscape - - - - + Обернений ландшафт + + Reverse portrait - - - - + Обернений портрет + + Margins - - - - + Поля + + top margin - - - - + верхнє поле + + left margin - - - - + ліве поле + + right margin - - - - + праве поле + + bottom margin - + нижнє поле + + + Centimeters (cm) + Сантиметри (см) + + + Millimeters (mm) + Міліметри (мм) + + + Inches (in) + Дюйми (in) + + + Points (pt) + Точки (pt) QPluginLoader - + The plugin was not loaded. + Додаток не було завантажено. + + Unknown error Невідома помилка - - - The plugin was not loaded. - Додаток не було завантажено. - QPrintDialog - + Print + Друк + + + A0 + + + + A1 + + + + A2 + + + + A3 + + + + A4 + + + + A5 + + + + A6 + + + + A7 + + + + A8 + + + + A9 + + + + B0 + + + + B1 + + + + B2 + + + + B3 + + + + B4 + + + + B5 + + + + B6 + + + + B7 + + + + B8 + + + + B9 + + + + B10 + + + + C5E + + + + DLE + + + + Executive + Executive + + + Folio + Folio + + + Ledger + Ledger + + + Legal + Legal + + + Letter + Letter + + + Tabloid + Tabloid + + + US Common #10 Envelope + US Common #10 Envelope + + + Custom + Користувацький + + + File exists + Файл існує + + + <qt>Do you want to overwrite it?</qt> + <qt>Бажаєте перезаписати його?</qt> + + + A0 (841 x 1189 mm) + A0 (841 x 1189 мм) + + + A1 (594 x 841 mm) + A1 (594 x 841 мм) + + + A2 (420 x 594 mm) + A2 (420 x 594 мм) + + + A3 (297 x 420 mm) + A3 (297 x 420 мм) + + + A4 (210 x 297 mm, 8.26 x 11.7 inches) + A4 (210 x 297 мм, 8.26 x 11.7 дюймів) + + + A5 (148 x 210 mm) + A5 (148 x 210 мм) + + + A6 (105 x 148 mm) + A6 (105 x 148 мм) + + + A7 (74 x 105 mm) + A7 (74 x 105 мм) + + + A8 (52 x 74 mm) + A8 (52 x 74 мм) + + + A9 (37 x 52 mm) + A9 (37 x 52 мм) + + + B0 (1000 x 1414 mm) + B0 (1000 x 1414 мм) + + + B1 (707 x 1000 mm) + B1 (707 x 1000 мм) + + + B2 (500 x 707 mm) + B2 (500 x 707 мм) + + + B3 (353 x 500 mm) + B3 (353 x 500 мм) + + + B4 (250 x 353 mm) + B4 (250 x 353 мм) + + + B5 (176 x 250 mm, 6.93 x 9.84 inches) + B5 (176 x 250 мм, 6.93 x 9.84 дюймів) + + + B6 (125 x 176 mm) + B6 (125 x 176 мм) + + + B7 (88 x 125 mm) + B7 (88 x 125 мм) + + + B8 (62 x 88 mm) + B8 (62 x 88 мм) + + + B9 (44 x 62 mm) + B9 (44 x 62 мм) + + + B10 (31 x 44 mm) + B10 (31 x 44 мм) + + + C5E (163 x 229 mm) + C5E (163 x 229 мм) + + + DLE (110 x 220 mm) + DLE (110 x 220 мм) + + + Executive (7.5 x 10 inches, 191 x 254 mm) + Executive (7.5 x 10 дюймів, 191 x 254 мм) + + + Folio (210 x 330 mm) + Folio (210 x 330 мм) + + + Ledger (432 x 279 mm) + Ledger (432 x 279 мм) + + + Legal (8.5 x 14 inches, 216 x 356 mm) + Legal (8.5 x 14 дюймів, 216 x 356 мм) + + + Letter (8.5 x 11 inches, 216 x 279 mm) + Letter (8.5 x 11 дюймів, 216 x 279 мм) + + + Tabloid (279 x 432 mm) + Tabloid (279 x 432 мм) + + + US Common #10 Envelope (105 x 241 mm) + US Common #10 Envelope (105 x 241 мм) + + + Print all + Друкувати все + + + Print selection + Друкувати виділення + + + Print range + Діапазон друку + + + Print current page + Друкувати поточну сторінку + + + &Options >> + &Опції >> + + + &Print + &Друк + + + &Options << + &Опції << + + + Print to File (PDF) + Друкувати в файл (PDF) + + + Print to File (Postscript) + Друкувати в файл (Postscript) + + + Local file + Локальний файл + + + Write %1 file + Записати в файл %1 + + + Print To File ... + Друкувати в файл... + + + %1 is a directory. +Please choose a different file name. + %1 - тека. +Будь ласка, оберіть інше ім'я файлу. + + + File %1 is not writable. +Please choose a different file name. + До файлу %1 неможливо писати. +Будь ласка, оберіть інше ім'я файлу. + + + %1 already exists. +Do you want to overwrite it? + %1 вже існує. +Бажаєте перезаписати його? + + + The 'From' value cannot be greater than the 'To' value. + Значення поля 'З' не може бути більшим значення поля 'По'. + + + OK + OK + + locally connected - локальне з'єднання - - - - + локально з'єднано + + Aliases: %1 - Псевдонім: %1 - - - - + Псевдоніми: %1 + + unknown невідомо + + + QPrintPreviewDialog + + Page Setup + Параметри сторінки + + + %1% + + + + Print Preview + Попередній перегляд друку + + + Next page + Наступна сторінка + + + Previous page + Попередня сторінка + + + First page + Перша сторінка + + + Last page + Остання сторінка + + + Fit width + По ширині + + + Fit page + Усю сторінку + + + Zoom in + Збільшити + + + Zoom out + Зменшити + Portrait - Книжкове + Портрет Landscape - Альбомне - - - - A0 (841 x 1189 mm) - A0 (841 x 1189 мм) - - - - A1 (594 x 841 mm) - A1 (594 x 841 мм) - - - - A2 (420 x 594 mm) - A2 (420 x 594 мм) - - - - A3 (297 x 420 mm) - A3 (297 x 420 мм) - - - - A4 (210 x 297 mm, 8.26 x 11.7 inches) - A4 (210 x 297 мм, 8.26 x 11.7 дюймів) - - - - A5 (148 x 210 mm) - A5 (148 x 210 мм) - - - - A6 (105 x 148 mm) - A6 (105 x 148 мм) - - - - A7 (74 x 105 mm) - A7 (74 x 105 мм) - - - - A8 (52 x 74 mm) - A8 (52 x 74 мм) - - - - A9 (37 x 52 mm) - A9 (37 x 52 мм) - - - - B0 (1000 x 1414 mm) - B0 (1000 x 1414 мм) - - - - B1 (707 x 1000 mm) - B1 (707 x 1000 мм) - - - - B2 (500 x 707 mm) - B2 (500 x 707 мм) - - - - B3 (353 x 500 mm) - B3 (353 x 500 мм) - - - - B4 (250 x 353 mm) - B4 (250 x 353 мм) - - - - B5 (176 x 250 mm, 6.93 x 9.84 inches) - B5 (176 x 250 мм, 6.93 x 9.84 дюймів) - - - - B6 (125 x 176 mm) - B6 (125 x 176 мм) - - - - B7 (88 x 125 mm) - B7 (88 x 125 мм) - - - - B8 (62 x 88 mm) - B8 (62 x 88 мм) - - - - B9 (44 x 62 mm) - B9 (44 x 62 мм) - - - - B10 (31 x 44 mm) - B10 (31 x 44 мм) - - - - C5E (163 x 229 mm) - C5E (163 x 229 мм) - - - - DLE (110 x 220 mm) - DLE (110 x 220 мм) - - - - Executive (7.5 x 10 inches, 191 x 254 mm) - Executive (7.5 x 10 дюймів, 191 x 254 мм) - - - - Folio (210 x 330 mm) - Folio (210 x 330 мм) - - - - Ledger (432 x 279 mm) - Ledger (432 x 279 мм) - - - - Legal (8.5 x 14 inches, 216 x 356 mm) - Legal (8.5 x 14 inches, 216 x 356 мм) - - - - Letter (8.5 x 11 inches, 216 x 279 mm) - Letter (8.5 x 11 inches, 216 x 279 мм) - - - - Tabloid (279 x 432 mm) - Tabloid (279 x 432 мм) - - - - US Common #10 Envelope (105 x 241 mm) - US Common #10 Envelope (105 x 241 мм) - - - - OK - Гаразд - - - Cancel - Скасувати - - - Page size: - Розмір сторінки: - - - Orientation: - Розташування: - - - Paper source: - Джерело паперу: - - - - - + Ландшафт + + + Show single page + Показати одну сторінку + + + Show facing pages + Показати титульні сторінки + + + Show overview of all pages + Показати огляд усіх сторінок + + Print - Друкувати - - - File - Файл - - - Printer - Принтер - - - - Print To File ... - Друкувати в файл... - - - Print dialog - Діалог друку - - - Paper format - Формат паперу - - - Size: - Розмір: - - - Properties - Властивості - - - Printer info: - Дані про принтер: - - - Browse - Навігація - - - Print to file - Друкувати в файл - - - + Друк + + + Page setup + Параметри сторінки + + + Close + Закрити + + + Export to PDF + Експорт в PDF + + + Export to PostScript + Експорт в PostScript + + + + QPrintPropertiesWidget + + Form + Форма + + + Page + Сторінка + + + Advanced + Розширені + + + + QPrintSettingsOutput + + Form + Форма + + + Copies + Копії + + Print range Діапазон друку - Print all Друкувати все Pages from - Сторінки з + Сторінки з to - по + до + + + Current Page + Поточну сторінку Selection - Вибрані - - - Copies - Копії - - - Number of copies: - Кількість копій: + Виділення + + + Output Settings + Налаштування виводу + + + Copies: + Копій: Collate - Сортувати - - - Print last page first - Друкувати останню сторінку першою - - - Other - Інше - - - Print in color if available - Друкувати в кольорах, якщо можливо - - - Double side printing - Двосторонній друк - - - - File %1 is not writable. -Please choose a different file name. - Файл %1 не дозволяє запис. -Будь ласка, виберіть інше ім'я файлу. - - - - %1 already exists. -Do you want to overwrite it? - %1 вже існує.Перезаписати? - - - - File exists - Файл існує - - - - <qt>Do you want to overwrite it?</qt> - <qt>Перезаписати?</qt> - - - - Print selection - Друкувати вибране - - - - %1 is a directory. -Please choose a different file name. - %1 є каталогом. -Введіть інше ім'я файлу. - - - - A0 - - - - - A1 - - - - - A2 - - - - - A3 - - - - - A4 - - - - - A5 - - - - - A6 - - - - - A7 - - - - - A8 - - - - - A9 - - - - - B0 - - - - - B1 - - - - - B2 - - - - - B3 - - - - - B4 - - - - - B5 - - - - - B6 - - - - - B7 - - - - - B8 - - - - - B9 - - - - - B10 - - - - - C5E - - - - - DLE - - - - - Executive - - - - - Folio - - - - - Ledger - - - - - Legal - - - - - Letter - - - - - Tabloid - - - - - US Common #10 Envelope - - - - - Custom - - - - - - &Options >> - - - - - &Print - - - - - &Options << - - - - - Print to File (PDF) - - - - - Print to File (Postscript) - - - - - Local file - - - - - Write %1 file - - - - - The 'From' value cannot be greater than the 'To' value. - - - - - QPrintPreviewDialog - - - - Page Setup - - - - - %1% - - - - - Print Preview - - - - - Next page - - - - - Previous page - - - - - First page - - - - - Last page - - - - - Fit width - - - - - Fit page - - - - - Zoom in - - - - - Zoom out - - - - - Portrait - Книжкове - - - - Landscape - Альбомне - - - - Show single page - - - - - Show facing pages - - - - - Show overview of all pages - - - - - Print - Друкувати - - - - Page setup - - - - - Close - Закрити - - - - Export to PDF - - - - - Export to PostScript - - - - - QPrintPropertiesDialog - - PPD Properties - Властивості PPD - - - Save - Зберегти - - - OK - Гаразд - - - - QPrintPropertiesWidget - - - Form - - - - - Page - - - - - Advanced - - - - - QPrintSettingsOutput - - - Form - - - - - Copies - Копії - - - - Print range - Діапазон друку - - - - Print all - Друкувати все - - - - Pages from - Сторінки з - - - - to - по - - - - Selection - Вибрані - - - - Output Settings - - - - - Copies: - - - - - Collate - Сортувати - - - + Розібрати по копіях + + Reverse - - - - + В зворотньому порядку + + Options - Опції - - - + Параметри + + Color Mode - - - - + Режим кольору + + Color - - - - + Колір + + Grayscale - - - - + Відтінки сірого + + Duplex Printing - - - - + Двосторонній друк + + None - - - - + Відсутній + + Long side - - - - + По довгій стороні + + Short side - + По короткій стороні QPrintWidget - Form - - - - + Форма + + Printer - Принтер - - - + Принтер + + &Name: - - - - + &Назва: + + P&roperties - - - - + &Властивості + + Location: - - - - + Розташування: + + Preview - - - - + Перегляд + + Type: - - - - + Тип: + + Output &file: - - - - + Вихідний &файл: + + ... - + ... QProcess - - + Error reading from process + Помилка читання з процесу + + + Error writing to process + Помилка запису в процес + + + Process crashed + Процес аварійно завершився + + + No program defined + Програму не задано + + Could not open input redirection for reading - - - - - + Не вдалося відкрити перенаправлення введення для читання + + Could not open output redirection for writing - - - - + Не вдалося відкрити перенаправлення виведення для запису + + Resource error (fork failure): %1 - - - - - - - - - - - - + Помилка ресурсу (збій fork): %1 + + Process operation timed out - - - - - - - - Error reading from process - - - - - - - Error writing to process - - - - - Process crashed - - - - - No program defined - - - - - Process failed to start - + Час на операцію з процесом вичерпано + + + Process failed to start: %1 + Збій запуску процесу: %1 QProgressDialog - Cancel Скасувати @@ -4620,7 +4842,6 @@ QPushButton - Open Відкрити @@ -4628,928 +4849,1559 @@ QRadioButton - Check - Поставити позначку + Відмітити QRegExp - no error occurred без помилок - disabled feature used - вжито вимкнену можливість - - - + використана вимкнена можливість + + bad char class syntax - неправильний синтаксис класу символу - - - + неправильний синтаксис класу символів + + bad lookahead syntax - неправильний синтаксис перегляду вперед - - - + неправильний синтаксис "lookahead" + + bad repetition syntax неправильний синтаксис повторення - invalid octal value неправильне вісімкове значення - missing left delim відсутній лівий розділювач - unexpected end неочікуваний кінець - met internal limit - досягнуто внутрішній ліміт + досягнуто внутрішнього обмеження + + + invalid interval + неправильний інтервал + + + invalid category + неправильна категорія QSQLite2Driver - - Error to open database - Помилка відкривання бази даних - - - + Error opening database + Помилка відкриття бази даних + + Unable to begin transaction Неможливо почати транзакцію - Unable to commit transaction Неможливо завершити транзакцію - - Unable to rollback Transaction + Unable to rollback transaction Неможливо відкотити транзакцію QSQLite2Result - Unable to fetch results - Неможливо витягнути результат - - - + Неможливо отримати результати + + Unable to execute statement - Неможливо виконати оператор + Неможливо виконати вираз QSQLiteDriver - Error opening database - Неможливо відкрити базу даних - - - + Помилка відкриття бази даних + + Error closing database - Помилка закривання бази даних - - - + Помилка закриття бази даних + + Unable to begin transaction Неможливо почати транзакцію - Unable to commit transaction Неможливо завершити транзакцію - Unable to roll back transaction - Неможливо відкотити транзакцію - - - Unable to rollback transaction - Неможливо відкотити транзакцію + Неможливо відкотити транзакцію QSQLiteResult - - - Unable to fetch row - Неможливо вибрати рядок - - - + Неможливо отримати рядок + + + No query + Запит відсутній + + Unable to execute statement - Неможливо виконати оператор - - - + Неможливо виконати вираз + + Unable to reset statement - Неможливо скинути оператор - - - + Неможливо скинути вираз + + Unable to bind parameters Неможливо прив'язати параметри - Parameter count mismatch Кількість параметрів не збігається - - - No query - + + + QScriptBreakpointsModel + + ID + + + + Location + Позиція + + + Condition + Умова + + + Ignore-count + Пропущено + + + Single-shot + Один раз + + + Hit-count + Збігів + + + + QScriptBreakpointsWidget + + New + Новий + + + Delete + Видалити + + + + QScriptDebugger + + Go to Line + Перейти до рядка + + + Line: + Рядок: + + + Interrupt + Перервати + + + Shift+F5 + + + + Continue + Продовжити + + + F5 + + + + Step Into + Увійти в + + + F11 + + + + Step Over + Перейти через + + + F10 + + + + Step Out + Вийти з + + + Shift+F11 + + + + Run to Cursor + Виконати до курсору + + + Ctrl+F10 + + + + Run to New Script + Виконати до нового скрипту + + + Toggle Breakpoint + Перемкнути точку перепину + + + F9 + + + + Clear Debug Output + Очистити зневаджувальне виведення + + + Clear Error Log + Очистити журнал помилок + + + Clear Console + Очистити консоль + + + &Find in Script... + &Знайти в скрипті... + + + Ctrl+F + + + + Find &Next + Знайти &наступне + + + F3 + + + + Find &Previous + Знайти &попереднє + + + Shift+F3 + + + + Ctrl+G + + + + Debug + Зневадження + + + + QScriptDebuggerCodeFinderWidget + + Close + Закрити + + + Previous + Попередній + + + Next + Наступний + + + Case Sensitive + Враховувати регістр + + + Whole words + Цілі слова + + + <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped + <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Пошук з початку + + + + QScriptDebuggerLocalsModel + + Name + Назва + + + Value + Значення + + + + QScriptDebuggerStackModel + + Level + Рівень + + + Name + Назва + + + Location + Позиція + + + + QScriptEdit + + Toggle Breakpoint + Перемкнути точку перепину + + + Disable Breakpoint + Вимкнути точку перепину + + + Enable Breakpoint + Увімкнути точку перепину + + + Breakpoint Condition: + Умова перепину: + + + + QScriptEngineDebugger + + Loaded Scripts + Завантажені скрипти + + + Breakpoints + Точки перепину + + + Stack + Стек + + + Locals + Локальні змінні + + + Console + Консоль + + + Debug Output + Зневаджувальне виведення + + + Error Log + Журнал помилок + + + Search + Пошук + + + View + Вид + + + Qt Script Debugger + Зневаджувач скриптів Qt + + + + QScriptNewBreakpointWidget + + Close + Закрити QScrollBar - Scroll here Прокрутити сюди - Left edge - Лівий край - - - + До лівої границі + + Top - Верх - - - + Вгору + + Right edge - Правий край - - - + До правої границі + + Bottom - Низ - - - + Донизу + + Page left - Сторінка ліворуч - - - - + На сторінку вліво + + Page up - Сторінка вгору - - - + На сторінку вгору + + Page right - Сторінка праворуч - - - - + На сторінку вправо + + Page down - Сторінка додолу - - - + На сторінку вниз + + Scroll left - Прокрутити ліворуч - - - + Прокрутити вліво + + Scroll up Прокрутити вгору - Scroll right - Прокрутити праворуч - - - + Прокрутити вправо + + Scroll down - Прокрутити додолу - - - + Прокрутити донизу + + Line up - Вирівняти - - - + На рядок вгору + + Position - Позиція - - - + Положення + + Line down - Рядок униз + На рядок вниз QSharedMemory - %1: unable to set key on lock - - - - + %1: неможливо встановити ключ для блокування + + %1: create size is less then 0 - - - - - + %1: розмір створення менший нуля + + %1: unable to lock - - - - + %1: неможливо заблокувати + + %1: unable to unlock - - - - - + %1: неможливо розблокувати + + + %1: already exists + %1: вже існує + + + %1: doesn't exists + %1: не існує + + + %1: invalid size + %1: неправильний розмір + + + %1: out of resources + %1: недостатньо ресурсів + + %1: permission denied - - - - - - %1: already exists - - - - - - %1: doesn't exists - - - - - - %1: out of resources - - - - - + %1: доступ заборонено + + %1: unknown error %2 - - - - - %1: key is empty - - - - - %1: unix key file doesn't exists - - - - - %1: ftok failed - - - - - + %1: невідома помилка %2 + + + %1: key error + %1: помилка ключа + + %1: unable to make key - - - - + %1: неможливо створити ключ + + + %1: doesn't exist + %1: не існує + + + %1: key is empty + %1: пустий ключ + + + %1: UNIX key file doesn't exist + %1: файл ключа UNIX не існує + + + %1: ftok failed + %1: збій ftok + + %1: system-imposed size restrictions - - - - + %1: обмеження розміру встановлені системою + + %1: not attached - - - - - %1: invalid size - - - - - %1: key error - - - - + %1: не прикріплено + + %1: size query failed - + %1: збій запиту розміру QShortcut - Space - Прогалина - - - + This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. + Пропуск + + Esc Esc - Tab Tab - Backtab Backtab - Backspace Backspace - Return - - - - + Return + + Enter Enter - Ins Ins - Del Del - Pause Pause - Print - Друкувати - - - + Print + + SysReq SysReq - Home Home - End End - Left - Ліворуч - - - + Вліво + + Up Вгору - Right - Праворуч - - - + Вправо + + Down - Додолу - - - + Вниз + + PgUp PgUp - PgDown PgDown - CapsLock CapsLock - NumLock NumLock - ScrollLock ScrollLock - Menu - Menu - - - + Меню + + Help Довідка - Back Назад - Forward - Forward - - - + Вперед + + Stop - Stop - - - + Стоп + + Refresh - Refresh - - - + Оновити + + Volume Down Тихіше - Volume Mute - Приглушити - - - + Вимкнути звук + + Volume Up - Голосніше - - - + Гучніше + + Bass Boost - Супербас - - - + Посилення басів + + Bass Up - Низькі частоти голосніше - - - + Баси гучніше + + Bass Down - Низькі частоти тихіше - - - + Баси тихіше + + Treble Up - Високі частоти голосніше - - - + ВЧ гучніше + + Treble Down - Високі частоти тихіше - - - + ВЧ тихіше + + Media Play - Запустити програвання - - - + Відтворення + + Media Stop - Зупинити програвання - - - + Зупинити відтворення + + Media Previous - Програти попередній - - - + Відтворити попереднє + + Media Next - Програти наступний - - - + Відтворити наступне + + Media Record Запис - + Media Pause + Media player pause button + Пауза + + + Toggle Media Play/Pause + Media player button to toggle between playing and paused + Грати/Пауза + + + Home Page + Домашня сторінка + + Favorites - Улюблені - - - + Обране + + Search Пошук - Standby - В режим чергування - - - + Режим очікування + + Open URL Відкрити URL - Launch Mail - Запустити пошту - - - + Пошта + + Launch Media - Запустити медіа - - - + Програвач + + Launch (0) Запустити (0) - Launch (1) Запустити (1) - Launch (2) Запустити (2) - Launch (3) Запустити (3) - Launch (4) Запустити (4) - Launch (5) Запустити (5) - Launch (6) Запустити (6) - Launch (7) Запустити (7) - Launch (8) Запустити (8) - Launch (9) Запустити (9) - Launch (A) Запустити (A) - Launch (B) Запустити (B) - Launch (C) Запустити (C) - Launch (D) Запустити (D) - Launch (E) Запустити (E) - Launch (F) Запустити (F) - + Monitor Brightness Up + Збільшити яскравість монітору + + + Monitor Brightness Down + Зменшити яскравість монітору + + + Keyboard Light On/Off + Вімк./Вимк. підсвітку клавіатури + + + Keyboard Brightness Up + Збільшити яскравість підсвітки клавіатури + + + Keyboard Brightness Down + Зменшити яскравість підсвітки клавіатури + + + Power Off + Вимкнути живлення + + + Wake Up + Прокинутись + + + Eject + Витягнути + + + Screensaver + Зберігач екрана + + + WWW + WWW + + + Sleep + Сплячий режим + + + LightBulb + Лампочка + + + Shop + Крамниця + + + History + Історія + + + Add Favorite + Додати до обраного + + + Hot Links + Гарячі посилання + + + Adjust Brightness + Налаштування яскравості + + + Finance + Фінанси + + + Community + Спільнота + + + Audio Rewind + Перемотка звуку на початок + + + Back Forward + Назад Вперед + + + Application Left + Додаток вліво + + + Application Right + Додаток вправо + + + Book + Книга + + + CD + CD + + + Calculator + Калькулятор + + + Clear + Очистити + + + Clear Grab + + + + Close + Закрити + + + Copy + Копіювати + + + Cut + Вирізати + + + Display + Дисплей + + + DOS + DOS + + + Documents + Документи + + + Spreadsheet + Електронна таблиця + + + Browser + Навігатор + + + Game + Гра + + + Go + Йти + + + iTouch + iTouch + + + Logoff + Вийти з системи + + + Market + Ринок + + + Meeting + Зустріч + + + Keyboard Menu + Клавіатурне меню + + + Menu PB + Меню PB + + + My Sites + Мої сайти + + + News + Новини + + + Home Office + Домашній офіс + + + Option + Опція + + + Paste + Вставити + + + Phone + Телефон + + + Reply + Відповісти + + + Reload + Перезавантажити + + + Rotate Windows + Обертати вікна + + + Rotation PB + Обертання PB + + + Rotation KB + Обертання KB + + + Save + Зберегти + + + Send + Надіслати + + + Spellchecker + Перевірка правопису + + + Split Screen + Розділити екран + + + Support + Підтримка + + + Task Panel + Панель задач + + + Terminal + Термінал + + + Tools + Інструменти + + + Travel + Подорож + + + Video + Відео + + + Word Processor + Текстовий процесор + + + XFer + XFer + + + Zoom In + Збільшити + + + Zoom Out + Зменшити + + + Away + Пішов + + + Messenger + Програма миттєвого зв'язку + + + WebCam + Веб-камера + + + Mail Forward + Переслати лист + + + Pictures + Зображення + + + Music + Музика + + + Battery + Батарея + + + Bluetooth + Bluetooth + + + Wireless + Бездротова мережа + + + Ultra Wide Band + Ultra Wide Band + + + Audio Forward + Послідовно + + + Audio Repeat + Повторювати + + + Audio Random Play + Випадкове відтворення + + + Subtitle + Субтитри + + + Audio Cycle Track + Зациклити трек + + + Time + Час + + + Select + Обрати + + + View + Вид + + + Top Menu + Головне меню + + + Suspend + Призупинити + + + Hibernate + Приспати + + Print Screen Друк екрану - Page Up - Сторінка вгору - - - + На сторінку вгору + + Page Down - Сторінка додолу - - - + На сторінку вниз + + Caps Lock - Caps Lock - - - + Верхній регістр + + Num Lock - Num Lock - - - + Цифрові клавіші + + Number Lock - Number Lock - - - + Цифрові клавіші + + Scroll Lock Scroll Lock - Insert Вставити - Delete - Вилучити - - - + Видалити + + Escape Escape - System Request - System Request - - - - Select - Select - - - + Системний запит + + Yes Так - No Ні - Context1 - Контекст1 - - - + Контекст 1 + + Context2 - Контекст2 - - - + Контекст 2 + + Context3 - Контекст3 - - - + Контекст 3 + + Context4 - Контекст4 - - - + Контекст 4 + + Call - Виклик - - - + Button to start a call (note: a separate button is used to end the call) + Дзвонити + + Hangup - Покласти - - - + Button to end a call (note: a separate button is used to start the call) + Покласти слухавку + + + Toggle Call/Hangup + Button that will hang up if we're in call, or make a call if we're not. + Подзвонити/покласти слухавку + + Flip - Flip - - - - + Фліп + + + Voice Dial + Button to trigger voice dialling + Голосовий набір + + + Last Number Redial + Button to redial the last number called + Повторний набір + + + Camera Shutter + Button to trigger the camera shutter (take a picture) + Спуск камери + + + Camera Focus + Button to focus the camera + Сфокусувати камеру + + + Kanji + Кандзі + + + Muhenkan + Muhenkan + + + Henkan + Henkan + + + Romaji + Ромадзі + + + Hiragana + Хірагана + + + Katakana + Катакана + + + Hiragana Katakana + Хірагана Катакана + + + Zenkaku + Zenkaku + + + Hankaku + Hankaku + + + Zenkaku Hankaku + Zenkaku Hankaku + + + Touroku + Touroku + + + Massyo + Massyo + + + Kana Lock + Замкнути кана + + + Kana Shift + Кана Shift + + + Eisu Shift + Eisu Shift + + + Eisu toggle + Eisu перемкнути + + + Code input + Ввести код + + + Multiple Candidate + Декілька кандидатів + + + Previous Candidate + Попередній кандидат + + + Hangul + Хангиль + + + Hangul Start + Початок хангиля + + + Hangul End + Кінець хангиля + + + Hangul Hanja + Хангиль Ханча + + + Hangul Jamo + Хангиль Чамо + + + Hangul Romaja + Хангиль Romaja + + + Hangul Jeonja + Хангиль Jeonja + + + Hangul Banja + Хангиль Banja + + + Hangul PreHanja + Хангиль преханча + + + Hangul PostHanja + Хангиль постханча + + + Hangul Special + Хангиль спеціальний + + Ctrl Ctrl - - Shift Shift - - Alt Alt - - Meta Meta - + + - F%1 F%1 - - - Home Page - Домашня сторінка - QSlider - Page left - Сторінка ліворуч - - - + На сторінку вліво + + Page up - Сторінка вгору - - - + На сторінку вгору + + Position Позиція - Page right - Сторінка праворуч - - - + На сторінку вправо + + Page down - Сторінка додолу + На сторінку вниз QSocks5SocketEngine - Connection to proxy refused - - - - + Проксі-сервер відмовив у з’єднанні + + Connection to proxy closed prematurely - - - - + З’єднання з проксі-сервером було несподівано закрите + + Proxy host not found - - - - + Не знайдено вузол проксі-сервера + + Connection to proxy timed out - - - - + Час на з’єднання з проксі-сервером вичерпано + + Proxy authentication failed - - - - + Збій авторизації з проксі-сервером + + Proxy authentication failed: %1 - - - - + Збій авторизації з проксі-сервером: %1 + + SOCKS version 5 protocol error - - - - + Помилка протоколу SOCKS версії 5 + + General SOCKSv5 server failure - - - - + Загальний збій сервера SOCKSv5 + + Connection not allowed by SOCKSv5 server - - - - + З’єднання не дозволене сервером SOCKSv5 + + TTL expired - - - - + TTL минув + + SOCKSv5 command not supported - - - - + Команда SOCKSv5 не підтримується + + Address type not supported - - - - + Тип адреси не підтримується + + Unknown SOCKSv5 proxy error code 0x%1 - - - - Socks5 timeout error connecting to socks server - Перевищено час очікування Socks5 для з'єднання до сервера socks - - - + Невідомий код помилки проксі-серверу SOCKSv5 0x%1 + + Network operation timed out - Перевищено термін очікування мережевої дії + Час на мережеву операцію вичерпано + + + + QSoftKeyManager + + Ok + Ok + + + Select + Обрати + + + Done + Завершено + + + Options + Опції + + + Cancel + Скасувати + + + Exit + Вийти QSpinBox - More Більше - Less Менше @@ -5557,162 +6409,238 @@ QSql - Delete - Вилучити - - - + Видалити + + Delete this record? - Вилучити цей запис? - - - - - + Видалити цей запис? + + Yes Так - - - No Ні - Insert Вставити - Update - Поновити - - - + Оновити + + Save edits? - Зберегти правлення? - - - + Зберегти зміни? + + Cancel Скасувати - Confirm Підтвердити - Cancel your edits? - Скасувати правлення? + Скасувати ваші зміни? QSslSocket - - Unable to write data: %1 - Неможливо записати дані: %1 - - - - Error while reading: %1 - Помилка читання: %1 - - - - Error during SSL handshake: %1 - Помилка квитування SSL: %1 - - - + No error + Немає помилки + + + The issuer certificate could not be found + Не вдалося знайти сертифікат видавця + + + The certificate signature could not be decrypted + Не вдалося дешифрувати підпис сертифіката + + + The public key in the certificate could not be read + Не вдалося прочитати відкритий ключ сертифіката + + + The signature of the certificate is invalid + Неправильний підпис сертифіката + + + The certificate is not yet valid + Сертифікати ще не є дійсним + + + The certificate has expired + Сертифікат застарів + + + The certificate's notBefore field contains an invalid time + Поле notBefore сертифіката містить неправильний час + + + The certificate's notAfter field contains an invalid time + Поле notAfter сертифіката містить неправильний час + + + The certificate is self-signed, and untrusted + Cертифікат самопідписаний та йому немає довіри + + + The root certificate of the certificate chain is self-signed, and untrusted + Кореневий сертифікат ланцюжка сертифікатів самопідписаний та йому немає довіри + + + The issuer certificate of a locally looked up certificate could not be found + Не вдалося знайти сертифікат видавця для сертифіката, що шукається локально + + + No certificates could be verified + Неможливо перевірити сертифікати + + + One of the CA certificates is invalid + Один з сертифікатів центру сертифікації неправильний + + + The basicConstraints path length parameter has been exceeded + Перевищено довжину шляху параметру basicConstraints + + + The supplied certificate is unsuitable for this purpose + Наданий сертифікат непридатний для даної мети + + + The root CA certificate is not trusted for this purpose + Кореневий сертифікат центру сертифікації не є надійним для даної мети + + + The root CA certificate is marked to reject the specified purpose + Кореневий сертифікат центру сертифікації помічений на відхилення для даної мети + + + The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate + Сертифікат поточного кандидата видавця було відхилено, оскільки назва теми не збігається з іменем видавця поточного сертифіката + + + The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate + Сертифікат поточного кандидата видавця було відхилено, оскільки представлені ім'я видавця та серійний номер не збігаються з ідентифікатором ключа сертифікаційного органу поточного сертифіката + + + The peer did not present any certificate + Інша сторона не надала жодного сертифіката + + + The host name did not match any of the valid hosts for this certificate + Назва вузла не збігається з жодною з припустимих назв вузлів для цього сертифіката + + + Unknown error + Невідома помилка + + Error creating SSL context (%1) Помилка створення контексту SSL (%1) - Invalid or empty cipher list (%1) Неправильний або порожній список шифрів (%1) - - Error creating SSL session, %1 - Помилка створення сеансу SSL, %1 - - - - Error creating SSL session: %1 - Помилка створення сеансу SSL: %1 - - - Cannot provide a certificate with no key, %1 Неможливо надати сертифікат без ключа, %1 - Error loading local certificate, %1 Помилка завантаження локального сертифіката, %1 - Error loading private key, %1 - Помилка завантаження приватного ключа, %1 - - - Private key do not certificate public key, %1 - Приватний ключ не засвідчує публічний ключ, %1 - - - - Private key does not certificate public key, %1 - + Помилка завантаження закритого ключа, %1 + + + Private key does not certify public key, %1 + Закритий ключ не сертифікує відкритий, %1 + + + Error creating SSL session, %1 + Помилка створення сесії SSL, %1 + + + Error creating SSL session: %1 + Помилка створення сесії SSL: %1 + + + Unable to write data: %1 + Неможливо записати дані: %1 + + + Unable to decrypt data: %1 + Неможливо дешифрувати дані, %1 + + + Error while reading: %1 + Помилка читання: %1 + + + Error during SSL handshake: %1 + Помилка рукостискання SSL: %1 + + + + QStateMachine + + Missing initial state in compound state '%1' + Відсутній початковий стан в складеному стані ’%1’ + + + Missing default state in history state '%1' + Відсутній типовий стан в історичному стані ’%1’ + + + No common ancestor for targets and source of transition from state '%1' + Немає спільного предка для цілей та джерел переходу зі стану '%1' + + + Unknown error + Невідома помилка QSystemSemaphore - - + %1: permission denied + %1: доступ заборонено + + + %1: already exists + %1: вже існує + + + %1: does not exist + %1: не існує + + %1: out of resources - - - - - - %1: permission denied - - - - - %1: already exists - - - - - %1: does not exist - - - - - + %1: недостатньо ресурсів + + %1: unknown error %2 - + %1: невідома помилка %2 QTDSDriver - Unable to open connection Неможливо відкрити з'єднання - Unable to use database Неможливо використати базу даних @@ -5720,82 +6648,63 @@ QTabBar - Scroll Left - Прокрутити ліворуч - - - + Прокрутити вліво + + Scroll Right - Прокрутити праворуч + Прокрутити вправо QTcpServer - Socket operation unsupported - Дії з сокетами не підтримуються - - - Operation on socket is not supported - + Непідтримувана для сокета операція QTextControl - &Undo &Повернути - &Redo П&овторити - Cu&t Ви&різати - &Copy &Копіювати - Copy &Link Location - Копіювати адресу &посилання - - - + Копіювати &адресу посилання + + &Paste &Вставити - Delete - Вилучити - - - + Видалити + + Select All - Вибрати все + Виділити все QToolButton - - Press - Натиснути - - - - + Натисніть + + Open Відкрити @@ -5803,7 +6712,6 @@ QUdpSocket - This platform does not support IPv6 Ця платформа не підтримує IPv6 @@ -5811,12 +6719,10 @@ QUndoGroup - Undo Повернути - Redo Повторити @@ -5824,7 +6730,6 @@ QUndoModel - <empty> <порожньо> @@ -5832,12 +6737,10 @@ QUndoStack - Undo Повернути - Redo Повторити @@ -5845,640 +6748,789 @@ QUnicodeControlCharacterMenu - LRM Left-to-right mark - LRM позначка зліва направо - - - + LRM Ознака зліва направо + + RLM Right-to-left mark - RLM позначка справа наліво - - - + RLM Ознака справа наліво + + ZWJ Zero width joiner - ZWJ з'єднувач нульової ширини - - - + ZWJ Об’єднувач нульової ширини + + ZWNJ Zero width non-joiner - ZWNJ нез'єднувач нульової ширини - - - + ZWNJ Необ’єднувач нульової довжини + + ZWSP Zero width space - ZWSP прогалина нульової ширини - - - + ZWSP Пропуск нульової ширини + + LRE Start of left-to-right embedding - LRE початок вбудовування зліва направо - - - + LRE Початок вбудованого напису зліва направо + + RLE Start of right-to-left embedding - RLE початок вбудовування справа наліво - - - + RLE Початок вбудованого напису справа наліво + + LRO Start of left-to-right override - LRO початок заміщення зліва направо - - - + LRO Початок заміни напису зліва направо + + RLO Start of right-to-left override - RLO початок заміщення справа наліво - - - + RLO Початок заміни напису справа наліво + + PDF Pop directional formatting - PDF Pop напрямне форматування - - - + PDF Забрати направлене форматування + + Insert Unicode control character - Вставити контрольний символ Unicode + Вставити керуючий символ Unicode QWebFrame - Request cancelled - - - - + Запит скасовано + + Request blocked - - - - + Запит блоковано + + Cannot show URL - - - - - Frame load interruped by policy change - - - - + Неможливо показати URL + + + Frame load interrupted by policy change + Завантаження фрейму було перерване зміною політики + + Cannot show mimetype - - - - + Неможливо показати тип MIME + + File does not exist - + Файл не існує QWebPage - + Redirection limit reached + Ліміт перенаправлень вичерпано + + Bad HTTP request - - - - + Поганий запит HTTP + + + %n file(s) + number of chosen file + + %n файл + %n файли + %n файлів + + + Submit default label for Submit buttons in forms on web pages - - - - + Надіслати + + Submit Submit (input element) alt text for <input> elements with no alt, title, or value - - - - + Надіслати + + Reset default label for Reset buttons in forms on web pages - Скинути - - - + Скинути + + This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' - - - - + Це пошуковий покажчик. Введіть ключові слова пошуку: + + Choose File title for file button used in HTML forms - - - - + Оберіть файл + + No file selected text to display in file button used in HTML forms when no file is selected - - - - + Файл не обрано + + Open in New Window Open in New Window context menu item - - - - + Відкрити в новому вікні + + Save Link... Download Linked File context menu item - - - - + Зберегти посилання... + + Copy Link Copy Link context menu item - - - - + Копіювати посилання + + Open Image Open Image in New Window context menu item - - - - + Відкрити зображення + + Save Image Download Image context menu item - - - - + Зберегти зображення + + Copy Image Copy Link context menu item - - - - + Копіювати зображення + + Open Frame Open Frame in New Window context menu item - - - - + Відкрити фрейм + + Copy Copy context menu item - - - - + Копіювати + + Go Back Back context menu item - Піти назад - - - + Йти назад + + Go Forward Forward context menu item - - - - + Йти вперед + + Stop Stop context menu item - Stop - - - + Зупинити + + Reload Reload context menu item - - - - + Перезавантажити + + Cut Cut context menu item - - - - + Вирізати + + Paste Paste context menu item - - - - + Вставити + + No Guesses Found No Guesses Found context menu item - - - - + Підказок не знайдено + + Ignore Ignore Spelling context menu item - Пропустити - - - + Ігнорувати + + Add To Dictionary Learn Spelling context menu item - - - - + Додати до словника + + Search The Web Search The Web context menu item - - - - + Пошук в мережі + + Look Up In Dictionary Look Up in Dictionary context menu item - - - - + Шукати в словнику + + Open Link Open Link context menu item - - - - + Відкрити посилання + + Ignore Ignore Grammar context menu item - Пропустити - - - + Ігнорувати + + Spelling Spelling and Grammar context sub-menu item - - - - + Правопис + + Show Spelling and Grammar menu item title - - - - + Показати правопис та граматику + + Hide Spelling and Grammar menu item title - - - - + Сховати правопис та граматику + + Check Spelling Check spelling context menu item - - - - + Перевірка правопису + + Check Spelling While Typing Check spelling while typing context menu item - - - - + Перевіряти правопис під час набору + + Check Grammar With Spelling Check grammar with spelling context menu item - - - - + Перевіряти граматику разом з правописом + + Fonts Font context sub-menu item - - - - + Шрифти + + Bold Bold context menu item - - - - + Жирний + + Italic Italic context menu item - - - - + Курсив + + Underline Underline context menu item - - - - + Підкреслений + + Outline Outline context menu item - - - - + Контур + + Direction Writing direction context sub-menu item - - - - + Напрямок + + Text Direction Text direction context sub-menu item - - - - + Напрямок тексту + + Default Default writing direction context menu item - - - - - LTR + Типово + + + Left to Right Left to Right context menu item - - - - - RTL + Зліва направо + + + Right to Left Right to Left context menu item - - - - + Справа наліво + + Inspect Inspect Element context menu item - - - - + Інспектувати + + No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed - - - - + Немає нещодавніх пошуків + + Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title - - - - + Нещодавні пошуки + + Clear recent searches menu item in Recent Searches menu that empties menu's contents - - - - + Очистити нещодавні пошуки + + + Missing Plug-in + Label text to be used when a plug-in is missing + Додаток відсутній + + Unknown Unknown filesize FTP directory listing item - Невідомо - - - + Невідомо + + %1 (%2x%3 pixels) Title string for images - - - - - Web Inspector - %2 - - - - + %1 (%2x%3 пікселів) + + + Loading... + Media controller status message when the media is loading + Завантаження... + + + Live Broadcast + Media controller status message when watching a live broadcast + Мовлення наживо + + + Audio Element + Media controller element + Аудіо-елемент + + + Video Element + Media controller element + Відео-елемент + + + Mute Button + Media controller element + Кнопка вимикання звуку + + + Unmute Button + Media controller element + Кнопка вмикання звуку + + + Play Button + Media controller element + Кнопка відтворення + + + Pause Button + Media controller element + Кнопка паузи + + + Slider + Media controller element + Повзунок + + + Slider Thumb + Media controller element + Держак повзунка + + + Rewind Button + Media controller element + Кнопка перемотки на початок + + + Return to Real-time Button + Media controller element + Кнопка повернення в реальний час + + + Elapsed Time + Media controller element + Пройшло часу + + + Remaining Time + Media controller element + Залишилось часу + + + Status Display + Media controller element + Відображення стану + + + Fullscreen Button + Media controller element + Кнопка повноекранного режиму + + + Seek Forward Button + Media controller element + Кнопка перемотки вперед + + + Seek Back Button + Media controller element + Кнопка перемотки назад + + + Audio element playback controls and status display + Media controller element + Елементи керування відтворенням звуку та відображення стану + + + Video element playback controls and status display + Media controller element + Елементи керування відтворенням відео та відображення стану + + + Mute audio tracks + Media controller element + Вимкнути звукові доріжки + + + Unmute audio tracks + Media controller element + Увімкнути звукові доріжки + + + Begin playback + Media controller element + Почати відтворення + + + Pause playback + Media controller element + Призупинити відтворення + + + Movie time scrubber + Media controller element + Повзунок часу фільму + + + Movie time scrubber thumb + Media controller element + Держак повзунка часу фільму + + + Rewind movie + Media controller element + Перемотка фільму на початок + + + Return streaming movie to real-time + Media controller element + Повернути потокове відео до реального часу + + + Current movie time + Media controller element + Поточний час фільму + + + Remaining movie time + Media controller element + Час до кінця фільму + + + Current movie status + Media controller element + Поточний стан фільму + + + Play movie in full-screen mode + Media controller element + Відтворити фільм в повноекранному режимі + + + Seek quickly back + Media controller element + Швидка перемотка назад + + + Seek quickly forward + Media controller element + Швидка перемотка вперед + + + Indefinite time + Media time description + Невизначений час + + + %1 days %2 hours %3 minutes %4 seconds + Media time description + %1 днів %2 годин %3 хвилин %4 секунд + + + %1 hours %2 minutes %3 seconds + Media time description + %1 годин %2 хвилин %3 секунд + + + %1 minutes %2 seconds + Media time description + %1 хвилин %2 секунд + + + %1 seconds + Media time description + %1 секунд + + Scroll here - Прокрутити сюди - - - + Прокрутити сюди + + Left edge - Лівий край - - - + До лівої границі + + Top - Верх - - - + Вгору + + Right edge - Правий край - - - + До правої границі + + Bottom - Низ - - - + Донизу + + Page left - Сторінка ліворуч - - - + На сторінку вліво + + Page up - Сторінка вгору - - - + На сторінку вгору + + Page right - Сторінка праворуч - - - + На сторінку вправо + + Page down - Сторінка додолу - - - + На сторінку вниз + + Scroll left - Прокрутити ліворуч - - - + Прокрутити вліво + + Scroll up - Прокрутити вгору - - - + Прокрутити вгору + + Scroll right - Прокрутити праворуч - - - + Прокрутити вправо + + Scroll down - Прокрутити додолу - - - - %n file(s) - number of chosen file - - - - - - - - + Прокрутити донизу + + JavaScript Alert - %1 - - - - + Попередження JavaScript - %1 + + JavaScript Confirm - %1 - - - - + Підтвердження JavaScript - %1 + + JavaScript Prompt - %1 - - - - + Запит JavaScript - %1 + + + JavaScript Problem - %1 + Проблема JavaScript - %1 + + + The script on this page appears to have a problem. Do you want to stop the script? + Здається є проблема зі скриптом на цій сторінці. Бажаєте зупинити скрипт? + + Move the cursor to the next character - - - - + Пересунути курсор до наступного символу + + Move the cursor to the previous character - - - - + Пересунути курсор до попереднього символу + + Move the cursor to the next word - - - - + Пересунути курсор до наступного слова + + Move the cursor to the previous word - - - - + Пересунути курсор до попереднього слова + + Move the cursor to the next line - - - - + Пересунути курсор до наступного рядка + + Move the cursor to the previous line - - - - + Пересунути курсор до попереднього рядка + + Move the cursor to the start of the line - - - - + Пересунути курсор до початку рядка + + Move the cursor to the end of the line - - - - + Пересунути курсор в кінець рядка + + Move the cursor to the start of the block - - - - + Пересунути курсор до початку блока + + Move the cursor to the end of the block - - - - + Пересунути курсор в кінець блока + + Move the cursor to the start of the document - - - - + Пересунути курсор до початку документа + + Move the cursor to the end of the document - - - - + Пересунути курсор в кінець документа + + Select all - - - - + Виділити все + + Select to the next character - - - - + Виділити до наступного символу + + Select to the previous character - - - - + Виділити до попереднього символу + + Select to the next word - - - - + Виділити до наступного слова + + Select to the previous word - - - - + Виділити до попереднього слова + + Select to the next line - - - - + Виділити до наступного рядка + + Select to the previous line - - - - + Виділити до попереднього рядка + + Select to the start of the line - - - - + Виділити до початку рядка + + Select to the end of the line - - - - + Виділити до кінця рядка + + Select to the start of the block - - - - + Виділити до початку блока + + Select to the end of the block - - - - + Виділити до кінця блока + + Select to the start of the document - - - - + Виділити до початку документа + + Select to the end of the document - - - - + Виділити до кінця документа + + Delete to the start of the word - - - - + Видалити до початку слова + + Delete to the end of the word - - - - + Видалити до кінця слова + + Insert a new paragraph - - - - + Вставити новий параграф + + Insert a new line - + Вставити новий рядок + + + Paste and Match Style + Вставити та зберегти стиль + + + Remove formatting + Видалити форматування + + + Strikethrough + Перекреслений + + + Subscript + Нижній індекс + + + Superscript + Верхній індекс + + + Insert Bulleted List + Вставити маркований список + + + Insert Numbered List + Вставити нумерований список + + + Indent + Збільшити відступ + + + Outdent + Зменшити відступ + + + Center + По центру + + + Justify + По ширині + + + Align Left + Вирівняти вліво + + + Align Right + Вирівняти вправо + + + Web Inspector - %2 + Web-інспектор - %2 QWhatsThisAction - What's This? Що це? @@ -6486,7 +7538,6 @@ QWidget - * * @@ -6494,748 +7545,597 @@ QWizard - Go Back - Піти назад - - - + Йти назад + + + < &Back + < &Назад + + Continue Продовжити - + &Next + &Далі + + + &Next > + &Далі > + + Commit - Зафіксувати - - - + Виконати + + Done - Зроблено - - - Quit - Вийти - - - + Завершено + + + &Finish + &Завершити + + + Cancel + Скасувати + + Help Довідка - - < &Back - < &Назад - - - - &Finish - &Закінчити - - - - Cancel - Скасувати - - - &Help &Довідка - - - &Next - - - - - &Next > - &Вперед > - QWorkspace - + Close + Закрити + + + Minimize + Мінімізувати + + + Restore Down + Відновити + + &Restore &Відновити - &Move &Пересунути - &Size &Розмір - Mi&nimize - Мі&німізувати - - - + М&інімізувати + + Ma&ximize - Ма&ксимізувати - - - + М&аксимізувати + + &Close - &Закрити - - - + Закри&ти + + Stay on &Top - Лишатися над &іншими - - - - + Залишатись на &горі + + Sh&ade - Зг&орнути - - - - + &Згорнути в заголовок + + %1 - [%2] %1 - [%2] - - Minimize - Мінімізувати - - - - Restore Down - Відновити додолу - - - - Close - Закрити - - - &Unshade - &Розгорнути + Р&озгорнути із заголовка QXml - no error occurred без помилок - error triggered by consumer - помилка викликана споживачем - - - + помилка, викликана користувачем + + unexpected end of file - неочікуваний кінець файлу - - - + несподіваний кінець файлу + + more than one document type definition - більше одного визначення типу документу (DTD) - - - + більш ніж одне визначення типу документу + + error occurred while parsing element - помилка аналізу елемента - - - + під час розбору елемента трапилась помилка + + tag mismatch - теґи не збігаються - - - + тег не збігається + + error occurred while parsing content - помилка аналізу вмісту - - - + під час розбору вмісту трапилась помилка + + unexpected character - неочікуваний символ - - - + несподіваний символ + + invalid name for processing instruction - неправильне ім'я для обробної команди - - - + неправильна назва для інструкції обробки + + version expected while reading the XML declaration - при читанні оголошення XML очікувалася версія - - - + під час читання оголошення XML очікувалась версія + + wrong value for standalone declaration - неправильне значення для окремого оголошення - - - + неправильне значення для самостійного оголошення + + encoding declaration or standalone declaration expected while reading the XML declaration - при читанні оголошень XML очікувалось оголошення кодування або окреме оголошення - - - + під час читання оголошення XML очікувалось оголошення кодування або самостійне оголошення + + standalone declaration expected while reading the XML declaration - при читанні оголошень XML очікувалось окреме оголошення - - - + під час читання оголошення XML очікувалось самостійне оголошення + + error occurred while parsing document type definition - помилка при аналізі визначення типу документу (DTD) - - - + під час розбору визначення типу документа трапилась помилка + + letter is expected очікувалась літера - error occurred while parsing comment - помилка аналізу коментаря - - - + під час розбору коментаря трапилась помилка + + error occurred while parsing reference - помилка аналізу посилання - - - + під час розбору посилання трапилась помилка + + internal general entity reference not allowed in DTD - посилання на внутрішній загальний елемент не дозволено в DTD - - - + внутрішнє посилання на загальну сутність не дозволене в DTD + + external parsed general entity reference not allowed in attribute value - посилання на зовнішній розібраний загальний елемент не дозволено в значенні атрибута - - - + зовнішнє розібране посилання на загальну сутність не дозволене в значенні атрибуту + + external parsed general entity reference not allowed in DTD - посилання на зовнішній розібраний загальний елемент не дозволено в DTD - - - + зовнішнє розібране посилання на загальну сутність не дозволене в DTD + + unparsed entity reference in wrong context - посилання на нерозібраний елемент у неправильному контексті - - - + нерозібране посилання на сутність в неправильному контексті + + recursive entities - рекурсивні елементи - - - + рекурсивні сутності + + error in the text declaration of an external entity - помилка в оголошенні тексту зовнішнього елемента + помилка в тексті оголошення зовнішньої сутності + + + + QXmlPatternistCLI + + Warning in %1, at line %2, column %3: %4 + Попередження в %1, рядок %2, позиція %3: %4 + + + Warning in %1: %2 + Попередження в %1: %2 + + + Unknown location + Невідома позиція + + + Error %1 in %2, at line %3, column %4: %5 + Помилка %1 в %2, рядок %3, позиція %4: %5 + + + Error %1 in %2: %3 + Помилка %1 в %2: %3 QXmlStream - - Extra content at end of document. - Надлишковий вміст в кінці документу. - - - + Зайві дані в кінці документу. + + Invalid entity value. - Неправильне значення елементу. - - - + Неправильне значення сутності. + + Invalid XML character. Неправильний символ XML. - Sequence ']]>' not allowed in content. - Послідовність "]]>" в вмісті є недозволеною. - - - + Послідовність ']]>' не дозволена в змісті. + + + Encountered incorrectly encoded content. + Виявлено неправильно закодований вміст. + + Namespace prefix '%1' not declared - Префікс простору імен "%1" не оголошено - - - + Префікс простору імен '%1' не оголошено + + + Illegal namespace declaration. + Неприпустиме оголошення простору імен. + + Attribute redefined. - Нове оголошення атрибуту. - - - + Атрибути перевизначено. + + Unexpected character '%1' in public id literal. - Неочікуваний символ "%1" в ідентифікаторі публічного літерала. - - - + Неочікуваний символ '%1' в публічному літералі id. + + Invalid XML version string. Неправильний рядок версії XML. - Unsupported XML version. Непідтримувана версія XML. - + The standalone pseudo attribute must appear after the encoding. + Самостійний псевдоатрибут має знаходитсь після кодування. + + %1 is an invalid encoding name. - %1 є неправильним ім'ям кодування. - - - + %1 - неправильна назва кодування. + + Encoding %1 is unsupported Кодування %1 не підтримується - Invalid XML encoding name. - Неправильне ім'я кодування XML. - - - Standalone accepts only yes or no. - Автономний приймає лише "так" чи "ні". - - - + Самостійний приймає лише так чи ні. + + Invalid attribute in XML declaration. Неправильний атрибут в оголошенні XML. - Premature end of document. - Передчасний кінець документа. - - - + Несподіваний кінець документу. + + Invalid document. - Неправильно сформований документ. - - - + Неправильний документ. + + Expected - Очікувався - - - + Очікувалось + + , but got ' - , але отримано " - - - + , але отримано ' + + Unexpected ' - Неочікуваний " - - - + Неочікуване ' + + Expected character data. Очікувались символьні дані. - Recursive entity detected. - Знайдено рекурсивний елемент. - - - + Знайдено рекурсивну сутність. + + Start tag expected. - Очікувався початковий теґ. - - - + Очікувався відкриваючий тег. + + + NDATA in parameter entity declaration. + NDATA в параметрі оголошення сутності. + + XML declaration not at start of document. - Оголошення XML не на початку документа. - - - - NDATA in parameter entity declaration. - NDATA в оголошенні порожнього параметра. - - - xml is an invalid processing instruction name. - xml не є дозволеною назвою інструкції обробляння. - - - + Оголошення XML не знаходиться на початку документу. + + %1 is an invalid processing instruction name. - %1 не є дозволеною назвою інструкції обробляння. - - - + %1 не є правильна назвою для інструкції обробки. + + Invalid processing instruction name. - Неправильне ім'я команди обробляння. - - - - - - - Illegal namespace declaration. - Неправильне оголошення простору імен. - - - + Неправильна назва для інструкції обробки. + + + %1 is an invalid PUBLIC identifier. + %1 не є правильним ідентифікатором PUBLIC. + + Invalid XML name. - Неправильне ім'я XML. - - - + Неправильна назва XML. + + Opening and ending tag mismatch. - Не збігаються відкривні й закривні теґи. - - - + Відкриваючий та закриваючий теги не збігаються. + + + Entity '%1' not declared. + Сутність '%1' не оголошена. + + Reference to unparsed entity '%1'. - Посилання на необроблений елемент "%1". - - - - - - Entity '%1' not declared. - Відсутнє оголошення елемента "%1". - - - + Посилання на нерозібрану сутність '%1'. + + Reference to external entity '%1' in attribute value. - Посилання на зовнішній елемент "%1" в значенні атрибута. - - - + Посилання на зовнішню сутність '%1' в значені атрибута. + + Invalid character reference. Неправильне символьне посилання. - - - - Encountered incorrectly encoded content. - Знайдено невірно закодований вміст. - - - - The standalone pseudo attribute must appear after the encoding. - Окремий псевдо-атрибут має бути присутній після кодування. - - - - %1 is an invalid PUBLIC identifier. - %1 є неприпустимим публічним іденифікатором. - QtXmlPatterns - - An %1-attribute with value %2 has already been declared. - - - - - An %1-attribute must have a valid %2 as value, which %3 isn't. - - - - + %1 is an unsupported encoding. + Кодування %1 не підтримується. + + + %1 contains octets which are disallowed in the requested encoding %2. + + + + The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. + + + Network timeout. - Element %1 can't be serialized because it appears outside the document element. - Attribute %1 can't be serialized because it appears at the top level. - Year %1 is invalid because it begins with %2. - - - - + Рік %1 неправильний, бо він починається з %2. + + Day %1 is outside the range %2..%3. - - - - + День %1 поза межами діапазону %2..%3. + + Month %1 is outside the range %2..%3. - - - - + Місяць %1 поза межами діапазону %2..%3. + + Overflow: Can't represent date %1. - - - - + Переповнення: Не можу представити дату %1. + + Day %1 is invalid for month %2. - - - - + Неправильний день %1 для місяця %2. + + Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; - Time %1:%2:%3.%4 is invalid. - - - - + Неправильний час %1:%2:%3.%4. + + Overflow: Date can't be represented. - - - - - + Переповнення: Не можу представити дату. + + At least one component must be present. - - - - + Щонайменше один компонент має бути присутнім. + + At least one time component must appear after the %1-delimiter. - - No operand in an integer division, %1, can be %2. - - - - - The first operand in an integer division, %1, cannot be infinity (%2). - - - - - The second operand in a division, %1, cannot be zero (%2). - - - - %1 is not a valid value of type %2. - - - - + %1 не є правильним значенням для типу %2. + + When casting to %1 from %2, the source value cannot be %3. - Integer division (%1) by zero (%2) is undefined. - - - - + Цілочисельне ділення (%1) на нуль (%2) не визначене. + + Division (%1) by zero (%2) is undefined. - - - - + Ділення (%1) на нуль (%2) не визначене. + + Modulus division (%1) by zero (%2) is undefined. - - Dividing a value of type %1 by %2 (not-a-number) is not allowed. - Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. - Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. - A value of type %1 cannot have an Effective Boolean Value. - Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - Value %1 of type %2 exceeds maximum (%3). - - - - + Значення %1 типу %2 перевищує максимум (%3). + + Value %1 of type %2 is below minimum (%3). - - - - + Значення %1 типу %2 менше за мінімум (%3). + + A value of type %1 must contain an even number of digits. The value %2 does not. - %1 is not valid as a value of type %2. - - - - + %1 не є правильним значенням для типу %2. + + + Ambiguous rule match. + + + Operator %1 cannot be used on type %2. - - - - + Оператор %1 не може використовуватись для типу %2. + + Operator %1 cannot be used on atomic values of type %2 and %3. - - - - + Оператор %1 не може використовуватись для атомарних значень типу %2 та %3. + + The namespace URI in the name for a computed attribute cannot be %1. - The name for a computed attribute cannot have the namespace URI %1 with the local name %2. - Type error in cast, expected %1, received %2. - When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. - - No casting is possible with %1 as the target type. - - - - - It is not possible to cast from %1 to %2. - - - - - Casting to %1 is not possible because it is an abstract type, and can therefore never be instantiated. - - - - - It's not possible to cast the value %1 of type %2 to %3 - - - - - Failure when casting from %1 to %2: %3 - - - - A comment cannot contain %1 - - - - + Коментар не може містити %1 + + A comment cannot end with a %1. - - - - - No comparisons can be done involving the type %1. - - - - - Operator %1 is not available between atomic values of type %2 and %3. - - - - + Коментар не може закінчувати на %1. + + + In a namespace constructor, the value for a namespace cannot be an empty string. + + + + The prefix must be a valid %1, which %2 is not. + + + + The prefix %1 cannot be bound. + Неможливо прив'язати префікс %1. + + + Only the prefix %1 can be bound to %2 and vice versa. + + + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - A library module cannot be evaluated directly. It must be imported from a main module. - No template by name %1 exists. - A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. - A positional predicate must evaluate to a single numeric value. - - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. - - - - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. + + + %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. - The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - The data of a processing instruction cannot contain the string %1 - No namespace binding exists for the prefix %1 - No namespace binding exists for the prefix %1 in %2 - - %1 is an invalid %2 + + The parameter %1 is passed, but no corresponding %2 exists. + + + + The parameter %1 is required, but no corresponding %2 is supplied. + + - %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7244,7 +8144,6 @@ - %1 requires at least %n argument(s). %2 is therefore invalid. @@ -7253,741 +8152,1583 @@ - The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. - The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. - The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. - %1 is not a valid XML 1.0 character. - - - - - The first argument to %1 cannot be of type %2. - - - - + %1 не є правильним символом XML 1.0. + + + The root node of the second argument to function %1 must be a document node. %2 is not a document node. + + + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - %1 was called. - %1 must be followed by %2 or %3, not at the end of the replacement string. - In the replacement string, %1 must be followed by at least one digit when not escaped. - In the replacement string, %1 can only be used to escape itself or %2, not %3 - %1 matches newline characters - %1 and %2 match the start and end of a line. - Matches are case insensitive - Whitespace characters are removed, except when they appear in character classes - %1 is an invalid regular expression pattern: %2 - %1 is an invalid flag for regular expressions. Valid flags are: - If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. - It will not be possible to retrieve %1. - - The root node of the second argument to function %1 must be a document node. %2 is not a document node. - - - - The default collection is undefined - %1 cannot be retrieved - The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - A zone offset must be in the range %1..%2 inclusive. %3 is out of range. - %1 is not a whole number of minutes. - + The URI cannot have a fragment + + + Required cardinality is %1; got cardinality %2. - The item %1 did not match the required type %2. - - - - - + Елемент %1 не відповідає необхідному типу %2. + + + The variable %1 is unused + Змінна %1 не використовується + + + W3C XML Schema identity constraint selector + + + + W3C XML Schema identity constraint field + + + + A construct was encountered which is disallowed in the current language(%1). + + + %1 is an unknown schema type. - + A template with name %1 has already been declared. + + + + %1 is not a valid numeric literal. + + + Only one %1 declaration can occur in the query prolog. - The initialization of variable %1 depends on itself - - No variable by name %1 exists - - - - - The variable %1 is unused - - - - + No variable with name %1 exists + + + Version %1 is not supported. The supported XQuery version is 1.0. - - - - + Версія %1 не підтримується. Підтримується XQuery версії 1.0. + + The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. - No function with signature %1 is available - - A default namespace declaration must occur before function, variable, and option declarations. - Namespace declarations must occur before function, variable, and option declarations. - Module imports must occur before function, variable, and option declarations. - + The keyword %1 cannot occur with any other mode name. + + + + The value of attribute %1 must be of type %2, which %3 isn't. + + + It is not possible to redeclare prefix %1. - + The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. + + + Prefix %1 is already declared in the prolog. - The name of an option must have a prefix. There is no default namespace for options. - The Schema Import feature is not supported, and therefore %1 declarations cannot occur. - The target namespace of a %1 cannot be empty. - The module import feature is not supported - - - - - No value is available for the external variable by name %1. - - - - - A construct was encountered which only is allowed in XQuery. - - - - - A template by name %1 has already been declared. - - - - - The keyword %1 cannot occur with any other mode name. - - - - - The value of attribute %1 must of type %2, which %3 isn't. - - - - - The prefix %1 can not be bound. By default, it is already bound to the namespace %2. - - - - - A variable by name %1 has already been declared. - - - - + Можливість імпорту модулів не підтримується + + + A variable with name %1 has already been declared. + + + + No value is available for the external variable with name %1. + + + A stylesheet function must have a prefixed name. - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) - The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. - The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 - A function already exists with the signature %1. - No external functions are supported. All supported functions can be used directly, without first declaring them as external - - An argument by name %1 has already been declared. Every argument name must be unique. - - - - + An argument with name %1 has already been declared. Every argument name must be unique. + + + When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. - In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. - In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. - In an XSL-T pattern, function %1 cannot have a third argument. - In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. - In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. - %1 is an invalid template mode name. - The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. - The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. - None of the pragma expressions are supported. Therefore, a fallback expression must be present - Each name of a template parameter must be unique; %1 is duplicated. - The %1-axis is unsupported in XQuery - - %1 is not a valid name for a processing-instruction. - - - - - %1 is not a valid numeric literal. - - - - - No function by name %1 is available. - - - - + No function with name %1 is available. + + + The namespace URI cannot be the empty string when binding to a prefix, %1. - %1 is an invalid namespace URI. - It is not possible to bind to the prefix %1 - Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). - Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). - Two namespace declaration attributes have the same name: %1. - The namespace URI must be a constant and cannot use enclosed expressions. - - An attribute by name %1 has already appeared on this element. - - - - + An attribute with name %1 has already appeared on this element. + + + A direct element constructor is not well-formed. %1 is ended with %2. - The name %1 does not refer to any schema type. - %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. - %1 is not an atomic type. Casting is only possible to atomic types. - - + %1 is not a valid name for a processing-instruction. + + + %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. - The name of an extension expression must be in a namespace. - - empty - - - - - zero or one - - - - - exactly one - - - - - one or more - - - - - zero or more - - - - - Required type is %1, but %2 was found. - - - - - Promoting %1 to %2 may cause loss of precision. - - - - - The focus is undefined. - - - - - It's not possible to add attributes after any other kind of node. - - - - - An attribute by name %1 has already been created. - - - - - Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - - - - - %1 is an unsupported encoding. - - - - - %1 contains octets which are disallowed in the requested encoding %2. - - - - - The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. - - - - - Ambiguous rule match. - - - - - In a namespace constructor, the value for a namespace cannot be an empty string. - - - - - The prefix must be a valid %1, which %2 is not. - - - - - The prefix %1 cannot be bound. - - - - - Only the prefix %1 can be bound to %2 and vice versa. - - - - - Circularity detected - - - - - The parameter %1 is required, but no corresponding %2 is supplied. - - - - - The parameter %1 is passed, but no corresponding %2 exists. - - - - - The URI cannot have a fragment - - - - Element %1 is not allowed at this location. - Text nodes are not allowed at this location. - Parse error: %1 - - - - + Помилка розбору: %1 + + The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. - Running an XSL-T 1.0 stylesheet with a 2.0 processor. - Unknown XSL-T attribute %1. - - - - + Невідомий атрибут XSL-T %1. + + Attribute %1 and %2 are mutually exclusive. - In a simplified stylesheet module, attribute %1 must be present. - If element %1 has no attribute %2, it cannot have attribute %3 or %4. - Element %1 must have at least one of the attributes %2 or %3. - At least one mode must be specified in the %1-attribute on element %2. - - Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. - - - - - Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the standard attributes. - - - - - Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the standard attributes. - - - - - Attribute %1 cannot appear on the element %2. Allowed is %3, and the standard attributes. - - - - - XSL-T attributes on XSL-T elements must be in the null namespace, not in the XSL-T namespace which %1 is. - - - - - The attribute %1 must appear on element %2. - - - - - The element with local name %1 does not exist in XSL-T. - - - - Element %1 must come last. - At least one %1-element must occur before %2. - Only one %1-element can appear. - At least one %1-element must occur inside %2. - When attribute %1 is present on %2, a sequence constructor cannot be used. - Element %1 must have either a %2-attribute or a sequence constructor. - When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. - Element %1 cannot have children. - Element %1 cannot have a sequence constructor. - - The attribute %1 cannot appear on %2, when it is a child of %3. - A parameter in a function cannot be declared to be a tunnel. - This processor is not Schema-aware and therefore %1 cannot be used. - Top level stylesheet elements must be in a non-null namespace, which %1 isn't. - The value for attribute %1 on element %2 must either be %3 or %4, not %5. - Attribute %1 cannot have the value %2. - The attribute %1 can only appear on the first %2 element. - At least one %1 element must appear as child of %2. - - - VolumeSlider - - - Muted - - - - - - Volume: %1% + + Empty particle cannot be derived from non-empty particle. + + + + Derived particle is missing element %1. + + + + Derived element %1 is missing value constraint as defined in base particle. + + + + Derived element %1 has weaker value constraint than base particle. + + + + Fixed value constraint of element %1 differs from value constraint in base particle. + + + + Derived element %1 cannot be nillable as base element is not nillable. + + + + Block constraints of derived element %1 must not be more weaker than in the base element. + + + + Simple type of derived element %1 cannot be validly derived from base element. + + + + Complex type of derived element %1 cannot be validly derived from base element. + + + + Element %1 is missing in derived particle. + + + + Element %1 does not match namespace constraint of wildcard in base particle. + + + + Wildcard in derived particle is not a valid subset of wildcard in base particle. + + + + processContent of wildcard in derived particle is weaker than wildcard in base particle. + + + + Derived particle allows content that is not allowed in the base particle. + + + + %1 has inheritance loop in its base type %2. + + + + Circular inheritance of base type %1. + + + + Circular inheritance of union %1. + + + + %1 is not allowed to derive from %2 by restriction as the latter defines it as final. + + + + %1 is not allowed to derive from %2 by extension as the latter defines it as final. + + + + Base type of simple type %1 cannot be complex type %2. + + + + Simple type %1 cannot have direct base type %2. + + + + Simple type %1 is not allowed to have base type %2. + + + + Simple type %1 can only have simple atomic type as base type. + + + + Simple type %1 cannot derive from %2 as the latter defines restriction as final. + + + + Variety of item type of %1 must be either atomic or union. + + + + Variety of member types of %1 must be atomic. + + + + %1 is not allowed to derive from %2 by list as the latter defines it as final. + + + + Simple type %1 is only allowed to have %2 facet. + + + + Base type of simple type %1 must have variety of type list. + + + + Base type of simple type %1 has defined derivation by restriction as final. + + + + Item type of base type does not match item type of %1. + + + + Simple type %1 contains not allowed facet type %2. + + + + %1 is not allowed to derive from %2 by union as the latter defines it as final. + + + + %1 is not allowed to have any facets. + + + + Base type %1 of simple type %2 must have variety of union. + + + + Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. + + + + Member type %1 cannot be derived from member type %2 of %3's base type %4. + + + + Derivation method of %1 must be extension because the base type %2 is a simple type. + + + + Complex type %1 has duplicated element %2 in its content model. + + + + Complex type %1 has non-deterministic content. + + + + Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. + + + + Content model of complex type %1 is not a valid extension of content model of %2. + + + + Complex type %1 must have simple content. + + + + Complex type %1 must have the same simple type as its base class %2. + + + + Complex type %1 cannot be derived from base type %2%3. + + + + Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. + + + + Complex type %1 with simple content cannot be derived from complex base type %2. + + + + Item type of simple type %1 cannot be a complex type. + + + + Member type of simple type %1 cannot be a complex type. + + + + %1 is not allowed to have a member type with the same name as itself. + + + + %1 facet collides with %2 facet. + + + + %1 facet must have the same value as %2 facet of base type. + + + + %1 facet must be equal or greater than %2 facet of base type. + + + + %1 facet must be less than or equal to %2 facet of base type. + + + + %1 facet contains invalid regular expression + + + + Unknown notation %1 used in %2 facet. + + + + %1 facet contains invalid value %2: %3. + + + + %1 facet cannot be %2 or %3 if %4 facet of base type is %5. + + + + %1 facet cannot be %2 if %3 facet of base type is %4. + + + + %1 facet must be less than or equal to %2 facet. + + + + %1 facet must be less than %2 facet of base type. + + + + %1 facet and %2 facet cannot appear together. + + + + %1 facet must be greater than %2 facet of base type. + + + + %1 facet must be less than %2 facet. + + + + %1 facet must be greater than or equal to %2 facet of base type. + + + + Simple type contains not allowed facet %1. + + + + %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. + + + + Only %1 and %2 facets are allowed when derived by union. + + + + %1 contains %2 facet with invalid data: %3. + + + + Attribute group %1 contains attribute %2 twice. + + + + Attribute group %1 contains two different attributes that both have types derived from %2. + + + + Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. + + + + Complex type %1 contains attribute %2 twice. + + + + Complex type %1 contains two different attributes that both have types derived from %2. + + + + Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. + + + + Element %1 is not allowed to have a value constraint if its base type is complex. + + + + Element %1 is not allowed to have a value constraint if its type is derived from %2. + + + + Value constraint of element %1 is not of elements type: %2. + + + + Element %1 is not allowed to have substitution group affiliation as it is no global element. + + + + Type of element %1 cannot be derived from type of substitution group affiliation. + + + + Value constraint of attribute %1 is not of attributes type: %2. + + + + Attribute %1 has value constraint but has type derived from %2. + + + + %1 attribute in derived complex type must be %2 like in base type. + + + + Attribute %1 in derived complex type must have %2 value constraint like in base type. + + + + Attribute %1 in derived complex type must have the same %2 value constraint like in base type. + + + + Attribute %1 in derived complex type must have %2 value constraint. + + + + processContent of base wildcard must be weaker than derived wildcard. + + + + Element %1 exists twice with different types. + + + + Particle contains non-deterministic wildcards. + + + + Base attribute %1 is required but derived attribute is not. + + + + Type of derived attribute %1 cannot be validly derived from type of base attribute. + + + + Value constraint of derived attribute %1 does not match value constraint of base attribute. + + + + Derived attribute %1 does not exist in the base definition. + + + + Derived attribute %1 does not match the wildcard in the base definition. + + + + Base attribute %1 is required but missing in derived definition. + + + + Derived definition contains an %1 element that does not exists in the base definition + + + + Derived wildcard is not a subset of the base wildcard. + + + + %1 of derived wildcard is not a valid restriction of %2 of base wildcard + + + + Attribute %1 from base type is missing in derived type. + + + + Type of derived attribute %1 differs from type of base attribute. + + + + Base definition contains an %1 element that is missing in the derived definition + + + + Can not process unknown element %1, expected elements are: %2. + + + + Element %1 is not allowed in this scope, possible elements are: %2. + + + + Child element is missing in that scope, possible child elements are: %1. + + + + Document is not a XML schema. + + + + %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. + Атрибут %1 елемента %2 містить неправильний вміст: {%3} не є значенням типу %4. + + + %1 attribute of %2 element contains invalid content: {%3}. + Атрибут %1 елемента %2 містить неправильний вміст: {%3}. + + + Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. + + + + Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. + + + + %1 element is not allowed to have the same %2 attribute value as the target namespace %3. + + + + %1 element without %2 attribute is not allowed inside schema without target namespace. + + + + %1 element is not allowed inside %2 element if %3 attribute is present. + + + + %1 element has neither %2 attribute nor %3 child element. + + + + %1 element with %2 child element must not have a %3 attribute. + + + + %1 attribute of %2 element must be %3 or %4. + Атрибут %1 елемента %2 має бути %3 або %4. + + + %1 attribute of %2 element must have a value of %3. + + + + %1 attribute of %2 element must have a value of %3 or %4. + + + + %1 element must not have %2 and %3 attribute together. + + + + Content of %1 attribute of %2 element must not be from namespace %3. + + + + %1 attribute of %2 element must not be %3. + + + + %1 attribute of %2 element must have the value %3 because the %4 attribute is set. + + + + Specifying use='prohibited' inside an attribute group has no effect. + + + + %1 element must have either %2 or %3 attribute. + + + + %1 element must have either %2 attribute or %3 or %4 as child element. + + + + %1 element requires either %2 or %3 attribute. + + + + Text or entity references not allowed inside %1 element + + + + %1 attribute of %2 element must contain %3, %4 or a list of URIs. + + + + %1 element is not allowed in this context. + + + + %1 attribute of %2 element has larger value than %3 attribute. + + + + Prefix of qualified name %1 is not defined. + + + + %1 attribute of %2 element must either contain %3 or the other values. + + + + Component with ID %1 has been defined previously. + + + + Element %1 already defined. + + + + Attribute %1 already defined. + + + + Type %1 already defined. + Тип %1 вже визначено. + + + Attribute group %1 already defined. + + + + Element group %1 already defined. + + + + Notation %1 already defined. + + + + Identity constraint %1 already defined. + + + + Duplicated facets in simple type %1. + + + + %1 references unknown %2 or %3 element %4. + + + + %1 references identity constraint %2 that is no %3 or %4 element. + + + + %1 has a different number of fields from the identity constraint %2 that it references. + + + + Base type %1 of %2 element cannot be resolved. + + + + Item type %1 of %2 element cannot be resolved. + + + + Member type %1 of %2 element cannot be resolved. + + + + Type %1 of %2 element cannot be resolved. + + + + Base type %1 of complex type cannot be resolved. + + + + %1 cannot have complex base type that has a %2. + + + + Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. + + + + Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. + + + + Type of %1 element must be a simple type, %2 is not. + + + + Substitution group %1 of %2 element cannot be resolved. + + + + Substitution group %1 has circular definition. + + + + Duplicated element names %1 in %2 element. + + + + Reference %1 of %2 element cannot be resolved. + + + + Circular group reference for %1. + + + + %1 element is not allowed in this scope + + + + %1 element cannot have %2 attribute with value other than %3. + + + + %1 element cannot have %2 attribute with value other than %3 or %4. + + + + %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. + + + + Attribute group %1 has circular reference. + + + + %1 attribute in %2 must have %3 use like in base type %4. + + + + Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. + + + + %1 has attribute wildcard but its base type %2 has not. + + + + Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. + + + + Enumeration facet contains invalid content: {%1} is not a value of type %2. + + + + Namespace prefix of qualified name %1 is not defined. + + + + %1 element %2 is not a valid restriction of the %3 element it redefines: %4. + + + + %1 is not valid according to %2. + %1 не є правильним відповідно до %2. + + + String content does not match the length facet. + + + + String content does not match the minLength facet. + + + + String content does not match the maxLength facet. + + + + String content does not match pattern facet. + + + + String content is not listed in the enumeration facet. + + + + Signed integer content does not match the maxInclusive facet. + + + + Signed integer content does not match the maxExclusive facet. + + + + Signed integer content does not match the minInclusive facet. + + + + Signed integer content does not match the minExclusive facet. + + + + Signed integer content is not listed in the enumeration facet. + + + + Signed integer content does not match pattern facet. + + + + Signed integer content does not match in the totalDigits facet. + + + + Unsigned integer content does not match the maxInclusive facet. + + + + Unsigned integer content does not match the maxExclusive facet. + + + + Unsigned integer content does not match the minInclusive facet. + + + + Unsigned integer content does not match the minExclusive facet. + + + + Unsigned integer content is not listed in the enumeration facet. + + + + Unsigned integer content does not match pattern facet. + + + + Unsigned integer content does not match in the totalDigits facet. + + + + Double content does not match the maxInclusive facet. + + + + Double content does not match the maxExclusive facet. + + + + Double content does not match the minInclusive facet. + + + + Double content does not match the minExclusive facet. + + + + Double content is not listed in the enumeration facet. + + + + Double content does not match pattern facet. + + + + Decimal content does not match in the fractionDigits facet. + + + + Decimal content does not match in the totalDigits facet. + + + + Date time content does not match the maxInclusive facet. + + + + Date time content does not match the maxExclusive facet. + + + + Date time content does not match the minInclusive facet. + + + + Date time content does not match the minExclusive facet. + + + + Date time content is not listed in the enumeration facet. + + + + Date time content does not match pattern facet. + + + + Duration content does not match the maxInclusive facet. + + + + Duration content does not match the maxExclusive facet. + + + + Duration content does not match the minInclusive facet. + + + + Duration content does not match the minExclusive facet. + + + + Duration content is not listed in the enumeration facet. + + + + Duration content does not match pattern facet. + + + + Boolean content does not match pattern facet. + + + + Binary content does not match the length facet. + + + + Binary content does not match the minLength facet. + + + + Binary content does not match the maxLength facet. + + + + Binary content is not listed in the enumeration facet. + + + + Invalid QName content: %1. + + + + QName content is not listed in the enumeration facet. + + + + QName content does not match pattern facet. + + + + Notation content is not listed in the enumeration facet. + + + + List content does not match length facet. + + + + List content does not match minLength facet. + + + + List content does not match maxLength facet. + + + + List content is not listed in the enumeration facet. + + + + List content does not match pattern facet. + + + + Union content is not listed in the enumeration facet. + + + + Union content does not match pattern facet. + + + + Data of type %1 are not allowed to be empty. + + + + Element %1 is missing child element. + + + + There is one IDREF value with no corresponding ID: %1. + + + + Loaded schema file is invalid. + + + + %1 contains invalid data. + + + + xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. + + + + xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. + + + + No schema defined for validation. + + + + No definition for element %1 available. + + + + Specified type %1 is not known to the schema. + + + + Element %1 is not defined in this scope. + + + + Declaration for element %1 does not exist. + + + + Element %1 contains invalid content. + + + + Element %1 is declared as abstract. + + + + Element %1 is not nillable. + + + + Attribute %1 contains invalid data: %2 + + + + Element contains content although it is nillable. + + + + Fixed value constraint not allowed if element is nillable. + + + + Specified type %1 is not validly substitutable with element type %2. + + + + Complex type %1 is not allowed to be abstract. + + + + Element %1 contains not allowed attributes. + + + + Element %1 contains not allowed child element. + + + + Content of element %1 does not match its type definition: %2. + + + + Content of element %1 does not match defined value constraint. + + + + Element %1 contains not allowed child content. + + + + Element %1 contains not allowed text content. + + + + Element %1 cannot contain other elements, as it has a fixed content. + + + + Element %1 is missing required attribute %2. + + + + Attribute %1 does not match the attribute wildcard. + + + + Declaration for attribute %1 does not exist. + + + + Element %1 contains two attributes of type %2. + + + + Attribute %1 contains invalid content. + + + + Element %1 contains unknown attribute %2. + + + + Content of attribute %1 does not match its type definition: %2. + + + + Content of attribute %1 does not match defined value constraint. + + + + Non-unique value found for constraint %1. + + + + Key constraint %1 contains absent fields. + + + + Key constraint %1 contains references nillable element %2. + + + + No referenced value found for key reference %1. + + + + More than one value found for field %1. + + + + Field %1 has no simple type. + + + + ID value '%1' is not unique. + + + + '%1' attribute contains invalid QName content: %2. + + + + empty + + + + zero or one + нуль чи один + + + exactly one + + + + one or more + один чи більше + + + zero or more + нуль чи більше + + + Required type is %1, but %2 was found. + Вимагається тип %1, але знайдено %2. + + + Promoting %1 to %2 may cause loss of precision. + + + + The focus is undefined. + Фокус не визначено. + + + It's not possible to add attributes after any other kind of node. + + + + An attribute by name %1 has already been created. + + + + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. diff -r ef0373b55136 -r 758a864f9613 translations/qtconfig_ja.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/qtconfig_ja.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,919 @@ + + + + + MainWindow + + + Desktop Settings (Default) + デスクトップの設定(デフォルト) + + + + Choose style and palette based on your desktop settings. + デスクトップの設定に応じてスタイルとパレットを選択します。 + + + + On The Spot + On The Spot + + + + + + + Auto (default) + 自動(デフォルト) + + + + Choose audio output automatically. + オーディオ出力を自動的に選択します。 + + + + + aRts + aRts + + + + Experimental aRts support for GStreamer. + Gstreamer での aRts のサポート(Experimental)。 + + + + Phonon GStreamer backend not available. + Phonon の GStreamer バックエンドが見つかりません。 + + + + Choose render method automatically + 描画メソッドを自動的に選択します + + + + + X11 + X11 + + + + Use X11 Overlays + X11 のオーバーレイを使用 + + + + + OpenGL + OpenGL + + + + Use OpenGL if available + OpenGL が使用可能な場合は使用 + + + + + Software + ソフトウェア + + + + Use simple software rendering + ソフトウェアでの描画を使用 + + + + No changes to be saved. + 内容が変更されていません。 + + + + Saving changes... + 保存中… + + + + Over The Spot + Over The Spot + + + + Off The Spot + Off The Spot + + + + Root + Root + + + + Select a Directory + ディレクトリの選択 + + + + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + <h3>%1</h3><br/>バージョン %2<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + + + + + + Qt Configuration + Qt 設定ツール + + + + Save Changes + 変更の保存 + + + + Save changes to settings? + 変更内容を設定に保存しますか？ + + + + &Yes + はい(&Y) + + + + &No + いいえ(&N) + + + + &Cancel + キャンセル(&C) + + + + MainWindowBase + + + Qt Configuration + Qt 設定ツール + + + + Appearance + 外観 + + + + GUI Style + GUI スタイル + + + + Select GUI &Style: + GUI スタイルの選択(&S): + + + + Preview + プレビュー + + + + Select &Palette: + パレットの選択(&P): + + + + Active Palette + アクティブなパレット + + + + Inactive Palette + アクティブではないパレット + + + + Disabled Palette + 無効時のパレット + + + + Build Palette + パレットの設定 + + + + &3-D Effects: + &3D エフェクト: + + + + Window Back&ground: + ウィンドウのバックグラウンド(&G): + + + + &Tune Palette... + パレットを調整(&T)... + + + + Please use the KDE Control Center to set the palette. + KDE のコントロールセンターでパレットの設定をしてください。 + + + + Fonts + フォント + + + + Default Font + デフォルトのフォント + + + + &Style: + スタイル(&S): + + + + &Point Size: + ポイントサイズ(&P): + + + + F&amily: + ファミリー(&F): + + + + Sample Text + テキストのサンプル + + + + Font Substitution + フォントの置換 + + + + S&elect or Enter a Family: + ファミリーを選択するか入力してください(&E): + + + + Current Substitutions: + 現在の置換定義: + + + + + Up + 上へ + + + + + Down + 下へ + + + + + Remove + 削除 + + + + Select s&ubstitute Family: + 置換するファミリーの選択(&U): + + + + + Add + 追加 + + + + Interface + インターフェース + + + + Feel Settings + 一般的な設定 + + + + + ms + ミリ秒 + + + + &Double Click Interval: + ダブルクリックの間隔(&D): + + + + No blinking + 点滅しない + + + + &Cursor Flash Time: + カーソルの点滅の間隔(&C): + + + + lines + 行 + + + + Wheel &Scroll Lines: + マウスホイールでのスクロール行数(&S): + + + + Resolve symlinks in URLs + URL のシンボリックリンクの解決 + + + + GUI Effects + GUI のエフェクト + + + + &Enable + 有効(&E) + + + + Alt+E + Alt+E + + + + &Menu Effect: + メニューのエフェクト(&E): + + + + C&omboBox Effect: + コンボボックスのエフェクト(&O): + + + + &ToolTip Effect: + ツールチップのエフェクト(&T): + + + + Tool&Box Effect: + ツールボックスのエフェクト(&B): + + + + + + + Disable + 無効 + + + + + + + Animate + アニメーション + + + + + Fade + フェード + + + + Global Strut + Global Strut + + + + Minimum &Width: + 幅の最小値(&W): + + + + Minimum Hei&ght: + 高さの最小値(&G): + + + + + pixels + ピクセル + + + + Enhanced support for languages written right-to-left + 右から左に書かれる言語のサポートの強化 + + + + XIM Input Style: + XIM のインプットスタイル: + + + + On The Spot + On The Spot + + + + Over The Spot + Over The Spot + + + + Off The Spot + Off The Spot + + + + Root + Root + + + + Default Input Method: + デフォルトのインプットメソッド: + + + + Printer + プリンタ + + + + Enable Font embedding + フォントを埋め込む + + + + Font Paths + フォントのパス + + + + Browse... + ブラウズ... + + + + Press the <b>Browse</b> button or enter a directory and press Enter to add them to the list. + <b>ブラウズ</b>ボタンを押すかディレクトリを入力し、エンターキーか追加ボタンでリストに追加してください。 + + + + Phonon + Phonon + + + + About Phonon + Phonon について + + + + + Current Version: + 現在のバージョン: + + + + + Not available + 使用不可能 + + + + + Website: + ウェブサイト: + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> + + + + About GStreamer + GStreamer について + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> + + + + GStreamer backend settings + GStreamer のバックエンドの設定 + + + + Preferred audio sink: + 優先するオーディオシンク: + + + + Preferred render method: + 優先する描画方法: + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: changes to these settings may prevent applications from starting up correctly.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">注: これらの設定の変更によりアプリケーションが正常に起動しなくなる場合があります。</span></p></body></html> + + + + &File + ファイル(&F) + + + + &Help + ヘルプ(&H) + + + + &Save + 保存(&S) + + + + Save + 保存 + + + + Ctrl+S + Ctrl+S + + + + E&xit + 終了(&X) + + + + Exit + 終了 + + + + &About + Qt 設定ツールについて(&A) + + + + About + Qt 設定ツールについて + + + + About &Qt + &Qt について + + + + About Qt + Qt について + + + + PaletteEditorAdvancedBase + + + Tune Palette + パレットの調整 + + + + <b>Edit Palette</b><p>Change the palette of the current widget or form.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget layouts in the preview section.</p> + <b>パレットの編集</b><p>現在のウィジェットやフォームのパレットを変更してください。</p><p>自動生成されたパレットを使用するか、それぞれのグループ／役割に対して色を選択してください。</p><p>パレットの内容のプレビューセクションにある様々なウィジェットのレイアウトで確認できます。</p> + + + + Select &Palette: + パレットの選択(&P): + + + + Active Palette + アクティブなパレット + + + + Inactive Palette + アクティブではないパレット + + + + Disabled Palette + 無効時のパレット + + + + Auto + 自動 + + + + Build inactive palette from active + アクティブなパレットからアクティブではないパレットを構築 + + + + Build disabled palette from active + アクティブなパレットから無効時のパレットを構築 + + + + Central color &roles + 中央部の色の役割(&R) + + + + Choose central color role + 中央部の色の役割を選択してください + + + + <b>Select a color role.</b><p>Available central roles are: <ul> <li>Window - general background color.</li> <li>WindowText - general foreground color. </li> <li>Base - used as background color for e.g. text entry widgets, usually white or another light color. </li> <li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. </li> <li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. </li> <li>ButtonText - a foreground color used with the Button color. </li> <li>Highlight - a color to indicate a selected or highlighted item. </li> <li>HighlightedText - a text color that contrasts to Highlight. </li> <li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. </li> </ul> </p> + <b>色の役割の選択。</b><p>選択可能な中央部の役割: <ul> <li>ウィンドウ - 一般的な背景色。</li> <li>ウィンドウテキスト - 一般的な前景色。 </li> <li>ベース - テキスト入力ウィジェット等の背景色。通常は白などの明るい色。 </li> <li>テキスト - ベースと共に用いられる前景色。通常はウィンドウテキストと同じだが、ウィンドウとベースに対してよりよいコントラストが必要な場合に使用される。 </li> <li>ボタン - 一般的なボタンの背景色。Macintosh スタイルのようにウィンドウと異なる背景色を使用する場合に使用される。 </li> <li>ボタンテキスト - ボタンと共に用いられる前景色 </li> <li>ハイライト - アイテムが選択されていたり、ハイライトされていることを示すために使用される色。 </li> <li>ハイライトのテキスト - ハイライト時のテキストの色。 </li> <li>明るいテキスト - 黒などの背景色に対して使用されるテキストの色。ウィンドウテキストの反対の色。 </li> </ul> </p> + + + + Window + ウィンドウ + + + + WindowText + ウィンドウテキスト + + + + Button + ボタン + + + + Base + ベース + + + + Text + テキスト + + + + BrightText + 明るいテキスト + + + + ButtonText + ボタンテキスト + + + + Highlight + ハイライト + + + + HighlightedText + ハイライトのテキスト + + + + &Select Color: + 色の選択(&S): + + + + + Choose a color + 色を選択してください + + + + Choose a color for the selected central color role. + 選択された中央部の色の役割に使用する色を選択してください。 + + + + 3-D shadow &effects + 3Dの影の効果(&E) + + + + Build &from button color + ボタンの色から構築する(&F) + + + + Generate shadings + 影を生成する + + + + Check to let 3D-effect colors be calculated from button-color. + 3D効果の色をボタンの色から計算するにはチェックしてください。 + + + + Choose 3D-effect color role + 3D効果の色の役割の選択 + + + + <b>Select a color role.</b><p>Available effect roles are: <ul> <li>Light - lighter than Button color. </li> <li>Midlight - between Button and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker than Button. </li> <li>Shadow - a very dark color. </li> </ul> + <b>色の役割の選択。</b><p>選択可能な中央部の役割: <ul> <li>ライト - ボタンの色より明るい。 </li> <li>ミッドライト - ボタンとライトの間。 </li> <li>ミッド - ボタンとダークの間。 </li> <li>ダーク - ボタンより暗い。 </li> <li>シャドウ - とても暗い色。 </li> </ul> + + + + Light + ライト + + + + Midlight + ミッドライト + + + + Mid + ミッド + + + + Dark + ダーク + + + + Shadow + シャドウ + + + + Select Co&lor: + 色の選択(&L): + + + + Choose a color for the selected effect color role. + 選択の効果の色の役割に使用する色を選択してください。 + + + + OK + OK + + + + Close dialog and apply all changes. + 全ての変更を適用してダイアログを閉じる。 + + + + Cancel + キャンセル + + + + Close dialog and discard all changes. + 全ての変更を破棄してダイアログを閉じる。 + + + + PreviewFrame + + + Desktop settings will only take effect after an application restart. + デスクトップの設定はアプリケーションの再起動後に反映されます。 + + + + PreviewWidgetBase + + + Preview Window + プレビューウィンドウ + + + + ButtonGroup + ボタングループ + + + + RadioButton1 + ラジオボタン1 + + + + RadioButton2 + ラジオボタン2 + + + + RadioButton3 + ラジオボタン3 + + + + ButtonGroup2 + ボタングループ2 + + + + CheckBox1 + チェックボックス1 + + + + CheckBox2 + チェックボックス2 + + + + LineEdit + ラインエディタ + + + + ComboBox + コンボボックス + + + + PushButton + プッシュボタン + + + + <p> +<a href="http://qt.nokia.com">http://qt.nokia.com</a> +</p> +<p> +<a href="http://www.kde.org">http://www.kde.org</a> +</p> + <p> +<a href="http://qt.nokia.com">http://qt.nokia.com</a> +</p> +<p> +<a href="http://www.kde.org">http://www.kde.org</a> +</p> + + + diff -r ef0373b55136 -r 758a864f9613 translations/qtconfig_ru.ts --- a/translations/qtconfig_ru.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qtconfig_ru.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,151 +4,114 @@ MainWindow - Desktop Settings (Default) Настройки рабочего стола (по умолчанию) - Choose style and palette based on your desktop settings. Выбор стиля и палитры на основе настроек рабочего стола. - On The Spot - - - - Auto (default) Автоматически (по умолчанию) - Choose audio output automatically. Автоматический выбор звукового выхода. - - aRts aRts - Experimental aRts support for GStreamer. Экспериментальная поддержка aRts в GStreamer. - Phonon GStreamer backend not available. Модуль поддержки GStreamer недоступен. - Choose render method automatically Автоматический выбор метода отрисовки - - X11 X11 - Use X11 Overlays Использовать оверлеи X11 - - OpenGL OpenGL - Use OpenGL if available Использовать OpenGL, если возможно - - Software Программный - Use simple software rendering Использовать простую программную отрисовку - No changes to be saved. Нет изменений для сохранения. - Saving changes... Сохранение изменений... - Over The Spot - Off The Spot - Root - Select a Directory Выбор каталога - <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). <h3>%1</h3><br/>Версия %2<br/><br/>Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения. - - - Qt Configuration Конфигурация Qt - Save Changes Сохранение изменений - Save changes to settings? Сохранить изменения настроек? - &Yes &Да - &No &Нет - &Cancel От&мена @@ -156,347 +119,278 @@ MainWindowBase - Qt Configuration Конфигурация Qt - Appearance Внешний вид - GUI Style Стиль пользовательского графического интерфейса - Select GUI &Style: &Стиль интерфейса: - Build Palette Палитра - &3-D Effects: Эффекты &3D: - Window Back&ground: &Фон окна: - &Tune Palette... &Настроить палитру... - Please use the KDE Control Center to set the palette. Используйте Центр управления KDE для настройки цветов. - Preview Предпросмотр - Select &Palette: Выбор &палитры: - Active Palette Палитра активных элементов - Inactive Palette Палитра неактивных элементов - Disabled Palette Палитра выключенных элементов - Fonts Шрифты - Default Font Шрифт по умолчанию - &Style: &Начертание: - &Point Size: &Размер: - F&amily: &Шрифт: - Sample Text Текст для примера (Sample Text) - Font Substitution Подстановка шрифтов - S&elect or Enter a Family: &Выберите шрифт для замены: - Current Substitutions: Текущие замены: - Up Выше - Down Ниже - Remove Удалить - Select s&ubstitute Family: &Заменять на шрифт: - Add Добавить - Interface Интерфейс - Feel Settings Настройка указателя - ms мс - &Double Click Interval: &Интервал двойного щелчка: - No blinking Без мигания - &Cursor Flash Time: &Период мигания курсора: - lines строк - Wheel &Scroll Lines: &Прокручивать строк при повороте колёсика: - Resolve symlinks in URLs Разрешать символьные ссылки в URL-ах - GUI Effects Эффекты пользовательского интерфейса - &Enable &Включить - Alt+E Alt+D - &Menu Effect: Эффект &меню: - C&omboBox Effect: Эффект &выпадающего списка: - &ToolTip Effect: Эффект &подсказки: - Tool&Box Effect: Эффект панели &инструментов: - Disable Выключен - Animate Анимация - Fade Затухание - Global Strut Минимальные размеры - Minimum &Width: Минимальная &ширина: - Minimum Hei&ght: Минимальная в&ысота: - pixels пикселей - Enhanced support for languages written right-to-left Расширенная поддержка письма справа налево - XIM Input Style: Стиль ввода XIM: - On The Spot - Over The Spot - Off The Spot - Root - Default Input Method: Метод ввода по умолчанию: - Printer Принтер - Enable Font embedding Разрешить встраивание шрифтов - Font Paths Пути к шрифтам - Browse... Обзор... - Press the <b>Browse</b> button or enter a directory and press Enter to add them to the list. Нажмите кнопку <b>Обзор...</b> или укажите каталог и нажмите Ввод для добавления его в список. - Phonon Phonon - About Phonon О Phonon - Current Version: Текущая версия: - Not available Недоступно - Website: Вэб-сайт: - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -509,12 +403,10 @@ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> - About GStreamer О GStreamer - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -527,22 +419,18 @@ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> - GStreamer backend settings Настройки модуля GStreamer - Preferred audio sink: Предпочитаемое звуковое устройство: - Preferred render method: Предпочитаемый метод отрисовки: - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -555,57 +443,46 @@ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Внимание: Изменение данных настроек может повлечь невозможность корректного запуска приложений.</span></p></body></html> - &File &Файл - &Help &Справка - &Save &Сохранить - Save Сохранить - Ctrl+S Ctrl+S - E&xit В&ыход - Exit Выход - &About &О программе - About О программе - About &Qt О &Qt - About Qt О Qt @@ -613,207 +490,166 @@ PaletteEditorAdvancedBase - Tune Palette Настройка палитры - <b>Edit Palette</b><p>Change the palette of the current widget or form.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget layouts in the preview section.</p> <b>Изменение палитры</b><p>Изменение палитры текущего виджета или формы.</p><p>Используйте сформированную палитру или выберите цвета для каждой группы цветов и каждой их роли.</p><p>Палитру можно проверить на виджетах в разных режимах отображения в разделе предпросмотра.</p> - Select &Palette: Выбор &палитры: - Active Palette Палитра активных элементов - Inactive Palette Палитра неактивных элементов - Disabled Palette Палитра выключенных элементов - Auto Автоматически - Build inactive palette from active Создать неактивную палитру из активной - Build disabled palette from active Создать выключенную палитру из активной - Central color &roles Роли &цветов - Choose central color role Выберите роль цвета - <b>Select a color role.</b><p>Available central roles are: <ul> <li>Window - general background color.</li> <li>WindowText - general foreground color. </li> <li>Base - used as background color for e.g. text entry widgets, usually white or another light color. </li> <li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. </li> <li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. </li> <li>ButtonText - a foreground color used with the Button color. </li> <li>Highlight - a color to indicate a selected or highlighted item. </li> <li>HighlightedText - a text color that contrasts to Highlight. </li> <li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. </li> </ul> </p> <b>Выбор роли цвета.</b><p>Доступны следующие роли: <ul><li>Window - основной цвет фона.</li> <li>WindowText - основной цвет текста.</li> <li>Base - используется в качестве фона для, например, виджетов с текстовыми полями, обычно, белый или другой светлый цвет.</li> <li>Text - цвет текста используемый совместно с Base. Обычно, он совпадает с WindowText, так как в этом случае получается максимальный контраст и с Window, и с Base.</li> <li>Button - основной цвет фона кнопки, которой требуется цвет отличный от Window, например, в стиле Macintosh.</li> <li>ButtonText - цвет текста используемый совместно с Button.</li> <li>Highlight - цвет для обозначения выбранного или выделенного элемента.</li> <li>HighlightedText - цвет текста контрастирующий с Highlight.</li> <li>BrightText - цвет текста, который отличается от WindowText и хорошо контрастирует с черным.</li></ul></p> - Window - WindowText - Button - Base - Text - BrightText - ButtonText - Highlight - HighlightedText - &Select Color: &Выбор цвета: - Choose a color Выберите цвет - Choose a color for the selected central color role. Выберите цвет для указанной роли. - 3-D shadow &effects Эффекты т&рехмерной тени - Build &from button color Получ&ить из цвета кнопки - Generate shadings Создание полутонов - Check to let 3D-effect colors be calculated from button-color. Включите, чтобы цвета эффекта трёхмерности были получены из цвета кнопки. - Choose 3D-effect color role Выбор роли цвета дял эффекта трёхмерности - <b>Select a color role.</b><p>Available effect roles are: <ul> <li>Light - lighter than Button color. </li> <li>Midlight - between Button and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker than Button. </li> <li>Shadow - a very dark color. </li> </ul> <b>Выбор роли цвета.</b><p>Доступны следующие роли: <ul> <li>Light - светлее цвета Button. </li> <li>Midlight - среднее между Light и Button. </li> <li>Mid - среднее между Button и Dark. </li> <li>Dark - темнее цвета Button. </li> <li>Shadow - очень темный цвет. </li> </ul> - Light - Midlight - Mid - Dark - Shadow - Select Co&lor: Выбор &цвета: - Choose a color for the selected effect color role. Выбор цвета для указанной роли. - OK Принять - Close dialog and apply all changes. Закрыть окно с применением изменений. - Cancel Отмена - Close dialog and discard all changes. Закрыть окно с отменой изменений. @@ -821,7 +657,6 @@ PreviewFrame - Desktop settings will only take effect after an application restart. Настройки рабочего стола применятся после перезапуска приложения. @@ -829,62 +664,50 @@ PreviewWidgetBase - Preview Window Окно предпросмотра - ButtonGroup ButtonGroup - RadioButton1 RadioButton1 - RadioButton2 RadioButton2 - RadioButton3 RadioButton3 - ButtonGroup2 ButtonGroup2 - CheckBox1 CheckBox1 - CheckBox2 CheckBox2 - LineEdit LineEdit - ComboBox ComboBox - PushButton PushButton - <p> <a href="http://qt.nokia.com">http://qt.nokia.com</a> </p> diff -r ef0373b55136 -r 758a864f9613 translations/qtconfig_sl.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/qtconfig_sl.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,732 @@ + + + + 2010-08-28 15:58+0200 + MIME-Version,Content-Type,Content-Transfer-Encoding,Plural-Forms,X-Language,X-Qt-Contexts,Last-Translator,PO-Revision-Date,Project-Id-Version,Language-Team,X-Generator + Lokalize 1.1 + Slovenian <lugos-slo@lugos.si> + + # Jure Repinc <jlp@holodeck1.com>, 2010. + Jure Repinc <jlp@holodeck1.com> + + MainWindow + + Desktop Settings (Default) + Nastavitve namizja (privzeto) + + + Choose style and palette based on your desktop settings. + Izberite slog in paleto, ki temeljita na vaših nastavitvah namizja. + + + On The Spot + Na mestu + + + Auto (default) + Samodejno (privzeto) + + + Choose audio output automatically. + Samodejno izbere zvočni izhod. + + + aRts + aRts + + + Experimental aRts support for GStreamer. + Poskusna podpora za aRts za GStreamer. + + + Phonon GStreamer backend not available. + Hrbtenica GStreamer za Phonon ni na voljo. + + + Choose render method automatically + Samodejno izberi način izrisovanja + + + X11 + X11 + + + Use X11 Overlays + Uporabi prekritja X11 + + + OpenGL + OpenGL + + + Use OpenGL if available + Če je na voljo, uporabi OpenGL + + + Software + Programsko + + + Use simple software rendering + Uporabi preprosto programsko izrisovanje + + + No changes to be saved. + Ni sprememb, ki bi jih bilo potrebno shraniti. + + + Saving changes... + Shranjevanje sprememb ... + + + Over The Spot + Prek mesta + + + Off The Spot + Z mesta + + + Root + Koren + + + Select a Directory + Izberite mapo + + + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + <h3>%1</h3><br/>Različica %2<br/><br/>Avtorske pravice © 2010 Nokia Corporation in/ali njene podružnice.<br/><br/>Prevedel: <a href="mailto:jlp@holodeck1.com">Jure Repinc</a>, <a href="http://www.lugos.si/">LUGOS</a> + + + Qt Configuration + Nastavitev Qt + + + Save Changes + Shrani spremembe + + + Save changes to settings? + Ali želite shraniti spremembe nastavitev? + + + &Yes + &Da + + + &No + &Ne + + + &Cancel + &Prekliči + + + + MainWindowBase + + Qt Configuration + Nastavitev Qt + + + Appearance + Videz + + + GUI Style + Slog grafičnega vmesnika + + + Select GUI &Style: + Izberite &slog grafičnega vmesnika: + + + Preview + Ogled + + + Select &Palette: + Izberite &paleto: + + + Active Palette + Paleta za aktivno + + + Inactive Palette + Paleta za neaktivno + + + Disabled Palette + Paleta za onemogočeno + + + Build Palette + Gradnja palete + + + &3-D Effects: + Učinki &3D: + + + Window Back&ground: + &Ozadje okna: + + + &Tune Palette... + &Nastavitev palete ... + + + Please use the KDE Control Center to set the palette. + Za nastavitev palete uporabite KDE-jeve Sistemske nastavitve. + + + Fonts + Pisave + + + Default Font + Privzeta pisava + + + &Style: + &Slog: + + + &Point Size: + &Velikost v točkah: + + + F&amily: + &Družina: + + + Sample Text + Vzorec besedila + + + Font Substitution + Nadomeščanje pisav + + + S&elect or Enter a Family: + I&zberite ali vnesite družino: + + + Current Substitutions: + Trenutni nadomestki: + + + Up + Gor + + + Down + Dol + + + Remove + Odstrani + + + Select s&ubstitute Family: + Izberite &nadomestno družino: + + + Add + Dodaj + + + Interface + Vmesnik + + + Feel Settings + Nastavitve obnašanja + + + ms + ms + + + &Double Click Interval: + Interval &dvojnega klika: + + + No blinking + Brez utripanja + + + &Cursor Flash Time: + &Hitrost utripanja kazalca: + + + lines + vrstic + + + Wheel &Scroll Lines: + &Vrtljaj koleščka: + + + Resolve symlinks in URLs + Razreši simbolične povezave v URL-jih + + + GUI Effects + Učinki grafičnega vmesnika + + + &Enable + &Omogoči + + + Alt+E + Alt+O + + + &Menu Effect: + Učinek &menija: + + + C&omboBox Effect: + Učinek &spustnega seznama: + + + &ToolTip Effect: + Učinek &namiga: + + + Tool&Box Effect: + Učinek o&rodjarne: + + + Disable + Onemogoči + + + Animate + Animiraj + + + Fade + Preidi + + + Global Strut + Globalni razmiki + + + Minimum &Width: + Najmanjša &širina: + + + Minimum Hei&ght: + Najmanjša &višina: + + + pixels + pik + + + Enhanced support for languages written right-to-left + Izboljšana podpora za jezike, ki se pišejo od desne proti levi + + + XIM Input Style: + Način za vnašanje XIM: + + + On The Spot + Na mestu + + + Over The Spot + Prek mesta + + + Off The Spot + Z mesta + + + Root + Vrh + + + Default Input Method: + Privzeti način vnašanja: + + + Printer + Tiskalnik + + + Enable Font embedding + Omogoči vgrajevanje pisav + + + Font Paths + Poti do posav + + + Browse... + Brskanje ... + + + Press the <b>Browse</b> button or enter a directory and press Enter to add them to the list. + Kliknite gumb <b>Brskanje</b> ali pa vnesite mapo in pritisnite vnašalko za dodajanje na seznam. + + + Phonon + Phonon + + + About Phonon + O Phononu + + + Current Version: + Trenutna različica: + + + Not available + Ni na voljo + + + Website: + Spletna stran: + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org/</span></a></p></body></html> + + + About GStreamer + O GStreamerju + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> + + + GStreamer backend settings + Nastavitve hrbtenice GStreamer + + + Preferred audio sink: + Prednostni ponor zvoka: + + + Preferred render method: + Prednostni način izrisovanja: + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: changes to these settings may prevent applications from starting up correctly.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Vedite: spremembe teh nastavitev lahko preprečijo pravilen zagon programov.</span></p></body></html> + + + &File + &Datoteka + + + &Help + &Pomoč + + + &Save + &Shrani + + + Save + Shrani + + + Ctrl+S + Ctrl+S + + + E&xit + Konča&j + + + Exit + Končaj + + + &About + &O + + + About + O + + + About &Qt + O &Qt + + + About Qt + O Qt + + + + PaletteEditorAdvancedBase + + Tune Palette + Nastavitev palete + + + <b>Edit Palette</b><p>Change the palette of the current widget or form.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget layouts in the preview section.</p> + <b>Nastavitev palete</b><p>Spremenite paleto za trenutni gradnik ali obrazec.</p><p>Uporabite ustvarjeno paleto ali pa za vsako barvno skupino in vsako barvno vlogo izberite barvo.</p><p>Paleto lahko v razdelku Ogled preizkusite z različnimi slogi gradnikov.</p> + + + Select &Palette: + Izberite &paleto: + + + Active Palette + Paleta za aktivno + + + Inactive Palette + Paleta za neaktivno + + + Disabled Palette + Paleta za onemogočeno + + + Auto + Samodejno + + + Build inactive palette from active + Paleto za neaktivno zgradi iz palete za aktivno + + + Build disabled palette from active + Paleto za onemogočeno zgradi iz palete za aktivno + + + Central color &roles + Osrednje barvne &vloge + + + Choose central color role + Izberite osrednjo barvno vlogo + + + <b>Select a color role.</b><p>Available central roles are: <ul> <li>Window - general background color.</li> <li>WindowText - general foreground color. </li> <li>Base - used as background color for e.g. text entry widgets, usually white or another light color. </li> <li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. </li> <li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. </li> <li>ButtonText - a foreground color used with the Button color. </li> <li>Highlight - a color to indicate a selected or highlighted item. </li> <li>HighlightedText - a text color that contrasts to Highlight. </li> <li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. </li> </ul> </p> + <b>Izberite barvno vlogo</b><p>Razpoložljive osrednje vloge so:<ul><li>Okno – splošna barva ozadja.</li><li>Besedilo okna – splošna barva ospredja</li><li>Osnova – uporabljena kot barva ozadja za npr. vnosne gradnike, običajno bela ali druga svetla barva.</li><li>Besedilo – barva ospredja, ki se uporablja z Osnovo. Običajno je to isto kot Besedilo okna in v tem primeru mora biti v kontrastu z barvama Okno in Osnova.</li><li>Gumb – splošna barva ozadja gumba, če gumb potrebuje ozadje, ki je drugačno od ozadja oken.</li><li>Besedilo gumba – barva ospredja, ki se uporablja z barvo Gumba<li>Poudarek – barva za nakazovanje izbranega ali poudarjenega.</li><li>Poudarjeno besedilo – barva besedila, ki se razlikuje od barve za Poudarek.</li><li>Svetlo besedilo – barva besedila, ki se zelo razlikuje od barve za Besedilo okna in je v kontrastu s črno.</li></ul></p> + + + Window + Okno + + + WindowText + Besedilo okna + + + Button + Gumb + + + Base + Osnova + + + Text + Besedilo + + + BrightText + Svetlo besedilo + + + ButtonText + Besedilo gumba + + + Highlight + Poudarek + + + HighlightedText + Poudarjeno besedilo + + + &Select Color: + &Izberite barvo: + + + Choose a color + Izberite barvo + + + Choose a color for the selected central color role. + Izberite barvo za izbrano osrednjo barvno vlogo. + + + 3-D shadow &effects + &Učinki 3D sence: + + + Build &from button color + &Zgradi iz barve za gumb + + + Generate shadings + Ustvari sence + + + Check to let 3D-effect colors be calculated from button-color. + Izberite, da se barve 3D učinka izračuna iz barve za gumb. + + + Choose 3D-effect color role + Izberite barvno vlogo 3D učinka + + + <b>Select a color role.</b><p>Available effect roles are: <ul> <li>Light - lighter than Button color. </li> <li>Midlight - between Button and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker than Button. </li> <li>Shadow - a very dark color. </li> </ul> + <b>Izberite barvno vlogo</b><p>Razpoložljive vloge za učinek so:<ul><li>Svetlo – svetlejše od barve za gumb.</li><li>Srednje svetlo – med barvama za gumb in Svetlo.</li><li>Srednje temno – med barvama za gumb in Temno</li><li>Temno – temnejše od barve za gumb.</li><li>Senca – zelo temna barva.</li></ul> + + + Light + Svetlo + + + Midlight + Srednje svetlo + + + Mid + Srednje temno + + + Dark + Temno + + + Shadow + Senca + + + Select Co&lor: + Izberite b&arvo: + + + Choose a color for the selected effect color role. + Izberite barvo za izbrano barvno vlogo učinka. + + + OK + V redu + + + Close dialog and apply all changes. + Zapre pogovorno okno in uveljavi spremembe. + + + Cancel + Prekliči + + + Close dialog and discard all changes. + Zapre pogovorno okno in zavrže spremembe. + + + + PreviewFrame + + Desktop settings will only take effect after an application restart. + Nastavitve namizja bodo stopile v veljavo po ponovnem zagonu programa. + + + + PreviewWidgetBase + + Preview Window + Okno ogleda + + + ButtonGroup + SkupinaGumbov + + + RadioButton1 + IzbirniGumb1 + + + RadioButton2 + IzbirniGumb2 + + + RadioButton3 + IzbirniGumb3 + + + ButtonGroup2 + SkupinaGumbov2 + + + CheckBox1 + PotrditvenoPolje1 + + + CheckBox2 + PotrditvenoPolje2 + + + LineEdit + UrejevalnaVrstica + + + ComboBox + SpustniSeznam + + + PushButton + Gumb + + + <p> +<a href="http://qt.nokia.com">http://qt.nokia.com</a> +</p> +<p> +<a href="http://www.kde.org">http://www.kde.org</a> +</p> + <p> +<a href="http://qt.nokia.com/">qt.nokia.com</a> +</p> +<p> +<a href="http://www.kde.org/">www.kde.org</a> +</p> + + + diff -r ef0373b55136 -r 758a864f9613 translations/qtconfig_uk.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/qtconfig_uk.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,717 @@ + + + + + MainWindow + + Desktop Settings (Default) + Налаштування стільниці (Типово) + + + Choose style and palette based on your desktop settings. + Оберіть стиль та палітру відповідно до ваших налаштувань стільниці. + + + On The Spot + У вікні документу + + + Auto (default) + Автоматично (типово) + + + Choose audio output automatically. + Вибрати аудіо вихід автоматично. + + + aRts + aRts + + + Experimental aRts support for GStreamer. + Експериментальна підтримка aRts для GStreamer. + + + Phonon GStreamer backend not available. + Підтримка GStreamer для Phonon не доступна. + + + Choose render method automatically + Обрати метод вімальовки автоматично + + + X11 + X11 + + + Use X11 Overlays + Використовувати оверлеї X11 + + + OpenGL + OpenGL + + + Use OpenGL if available + Використовувати OpenGL, якщо доступно + + + Software + Програмно + + + Use simple software rendering + Використовувати простий програмний рендеринг + + + No changes to be saved. + Немає змін для збереження. + + + Saving changes... + Збереження змін... + + + Over The Spot + Над вікном документу + + + Off The Spot + В рядку стану + + + Root + В додатковому вікні + + + Select a Directory + Оберіть теку + + + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + + + Qt Configuration + Налаштування Qt + + + Save Changes + Зберегти зміни + + + Save changes to settings? + Зберегти зміни до налаштувань? + + + &Yes + &Так + + + &No + &Ні + + + &Cancel + &Скасувати + + + + MainWindowBase + + Qt Configuration + Налаштування Qt + + + Appearance + Вигляд + + + GUI Style + Стиль GUI + + + Select GUI &Style: + Оберіть &стиль GUI: + + + Preview + Попередній перегляд + + + Select &Palette: + Виберіть &палітру: + + + Active Palette + Активна палітра + + + Inactive Palette + Неактивна палітра + + + Disabled Palette + Вимкнена палітра + + + Build Palette + Створити палітру + + + &3-D Effects: + &3-D ефекти: + + + Window Back&ground: + Фон &вікна: + + + &Tune Palette... + &Налаштувати палітру... + + + Please use the KDE Control Center to set the palette. + Будь ласка, використовуйте Системні параметри KDE, щоб встановити палітру. + + + Fonts + Шрифти + + + Default Font + Типовий шрифт + + + &Style: + &Стиль: + + + &Point Size: + &Розмір: + + + F&amily: + &Шрифт: + + + Sample Text + Зразок тексту + + + Font Substitution + Заміна шрифтів + + + S&elect or Enter a Family: + &Виберіть чи введіть шрифт: + + + Current Substitutions: + Поточні заміни: + + + Up + Вгору + + + Down + Вниз + + + Remove + Видалити + + + Select s&ubstitute Family: + &Оберіть шрифт, яким заміняти: + + + Add + Додати + + + Interface + Інтерфейс + + + Feel Settings + Поведінка миші + + + ms + мс + + + &Double Click Interval: + &Інтервал подвійного клацання: + + + No blinking + Без блимання + + + &Cursor Flash Time: + &Час блимання курсору: + + + lines + рядків + + + Wheel &Scroll Lines: + &Коліщатко прокручує: + + + Resolve symlinks in URLs + Вирішувати символьні посилання в URL + + + GUI Effects + Ефекти GUI + + + &Enable + &Увімкнути + + + Alt+E + + + + &Menu Effect: + Ефект &меню: + + + C&omboBox Effect: + Ефект випадаючого &списку: + + + &ToolTip Effect: + Ефект &підказки: + + + Tool&Box Effect: + Ефект панелі &інструментів: + + + Disable + Вимкнуто + + + Animate + Анімація + + + Fade + Згасання + + + Global Strut + Мінімальний розмір віджетів + + + Minimum &Width: + Мінімальна &ширина: + + + Minimum Hei&ght: + Мінімальна &висота: + + + pixels + пікселів + + + Enhanced support for languages written right-to-left + Розширена підтримка для, що пишуться справа наліво + + + XIM Input Style: + Стиль введення XIM: + + + On The Spot + У вікні документу + + + Over The Spot + Над вікном документу + + + Off The Spot + В рядку стану + + + Root + В додатковому вікні + + + Default Input Method: + Типовий метод введення: + + + Printer + Принтер + + + Enable Font embedding + Увімкнути вживлення шрифтів + + + Font Paths + Шляхи до шрифтів + + + Browse... + Огляд... + + + Press the <b>Browse</b> button or enter a directory and press Enter to add them to the list. + Натисніть кнопку <b>Огляд</b> чи введіть теку та натисніть Enter, щоб додати її до списку. + + + Phonon + Phonon + + + About Phonon + Про Phonon + + + Current Version: + Поточна версія: + + + Not available + Не доступна + + + Website: + Веб-сайт: + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> + + + + About GStreamer + Про GStreamer + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> + + + + GStreamer backend settings + Налаштування модуля GStreamer + + + Preferred audio sink: + Бажаний аудіо вихід: + + + Preferred render method: + Бажаний метод рендерингу: + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: changes to these settings may prevent applications from starting up correctly.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Примітка: зміни до цих налаштувань можуть заважати правильному запуску програм.</span></p></body></html> + + + &File + &Файл + + + &Help + &Довідка + + + &Save + &Зберегти + + + Save + Зберегти + + + Ctrl+S + Ctrl+S + + + E&xit + Ви&йти + + + Exit + Вийти + + + &About + &Про + + + About + Про + + + About &Qt + Про &Qt + + + About Qt + Про Qt + + + + PaletteEditorAdvancedBase + + Tune Palette + Налаштувати палітру + + + <b>Edit Palette</b><p>Change the palette of the current widget or form.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget layouts in the preview section.</p> + <b>Редагування палітри</b><p>Змінити палітру поточного віджета чи форми.</p><p>Використовуйте згенеровану палітру чи оберіть кольори для кожної групи кольорів та кожної кольорової ролі.</p><p>Палітру можна протестувати з різними розміщеннями віджетів в секції попереднього перегляду.</p> + + + Select &Palette: + Виберіть &палітру: + + + Active Palette + Активна палітра + + + Inactive Palette + Неактивна палітра + + + Disabled Palette + Вимкнена палітра + + + Auto + Автоматично + + + Build inactive palette from active + Будувати неактивну палітру з активної + + + Build disabled palette from active + Будувати вимкнену палітру з активної + + + Central color &roles + Головні кольорові &ролі + + + Choose central color role + Оберіть головну кольорову роль + + + <b>Select a color role.</b><p>Available central roles are: <ul> <li>Window - general background color.</li> <li>WindowText - general foreground color. </li> <li>Base - used as background color for e.g. text entry widgets, usually white or another light color. </li> <li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. </li> <li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. </li> <li>ButtonText - a foreground color used with the Button color. </li> <li>Highlight - a color to indicate a selected or highlighted item. </li> <li>HighlightedText - a text color that contrasts to Highlight. </li> <li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. </li> </ul> </p> + <b>Вибір кольорової ролі.</b><p>Доступні наступні головні ролі: <ul> <li>Вікно - загальний колір фону.</li> <li>Текст вікна - загальний колір переднього плану. </li> <li>Базовий - використовується як колір фону, наприклад, для віджетів для введення тексту, зазвичай білий або інший світлий колір. </li> <li>Текст - колір переднього плану, що використовується разом з базовим. Зазвичай збігається з "Текст вікна", і в цьому випадку має забезпечувати гарний контраст і з "Вікном", і з "Базовим". </li> <li>Кнопка - загальний колір фону кнопки, там де кнопки потребуються інший від "Вікна" фон, як в стилі Macintosh. </li> <li>Текст кнопки - колір переднього плану, що застосовується разом з кольором "Кнопки". </li> <li>Підсвічений - колір для індикації виділеного чи підсвіченого елементу. </li> <li>Підсвічений текст - колір тексту, що контрастує з "Підсвіченим". </li> <li>Яскравий текст - колір тексту, що суттєво відрізняється від "Тексту вікна" та добре контрастує з чорним, наприклад. </li> </ul> </p> + + + Window + Вікно + + + WindowText + Текст вікна + + + Button + Кнопка + + + Base + Базовий + + + Text + Текст + + + BrightText + Яскравий текст + + + ButtonText + Текст кнопки + + + Highlight + Підсвічений + + + HighlightedText + Підсвічений текст + + + &Select Color: + &Оберіть колір: + + + Choose a color + Оберіть колір + + + Choose a color for the selected central color role. + Виберіть колір для вказаної головної кольорової ролі. + + + 3-D shadow &effects + 3-D &ефекти тіні + + + Build &from button color + Будувати &з кольору кнопки + + + Generate shadings + Генерувати тіні + + + Check to let 3D-effect colors be calculated from button-color. + Увімкніть, щоб кольори 3D-ефектів розраховувались з кольору кнопки. + + + Choose 3D-effect color role + Оберіть роль для 3D-ефектів + + + <b>Select a color role.</b><p>Available effect roles are: <ul> <li>Light - lighter than Button color. </li> <li>Midlight - between Button and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker than Button. </li> <li>Shadow - a very dark color. </li> </ul> + <b>Оберіть кольорову роль.</b><p>Доступні наступні ролі ефектів: <ul> <li>Світлий - світліше ніж колір кнопки. </li> <li>Напівсвітлий - між "Кнопкою" та "Світлим". </li> <li>Напівтемний - між "Кнопкою" та "Темним". </li> <li>Темний - темніший ніж "Кнопка". </li> <li>Тінь - дуже темний колір. </li> </ul> + + + Light + Світлий + + + Midlight + Напівсвітлий + + + Mid + Напівтемний + + + Dark + Темний + + + Shadow + Тінь + + + Select Co&lor: + Оберіть &колір: + + + Choose a color for the selected effect color role. + Оберіть колір для вказаної кольорової ролі ефектів. + + + OK + OK + + + Close dialog and apply all changes. + Закрити діалог та застосувати усі зміни. + + + Cancel + Скасувати + + + Close dialog and discard all changes. + Закрити діалог та відкинути усі зміни. + + + + PreviewFrame + + Desktop settings will only take effect after an application restart. + Налаштування стільниці будуть застосовані лише після перезапуску програми. + + + + PreviewWidgetBase + + Preview Window + Вікно попереднього перегляду + + + ButtonGroup + Група кнопок + + + RadioButton1 + Перемикач 1 + + + RadioButton2 + Перемикач 2 + + + RadioButton3 + Перемикач 3 + + + ButtonGroup2 + Група кнопок 2 + + + CheckBox1 + Прапорець 1 + + + CheckBox2 + Прапорець 2 + + + LineEdit + Поле введення + + + ComboBox + Випадаючий список + + + PushButton + Кнопка + + + <p> +<a href="http://qt.nokia.com">http://qt.nokia.com</a> +</p> +<p> +<a href="http://www.kde.org">http://www.kde.org</a> +</p> + <p> +<a href="http://qt.nokia.com">http://qt.nokia.com</a> +</p> +<p> +<a href="http://www.kde.org">http://www.kde.org</a> +</p> + + + diff -r ef0373b55136 -r 758a864f9613 translations/qvfb_ja.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/qvfb_ja.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,525 @@ + + + + + AnimationSaveWidget + + + + Record + 録画 + + + + Reset + リセット + + + + Save + 保存 + + + + Save in MPEG format (requires netpbm package installed) + MPEG形式で保存(netpbmパッケージのインストールが必要) + + + + + Click record to begin recording. + 録画を開始するには「録画」をクリックしてください。 + + + + + Finished saving. + 保存が完了しました。 + + + + Paused. Click record to resume, or save if done. + 一時停止中。「録画」をクリック再開するか、保存をしてください。 + + + + Pause + 一時停止 + + + + Recording... + 録画中... + + + + Saving... + 保存中... + + + + + Save animation... + 動画を保存中... + + + + Save canceled. + 保存がキャンセルされました。 + + + + Save failed! + 保存に失敗しました！ + + + + Config + + + Configure + 設定 + + + + Size + サイズ + + + + 176x220 "SmartPhone" + 176x220 "スマートフォン" + + + + 240x320 "PDA" + 240x320 "PDA" + + + + 320x240 "TV" / "QVGA" + 320x240 "TV" / "QVGA" + + + + 640x480 "VGA" + 640x480 "VGA" + + + + 800x480 + 800x480 + + + + 800x600 + 800x600 + + + + 1024x768 + 1024x768 + + + + Custom + それ以外 + + + + Depth + 色深度 + + + + 1 bit monochrome + 1 bit モノクロ + + + + 2 bit grayscale + 2 bit グレイスケール + + + + 4 bit grayscale + 4 bit グレイスケール + + + + 8 bit + 8 bit + + + + 12 (16) bit + 12(16) bit + + + + 15 bit + 15 bit + + + + 16 bit + 16 bit + + + + 18 bit + 18 bit + + + + 24 bit + 24 bit + + + + 32 bit + 32 bit + + + + 32 bit ARGB + 32 bit ARGB + + + + Swap red and blue channels + 赤と青のチャンネルを入れ替える + + + + BGR format + BGR フォーマット + + + + Skin + スキン + + + + None + なし + + + + Emulate touch screen (no mouse move) + タッチスクリーンのエミュレート(マウスムーブが無効になります) + + + + Emulate LCD screen (Only with fixed zoom of 3.0 times magnification) + LCDスクリーンのエミュレート(3倍固定の拡大ズーム) + + + + <p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>. + <p><i>以上の</i>サイズや色深度を変更した場合、ヴァーチャルフレームバッファ上で動作しているアプリケーションは終了します。<i>以下の</i>ガンマ値の変更の場合はアプリケーションは終了しません。 + + + + Gamma + ガンマ + + + + Blue + 青 + + + + + + + 1.0 + 1.0 + + + + Green + 緑 + + + + All + 全て + + + + Red + 赤 + + + + Set all to 1.0 + 全て1.0にする + + + + &OK + &OK + + + + &Cancel + キャンセル(&C) + + + + DeviceSkin + + + The image file '%1' could not be loaded. + 画像ファイル "%1" を読み込めません。 + + + + The skin directory '%1' does not contain a configuration file. + スキンのディレクトリ "%1" に設定ファイルがありません。 + + + + The skin configuration file '%1' could not be opened. + スキンの設定ファイル "%1" が開けません。 + + + + The skin configuration file '%1' could not be read: %2 + スキンの設定ファイル "%1" が読み込めません: %2 + + + + Syntax error: %1 + シンタックスエラー: %1 + + + + The skin "up" image file '%1' does not exist. + スキンの "up" の画像ファイル "%1" がありません。 + + + + The skin "down" image file '%1' does not exist. + スキンの "down" の画像ファイル "%1" がありません。 + + + + The skin "closed" image file '%1' does not exist. + スキンの "closed" の画像ファイル "%1" がありません。 + + + + The skin cursor image file '%1' does not exist. + スキンのカーソルの画像ファイル "%1" がありません。 + + + + Syntax error in area definition: %1 + エリア定義のシンタックスエラー: %1 + + + + Mismatch in number of areas, expected %1, got %2. + エリア数が正しくありません。%2 となってありますが %1 であるべきです。 + + + + QVFb + + + &Save image... + 画像の保存(&S)... + + + + &Animation... + 動画の保存(&A)... + + + + &Quit + 終了(&Q) + + + + Show &Cursor + カーソルの表示(&C) + + + + &Refresh Rate... + リフレッシュレート(&R)... + + + + Zoom scale &0.5 + ズームスケール &0.5 + + + + Zoom scale &1 + ズームスケール &1 + + + + Zoom scale &2 + ズームスケール &2 + + + + Zoom scale &3 + ズームスケール &3 + + + + Zoom scale &4 + ズームスケール &4 + + + + &File + ファイル(&F) + + + + &Configure... + 設定の変更(&C)... + + + + &View + 表示(&V) + + + + &No rotation + ローテーションなし(&N) + + + + &90° rotation + &90° ローテーション + + + + 1&80° rotation + 1&80° ローテーション + + + + 2&70° rotation + 2&70° ローテーション + + + + Zoom scale 0.7&5 + ズームスケール 0.7&5 + + + + Zoom &scale... + ズームスケール(&S)... + + + + &Help + ヘルプ(&H) + + + + &About... + QVFB について(&A)... + + + + Save Main Screen image + メインスクリーンの画像の保存 + + + + + snapshot.png + スナップショット.png + + + + + Portable Network Graphics (*.png) + + + + + Save Main Screen Image + メインスクリーンの画像の保存 + + + + + Save failed. Check that you have permission to write to the target directory. + 保存に失敗しました。保存先のディレクトリn書き込み権限があるかを確認してください。 + + + + Save Second Screen image + サブスクリーンの画像の保存 + + + + Save Second Screen Image + サブスクリーンの画像の保存 + + + + About QVFB + QVFB について + + + + <h2>The Qt for Embedded Linux Virtual X11 Framebuffer</h2><p>This application runs under Qt for X11, emulating a simple framebuffer, which the Qt for Embedded Linux server and clients can attach to just as if it was a hardware Linux framebuffer. <p>With the aid of this development tool, you can develop Qt for Embedded Linux applications under X11 without having to switch to a virtual console. This means you can comfortably use your other development tools such as GUI profilers and debuggers. + <h2>The Qt for Embedded Linux Virtual X11 Framebuffer</h2><p>このアプリケーションは Qt for X11 上で動作し、Qt for Embedded Linux のサーバーとクライアントがハードウェアの Linux フレームバッファのように接続可能なシンプルなフレームバッファをエミュレートします。 <p>この開発ツールを使用すると Qt for Embedded Linux 向けのアプリケーションが X11 上でヴァーチャルコンソールへ切り替える事なく開発できるようになります。GUI のプロファイラやデバッガなどの他のツールを一緒に使用する時に便利でしょう。 + + + + Browse... + 他のスキンを参照... + + + + Load Custom Skin... + カスタムスキンを開く... + + + + All QVFB Skins (*.skin) + QVFB のスキン(*.skin) + + + + QVFbRateDialog + + + Target frame rate: + ターゲットのフレームレート: + + + + + %1fps + %1fps + + + + OK + OK + + + + Cancel + キャンセル + + + diff -r ef0373b55136 -r 758a864f9613 translations/qvfb_ru.ts --- a/translations/qvfb_ru.ts Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/qvfb_ru.ts Mon Oct 04 01:19:32 2010 +0300 @@ -4,71 +4,54 @@ AnimationSaveWidget - - Record Записать - Reset Сбросить - Save Сохранить - Save in MPEG format (requires netpbm package installed) Сохранить в формат MPEG (требуется установленный пакет netpbm) - - Click record to begin recording. Нажмите "Записать" для начала записи. - - Finished saving. Сохранение завершено. - Paused. Click record to resume, or save if done. Приостановлено. Нажмите "Записать" для продолжения или "Сохранить", если готово. - Pause Пауза - Recording... Идёт запись... - Saving... Сохранение... - - Save animation... Сохранение анимации... - Save canceled. Сохранение отменено. - Save failed! Сохранение не удалось! @@ -76,193 +59,155 @@ Config - Configure Настройка - Size Размер - 176x220 "SmartPhone" 176x220 "SmartPhone" - 240x320 "PDA" 240x320 "PDA" - 320x240 "TV" / "QVGA" 320x240 "TV" / "QVGA" - 640x480 "VGA" 640x480 "VGA" - 800x480 800x480 - 800x600 800x600 - 1024x768 1024x768 - Custom Особый - Depth Глубина - 1 bit monochrome 1 бит (монохромный) - 2 bit grayscale 2 бита (градации серого) - 4 bit grayscale 4 бита (градации серого) - 8 bit 8 бит - 12 (16) bit 12 (16) бит - 15 bit 15 бит - 16 bit 16 бит - 18 bit 18 бит - 24 bit 24 бита - 32 bit 32 бита - 32 bit ARGB 32 бита (ARGB) - Swap red and blue channels Поменять синий и красный каналы - BGR format Формат BGR - Skin Обложка - None Нет - Emulate touch screen (no mouse move) указателя? Эмулировать тачскрин (без перемещения мыши) - Emulate LCD screen (Only with fixed zoom of 3.0 times magnification) Эмулировать ж/к экран (только с 3-х кратным увеличением) - <p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>. <p>Имейте в виду, что программы, использующие фрэймбуфер, будут завершены, если изменится <i>размер</i> и/или <i>глубина</i> экрана. - Gamma Гамма - Blue Синий - 1.0 1.0 - Green Зеленый - All Все - Red Красный - Set all to 1.0 Выставить все в 1.0 - &OK &ОК - &Cancel От&мена @@ -270,57 +215,46 @@ DeviceSkin - The image file '%1' could not be loaded. Не удалось загрузить изображение '%1'. - The skin directory '%1' does not contain a configuration file. Каталог обложки '%1' не содержит файла настроек. - The skin configuration file '%1' could not be opened. Не удалось открыть файл настроек обложки '%1'. - The skin configuration file '%1' could not be read: %2 Не удалось прочитать файл настроек обложки '%1': %2 - Syntax error: %1 Синтаксическая ошибка: %1 - The skin "up" image file '%1' does not exist. Файл изображения "up" '%1' не существует. - The skin "down" image file '%1' does not exist. Файл изображения "down" '%1' не существует. - The skin "closed" image file '%1' does not exist. Файл изображения "closed" '%1' не существует. - The skin cursor image file '%1' does not exist. Файл изображения курсора '%1' не существует. - Syntax error in area definition: %1 Синтаксическая ошибка в определении области: %1 - Mismatch in number of areas, expected %1, got %2. Несовпадение количества зон: ожидается %1, указано %2. @@ -328,17 +262,14 @@ QVFb - Browse... Обзор... - Load Custom Skin... Загрузить обложку пользователя... - All QVFB Skins (*.skin) Все обложки QVFB (*.skin) diff -r ef0373b55136 -r 758a864f9613 translations/qvfb_sl.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/qvfb_sl.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,422 @@ + + + + 2010-08-28 16:47+0200 + MIME-Version,Content-Type,Content-Transfer-Encoding,Plural-Forms,X-Language,X-Qt-Contexts,Last-Translator,PO-Revision-Date,Project-Id-Version,Language-Team,X-Generator + Lokalize 1.1 + Slovenian <lugos-slo@lugos.si> + + # Jure Repinc <jlp@holodeck1.com>, 2010. + Jure Repinc <jlp@holodeck1.com> + + AnimationSaveWidget + + Record + Posnemi + + + Reset + Ponastavi + + + Save + Shrani + + + Save in MPEG format (requires netpbm package installed) + Shrani v obliko MPEG (potrebuje nameščen paket netpbm) + + + Click record to begin recording. + Kliknite Posnemi za začetek snemanja. + + + Finished saving. + Shranjevanje zaključeno. + + + Paused. Click record to resume, or save if done. + Premor. Za nadaljevanje kliknite Posnemi, če ste zaključili pa Shrani. + + + Pause + Premor + + + Recording... + Snemanje ... + + + Saving... + Shranjevanje ... + + + Save animation... + Shrani animacijo ... + + + Save canceled. + Shranjevanje preklicano + + + Save failed! + Shranjevanje ni uspelo. + + + + Config + + Configure + Nastavi + + + Size + Velikost + + + 176x220 "SmartPhone" + 176⨯220 (pametni telefon) + + + 240x320 "PDA" + 240⨯320 (dlančnik) + + + 320x240 "TV" / "QVGA" + 320⨯240 (TV/QVGA) + + + 640x480 "VGA" + 640⨯480 (VGA) + + + 800x480 + 800⨯480 + + + 800x600 + 800⨯600 + + + 1024x768 + 1024⨯768 + + + Custom + Po meri + + + Depth + Globina + + + 1 bit monochrome + 1 bit enobarvno + + + 2 bit grayscale + 2 bita sivine + + + 4 bit grayscale + 4 bite sivine + + + 8 bit + 8 bitov + + + 12 (16) bit + 12 (16) bitov + + + 15 bit + 15 bitov + + + 16 bit + 16 bitov + + + 18 bit + 18 bitov + + + 24 bit + 24 bitov + + + 32 bit + 32 bitov + + + 32 bit ARGB + 32-bitov ARGB + + + Swap red and blue channels + Izmenjaj modri in rdeči kanal + + + BGR format + Format BGR + + + Skin + Tema + + + None + Brez + + + Emulate touch screen (no mouse move) + Posnemaj zaslon na dotik (brez premikov miške) + + + Emulate LCD screen (Only with fixed zoom of 3.0 times magnification) + Posnemaj zaslon LCD (samo s stalno 3.0⨯ povećavo) + + + <p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>. + <p>Vedite, da bo ob spremembi velikosti ali globine vsak program, ki uporablja navidezni slikovni medpomnilnik, končan. Gamo lahko prosto spreminjate. + + + Gamma + Gama + + + Blue + Modra + + + 1.0 + 1,0 + + + Green + Zelena + + + All + Vse + + + Red + Rdeča + + + Set all to 1.0 + Nastavi vse na 1,0 + + + &OK + &V redu + + + &Cancel + &Prekliči + + + + DeviceSkin + + The image file '%1' could not be loaded. + Slikovne datoteke »%1« ni bilo moč naložiti. + + + The skin directory '%1' does not contain a configuration file. + Mapa s temo »%1« ne vsebuje nastavitvene datoteke. + + + The skin configuration file '%1' could not be opened. + Nastavitvene datoteke za temo »%1« ni bilo moč odpreti. + + + The skin configuration file '%1' could not be read: %2 + Nastavitvene datoteke za temo »%1« ni bilo moč prebrati: %2 + + + Syntax error: %1 + Skladenjska napaka: %1 + + + The skin "up" image file '%1' does not exist. + Datoteka slike »up« teme »%1« ne obstaja. + + + The skin "down" image file '%1' does not exist. + Datoteka slike »down« teme »%1« ne obstaja. + + + The skin "closed" image file '%1' does not exist. + Datoteka slike »closed« teme »%1« ne obstaja. + + + The skin cursor image file '%1' does not exist. + Slikovna datoteka s kazalcem za temo »%1« ne obstaja. + + + Syntax error in area definition: %1 + Skladenjska napaka pri določitvi območja: %1 + + + Mismatch in number of areas, expected %1, got %2. + Neujemanje v številu območij, pričakovano %1, dobljeno %2. + + + + QVFb + + &File + &Datoteka + + + &Configure... + &Nastavi ... + + + &Save image... + &Shrani sliko ... + + + &Animation... + &Animacija ... + + + &Quit + Konča&j + + + &View + &Videz + + + Show &Cursor + Prikaži &kazalec + + + &Refresh Rate... + &Hitrost osveževanja ... + + + &No rotation + &Brez zasuka + + + &90° rotation + Zasuk za &90° + + + 1&80° rotation + Zasuk za 1&80° + + + 2&70° rotation + Zasuk za 2&70° + + + Zoom scale &0.5 + Povečava &0,5 + + + Zoom scale 0.7&5 + Povečava 0,7&5 + + + Zoom scale &1 + Povečeva &1,0 + + + Zoom scale &2 + Povečava &2,0 + + + Zoom scale &3 + Povečeva &3,0 + + + Zoom scale &4 + Povečava &4,0 + + + Zoom &scale... + &Povečava ... + + + &Help + &Pomoč + + + &About... + &O ... + + + Save Main Screen image + Shrani sliko glavnega zaslona + + + snapshot.png + posnetek.png + + + Portable Network Graphics (*.png) + Portable Network Graphics (*.png) + + + Save Main Screen Image + Shrani sliko glavnega zaslona + + + Save failed. Check that you have permission to write to the target directory. + Shranjevanje ni uspelo. Preverite dovoljenja za pisanje v ciljno mapo. + + + Save Second Screen image + Shrani sliko drugega zaslona + + + Save Second Screen Image + Shrani sliko drugega zaslona + + + About QVFB + O QVFB + + + <h2>The Qt for Embedded Linux Virtual X11 Framebuffer</h2><p>This application runs under Qt for X11, emulating a simple framebuffer, which the Qt for Embedded Linux server and clients can attach to just as if it was a hardware Linux framebuffer. <p>With the aid of this development tool, you can develop Qt for Embedded Linux applications under X11 without having to switch to a virtual console. This means you can comfortably use your other development tools such as GUI profilers and debuggers. + <h2>Qt for Embedded Linux Virtual X11 Framebuffer</h2><p>Ta program teče pod okenskim sistemom X11 in posnema preprost slikovni medpomnilnik, na katerega se lahko strežniki in odjemalci, izdelani s Qt za vgrajeni Linux, priklopijo, kot da bi bil pravi strojni slikovni medpomnilnik Linuxa.<p>S pomočjo tega orodja lahko programe Qt za vgrajeni Linux razvijate pod X11, ne da bi bilo potrebno preklopiti v navidezno konzolo. To pomeni, da lahko še naprej udobno uporabljate druga razvojna orodja, kot so grafični profilirniki in razhroščevalniki. + + + Browse... + Brskanje ... + + + Load Custom Skin... + Naloži temo po meri ... + + + All QVFB Skins (*.skin) + Vse teme za QVFB (*.skin) + + + + QVFbRateDialog + + Target frame rate: + Ciljna hitrost sličic: + + + %1fps + %1 sl./s + + + OK + V redu + + + Cancel + Prekliči + + + diff -r ef0373b55136 -r 758a864f9613 translations/qvfb_uk.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/translations/qvfb_uk.ts Mon Oct 04 01:19:32 2010 +0300 @@ -0,0 +1,415 @@ + + + + + AnimationSaveWidget + + Record + Записати + + + Reset + Відновити + + + Save + Зберегти + + + Save in MPEG format (requires netpbm package installed) + Зберегти в форматі MPEG (необхідний встановлений пакунок netpbm) + + + Click record to begin recording. + Клацніть "Записати", щоб розпочати запис. + + + Finished saving. + Збереження завершено. + + + Paused. Click record to resume, or save if done. + Зупинено. Клацніть "Записати", щоб продовжити, або "Зберегти" якщо готово. + + + Pause + Пауза + + + Recording... + Записую... + + + Saving... + Зберігаю... + + + Save animation... + Зберегти анімацію... + + + Save canceled. + Збереження скасовано. + + + Save failed! + Збереження провалилось! + + + + Config + + Configure + Налаштувати + + + Size + Розмір + + + 176x220 "SmartPhone" + 176x220 "Смартфон" + + + 240x320 "PDA" + 240x320 "PDA" + + + 320x240 "TV" / "QVGA" + 320x240 "TV" / "QVGA" + + + 640x480 "VGA" + 640x480 "VGA" + + + 800x480 + 800x480 + + + 800x600 + 800x600 + + + 1024x768 + 1024x768 + + + Custom + Користувацький + + + Depth + Глибина кольору + + + 1 bit monochrome + 1 біт монохромний + + + 2 bit grayscale + 2 біти сірий + + + 4 bit grayscale + 4 біти сірий + + + 8 bit + 8 біт + + + 12 (16) bit + 12 (16) біт + + + 15 bit + 15 біт + + + 16 bit + 16 біт + + + 18 bit + 18 біт + + + 24 bit + 24 біти + + + 32 bit + 32 біти + + + 32 bit ARGB + 32 біти ARGB + + + Swap red and blue channels + Поміняти червоний та блакитний канали + + + BGR format + Формат BGR + + + Skin + Обкладинка + + + None + Немає + + + Emulate touch screen (no mouse move) + Емулювати тачскрін (без пересувань миші) + + + Emulate LCD screen (Only with fixed zoom of 3.0 times magnification) + Емулювати LCD-екран (Лише фіксований масштаб з 3x збільшенням) + + + <p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>. + <p>Зверніть увагу, що будь-який додаток, який використовує віртуальний фреймбуфер буде закрито, якщо ви зміните розмір чи глибину кольору <i>зверху</i>. Ви можете довільно змінювати гамму <i>знизу</i>. + + + Gamma + Гамма + + + Blue + Блакитний + + + 1.0 + 1,0 + + + Green + Зелений + + + All + Усі + + + Red + Червоний + + + Set all to 1.0 + Встановити усі в 1.0 + + + &OK + &OK + + + &Cancel + &Скасувати + + + + DeviceSkin + + The image file '%1' could not be loaded. + Не вдалось завантажити файл зображення '%1'. + + + The skin directory '%1' does not contain a configuration file. + Тека обкладинки '%1' не містить файлу налаштувань. + + + The skin configuration file '%1' could not be opened. + Не вдалось відкрити файл налаштувань обкладинки '%1'. + + + The skin configuration file '%1' could not be read: %2 + Не вдалось прочитати файл налаштувань обкладинки '%1': %2 + + + Syntax error: %1 + Синтаксична помилка: %1 + + + The skin "up" image file '%1' does not exist. + Зображення обкладинки "вгору" '%1' не існує. + + + The skin "down" image file '%1' does not exist. + Зображення обкладинки "вниз" '%1' не існує. + + + The skin "closed" image file '%1' does not exist. + Зображення обкладинки "закрито" '%1' не існує. + + + The skin cursor image file '%1' does not exist. + Зображення обкладинки для курсору '%1' не існує. + + + Syntax error in area definition: %1 + Синтаксична помилка в описі області: %1 + + + Mismatch in number of areas, expected %1, got %2. + Не збігається кількість областей, очікувалось %1, отримано %2. + + + + QVFb + + &File + &Файл + + + &Configure... + &Налаштувати... + + + &Save image... + &Зберегти зображення... + + + &Animation... + &Анімація... + + + &Quit + Ви&йти + + + &View + &Вид + + + Show &Cursor + Показувати &курсор + + + &Refresh Rate... + Швидкість &оновлення... + + + &No rotation + &Без обертання + + + &90° rotation + Обернути на &90° + + + 1&80° rotation + Обернути на 1&80° + + + 2&70° rotation + Обернути на 2&70° + + + Zoom scale &0.5 + Коефіцієнт масштабування &0.5 + + + Zoom scale 0.7&5 + Коефіцієнт масштабування 0.7&5 + + + Zoom scale &1 + Коефіцієнт масштабування &1 + + + Zoom scale &2 + Коефіцієнт масштабування &2 + + + Zoom scale &3 + Коефіцієнт масштабування &3 + + + Zoom scale &4 + Коефіцієнт масштабування &4 + + + Zoom &scale... + Коефіцієнт &масштабування... + + + &Help + &Довідка + + + &About... + &Про... + + + Save Main Screen image + Зберегти зображення головного екрану + + + snapshot.png + + + + Portable Network Graphics (*.png) + Переносима мережева графіка (*.png) + + + Save Main Screen Image + Зберегти зображення головного екрану + + + Save failed. Check that you have permission to write to the target directory. + Збій збереження. Перевірте чи маєте ви право на запис в теку збереження. + + + Save Second Screen image + Зберегти зображення другого екрану + + + Save Second Screen Image + Зберегти зображення другого екрану + + + About QVFB + Про QVFB + + + <h2>The Qt for Embedded Linux Virtual X11 Framebuffer</h2><p>This application runs under Qt for X11, emulating a simple framebuffer, which the Qt for Embedded Linux server and clients can attach to just as if it was a hardware Linux framebuffer. <p>With the aid of this development tool, you can develop Qt for Embedded Linux applications under X11 without having to switch to a virtual console. This means you can comfortably use your other development tools such as GUI profilers and debuggers. + <h2>Віртуальний фреймбуфер X11 Qt для Embedded Linux</h2><p>Ця програма виконується під Qt для X11, емулюючи простий фреймбуфер, до якого сервер та клієнти Qt для Embedded Linux можуть приєднуватись так само, як би це був апаратний фреймбуфер Linux. <p>За допомогою цього інструменту ви можете розробляти програми Qt для Embedded Linux під X11, без потреби перемикатись на віртуальну консоль. Це означає, що ви можете зручно використовувати інші ваші інструменти розробки, такі як профайлери та зневаджувачі з графічним інтерфейсом користувача. + + + Browse... + Оглянути... + + + Load Custom Skin... + Завантажити обкладинку користувача... + + + All QVFB Skins (*.skin) + Усі обкладинки QVFB (*.skin) + + + + QVFbRateDialog + + Target frame rate: + Швидкість оновлення: + + + %1fps + %1 кадрів в секунду + + + OK + + + + Cancel + Скасувати + + + diff -r ef0373b55136 -r 758a864f9613 translations/translations.pri --- a/translations/translations.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/translations/translations.pri Mon Oct 04 01:19:32 2010 +0300 @@ -47,8 +47,8 @@ xmlpatterns \ ) addTsTargets(designer, ../tools/designer/designer.pro) -addTsTargets(linguist, ../tools/linguist/linguist/linguist.pro) -addTsTargets(assistant, ../tools/assistant/tools/assistant/assistant.pro) +addTsTargets(linguist, ../tools/linguist/linguist.pro) +addTsTargets(assistant, ../tools/assistant/tools/tools.pro) addTsTargets(qt_help, ../tools/assistant/lib/lib.pro) addTsTargets(qtconfig, ../tools/qtconfig/qtconfig.pro) addTsTargets(qvfb, ../tools/qvfb/qvfb.pro)