Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add GUI in preferences dialog for adding URI customized schemes #9195

Closed
wants to merge 2 commits into from
Closed

Add GUI in preferences dialog for adding URI customized schemes #9195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e949fb5
Add default supported url schemes
donho Nov 22, 2020
294a8f4
Add GUI in Preferences dialog for adding URI customized schemes
donho Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions PowerEditor/installer/nativeLang/english.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,10 +1007,15 @@ You can define several column markers by using white space to separate the diffe
(don't choose it unless you know what you're doing)"/>
</Delimiter>

<Cloud title="Cloud">
<Cloud title="Cloud &amp; Link">
<Item id="6262" name="Settings on cloud"/>
<Item id="6263" name="No Cloud"/>
<Item id="6267" name="Set your cloud location path here:"/>
<Item id="6318" name="Clickable Link Settings"/>
<Item id="6319" name="Enable"/>
<Item id="6320" name="No underline"/>
<Item id="6350" name="Enable fullbox mode"/>
<Item id="6264" name="URI customized schemes:"/>
</Cloud>

<SearchEngine title="Search Engine">
Expand All @@ -1033,18 +1038,14 @@ You can define several column markers by using white space to separate the diffe
<Item id="6308" name="Minimize to system tray"/>
<Item id="6312" name="File Status Auto-Detection"/>
<Item id="6313" name="Update silently"/>
<Item id="6318" name="Clickable Link Settings"/>
<Item id="6325" name="Scroll to the last line after update"/>
<Item id="6319" name="Enable"/>
<Item id="6320" name="No underline"/>
<Item id="6322" name="Session file ext.:"/>
<Item id="6323" name="Enable Notepad++ auto-updater"/>
<Item id="6351" name="Set Save dialog file extension filter to .* instead of .txt for Normal Text"/>
<Item id="6324" name="Document Switcher (Ctrl+TAB)"/>
<Item id="6331" name="Show only filename in title bar"/>
<Item id="6334" name="Autodetect character encoding"/>
<Item id="6349" name="Use DirectWrite (May improve rendering special characters, need to restart Notepad++)"/>
<Item id="6350" name="Enable fullbox mode"/>
<Item id="6337" name="Workspace file ext.:"/>
<Item id="6114" name="Enable"/>
<Item id="6117" name="Enable MRU behaviour"/>
Expand Down
11 changes: 6 additions & 5 deletions PowerEditor/installer/nativeLang/french.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,10 +968,15 @@ Vous pouvez définir plusieurs marqueurs de colonne en utilisant un espace pour
(Ne pas utiliser cette option si vous ne savez pas ce qu'elle fait)"/>
</Delimiter>

<Cloud title="Cloud">
<Cloud title="Cloud &amp; Lien">
<Item id="6262" name="Sauvegarder les paramètres dans le cloud"/>
<Item id="6263" name="Par défaut"/>
<Item id="6267" name="Chemin d'accès de votre cloud :"/>
<Item id="6318" name="Paramétrage de lien cliquable"/>
<Item id="6319" name="Activer"/>
<Item id="6320" name="Ne pas souligner"/>
<Item id="6350" name="Activer la mode d'arrière-plan"/>
<Item id="6264" name="Schémas personnalisés d'URI:"/>
</Cloud>

<SearchEngine title="Moteur de recherche">
Expand All @@ -996,17 +1001,13 @@ Vous pouvez définir plusieurs marqueurs de colonne en utilisant un espace pour
<Item id="6308" name="Réduire dans la barre de notifications"/>
<Item id="6312" name="Surveillance de l’état des fichiers"/>
<Item id="6313" name="Mise à jour sans alerte"/>
<Item id="6318" name="Paramétrage de lien cliquable"/>
<Item id="6319" name="Activer"/>
<Item id="6320" name="Ne pas souligner"/>
<Item id="6322" name="Ext. fichier session :"/>
<Item id="6323" name="Activer la mise à jour automatique"/>
<Item id="6324" name="Commutateur de documents (Ctrl+Tab)"/>
<Item id="6325" name="Aller à la dernière ligne après mise à jour"/>
<Item id="6331" name="Afficher seulement le nom du fichier dans la barre de titre"/>
<Item id="6334" name="Détecter l'encodage automatiquement"/>
<Item id="6349" name="Utiliser &quot;DirectWrite&quot; (il pourrait améliorer le rendu des caractères spéciaux. Nécessité de redémarrage)"/>
<Item id="6350" name="Activer la mode d'arrière-plan"/>
<Item id="6337" name="Ext. fichier espace de travail :"/>
<Item id="6344" name="Aperçu du document"/>
<Item id="6345" name="Aperçu à onglet"/>
Expand Down
14 changes: 7 additions & 7 deletions PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,11 +977,15 @@
<Item id="6163" name="添加字元（不了解此選項的話不建議選取）"/>
</Delimiter>

<Cloud title="雲端">
<Cloud title="雲端與連結">
<Item id="6262" name="雲端設定"/>
<Item id="6263" name="不使用雲端"/>
<Item id="6267" name="雲端路徑："/>
<!-- <Item id="6261" name="（重新啟動 Notepad++ 後生效）"/> -->
<Item id="6318" name="連結設定"/>
<Item id="6319" name="將連結設為可點擊"/>
<Item id="6320" name="隱藏連結底線"/>
<Item id="6350" name="啟動背景模式"/>
<Item id="6264" name="自訂 URI 格式："/>
</Cloud>

<SearchEngine title="搜尋引擎">
Expand All @@ -1004,18 +1008,14 @@
<Item id="6308" name="最小化至系統匣"/>
<Item id="6312" name="自動更新檔案狀態"/>
<Item id="6313" name="於背景自動更新"/>
<Item id="6318" name="連結設定"/>
<Item id="6325" name="更新後捲動至最後一行"/>
<Item id="6319" name="將連結設為可點擊"/>
<Item id="6320" name="隱藏連結底線"/>
<Item id="6322" name="工作階段檔案副檔名："/>
<Item id="6323" name="自動更新 Notepad++"/>
<Item id="6324" name="文件切換器（Ctrl + TAB）"/>
<Item id="6331" name="在標題列僅顯示檔案名稱（隱藏資料夾路徑）"/>
<Item id="6334" name="自動偵測檔案編碼"/>
<Item id="6349" name="使用 DirectWrite（可改善特殊字符的呈現，需要重新啟動 Notepad++）"/>
<Item id="6350" name="啟動背景模式"/>
<Item id="6337" name="資料夾工作區檔案副檔名："/>
<Item id="6337" name="資料夾工作區檔案副檔名："/>
<Item id="6114" name="啟動"/>
<Item id="6117" name="開啟「最近使用的檔案」功能"/>
<Item id="6344" name="窺視檔案"/>
Expand Down
2 changes: 1 addition & 1 deletion PowerEditor/src/Notepad_plus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2639,7 +2639,7 @@ bool isUrlSchemeSupported(INTERNET_SCHEME s, TCHAR *url)
case INTERNET_SCHEME_FILE:
return true;
}
generic_string const mySchemes = (NppParameters::getInstance()).getNppGUI()._customizedShemes + TEXT(" ");
generic_string const mySchemes = (NppParameters::getInstance()).getNppGUI()._uriShemes + TEXT(" ");
TCHAR *p = (TCHAR *)mySchemes.c_str();
while (*p)
{
Expand Down
10 changes: 5 additions & 5 deletions PowerEditor/src/Parameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4442,14 +4442,14 @@ void NppParameters::feedGUIParameters(TiXmlNode *node)
}
}

