1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 12:46:35 +01:00

Merge branch 'Falkon/3.1'

This commit is contained in:
David Rosca 2019-04-05 20:40:15 +02:00
commit cb30ecb994
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
19 changed files with 31 additions and 123 deletions

View File

@ -121,11 +121,11 @@ endif()
# Optional: PySide2
find_package(PySide2 "2.0.0")
find_package(Shiboken2 "2.0.0")
find_package(PythonLibs "3.0")
set_package_properties(PySide2 PROPERTIES DESCRIPTION "Python plugins (experimental)" TYPE OPTIONAL)
set_package_properties(Shiboken2 PROPERTIES DESCRIPTION "Python plugins (experimental)" TYPE OPTIONAL)
set_package_properties(PythonLibs PROPERTIES DESCRIPTION "Python plugins (experimental)" TYPE OPTIONAL)
if (PySide2_FOUND AND Shiboken2_FOUND AND PythonLibs_FOUND)
find_package(Python3 COMPONENTS Development)
set_package_properties(PySide2 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
set_package_properties(Shiboken2 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
set_package_properties(Python3 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
if (PySide2_FOUND AND Shiboken2_FOUND AND Python3_FOUND)
set(ENABLE_PYTHON_PLUGINS TRUE)
endif()

View File

@ -4,7 +4,7 @@
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<name>Falkon</name>
<name xml:lang="ar">فالكون</name>
<name xml:lang="ast">Falkon</name>
<name xml:lang="ca">Falkon</name>
<name xml:lang="ca-valencia">Falkon</name>
<name xml:lang="cs">Falkon</name>
@ -30,7 +30,7 @@
<name xml:lang="zh-CN">Falkon</name>
<name xml:lang="zh-TW">Falkon</name>
<summary>Web Browser</summary>
<summary xml:lang="ar">متصفّح الوبّ</summary>
<summary xml:lang="ast">Restolador web</summary>
<summary xml:lang="ca">Navegador web</summary>
<summary xml:lang="ca-valencia">Navegador web</summary>
<summary xml:lang="cs">Webový prohlížeč</summary>

View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Falkon
Name[ar]=فالكون
Name[ast]=Falkon
Name[ca]=Falkon
Name[ca@valencia]=Falkon
Name[cs]=Falkon
@ -30,6 +31,7 @@ Icon=falkon
Categories=Network;WebBrowser;
Comment=A fast and secure web browser
Comment[ar]=متصفّح وبّ سريع وآمن
Comment[ast]=Un restolador web seguru y rápidu
Comment[ca]=Un navegador web ràpid i segur
Comment[ca@valencia]=Un navegador web ràpid i segur
Comment[cs]=Rychlý a bezpečný webový prohlížeč
@ -47,7 +49,7 @@ Comment[nn]=Ein kjapp og sikker nettlesar
Comment[pl]=Szybka i bezpieczna przeglądarka sieciowa
Comment[pt]=Um navegador Web rápido e seguro
Comment[pt_BR]=Um navegar Web rápido e seguro
Comment[sk]=Rýchly a bezpečný prehliadač internetu
Comment[sk]=Rýchly a bezpečný internetový prehliadač
Comment[sv]=En snabb och säker webbläsare
Comment[uk]=Проста і безпечна програма для перегляду інтернету
Comment[x-test]=xxA fast and secure web browserxx
@ -55,6 +57,7 @@ Comment[zh_CN]=快速、安全的网页浏览器
Comment[zh_TW]=
GenericName=Web Browser
GenericName[ar]=متصفّح وبّ
GenericName[ast]=Restolador web
GenericName[ca]=Navegador web
GenericName[ca@valencia]=Navegador web
GenericName[cs]=Webový prohlížeč
@ -87,6 +90,7 @@ Actions=NewTab;NewWindow;PrivateBrowsing;
[Desktop Action NewTab]
Name=Open new tab
Name[ar]=افتح لسانًا جديدًا
Name[ast]=Abrir llingüeta nueva
Name[ca]=Obre una pestanya nova
Name[ca@valencia]=Obri una pestanya nova
Name[cs]=Otevřít novou kartu
@ -115,6 +119,7 @@ Exec=falkon --new-tab
[Desktop Action NewWindow]
Name=Open new window
Name[ar]=افتح نافذة جديدة
Name[ast]=Abrir ventana nueva
Name[ca]=Obre una finestra nova
Name[ca@valencia]=Obri una finestra nova
Name[cs]=Otevřít nové okno
@ -143,6 +148,7 @@ Exec=falkon --new-window
[Desktop Action PrivateBrowsing]
Name=Start private browsing
Name[ar]=ابدأ التّصفّح الخاصّ
Name[ast]=Aniciar restolar en privao
Name[ca]=Inicia la navegació privada
Name[ca@valencia]=Inicia la navegació privada
Name[cs]=Začít soukromé prohlížení

View File

@ -17,7 +17,7 @@ Name[nn]=Reklamefilter
Name[pl]=AdBlock
Name[pt]=AdBlock
Name[pt_BR]=AdBlock
Name[sk]=AdBlock
Name[sk]=Adblock
Name[sv]=Reklamblockering
Name[uk]=Блокування реклами
Name[x-test]=xxAdBlockxx
@ -41,7 +41,7 @@ Comment[nn]=Blokkerer uønskt vevinnhald
Comment[pl]=Blokuje niechciane treści z sieci
Comment[pt]=Bloqueia o conteúdo Web indesejado
Comment[pt_BR]=Bloqueie conteúdos web indesejados
Comment[sk]=Blokuje nechcený obsah
Comment[sk]=Blokuje neželaný internetový obsah
Comment[sv]=Blockerar oönskat webbinnehåll
Comment[uk]=Блокує небажані інтернет-дані
Comment[x-test]=xxBlocks unwanted web contentxx

View File

@ -1,6 +1,7 @@
[Icon Theme]
Name=Breeze
Name[ar]=نسيم
Name[ast]=Breeze
Name[ca]=Brisa
Name[ca@valencia]=Brisa
Name[cs]=Breeze
@ -26,6 +27,7 @@ Name[zh_CN]=微风
Name[zh_TW]=Breeze
Comment=Breeze Team
Comment[ar]=فريق نسيم
Comment[ast]=L'equipu de Breeze
Comment[ca]=L'equip «Breeze»
Comment[ca@valencia]=L'equip «Breeze»
Comment[cs]=Team Breeze
@ -43,7 +45,7 @@ Comment[nn]=Breeze-laget
Comment[pl]=Zespół Bryzy
Comment[pt]=Equipa do Brisa
Comment[pt_BR]=Equipe Breeze
Comment[sk]=Breeze Team
Comment[sk]=Tým Vánok
Comment[sv]=Breeze-gruppen
Comment[uk]=Команда Breeze
Comment[x-test]=xxBreeze Teamxx

View File

@ -57,7 +57,6 @@ void SearchToolBar::showMinimalInPopupWindow()
{
// Show only essentials widget + set minimum width
ui->caseSensitive->hide();
ui->results->hide();
ui->horizontalLayout->setSpacing(2);
ui->horizontalLayout->setContentsMargins(2, 6, 2, 6);
setMinimumWidth(260);
@ -129,11 +128,6 @@ void SearchToolBar::searchText(const QString &text)
if (ui->lineEdit->text().isEmpty())
found = true;
if (!found)
ui->results->setText(tr("No results found."));
else
ui->results->clear();
ui->lineEdit->setProperty("notfound", QVariant(!found));
ui->lineEdit->style()->unpolish(ui->lineEdit);
ui->lineEdit->style()->polish(ui->lineEdit);

View File

@ -94,13 +94,6 @@
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="results">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>

View File

@ -17,7 +17,7 @@ Name[nn]=Handsamar for Flash-infokapslar
Name[pl]=Zarządzanie ciasteczkami Flash
Name[pt]=Gestor de 'Cookies' do Flash
Name[pt_BR]=Gerenciador de cookies Flash
Name[sk]=Správca pre Flash Cookie
Name[sk]=Správca Flash Cookie
Name[sv]=Flash kakhanterare
Name[uk]=Керування куками Flash
Name[x-test]=xxFlash Cookie Managerxx

View File

@ -136,7 +136,7 @@ set(GENERATED_SOURCES_DEPENDENCIES
# Add custom target to run shiboken.
add_custom_command(OUTPUT ${GENERATED_SOURCES}
COMMAND ${SHIBOKEN_BINARY}
COMMAND Shiboken2::shiboken2
${SHIBOKEN_OPTIONS} ${GLOBAL_HEADER} ${TYPESYSTEM_FILE}
DEPENDS ${GENERATED_SOURCES_DEPENDENCIES}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@ -144,10 +144,12 @@ add_custom_command(OUTPUT ${GENERATED_SOURCES}
# We need to include the headers for the module bindings that we use.
set(PYSIDE_ADDITIONAL_INCLUDES "")
foreach(INCLUDE_DIR ${PYSIDE_INCLUDE_DIR})
get_target_property(PYSIDE_INCLUDE_DIRS PySide2::pyside2 INTERFACE_INCLUDE_DIRECTORIES)
foreach(INCLUDE_DIR ${PYSIDE_INCLUDE_DIRS})
list(APPEND PYSIDE_ADDITIONAL_INCLUDES "${INCLUDE_DIR}/QtCore")
list(APPEND PYSIDE_ADDITIONAL_INCLUDES "${INCLUDE_DIR}/QtGui")
list(APPEND PYSIDE_ADDITIONAL_INCLUDES "${INCLUDE_DIR}/QtNetwork")
list(APPEND PYSIDE_ADDITIONAL_INCLUDES "${INCLUDE_DIR}/QtPrintSupport")
list(APPEND PYSIDE_ADDITIONAL_INCLUDES "${INCLUDE_DIR}/QtWidgets")
list(APPEND PYSIDE_ADDITIONAL_INCLUDES "${INCLUDE_DIR}/QtWebChannel")
list(APPEND PYSIDE_ADDITIONAL_INCLUDES "${INCLUDE_DIR}/QtWebEngineCore")
@ -164,9 +166,6 @@ install(TARGETS PyFalkon DESTINATION ${FALKON_INSTALL_PLUGINDIR})
target_include_directories(PyFalkon
PRIVATE
${SHIBOKEN_INCLUDE_DIR}
${SHIBOKEN_PYTHON_INCLUDE_DIR}
${PYSIDE_INCLUDE_DIR}
${PYSIDE_ADDITIONAL_INCLUDES}
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/PyFalkon
@ -175,10 +174,9 @@ target_include_directories(PyFalkon
target_link_libraries(PyFalkon
PRIVATE
FalkonPrivate
${PYTHON_LIBRARIES}
${SHIBOKEN_LIBRARY}
${SHIBOKEN_PYTHON_LIBRARIES}
${PYSIDE_LIBRARY}
Shiboken2::libshiboken
PySide2::pyside2
Python3::Python
)
# Same as CONFIG += no_keywords to avoid syntax errors in object.h due to the usage of the word Slot

View File

@ -17,7 +17,7 @@ Name[nn]=Statuslinje-ikon
Name[pl]=Ikony paska stanu
Name[pt]=Ícones da Barra de Estado
Name[pt_BR]=Ícones da barra de status
Name[sk]=StatusBar Ikony
Name[sk]=Ikony stavovej lišty
Name[sv]=Ikoner i statusraden
Name[uk]=Піктограми смужки стану
Name[x-test]=xxStatusBar Iconsxx

View File

@ -17,7 +17,7 @@ Name[nn]=Eksempel-tillegg
Name[pl]=Przykładowa wtyczka
Name[pt]='Plugin' de Exemplo
Name[pt_BR]=Plugin de exemplo
Name[sk]=Ukážkový doplnok
Name[sk]=Príkladový doplnok
Name[sv]=Exempelinsticksprogram
Name[uk]=Приклад додатка
Name[x-test]=xxExample Pluginxx

View File

@ -2,27 +2,20 @@
Name=Dictionary
Name[ca]=Diccionari
Name[ca@valencia]=Diccionari
Name[cs]=Slovník
Name[da]=Ordbog
Name[de]=Wörterbuch
Name[en_GB]=Dictionary
Name[es]=Diccionario
Name[fi]=Sanasto
Name[fr]=Dictionnaire
Name[gl]=Dicionario
Name[id]=Kamus
Name[it]=Dizionario
Name[nl]=Woordenboek
Name[nn]=Ordliste
Name[pl]=Słownik
Name[pt]=Dicionário
Name[pt_BR]=Dicionário
Name[sk]=Slovník
Name[sv]=Ordlista
Name[uk]=Словник
Name[x-test]=xxDictionaryxx
Name[zh_CN]=
Name[zh_TW]=Dictionary
Type=Service

View File

@ -2,51 +2,37 @@
Name=Google
Name[ca]=Google
Name[ca@valencia]=Google
Name[cs]=Google
Name[da]=Google
Name[de]=Google
Name[en_GB]=Google
Name[es]=Google
Name[fi]=Google
Name[fr]=Google
Name[gl]=Google
Name[id]=Google
Name[it]=Google
Name[nl]=Google
Name[nn]=Google
Name[pl]=Google
Name[pt]=Google
Name[pt_BR]=Google
Name[sk]=Google
Name[sv]=Google
Name[uk]=Google
Name[x-test]=xxGooglexx
Name[zh_CN]=Google
Name[zh_TW]=Google
Comment=Search with...
Comment[ca]=Cerca amb...
Comment[ca@valencia]=Cerca amb...
Comment[cs]=Hledat pomocí...
Comment[da]=Søg med...
Comment[de]=Suchen mit ...
Comment[en_GB]=Search with...
Comment[es]=Buscar con...
Comment[fi]=Etsi hakukoneella
Comment[fr]=Chercher avec
Comment[gl]=Buscar con
Comment[id]=Cari dengan...
Comment[it]=Cerca con...
Comment[nl]=Zoeken met...
Comment[nn]=Søk med 
Comment[pl]=Szukaj z...
Comment[pt]=Procurar com...
Comment[pt_BR]=Pesquisar com...
Comment[sk]=Hľadať s...
Comment[sv]=Sök med...
Comment[uk]=Шукати за допомогою
Comment[x-test]=xxSearch with...xx
Comment[zh_CN]=使...
Comment[zh_TW]=
Icon=google.png
Type=Service

View File

@ -2,27 +2,19 @@
Name=Open with mpv
Name[ca]=Obre amb el «mpv»
Name[ca@valencia]=Obri amb el «mpv»
Name[cs]=Otevřít pomocí mpv
Name[da]=Åbn med mpv
Name[de]=Mit mpv öffnen
Name[en_GB]=Open with mpv
Name[es]=Abrir con mpv
Name[fi]=Avaa mpv:hen
Name[fr]=Ouvrir avec mpv
Name[gl]=Abrir con mpv
Name[id]=Buka dengan mpv
Name[it]=Apri con mpv
Name[nl]=Met mpv openen
Name[nn]=Opna med mpv
Name[pl]=Otwórz w mpv
Name[pt]=Abrir com o 'mpv'
Name[pt_BR]=Abrir com o mpv
Name[sk]=Otvoriť s mpv
Name[sv]=Öppna med mpv
Name[uk]=Відкрити за допомогою mpv
Name[x-test]=xxOpen with mpvxx
Name[zh_CN]= mpv
Name[zh_TW]=使 mpv
Icon=mpv
TryExec=mpv

View File

@ -2,51 +2,37 @@
Name=TinEye
Name[ca]=TinEye
Name[ca@valencia]=TinEye
Name[cs]=TinEye
Name[da]=TinEye
Name[de]=TinEye
Name[en_GB]=TinEye
Name[es]=TinEye
Name[fi]=TinEye
Name[fr]=TinEye
Name[gl]=TinEye
Name[id]=TinEye
Name[it]=TinEye
Name[nl]=TinEye
Name[nn]=TinEye
Name[pl]=TinEye
Name[pt]=TinEye
Name[pt_BR]=TinEye
Name[sk]=TinEye
Name[sv]=TinEye
Name[uk]=TinEye
Name[x-test]=xxTinEyexx
Name[zh_CN]=TinEye
Name[zh_TW]=TinEye
Comment=Search with...
Comment[ca]=Cerca amb...
Comment[ca@valencia]=Cerca amb...
Comment[cs]=Hledat pomocí...
Comment[da]=Søg med...
Comment[de]=Suchen mit ...
Comment[en_GB]=Search with...
Comment[es]=Buscar con...
Comment[fi]=Etsi hakukoneella
Comment[fr]=Chercher avec
Comment[gl]=Buscar con
Comment[id]=Cari dengan...
Comment[it]=Cerca con...
Comment[nl]=Zoeken met...
Comment[nn]=Søk med 
Comment[pl]=Szukaj z...
Comment[pt]=Procurar com...
Comment[pt_BR]=Pesquisar com...
Comment[sk]=Hľadať s...
Comment[sv]=Sök med...
Comment[uk]=Шукати за допомогою
Comment[x-test]=xxSearch with...xx
Comment[zh_CN]=使...
Comment[zh_TW]=
Icon=tineye.png
Type=Service

View File

@ -2,27 +2,20 @@
Name=Translate page
Name[ca]=Tradueix la pàgina
Name[ca@valencia]=Tradueix la pàgina
Name[cs]=Přeložit stránku
Name[da]=Oversæt side
Name[de]=Seite übersetzen
Name[en_GB]=Translate page
Name[es]=Traducir página
Name[fi]=Käännä sivu
Name[fr]=Traduire la page Web
Name[gl]=Traducir a páxina
Name[id]=Terjemahkan halaman
Name[it]=Traduci la pagina
Name[nl]=Pagina vertalen
Name[nn]=Set om side
Name[pl]=Przetłumacz stronę
Name[pt]=Traduzir a página
Name[pt_BR]=Traduzir página
Name[sk]=Preložiť stránku
Name[sv]=Översätt sida
Name[uk]=Перекласти сторінку
Name[x-test]=xxTranslate pagexx
Name[zh_CN]=
Name[zh_TW]=
Icon=translate.png
Type=Service

View File

@ -2,27 +2,20 @@
Name=Validate page
Name[ca]=Valida la pàgina
Name[ca@valencia]=Valida la pàgina
Name[cs]=Ověřit stránku
Name[da]=Valider side
Name[de]=Seite überprüfen
Name[en_GB]=Validate page
Name[es]=Validar página
Name[fi]=Tarkista sivu
Name[fr]=Valider la page
Name[gl]=Validar a páxina
Name[id]=Validasi halaman
Name[it]=Convalida la pagina
Name[nl]=Pagina valideren
Name[nn]=Valider side
Name[pl]=Potwierdź stronę
Name[pt]=Validar a página
Name[pt_BR]=Validar página
Name[sk]=Ohodnotiť stránku
Name[sk]=Skontrolovať stránku
Name[sv]=Validera sida
Name[uk]=Перевірити достовірність сторінки
Name[x-test]=xxValidate pagexx
Name[zh_CN]=
Name[zh_TW]=
Icon=w3.png
Type=Service

View File

@ -2,51 +2,37 @@
Name=Yandex
Name[ca]=Yandex
Name[ca@valencia]=Yandex
Name[cs]=Yandex
Name[da]=Yandex
Name[de]=Yandex
Name[en_GB]=Yandex
Name[es]=Yandex
Name[fi]=Yandex
Name[fr]=Yandex
Name[gl]=Yandex
Name[id]=Yandex
Name[it]=Yandex
Name[nl]=Yandex
Name[nn]=Yandex
Name[pl]=Yandex
Name[pt]=Yandex
Name[pt_BR]=Yandex
Name[sk]=Yandex
Name[sv]=Yandex
Name[uk]=Яндекс
Name[x-test]=xxYandexxx
Name[zh_CN]=Yandex
Name[zh_TW]=Yandex
Comment=Search with...
Comment[ca]=Cerca amb...
Comment[ca@valencia]=Cerca amb...
Comment[cs]=Hledat pomocí...
Comment[da]=Søg med...
Comment[de]=Suchen mit ...
Comment[en_GB]=Search with...
Comment[es]=Buscar con...
Comment[fi]=Etsi hakukoneella
Comment[fr]=Chercher avec
Comment[gl]=Buscar con
Comment[id]=Cari dengan...
Comment[it]=Cerca con...
Comment[nl]=Zoeken met...
Comment[nn]=Søk med 
Comment[pl]=Szukaj z...
Comment[pt]=Procurar com...
Comment[pt_BR]=Pesquisar com...
Comment[sk]=Hľadať s...
Comment[sv]=Sök med...
Comment[uk]=Шукати за допомогою
Comment[x-test]=xxSearch with...xx
Comment[zh_CN]=使...
Comment[zh_TW]=
Icon=yandex.png
Type=Service

View File

@ -2,49 +2,35 @@
Name=Run Action
Name[ca]=Executa una acció
Name[ca@valencia]=Executa una acció
Name[cs]=Spustit činnost
Name[da]=Kør handling
Name[en_GB]=Run Action
Name[es]=Ejecutar acción
Name[fi]=Suorita toiminto
Name[fr]=Lancer une action
Name[gl]=Executar a acción
Name[id]=Run Action
Name[it]=Esegui azione
Name[nl]=Uitvoeractie
Name[nn]=Køyr handling
Name[pl]=Wykonaj działanie
Name[pt]=Executar uma Acção
Name[pt_BR]=Executar ação
Name[sk]=Spustiť akciu
Name[sv]=Utför åtgärd
Name[uk]=Виконати дію
Name[x-test]=xxRun Actionxx
Name[zh_CN]=
Name[zh_TW]=
Comment=Run various actions on sites
Comment[ca]=Executa diverses accions als llocs
Comment[ca@valencia]=Executa diverses accions als llocs
Comment[cs]=Spouštět různé činnosti na stránkách
Comment[da]=Kør diverse handlinger på steder
Comment[en_GB]=Run various actions on sites
Comment[es]=Ejecutar varias acciones en sitios
Comment[fi]=Suorita eri toimintoja sivustoilla
Comment[fr]=Lancement d'actions diverses sur des sites Web
Comment[gl]=Executar varias accións en sitios
Comment[id]=Jalankan beberapa aksi pada situs
Comment[it]=Esegue numerose azioni nei siti
Comment[nl]=Verschillende acties op sites uitvoeren
Comment[nn]=Køyr ymse handlingar på nettstadar
Comment[pl]=Wykonuj różne działania na stronach
Comment[pt]=Executar várias acções sobre as páginas
Comment[pt_BR]=Executar várias ações nos sites
Comment[sk]=Spustiť rôzne akcie na stránkach
Comment[sv]=Utför diverse åtgärder på webbplatser
Comment[uk]=Виконання різноманітних дій на сайтах
Comment[x-test]=xxRun various actions on sitesxx
Comment[zh_CN]=
Comment[zh_TW]=
Icon=icon.svg
Type=Service