diff options
Diffstat (limited to 'examples')
15 files changed, 177 insertions, 184 deletions
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml index c7af666..275ad43 100644 --- a/examples/declarative/fonts/fonts.qml +++ b/examples/declarative/fonts/fonts.qml @@ -8,7 +8,7 @@ Rectangle { FontLoader { id: fixedFont; name: "Courier" } - FontLoader { id: localFont; source: "fonts/FreeMono.ttf" } + FontLoader { id: localFont; source: "fonts/tarzenau-ocr-a.ttf" } FontLoader { id: webFont; source: "http://www.princexml.com/fonts/steffmann/Starburst.ttf" } FontLoader { id: webFont2; source: "http://wrong.address.org" } diff --git a/examples/declarative/fonts/fonts/FreeMono.ttf b/examples/declarative/fonts/fonts/FreeMono.ttf Binary files differdeleted file mode 100644 index d7ce52d..0000000 --- a/examples/declarative/fonts/fonts/FreeMono.ttf +++ /dev/null diff --git a/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf b/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf Binary files differnew file mode 100644 index 0000000..cf93f96 --- /dev/null +++ b/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf diff --git a/examples/declarative/plugins/plugins.qml b/examples/declarative/plugins/plugins.qml index 97c1b69..dbeb001 100644 --- a/examples/declarative/plugins/plugins.qml +++ b/examples/declarative/plugins/plugins.qml @@ -1,4 +1,5 @@ -import com.nokia.TimeExample 1.0 +import com.nokia.TimeExample 1.0 // import types from the plugin +import 'files' // import types from the 'files' directory Clock { // this class is defined in QML (files/Clock.qml) diff --git a/examples/declarative/tutorials/samegame/samegame4/README b/examples/declarative/tutorials/samegame/samegame4/README deleted file mode 100644 index 244b205..0000000 --- a/examples/declarative/tutorials/samegame/samegame4/README +++ /dev/null @@ -1,10 +0,0 @@ -This demo uses pictures from the KDE project (www.kde.org), -specifically the images from the KSame game. These images are - -background.png -blueStone.png -redStone.png -greenStone.png -yellowStone.png - -and are presumably under the same GPL2 license as the rest of kdegames diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png Binary files differindex 25e885f..3734a27 100644 --- a/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png +++ b/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png Binary files differindex bf342e0..20e43c7 100644 --- a/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png +++ b/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png Binary files differindex 5ac14a5..b568a19 100644 --- a/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png +++ b/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png Binary files differindex b099f60..36b09a2 100644 --- a/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png +++ b/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png Binary files differindex c56124a..b1ce762 100644 --- a/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png +++ b/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro index 210ab1f..8f65d51 100644 --- a/examples/graphicsview/graphicsview.pro +++ b/examples/graphicsview/graphicsview.pro @@ -10,6 +10,7 @@ SUBDIRS = \ dragdroprobot \ flowlayout \ anchorlayout \ + simpleanchorlayout \ weatheranchorlayout contains(QT_CONFIG, qt3support):SUBDIRS += portedcanvas portedasteroids diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp index 6373d57..7d09c38 100644 --- a/examples/multimedia/audiodevices/audiodevices.cpp +++ b/examples/multimedia/audiodevices/audiodevices.cpp @@ -96,8 +96,8 @@ void AudioTest::test() } else { QAudioFormat nearest = deviceInfo.nearestFormat(settings); logOutput->append(tr("Failed")); - nearestFreq->setText(QString("%1").arg(nearest.sampleRate())); - nearestChannel->setText(QString("%1").arg(nearest.channelCount())); + nearestFreq->setText(QString("%1").arg(nearest.frequency())); + nearestChannel->setText(QString("%1").arg(nearest.channels())); nearestCodec->setText(nearest.codec()); nearestSampleSize->setText(QString("%1").arg(nearest.sampleSize())); @@ -149,18 +149,18 @@ void AudioTest::deviceChanged(int idx) deviceInfo = deviceBox->itemData(idx).value<QAudioDeviceInfo>(); frequencyBox->clear(); - QList<int> freqz = deviceInfo.supportedSampleRates(); + QList<int> freqz = deviceInfo.supportedFrequencies(); for(int i = 0; i < freqz.size(); ++i) frequencyBox->addItem(QString("%1").arg(freqz.at(i))); if(freqz.size()) - settings.setSampleRate(freqz.at(0)); + settings.setFrequency(freqz.at(0)); channelsBox->clear(); - QList<int> chz = deviceInfo.supportedChannelCounts(); + QList<int> chz = deviceInfo.supportedChannels(); for(int i = 0; i < chz.size(); ++i) channelsBox->addItem(QString("%1").arg(chz.at(i))); if(chz.size()) - settings.setChannelCount(chz.at(0)); + settings.setChannels(chz.at(0)); codecsBox->clear(); QStringList codecz = deviceInfo.supportedCodecs(); @@ -217,12 +217,12 @@ void AudioTest::deviceChanged(int idx) void AudioTest::freqChanged(int idx) { // freq has changed - settings.setSampleRate(frequencyBox->itemText(idx).toInt()); + settings.setFrequency(frequencyBox->itemText(idx).toInt()); } void AudioTest::channelChanged(int idx) { - settings.setChannelCount(channelsBox->itemText(idx).toInt()); + settings.setChannels(channelsBox->itemText(idx).toInt()); } void AudioTest::codecChanged(int idx) diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp index 86650da..8cc9948 100644 --- a/examples/multimedia/audioinput/audioinput.cpp +++ b/examples/multimedia/audioinput/audioinput.cpp @@ -198,8 +198,8 @@ InputTest::InputTest() pullMode = true; - format.setSampleRate(8000); - format.setChannelCount(1); + format.setFrequency(8000); + format.setChannels(1); format.setSampleSize(16); format.setSampleType(QAudioFormat::SignedInt); format.setByteOrder(QAudioFormat::LittleEndian); diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index 58dbbaf..0c57f4d 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -164,8 +164,8 @@ AudioTest::AudioTest() gen->start(); - settings.setSampleRate(SYSTEM_FREQ); - settings.setChannelCount(1); + settings.setFrequency(SYSTEM_FREQ); + settings.setChannels(1); settings.setSampleSize(16); settings.setCodec("audio/pcm"); settings.setByteOrder(QAudioFormat::LittleEndian); diff --git a/examples/widgets/validators/validators.ui b/examples/widgets/validators/validators.ui index f05b96f..cd984e6 100644 --- a/examples/widgets/validators/validators.ui +++ b/examples/widgets/validators/validators.ui @@ -1,41 +1,42 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ValidatorsForm</class> - <widget class="QWidget" name="ValidatorsForm" > - <property name="geometry" > + <widget class="QWidget" name="ValidatorsForm"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>526</width> - <height>668</height> + <height>443</height> </rect> </property> - <property name="windowTitle" > - <string>Form</string> + <property name="windowTitle"> + <string>Validators</string> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>9</number> + </property> <item> - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > + <layout class="QHBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> - <widget class="LocaleSelector" name="localeSelector" /> + <widget class="LocaleSelector" name="localeSelector"/> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -46,84 +47,84 @@ </layout> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>QIntValidator</string> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>9</number> + </property> <item> - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > + <layout class="QHBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> - <layout class="QGridLayout" > - <property name="margin" > + <layout class="QGridLayout"> + <property name="margin"> <number>0</number> </property> - <property name="spacing" > + <property name="spacing"> <number>6</number> </property> - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>Min:</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QSpinBox" name="minVal" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <item row="0" column="1"> + <widget class="QSpinBox" name="minVal"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>1</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimum" > + <property name="minimum"> <number>-1000000</number> </property> - <property name="maximum" > + <property name="maximum"> <number>1000000</number> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> <string>Max:</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QSpinBox" name="maxVal" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <item row="1" column="1"> + <widget class="QSpinBox" name="maxVal"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>1</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimum" > + <property name="minimum"> <number>-1000000</number> </property> - <property name="maximum" > + <property name="maximum"> <number>1000000</number> </property> - <property name="value" > + <property name="value"> <number>1000</number> </property> </widget> @@ -131,39 +132,39 @@ </layout> </item> <item> - <widget class="QFrame" name="frame" > - <property name="frameShape" > + <widget class="QFrame" name="frame"> + <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>9</number> + </property> <item> - <widget class="LEDWidget" name="ledWidget" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <widget class="LEDWidget" name="ledWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="pixmap" > - <pixmap resource="validators.qrc" >:/ledoff.png</pixmap> + <property name="pixmap"> + <pixmap resource="validators.qrc">:/ledoff.png</pixmap> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> </item> <item> - <widget class="QLabel" name="label_7" > - <property name="text" > + <widget class="QLabel" name="label_7"> + <property name="text"> <string>editingFinished()</string> </property> </widget> @@ -175,13 +176,13 @@ </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Fixed</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>20</height> @@ -190,134 +191,134 @@ </spacer> </item> <item> - <widget class="QLineEdit" name="editor" /> + <widget class="QLineEdit" name="editor"/> </item> </layout> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> <string>QDoubleValidator</string> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>9</number> + </property> <item> - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > + <layout class="QHBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> - <layout class="QGridLayout" > - <property name="margin" > + <layout class="QGridLayout"> + <property name="margin"> <number>0</number> </property> - <property name="spacing" > + <property name="spacing"> <number>6</number> </property> - <item row="0" column="0" > - <widget class="QLabel" name="label_3" > - <property name="text" > + <item row="0" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Min:</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QDoubleSpinBox" name="doubleMinVal" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <item row="0" column="1"> + <widget class="QDoubleSpinBox" name="doubleMinVal"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>1</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimum" > + <property name="minimum"> <double>-100000.000000000000000</double> </property> - <property name="maximum" > + <property name="maximum"> <double>100000.000000000000000</double> </property> - <property name="value" > + <property name="value"> <double>0.000000000000000</double> </property> </widget> </item> - <item row="0" column="2" > - <widget class="QLabel" name="label_5" > - <property name="text" > + <item row="0" column="2"> + <widget class="QLabel" name="label_5"> + <property name="text"> <string>Format:</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </item> - <item row="0" column="3" > - <widget class="QComboBox" name="doubleFormat" > + <item row="0" column="3"> + <widget class="QComboBox" name="doubleFormat"> <item> - <property name="text" > + <property name="text"> <string>Standard</string> </property> </item> <item> - <property name="text" > + <property name="text"> <string>Scientific</string> </property> </item> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_4" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> <string>Max:</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QDoubleSpinBox" name="doubleMaxVal" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <item row="1" column="1"> + <widget class="QDoubleSpinBox" name="doubleMaxVal"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>1</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimum" > + <property name="minimum"> <double>-100000.000000000000000</double> </property> - <property name="maximum" > + <property name="maximum"> <double>100000.000000000000000</double> </property> - <property name="value" > + <property name="value"> <double>1000.000000000000000</double> </property> </widget> </item> - <item row="1" column="2" > - <widget class="QLabel" name="label_6" > - <property name="text" > + <item row="1" column="2"> + <widget class="QLabel" name="label_6"> + <property name="text"> <string>Decimals:</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> </item> - <item row="1" column="3" > - <widget class="QSpinBox" name="doubleDecimals" > - <property name="value" > + <item row="1" column="3"> + <widget class="QSpinBox" name="doubleDecimals"> + <property name="value"> <number>2</number> </property> </widget> @@ -325,36 +326,36 @@ </layout> </item> <item> - <widget class="QFrame" name="frame_2" > - <property name="frameShape" > + <widget class="QFrame" name="frame_2"> + <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>9</number> + </property> <item> - <widget class="LEDWidget" name="doubleLedWidget" > - <property name="text" > + <widget class="LEDWidget" name="doubleLedWidget"> + <property name="text"> <string/> </property> - <property name="pixmap" > - <pixmap resource="validators.qrc" >:/ledoff.png</pixmap> + <property name="pixmap"> + <pixmap resource="validators.qrc">:/ledoff.png</pixmap> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> </item> <item> - <widget class="QLabel" name="label_8" > - <property name="text" > + <widget class="QLabel" name="label_8"> + <property name="text"> <string>editingFinished()</string> </property> </widget> @@ -366,13 +367,13 @@ </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Fixed</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>20</height> @@ -381,17 +382,17 @@ </spacer> </item> <item> - <widget class="QLineEdit" name="doubleEditor" /> + <widget class="QLineEdit" name="doubleEditor"/> </item> </layout> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>111</height> @@ -400,19 +401,19 @@ </spacer> </item> <item> - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > + <layout class="QHBoxLayout"> + <property name="spacing"> <number>6</number> </property> + <property name="margin"> + <number>0</number> + </property> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -421,8 +422,8 @@ </spacer> </item> <item> - <widget class="QPushButton" name="pushButton" > - <property name="text" > + <widget class="QPushButton" name="pushButton"> + <property name="text"> <string>Quit</string> </property> </widget> @@ -444,7 +445,7 @@ </customwidget> </customwidgets> <resources> - <include location="validators.qrc" /> + <include location="validators.qrc"/> </resources> <connections> <connection> @@ -453,11 +454,11 @@ <receiver>ValidatorsForm</receiver> <slot>close()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>94</x> <y>274</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>131</x> <y>260</y> </hint> |
