Skip to content

Commit e38c0d1

Browse files
sithlord48sithlord48
committed
small qml cleanup
1 parent a7f45f9 commit e38c0d1

File tree

3 files changed

+6
-154
lines changed

3 files changed

+6
-154
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ jobs:
107107
uses: actions/cache@v3
108108
with:
109109
path: |
110+
C:/ProgramData/chocolatey/bin/
110111
C:/ProgramData/chocolatey/lib/ninja
111-
C:/ProgramData/chocolatey/bin/ninja.exe
112112
C:/ProgramData/chocolatey/lib/doxygen.install
113113
C:/ProgramData/chocolatey/lib/Graphviz
114114
"C:/Program Files/doxygen"
115115
"C:/Program Files/Graphviz"
116-
key: cache-chocolatey-${{ matrix.config.WIN_ARCH }}
116+
key: cache-chocolatey-2${{ matrix.config.WIN_ARCH }}
117117
- name: Env Script (Windows)
118118
uses: ilammy/msvc-dev-cmd@v1
119119
if: runner.os == 'Windows'
@@ -146,6 +146,7 @@ jobs:
146146
cmake --install ${{github.workspace}}\zlib-git\build --strip
147147
mkdir D:\a\ff7tk\ff7tk\build\src\utils
148148
copy "C:\zlib\bin\zlib.dll" D:\a\ff7tk\ff7tk\build\src\utils
149+
149150
- name: Build ff7tk
150151
run: |
151152
${{env.cmakeConfigure}} -DCPACK_PACKAGE_VERSION="${{ needs.precheck.outputs.version }}" -DCPACK_IFW_ROOT=${{matrix.config.Qt_TOOL_PATH}} ${{matrix.config.extraCmakeConfig}}

‎demos/ff7tkQmlGallery/ItemPreview.qml‎

Lines changed: 1 addition & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import QtQuick 2.15
1+
import QtQuick
22
import org.ff7tk 1.0 as FF7tk
33

