Skip to content

Commit 7e18961

Browse files
CuperinoCuperino
committed
Add forced icon paths to Windows and Android builds
1 parent 532208c commit 7e18961

File tree

6 files changed

+75
-38
lines changed

6 files changed

+75
-38
lines changed

‎src/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ set(icon_files
222222
icons/16/view-fullscreen.svg
223223
icons/16/empty.svg
224224
icons/16/amarok_change_language.svg
225+
icons/22/akonadiconsole.svg
225226
icons/22/handle-sort.svg
226227
icons/22/gnumeric-object-rectangle.svg
227228
icons/22/tool_color_eraser.svg

‎src/icons/16/edit-opacity.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎src/icons/22/akonadiconsole.svg‎

Lines changed: 14 additions & 0 deletions
Loading

‎src/kirigami_ui/+android/main.qml‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -232,49 +232,54 @@ Kirigami.ApplicationWindow {
232232
},
233233
Kirigami.Action {
234234
text: i18nc("Main menu actions. Menu regarding input settings.", "&Controls Settings")
235-
icon.name: "transform-browse" // "hand"
235+
// icon.name: "transform-browse" // "hand"
236+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/transform-browse.svg"
236237
Kirigami.Action {
237238
visible: ["android", "ios", "tvos", "ipados", "qnx"].indexOf(Qt.platform.os)===-1
238239
text: i18nc("Main menu and global menu actions. Opens dialog to configure keyboard inputs.", "Keyboard Inputs")
239-
icon.name: "key-enter" // "keyboard"
240-
onTriggered: {
241-
root.pageStack.currentItem.keyConfigurationOverlay.open()
242-
}
240+
// icon.name: "key-enter" // "keyboard"
241+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/key-enter.svg"
242+
onTriggered: root.pageStack.currentItem.keyConfigurationOverlay.open()
243243
}
244244
Kirigami.Action {
245245
visible: ["android", "ios", "tvos", "ipados", "qnx"].indexOf(Qt.platform.os)===-1
246246
text: i18nc("Open 'scroll settings' from main menu and global menu actions", "Scroll throttle settings")
247-
icon.name: "gnumeric-object-scrollbar" // "keyboard"
247+
// icon.name: "gnumeric-object-scrollbar" // "keyboard"
248+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/gnumeric-object-scrollbar.svg"
248249
onTriggered: wheelSettings.open()
249250
}
250251
Kirigami.Action {
251252
text: i18nc("Main menu and global menu actions. Have up arrow behave like down arrow and vice versa while prompting.", "Invert &arrow keys")
252253
enabled: !root.__noScroll
253-
icon.name: "circular-arrow-shape"
254+
// icon.name: "circular-arrow-shape"
255+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/circular-arrow-shape.svg"
254256
checkable: true
255257
checked: root.__invertArrowKeys
256258
onTriggered: root.__invertArrowKeys = checked
257259
}
258260
Kirigami.Action {
259261
text: i18nc("Main menu and global menu actions. Invert scroll direction while prompting.", "Invert &scroll direction (Natural scrolling)")
260262
enabled: !root.__noScroll
261-
icon.name: "gnumeric-object-scrollbar"
263+
// icon.name: "gnumeric-object-scrollbar"
264+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/gnumeric-object-scrollbar.svg"
262265
checkable: true
263266
checked: root.__invertScrollDirection
264267
onTriggered: root.__invertScrollDirection = checked
265268
}
266269
Kirigami.Action {
267270
text: i18nc("Main menu and global menu actions. Have touchpad and mouse wheel scrolling adjust velocity instead of scrolling like most other apps.", "Use scroll as velocity &dial")
268271
enabled: !root.__noScroll
269-
icon.name: "filename-bpm-amarok"
272+
// icon.name: "filename-bpm-amarok"
273+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/filename-bpm-amarok.svg"
270274
// ToolTip.text: i18n("Use mouse and touchpad scroll as speed dial while prompting")
271275
checkable: true
272276
checked: root.__scrollAsDial
273277
onTriggered: root.__scrollAsDial = checked
274278
}
275279
Kirigami.Action {
276280
text: i18nc("Main menu and global menu actions. Touchpad scrolling and mouse wheel use have no effect while prompting.", "Disable scrolling while prompting")
277-
icon.name: "paint-none"
281+
//icon.name: "paint-none"
282+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/paint-none.svg"
278283
checkable: true
279284
checked: root.__noScroll
280285
onTriggered: root.__noScroll = checked
@@ -350,7 +355,8 @@ Kirigami.ApplicationWindow {
350355
}
351356
Kirigami.Action {
352357
text: i18nc("Main menu actions", "Restore factory defaults")
353-
icon.name: "edit-clear-history"
358+
// icon.name: "edit-clear-history"
359+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/edit-clear-history.svg"
354360
onTriggered: {
355361
factoryResetDialog.open();
356362
}
@@ -366,7 +372,8 @@ Kirigami.ApplicationWindow {
366372
},
367373
Kirigami.Action {
368374
text: i18nc("Main menu actions. Load about page.", "Abou&t %1", aboutData.displayName)
369-
icon.name: "help-about"
375+
//icon.name: "help-about"
376+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/help-about.svg"
370377
onTriggered: loadAboutPage()
371378
},
372379
Kirigami.Action {

‎src/kirigami_ui/+windows/main.qml‎

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,15 @@ Kirigami.ApplicationWindow {
196196
actions: [
197197
Kirigami.Action {
198198
text: i18nc("Main menu and global menu actions", "&New")
199-
icon.name: "document-new"
199+
//icon.name: "document-new"
200+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/document-new.svg"
200201
shortcut: StandardKey.New
201202
onTriggered: root.pageStack.currentItem.document.newDocument()
202203
},
203204
Kirigami.Action {
204205
text: i18nc("Main menu and global menu actions", "&Open")
205-
icon.name: "document-open"
206+
//icon.name: "document-open"
207+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/document-open.svg"
206208
shortcut: StandardKey.Open
207209
onTriggered: {
208210
root.onDiscard = Prompter.CloseActions.Open
@@ -220,7 +222,8 @@ Kirigami.ApplicationWindow {
220222
},
221223
Kirigami.Action {
222224
text: i18nc("Main menu and global menu actions", "&Save")
223-
icon.name: "document-save"
225+
//icon.name: "document-save"
226+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/document-save.svg"
224227
shortcut: StandardKey.Save
225228
onTriggered: {
226229
root.onDiscard = Prompter.CloseActions.Ignore
@@ -229,7 +232,8 @@ Kirigami.ApplicationWindow {
229232
},
230233
Kirigami.Action {
231234
text: i18nc("Main menu and global menu actions", "Save &As")
232-
icon.name: "document-save-as"
235+
//icon.name: "document-save-as"
236+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/document-save-as.svg"
233237
shortcut: StandardKey.SaveAs
234238
onTriggered: {
235239
root.onDiscard = Prompter.CloseActions.Ignore
@@ -239,65 +243,72 @@ Kirigami.ApplicationWindow {
239243
Kirigami.Action {
240244
visible: false
241245
text: i18nc("Main menu actions", "&Recent Files")
242-
icon.name: "document-open-recent"
246+
//icon.name: "document-open-recent"
247+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/document-open-recent.svg"
243248
//Kirigami.Action {
244249
//text: i18n("View Action 1")
245250
//onTriggered: showPassiveNotification(i18n("View Action 1 clicked"))
246251
//}
247252
},
248253
Kirigami.Action {
249254
text: i18nc("Main menu actions. Menu regarding input settings.", "&Controls Settings")
250-
icon.name: "transform-browse" // "hand"
255+
// icon.name: "transform-browse" // "hand"
256+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/transform-browse.svg"
251257
Kirigami.Action {
252258
visible: ["android", "ios", "tvos", "ipados", "qnx"].indexOf(Qt.platform.os)===-1
253259
text: i18nc("Main menu and global menu actions. Opens dialog to configure keyboard inputs.", "Keyboard Inputs")
254-
icon.name: "key-enter" // "keyboard"
255-
onTriggered: {
256-
root.pageStack.currentItem.keyConfigurationOverlay.open()
257-
}
260+
// icon.name: "key-enter" // "keyboard"
261+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/key-enter.svg"
262+
onTriggered: root.pageStack.currentItem.keyConfigurationOverlay.open()
258263
}
259264
Kirigami.Action {
260265
visible: ["android", "ios", "tvos", "ipados", "qnx"].indexOf(Qt.platform.os)===-1
261266
text: i18nc("Open 'scroll settings' from main menu and global menu actions", "Scroll throttle settings")
262-
icon.name: "gnumeric-object-scrollbar" // "keyboard"
267+
// icon.name: "gnumeric-object-scrollbar" // "keyboard"
268+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/gnumeric-object-scrollbar.svg"
263269
onTriggered: wheelSettings.open()
264270
}
265271
Kirigami.Action {
266272
text: i18nc("Main menu and global menu actions. Have up arrow behave like down arrow and vice versa while prompting.", "Invert &arrow keys")
267273
enabled: !root.__noScroll
268-
icon.name: "circular-arrow-shape"
274+
// icon.name: "circular-arrow-shape"
275+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/circular-arrow-shape.svg"
269276
checkable: true
270277
checked: root.__invertArrowKeys
271278
onTriggered: root.__invertArrowKeys = checked
272279
}
273280
Kirigami.Action {
274281
text: i18nc("Main menu and global menu actions. Invert scroll direction while prompting.", "Invert &scroll direction (Natural scrolling)")
275282
enabled: !root.__noScroll
276-
icon.name: "gnumeric-object-scrollbar"
283+
// icon.name: "gnumeric-object-scrollbar"
284+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/gnumeric-object-scrollbar.svg"
277285
checkable: true
278286
checked: root.__invertScrollDirection
279287
onTriggered: root.__invertScrollDirection = checked
280288
}
281289
Kirigami.Action {
282290
text: i18nc("Main menu and global menu actions. Have touchpad and mouse wheel scrolling adjust velocity instead of scrolling like most other apps.", "Use scroll as velocity &dial")
283291
enabled: !root.__noScroll
284-
icon.name: "filename-bpm-amarok"
292+
// icon.name: "filename-bpm-amarok"
293+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/filename-bpm-amarok.svg"
285294
// ToolTip.text: i18n("Use mouse and touchpad scroll as speed dial while prompting")
286295
checkable: true
287296
checked: root.__scrollAsDial
288297
onTriggered: root.__scrollAsDial = checked
289298
}
290299
Kirigami.Action {
291300
text: i18nc("Main menu and global menu actions. Touchpad scrolling and mouse wheel use have no effect while prompting.", "Disable scrolling while prompting")
292-
icon.name: "paint-none"
301+
//icon.name: "paint-none"
302+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/paint-none.svg"
293303
checkable: true
294304
checked: root.__noScroll
295305
onTriggered: root.__noScroll = checked
296306
}
297307
},
298308
Kirigami.Action {
299309
text: i18nc("Main menu actions", "Other &Settings")
300-
icon.name: "configure"
310+
// icon.name: "configure"
311+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/configure.svg"
301312
// Kirigami.Action {
302313
// text: i18n("Telemetry")
303314
// icon.name: "document-send"
@@ -308,8 +319,8 @@ Kirigami.ApplicationWindow {
308319
Kirigami.Action {
309320
text: i18nc("Main menu actions. Load Path Settings page.", "External Tools and Applications")
310321
visible: ['android', 'ios', 'tvos', 'wasm'].indexOf(Qt.platform.os)===-1
311-
icon.name: "akonadiconsole"
312-
// icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/akonadiconsole.svg"
322+
// icon.name: "akonadiconsole"
323+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/akonadiconsole.svg"
313324
onTriggered: loadPathsPage();
314325
}
315326
Kirigami.Action {
@@ -384,8 +395,8 @@ Kirigami.ApplicationWindow {
384395
text: i18nc("Main menu actions. QPrompt switches between two text rendering techniques when the base font size exceeds 120px. Enabling this option forces QPrompt to always use the default renderer, which features smoother sub-pixel animations.", "Force sub-pixel text renderer past 120px")
385396
// Hiding option because only Qt text renderer is used on devices of greater pixel density, due to bug in rendering native fonts while scaling is enabled.
386397
visible: ['android', 'ios', 'wasm', 'tvos', 'qnx', 'ipados'].indexOf(Qt.platform.os)===-1 && screen.devicePixelRatio === 1.0
387-
icon.name: "format-font-size-more"
388-
// icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/format-font-size-more.svg"
398+
// icon.name: "format-font-size-more"
399+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/format-font-size-more.svg"
389400
checkable: true
390401
checked: root.forceQtTextRenderer
391402
onTriggered: root.forceQtTextRenderer = !root.forceQtTextRenderer
@@ -411,7 +422,8 @@ Kirigami.ApplicationWindow {
411422
}
412423
Kirigami.Action {
413424
text: i18nc("Main menu actions", "Restore factory defaults")
414-
icon.name: "edit-clear-history"
425+
// icon.name: "edit-clear-history"
426+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/edit-clear-history.svg"
415427
onTriggered: {
416428
factoryResetDialog.open();
417429
}
@@ -427,13 +439,15 @@ Kirigami.ApplicationWindow {
427439
},
428440
Kirigami.Action {
429441
text: i18nc("Main menu actions. Load about page.", "Abou&t %1", aboutData.displayName)
430-
icon.name: "help-about"
442+
//icon.name: "help-about"
443+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/help-about.svg"
431444
onTriggered: loadAboutPage();
432445
},
433446
Kirigami.Action {
434447
visible: !Kirigami.Settings.isMobile
435448
text: i18nc("Main menu and global menu actions", "&Quit")
436-
icon.name: "application-exit"
449+
//icon.name: "application-exit"
450+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/application-exit.svg"
437451
shortcut: StandardKey.Quit
438452
onTriggered: close()
439453
},

‎src/kirigami_ui/main.qml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,8 @@ Kirigami.ApplicationWindow {
319319
Kirigami.Action {
320320
text: i18nc("Main menu actions. Load Path Settings page.", "External Tools and Applications")
321321
visible: ['android', 'ios', 'tvos', 'wasm'].indexOf(Qt.platform.os)===-1
322-
icon.name: "akonadiconsole"
323-
// icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/akonadiconsole.svg"
322+
// icon.name: "akonadiconsole"
323+
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/akonadiconsole.svg"
324324
onTriggered: loadPathsPage();
325325
}
326326
Kirigami.Action {
@@ -424,6 +424,7 @@ Kirigami.ApplicationWindow {
424424
}
425425
Kirigami.Action {
426426
text: i18nc("Main menu actions", "Restore factory defaults")
427+
// icon.name: "edit-clear-history"
427428
icon.source: "qrc:/qt/qml/com/cuperino/qprompt/icons/edit-clear-history.svg"
428429
onTriggered: {
429430
factoryResetDialog.open();

0 commit comments

Comments
 (0)