Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed ui/StatusQ/src/assets/png/browser/compass.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ui/StatusQ/src/assets/png/png.qrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<RCC>
<qresource prefix="/assets/png">
<file>browser/compass.png</file>
<file>browser/[email protected]</file>
<file>browser/pepehand.png</file>
<file>community/airdrops8_1.png</file>
<file>community/mint2_1.png</file>
<file>community/permissions2_3.png</file>
Expand Down
2 changes: 1 addition & 1 deletion ui/app/AppLayouts/Browser/views/BrowserWebEngineView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ WebEngineView {

Image {
id: emptyPageImage
source: Theme.png("browser/compass")
source: Theme.png("browser/pepehand")
width: 294
height: 294
anchors.horizontalCenter: parent.horizontalCenter
Expand Down
58 changes: 31 additions & 27 deletions ui/imports/utils/SearchEnginesConfig.qml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ QtObject {

readonly property int browserSearchEngineNone: 0
readonly property int browserSearchEngineDuckDuckGo: 1
readonly property int browserSearchEngineBrave: 2
readonly property int browserSearchEngineQwant: 3
readonly property int browserSearchEngineStartpage: 4
readonly property int browserSearchEngineMojeek: 5
readonly property int browserSearchEngineEcosia: 6
readonly property int browserSearchEngineBing: 7
readonly property int browserSearchEngineGoogle: 8
readonly property int browserSearchEngineCustom: 9
readonly property int browserSearchEngineQwant: 2
readonly property int browserSearchEngineStartpage: 3
readonly property int browserSearchEngineMojeek: 4
readonly property int browserSearchEngineEcosia: 5
readonly property int browserSearchEngineBing: 6
readonly property int browserSearchEngineGoogle: 7
readonly property int browserSearchEngineCustom: 8

readonly property ListModel engines: ListModel {
ListElement {
Expand All @@ -32,56 +31,49 @@ QtObject {
urlTemplate: "https://duckduckgo.com/?q=%1"
}
ListElement {
engineId: 2 // browserSearchEngineBrave
name: "Brave Search"
description: ""
iconUrl: "search_engines/brave_search"
urlTemplate: "https://search.brave.com/search?q=%1"
}
ListElement {
engineId: 3 // browserSearchEngineQwant
engineId: 2 // browserSearchEngineQwant
name: "Qwant"
description: ""
iconUrl: "search_engines/qwant"
urlTemplate: "https://www.qwant.com/?q=%1"
}
ListElement {
engineId: 4 // browserSearchEngineStartpage
engineId: 3 // browserSearchEngineStartpage
name: "Startpage"
description: ""
iconUrl: "search_engines/starpage"
urlTemplate: "https://www.startpage.com/sp/search?q=%1"
}
ListElement {
engineId: 5 // browserSearchEngineMojeek
engineId: 4 // browserSearchEngineMojeek
name: "Mojeek"
description: ""
iconUrl: "search_engines/mojeek"
urlTemplate: "https://www.mojeek.com/search?q=%1"
}
ListElement {
engineId: 6 // browserSearchEngineEcosia
engineId: 5 // browserSearchEngineEcosia
name: "Ecosia"
description: ""
iconUrl: "search_engines/ecosia"
urlTemplate: "https://www.ecosia.org/search?q=%1"
}
ListElement {
engineId: 7 // browserSearchEngineBing
engineId: 6 // browserSearchEngineBing
name: "Bing"
description: ""
iconUrl: "search_engines/bing"
urlTemplate: "https://www.bing.com/search?q=%1"
}
ListElement {
engineId: 8 // browserSearchEngineGoogle
engineId: 7 // browserSearchEngineGoogle
name: "Google"
description: ""
iconUrl: "search_engines/google"
urlTemplate: "https://www.google.com/search?q=%1"
}
ListElement {
engineId: 9 // browserSearchEngineCustom
engineId: 8 // browserSearchEngineCustom
name: qsTr("Custom")
description: qsTr("Plug in your own search engine that follows the OpenSearch URL format")
iconUrl: "search_engines/custom"
Expand All @@ -98,25 +90,37 @@ QtObject {
return null
}

function getEngineName(engineId) {
function getEngineByIdOrDefault(engineId) {
const engine = getEngineById(engineId)
if (!engine) {
console.warn("SearchEnginesConfig: Invalid engine ID", engineId, "- using DuckDuckGo as default")
return getEngineById(browserSearchEngineDuckDuckGo)
}
return engine
}

function isValidEngineId(engineId) {
return getEngineById(engineId) !== null
}

function getEngineName(engineId) {
const engine = getEngineByIdOrDefault(engineId)
return engine ? engine.name : qsTr("None")
}

function getEngineDescription(engineId) {
const engine = getEngineById(engineId)
const engine = getEngineByIdOrDefault(engineId)
return engine ? engine.description : ""
}

function formatSearchUrl(engineId, query, customUrl) {
const engine = getEngineById(engineId)
const engine = getEngineByIdOrDefault(engineId)
if (!engine) {
console.warn("SearchEnginesConfig: Engine not found for id:", engineId)
return ""
}

// Custom: append query to the custom URL prefix
if (engineId === browserSearchEngineCustom) {
if (engine.engineId === browserSearchEngineCustom) {
if (!customUrl || customUrl === "") {
console.warn("SearchEnginesConfig: Custom search engine selected but no URL configured")
return ""
Expand Down