mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-19 10:16:34 +01:00
Remove FTP support
The sepport was removed from Chromium, QtWebEngine. BUG: 494222 Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
This commit is contained in:
parent
01191a2911
commit
e3cf9424cc
@ -134,7 +134,7 @@ GenericName[zh_CN]=网页浏览器
|
|||||||
GenericName[zh_TW]=網路瀏覽器
|
GenericName[zh_TW]=網路瀏覽器
|
||||||
Exec=falkon %u
|
Exec=falkon %u
|
||||||
StartupWMClass=Falkon
|
StartupWMClass=Falkon
|
||||||
MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;application/x-mimearchive;
|
MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-mimearchive;
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Actions=NewTab;NewWindow;PrivateBrowsing;
|
Actions=NewTab;NewWindow;PrivateBrowsing;
|
||||||
|
|
||||||
|
@ -281,7 +281,6 @@ MainApplication::MainApplication(int &argc, char** argv)
|
|||||||
QSettings::setDefaultFormat(QSettings::IniFormat);
|
QSettings::setDefaultFormat(QSettings::IniFormat);
|
||||||
QDesktopServices::setUrlHandler(QSL("http"), this, "addNewTab");
|
QDesktopServices::setUrlHandler(QSL("http"), this, "addNewTab");
|
||||||
QDesktopServices::setUrlHandler(QSL("https"), this, "addNewTab");
|
QDesktopServices::setUrlHandler(QSL("https"), this, "addNewTab");
|
||||||
QDesktopServices::setUrlHandler(QSL("ftp"), this, "addNewTab");
|
|
||||||
|
|
||||||
ProfileManager profileManager;
|
ProfileManager profileManager;
|
||||||
profileManager.initConfigDir();
|
profileManager.initConfigDir();
|
||||||
@ -394,7 +393,6 @@ MainApplication::~MainApplication()
|
|||||||
|
|
||||||
QDesktopServices::unsetUrlHandler(QSL("http"));
|
QDesktopServices::unsetUrlHandler(QSL("http"));
|
||||||
QDesktopServices::unsetUrlHandler(QSL("https"));
|
QDesktopServices::unsetUrlHandler(QSL("https"));
|
||||||
QDesktopServices::unsetUrlHandler(QSL("ftp"));
|
|
||||||
|
|
||||||
IconProvider::instance()->saveIconsToDatabase();
|
IconProvider::instance()->saveIconsToDatabase();
|
||||||
|
|
||||||
@ -1272,7 +1270,6 @@ RegisterQAppAssociation* MainApplication::associationManager()
|
|||||||
m_registerQAppAssociation->addCapability(QSL(".htm"), QSL("FalkonHTML"), QSL("Falkon HTML Document"), fileIconPath, RegisterQAppAssociation::FileAssociation);
|
m_registerQAppAssociation->addCapability(QSL(".htm"), QSL("FalkonHTML"), QSL("Falkon HTML Document"), fileIconPath, RegisterQAppAssociation::FileAssociation);
|
||||||
m_registerQAppAssociation->addCapability(QSL("http"), QSL("FalkonURL"), QSL("Falkon URL"), appIconPath, RegisterQAppAssociation::UrlAssociation);
|
m_registerQAppAssociation->addCapability(QSL("http"), QSL("FalkonURL"), QSL("Falkon URL"), appIconPath, RegisterQAppAssociation::UrlAssociation);
|
||||||
m_registerQAppAssociation->addCapability(QSL("https"), QSL("FalkonURL"), QSL("Falkon URL"), appIconPath, RegisterQAppAssociation::UrlAssociation);
|
m_registerQAppAssociation->addCapability(QSL("https"), QSL("FalkonURL"), QSL("Falkon URL"), appIconPath, RegisterQAppAssociation::UrlAssociation);
|
||||||
m_registerQAppAssociation->addCapability(QSL("ftp"), QSL("FalkonURL"), QSL("Falkon URL"), appIconPath, RegisterQAppAssociation::UrlAssociation);
|
|
||||||
}
|
}
|
||||||
return m_registerQAppAssociation;
|
return m_registerQAppAssociation;
|
||||||
}
|
}
|
||||||
|
@ -72,7 +72,7 @@ void History::addHistoryEntry(const QUrl &url, QString title)
|
|||||||
}
|
}
|
||||||
|
|
||||||
const QStringList schemes = {
|
const QStringList schemes = {
|
||||||
QSL("http"), QSL("https"), QSL("ftp"), QSL("file")
|
QSL("http"), QSL("https"), QSL("file")
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!schemes.contains(url.scheme()) && !qzSettings->allowedSchemes.contains(url.scheme())) {
|
if (!schemes.contains(url.scheme()) && !qzSettings->allowedSchemes.contains(url.scheme())) {
|
||||||
|
@ -212,7 +212,6 @@ QStringList WebPage::internalSchemes()
|
|||||||
QSL("http"),
|
QSL("http"),
|
||||||
QSL("https"),
|
QSL("https"),
|
||||||
QSL("file"),
|
QSL("file"),
|
||||||
QSL("ftp"),
|
|
||||||
QSL("data"),
|
QSL("data"),
|
||||||
QSL("about"),
|
QSL("about"),
|
||||||
QSL("view-source"),
|
QSL("view-source"),
|
||||||
|
@ -242,7 +242,6 @@ SectionGroup "${TITLE_SecSetASDefault}" SecSetASDefault
|
|||||||
StrCmp $installAsPortable "NO" 0 skipSecProtocols
|
StrCmp $installAsPortable "NO" 0 skipSecProtocols
|
||||||
${RegisterAssociation} "http" "$INSTDIR\falkon.exe" "FalkonURL" "Falkon URL" "$INSTDIR\falkon.exe,0" "protocol"
|
${RegisterAssociation} "http" "$INSTDIR\falkon.exe" "FalkonURL" "Falkon URL" "$INSTDIR\falkon.exe,0" "protocol"
|
||||||
${RegisterAssociation} "https" "$INSTDIR\falkon.exe" "FalkonURL" "Falkon URL" "$INSTDIR\falkon.exe,0" "protocol"
|
${RegisterAssociation} "https" "$INSTDIR\falkon.exe" "FalkonURL" "Falkon URL" "$INSTDIR\falkon.exe,0" "protocol"
|
||||||
${RegisterAssociation} "ftp" "$INSTDIR\falkon.exe" "FalkonURL" "Falkon URL" "$INSTDIR\falkon.exe,0" "protocol"
|
|
||||||
${UpdateSystemIcons}
|
${UpdateSystemIcons}
|
||||||
skipSecProtocols:
|
skipSecProtocols:
|
||||||
SectionEnd
|
SectionEnd
|
||||||
@ -362,7 +361,6 @@ notRunning:
|
|||||||
${UnRegisterAssociation} ".html" "FalkonHTML" "$INSTDIR\falkon.exe" "file"
|
${UnRegisterAssociation} ".html" "FalkonHTML" "$INSTDIR\falkon.exe" "file"
|
||||||
${UnRegisterAssociation} "http" "FalkonURL" "$INSTDIR\falkon.exe" "protocol"
|
${UnRegisterAssociation} "http" "FalkonURL" "$INSTDIR\falkon.exe" "protocol"
|
||||||
${UnRegisterAssociation} "https" "FalkonURL" "$INSTDIR\falkon.exe" "protocol"
|
${UnRegisterAssociation} "https" "FalkonURL" "$INSTDIR\falkon.exe" "protocol"
|
||||||
${UnRegisterAssociation} "ftp" "FalkonURL" "$INSTDIR\falkon.exe" "protocol"
|
|
||||||
${UpdateSystemIcons}
|
${UpdateSystemIcons}
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
@ -423,7 +421,6 @@ Function RegisterCapabilities
|
|||||||
WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\FileAssociations" ".html" "FalkonHTML"
|
WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\FileAssociations" ".html" "FalkonHTML"
|
||||||
WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\URLAssociations" "http" "FalkonURL"
|
WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\URLAssociations" "http" "FalkonURL"
|
||||||
WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\URLAssociations" "https" "FalkonURL"
|
WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\URLAssociations" "https" "FalkonURL"
|
||||||
WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\URLAssociations" "ftp" "FalkonURL"
|
|
||||||
WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\Startmenu" "StartMenuInternet" "$INSTDIR\falkon.exe"
|
WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\Startmenu" "StartMenuInternet" "$INSTDIR\falkon.exe"
|
||||||
WriteRegStr HKLM "SOFTWARE\RegisteredApplications" "${PRODUCT_NAME}" "${PRODUCT_CAPABILITIES_KEY}"
|
WriteRegStr HKLM "SOFTWARE\RegisteredApplications" "${PRODUCT_NAME}" "${PRODUCT_CAPABILITIES_KEY}"
|
||||||
${EndIf}
|
${EndIf}
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
!define DESC_SecExtensions "Associate Falkon with .htm(l) files"
|
!define DESC_SecExtensions "Associate Falkon with .htm(l) files"
|
||||||
!define DESC_SecThemes "Additional themes for Falkon"
|
!define DESC_SecThemes "Additional themes for Falkon"
|
||||||
!define DESC_SecSetASDefault "Set Falkon as default internet browser"
|
!define DESC_SecSetASDefault "Set Falkon as default internet browser"
|
||||||
!define DESC_SecProtocols "Associate Falkon with http(s) and ftp protocols"
|
!define DESC_SecProtocols "Associate Falkon with http(s) protocols"
|
||||||
|
|
||||||
!define DESC_InstallationMode "Select installation mode"
|
!define DESC_InstallationMode "Select installation mode"
|
||||||
!define DESC_PortableInstallation "Falkon will be installed as a 'Portable Application' to the selected location."
|
!define DESC_PortableInstallation "Falkon will be installed as a 'Portable Application' to the selected location."
|
||||||
|
Loading…
Reference in New Issue
Block a user