"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/GUI/qml/Summary.qml" between
flightgear-2020.3.7.tar.bz2 and flightgear-2020.3.8.tar.bz2

About: FlightGear is a multi-platform, cooperative flight simulator development project.

Summary.qml  (flightgear-2020.3.7.tar.bz2):Summary.qml  (flightgear-2020.3.8.tar.bz2)
skipping to change at line 157 skipping to change at line 157
} }
// aircraft name row // aircraft name row
StyledText { StyledText {
text: qsTr("Aircraft:") text: qsTr("Aircraft:")
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font.pixelSize: Style.headingFontPixelSize font.pixelSize: Style.headingFontPixelSize
} }
ClickableText { ClickableText {
text: _launcher.selectedAircraftInfo.name === "" ? text: {
qsTr("No aircraft selected") : _launcher.selectedAircr if (_launcher.skipAircraftFromArgs) return qsTr("<i>set from
aftInfo.name user arguments (in Settings)</i>");
enabled: _launcher.selectedAircraftInfo.name !== "" if (_launcher.selectedAircraftInfo.name === "") return qsTr
("No aircraft selected");
return _launcher.selectedAircraftInfo.name;
}
enabled: _launcher.selectedAircraftInfo.name !== "" && !_launche
r.skipAircraftFromArgs
font.pixelSize: Style.headingFontPixelSize font.pixelSize: Style.headingFontPixelSize
onClicked: root.showSelectedAircraft(); onClicked: root.showSelectedAircraft();
} }
HistoryPopup { HistoryPopup {
id: aircraftHistoryPopup id: aircraftHistoryPopup
model: _launcher.aircraftHistory model: _launcher.aircraftHistory
enabled: !_launcher.aircraftHistory.isEmpty enabled: !_launcher.aircraftHistory.isEmpty && !_launcher.skipAi rcraftFromArgs
onSelected: { onSelected: {
_launcher.selectedAircraft = _launcher.aircraftHistory.uriAt (index) _launcher.selectedAircraft = _launcher.aircraftHistory.uriAt (index)
} }
GettingStartedTip { GettingStartedTip {
tipId: "aircraftHistoryTip" tipId: "aircraftHistoryTip"
nextTip: "locationHistoryTip" nextTip: "locationHistoryTip"
arrow: GettingStartedTip.BottomRight arrow: GettingStartedTip.BottomRight
anchors { anchors {
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
bottom: parent.top bottom: parent.top
} }
text: qsTr("Access recently used aircraft.") text: qsTr("Access recently used aircraft.")
} }
} }
// empty space in next row (thumbnail, long aircraft description) // empty space in next row (thumbnail, long aircraft description)
Item { Item {
width: 1; height: 1 width: 1; height: 1
visible: aircraftDetailsRow.visible
} }
Item { Item {
id: aircraftDetailsRow id: aircraftDetailsRow
width: summaryGrid.middleColumnWidth width: summaryGrid.middleColumnWidth
height: Math.max(thumbnail.height, aircraftDescriptionText.heigh t) height: Math.max(thumbnail.height, aircraftDescriptionText.heigh t)
visible: !_launcher.skipAircraftFromArgs
ThumbnailImage { ThumbnailImage {
id: thumbnail id: thumbnail
aircraftUri: _launcher.selectedAircraft aircraftUri: _launcher.selectedAircraft
maximumSize.width: 172 maximumSize.width: 172
maximumSize.height: 128 maximumSize.height: 128
} }
StyledText { StyledText {
id: aircraftDescriptionText id: aircraftDescriptionText
skipping to change at line 221 skipping to change at line 226
text: root.__aircraftDescription text: root.__aircraftDescription
visible: root.__aircraftDescription != "" visible: root.__aircraftDescription != ""
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
maximumLineCount: 5 maximumLineCount: 5
elide: Text.ElideRight elide: Text.ElideRight
} }
} }
Item { Item {
width: 1; height: 1 width: 1; height: 1
visible: aircraftDetailsRow.visible
} }
// aircraft state row, if enabled // aircraft state row, if enabled
Item { Item {
width: 1; height: 1 width: 1; height: 1
visible: stateSelectionGroup.visible visible: stateSelectionGroup.visible
} }
Column { Column {
id: stateSelectionGroup id: stateSelectionGroup
visible: _launcher.selectedAircraftInfo.hasStates visible: _launcher.selectedAircraftInfo.hasStates && !_launcher. skipAircraftFromArgs
width: summaryGrid.middleColumnWidth width: summaryGrid.middleColumnWidth
spacing: Style.margin spacing: Style.margin
Component.onCompleted: updateComboFromController(); Component.onCompleted: updateComboFromController();
function updateComboFromController() function updateComboFromController()
{ {
stateSelectionCombo.currentIndex = _launcher.selectedAircraf tInfo.statesModel.indexForTag(_launcher.selectedAircraftState) stateSelectionCombo.currentIndex = _launcher.selectedAircraf tInfo.statesModel.indexForTag(_launcher.selectedAircraftState)
} }
 End of changes. 6 change blocks. 
6 lines changed or deleted 14 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)