else if (!lstrcmp(nm, TEXT("URL customized schemes")))
else if (!lstrcmp(nm, TEXT("uriCustomizedSchemes")))
{
TiXmlNode *n = childNode->FirstChild();
if (n)
{
const TCHAR* val = n->Value();
if (val)
_nppGUI._customizedShemes = val;
_nppGUI._uriShemes = val;
}
}

Expand Down Expand Up @@ -6009,11 +6009,11 @@ void NppParameters::createXmlTreeFromGUIParams()
GUIConfigElement->InsertEndChild(TiXmlText(szStr));
}

// <GUIConfig name="URL customized schemes">svn://</GUIConfig>
// <GUIConfig name="uriCustomizedSchemes">svn://</GUIConfig>
{
TiXmlElement *GUIConfigElement = (newGUIRoot->InsertEndChild(TiXmlElement(TEXT("GUIConfig"))))->ToElement();
GUIConfigElement->SetAttribute(TEXT("name"), TEXT("URL customized schemes"));
GUIConfigElement->InsertEndChild(TiXmlText(_nppGUI._customizedShemes.c_str()));
GUIConfigElement->SetAttribute(TEXT("name"), TEXT("uriCustomizedSchemes"));
GUIConfigElement->InsertEndChild(TiXmlText(_nppGUI._uriShemes.c_str()));
}
// <GUIConfig name = "globalOverride" fg = "no" bg = "no" font = "no" fontSize = "no" bold = "no" italic = "no" underline = "no" / >
{
Expand Down
2 changes: 1 addition & 1 deletion PowerEditor/src/Parameters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ struct NppGUI final
bool _isWordCharDefault = true;
std::string _customWordChars;
urlMode _styleURL = urlUnderLineFg;
generic_string _customizedShemes = TEXT("");
generic_string _uriShemes = TEXT("svn:// cvs:// git:// imap:// irc:// irc6:// ircs:// ldap:// ldaps:// news: telnet:// gopher:// ssh:// sftp:// smb:// skype: snmp:// spotify: steam:// sms: slack:// chrome:// bitcoin:");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@donho Spelling _uriShemes -> _uriSchemes :-)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But you didn't change the spelling problem? :-)

NewDocDefaultSettings _newDocDefaultSettings;


Expand Down