44
Item {
@@ -7,7 +7,6 @@ Item {
77
visible: itemId != -1
88
Rectangle {
99
anchors.fill: parent
10-
color: Qt.rgba(0.5,0.5,0.5,0.25)
1110
FontMetrics {
1211
id: fm
1312
}
@@ -173,9 +172,7 @@ Item {
173172
visible: elementalList.count > 0
174173
Rectangle {
175174
anchors.fill: parent
176-
border.color: "black"
177175
border.width: 2
178-
color: palette.base
179176
Text{
180177
id: elementTitle
181178
anchors.top: parent.top
@@ -218,7 +215,6 @@ Item {
218215
visible: statusList.count > 0
219216
Rectangle {
220217
anchors.fill: parent
221-
border.color: "black"
222218
border.width: 2
223219
clip: true
224220
Text{
@@ -251,148 +247,3 @@ Item {
251247
}
252248
}
253249
}
254-
255-
// GroupBox {
256-
// id: group_MSlots
257-
// visible: false
258-
// RowLayout {
259-
// RowLayout {
260-
// id: mGroup1
261-
// Image{
262-
// id: lblMSlot1
263-
// source: "qrc" + FF7tk.FF7Item.materiaSlotResource()
264-
// visible: FF7tk.FF7Item.materiaSlots(item)
265-
// }
266-
// Image{
267-
// id: lblLink1
268-
// source: "qrc" + FF7tk.FF7Item.materiaLinkResource()
269-
// }
270-
// Image{
271-
// id: lblMSlot2
272-
// source: "qrc" + FF7tk.FF7Item.materiaSlotResource()
273-
// }
274-
// }
275-
// Row {
276-
// id: mGroup2
277-
// Image{
278-
// id: lblMSlot3
279-
// source: "qrc" + FF7tk.FF7Item.materiaSlotResource()
280-
// }
281-
// Image{
282-
// id: lblLink2
283-
// source: "qrc" + FF7tk.FF7Item.materiaLinkResource()
284-
// }
285-
// Image{
286-
// id: lblMSlot4
287-
// source: "qrc" + FF7tk.FF7Item.materiaSlotResource()
288-
// }
289-
// }
290-
// Row {
291-
// id: mGroup3
292-
// Image{
293-
// id: lblMSlot5
294-
// source: "qrc" + FF7tk.FF7Item.materiaSlotResource()
295-
// }
296-
// Image{
297-
// id: lblLink3
298-
// source: "qrc" + FF7tk.FF7Item.materiaLinkResource()
299-
// }
300-
// Image{
301-
// id: lblMSlot6
302-
// source: "qrc" + FF7tk.FF7Item.materiaSlotResource()
303-
// }
304-
// }
305-
// Row {
306-
// id: mGroup4
307-
// Image{
308-
// id: lblMSlot7
309-
// source: "qrc" + FF7tk.FF7Item.materiaSlotResource()
310-
// }
311-
// Image{
312-
// id: lblLink4
313-
// source: "qrc" + FF7tk.FF7Item.materiaLinkResource()
314-
// }
315-
// Image{
316-
// id: lblMSlot8
317-
// source: "qrc" + FF7tk.FF7Item.materiaSlotResource()
318-
// }
319-
// }
320-
// }
321-
// }
322-
323-
// function setItem (itemID) {
324-
// var type = FF7tk.FF7Item.type(itemID)
325-
// //if(type == FF7tk.FF7Item.Unknown) { return }
326-
// itemName.text = FF7tk.FF7Item.name(itemID)
327-
// itemDesc.text = FF7tk.FF7Item.desc(itemID)
328-
// itemTypeIcon.source = FF7tk.FF7Item.iconResource(itemID)
329-
330-
// if (type !== FF7tk.FF7Item.Item && type !== FF7tk.FF7Item.Accessory) {
331-
// group_MSlots.visible = true
332-
// group_MSlots.title = "APx" + Number(FF7tk.FF7Item.materiaGrowthRate(itemID)).toString()
333-
// setSlots(itemID)
334-
// } else {
335-
// group_MSlots.visible = false
336-
// }
337-
// setElementalInfo(itemID)
338-
// setStatusInfo(itemID)
339-
// }
340-
341-
// function setSlots(itemID) {
342-
// var MslotString = ""
343-
// if (FF7tk.FF7Item.materiaGrowthRate(itemID) >0) {
344-
// MslotString = FF7tk.FF7Item.materiaSlotResource()
345-
// } else {
346-
// MslotString = FF7tk.FF7Item.materiaSlotNoGrowthResource()
347-
// }
348-
// lblMSlot1.visible = false
349-
// lblMSlot2.visible = false
350-
// lblMSlot3.visible = false
351-
// lblMSlot4.visible = false
352-
// lblMSlot5.visible = false
353-
// lblMSlot6.visible = false
354-
// lblMSlot7.visible = false
355-
// lblMSlot8.visible = false
356-
// lblLink1.visible = false
357-
// lblLink2.visible = false
358-
// lblLink3.visible = false
359-
// lblLink4.visible = false
360-
// mGroup1.spacing = 14
361-
// mGroup2.spacing = 14
362-
// mGroup3.spacing = 14
363-
// mGroup4.spacing = 14
364-
365-
366-
// switch(FF7tk.FF7Item.materiaSlots(itemID)) {
367-
// case 8:
368-
// lblMSlot8.visible = true
369-
// case 7:
370-
// lblMSlot7.visible = true
371-
// case 6:
372-
// lblMSlot6.visible = true
373-
// case 5:
374-
// lblMSlot5.visible = true
375-
// case 4:
376-
// lblMSlot4.visible = true
377-
// case 3:
378-
// lblMSlot3.visible = true
379-
// case 2:
380-
// lblMSlot2.visible = true
381-
// case 1:
382-
// lblMSlot1.visible = true
383-
// }
384-
// switch(FF7tk.FF7Item.linkedSlots(itemID)) {
385-
// case 4:
386-
// lblLink4.visible = true
387-
// mGroup4.spacing = 0
388-
// case 3:
389-
// lblLink3.visible = true
390-
// mGroup3.spacing = 0
391-
// case 2:
392-
// lblLink2.visible = true
393-
// mGroup2.spacing = 0
394-
// case 1:
395-
// lblLink1.visible = true
396-
// mGroup1.spacing = 0
397-
// }
398-
// }

‎demos/ff7tkQmlGallery/TextDemo.qml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import QtQuick 2.15
2-
import QtQuick.Controls 2.15
1+
import QtQuick
2+
import QtQuick.Controls
33
import org.ff7tk 1.0 as FF7tk
44

55
Item {

0 commit comments

Comments
 (0)