diff --git a/language/common_res.h b/language/common_res.h index 496eaae5a..cb2a39977 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -390,8 +390,6 @@ #define CMD_SAVEASDEFWINPOS 20053 #define CMD_CLEARSAVEDWINPOS 20054 #define CMD_CHECK_INDENTATION 20055 -//#define CMD_LEFT 20056 -//#define CMD_RIGHT 20057 #define IDS_MUI_MENU_LANGUAGE 34500 #define IDS_MUI_LANG_EN_US 34501 @@ -608,6 +606,7 @@ #define IDM_VIEW_TOGGLE_VIEW 40465 #define IDM_VIEW_CHASING_DOCTAIL 40466 #define IDM_VIEW_TOGGLETB 40467 +#define IDM_VIEW_MUTE_MESSAGEBEEP 40468 #define IDM_SET_RENDER_TECH_DEFAULT 40500 #define IDM_SET_RENDER_TECH_D2D 40501 diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 55c50de3c..39461121a 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -184,11 +184,11 @@ BEGIN POPUP "&Seleksie" BEGIN MENUITEM "&Inkeep", IDM_EDIT_INDENT - MENUITEM "&Ontkeep", IDM_EDIT_UNINDENT + MENUITEM "&Ontkeep", IDM_EDIT_UNINDENT MENUITEM SEPARATOR POPUP "Omsluit S&eleksie" BEGIN - MENUITEM "&Enkele Aanhaling\tCtrl+1", CMD_STRINGIFY + MENUITEM "&Enkele Aanhaling\tCtrl+1", CMD_STRINGIFY MENUITEM "&Dubbelle Aanhaling\tCtrl+2", CMD_STRINGIFY2 MENUITEM SEPARATOR MENUITEM "( )\tCtrl+3", CMD_EMBRACE @@ -197,9 +197,9 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Backticks\tCtrl+6", CMD_EMBRACE4 MENUITEM SEPARATOR - MENUITEM "&Met...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION + MENUITEM "&Met...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION END - MENUITEM "&Dupliseer Seleksie/Lyn\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION + MENUITEM "&Dupliseer Seleksie/Lyn\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION MENUITEM SEPARATOR MENUITEM "&Pad Met Spasies\tAlt+B", IDM_EDIT_PADWITHSPACES MENUITEM "Strip &Eerste Karakter\tAlt+Z", IDM_EDIT_STRIP1STCHAR @@ -213,14 +213,14 @@ BEGIN END POPUP "Co&nvert" BEGIN - MENUITEM "&Hoofletters\tCtrl+Shift+U", IDM_EDIT_CONVERTUPPERCASE - MENUITEM "&Kleinletter\tCtrl+U", IDM_EDIT_CONVERTLOWERCASE + MENUITEM "&Hoofletters\tCtrl+Shift+U", IDM_EDIT_CONVERTUPPERCASE + MENUITEM "&Kleinletter\tCtrl+U", IDM_EDIT_CONVERTLOWERCASE MENUITEM SEPARATOR - MENUITEM "Keer &Case\tCtrl+Alt+U", IDM_EDIT_INVERTCASE - MENUITEM "&Titel Case\tCtrl+Alt+I", IDM_EDIT_TITLECASE - MENUITEM "&Sin Case\tCtrl+Alt+O", IDM_EDIT_SENTENCECASE + MENUITEM "Keer &Case\tCtrl+Alt+U", IDM_EDIT_INVERTCASE + MENUITEM "&Titel Case\tCtrl+Alt+I", IDM_EDIT_TITLECASE + MENUITEM "&Sin Case\tCtrl+Alt+O", IDM_EDIT_SENTENCECASE MENUITEM SEPARATOR - MENUITEM "&Tabifiseer Seleksie\tCtrl+Shift+T", IDM_EDIT_CONVERTSPACES + MENUITEM "&Tabifiseer Seleksie\tCtrl+Shift+T", IDM_EDIT_CONVERTSPACES MENUITEM "&On-Tabifiseer Seleksie\tCtrl+Shift+S", IDM_EDIT_CONVERTTABS MENUITEM SEPARATOR MENUITEM "Ta&bifiseer Inkeep\tCtrl+Alt+T", IDM_EDIT_CONVERTSPACES2 @@ -239,77 +239,77 @@ BEGIN MENUITEM "&Opdateer Tydstempel\tShift+F5", CMD_TIMESTAMPS MENUITEM SEPARATOR MENUITEM "&Lernaam\tCtrl+F9", IDM_EDIT_INSERT_FILENAME - MENUITEM "&Pad en Lernaam\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME + MENUITEM "&Pad en Lernaam\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME MENUITEM SEPARATOR MENUITEM "&GUID\tCtrl+Shift+.", IDM_EDIT_INSERT_GUID END POPUP "&Diverse" BEGIN - MENUITEM "&Lyn Kommentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT - MENUITEM "&Stroom Kommentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT + MENUITEM "&Lyn Kommentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "&Stroom Kommentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR - MENUITEM "&URL Kodeer\tCtrl+Shift+E", IDM_EDIT_URLENCODE - MENUITEM "URL &Dekodeer\tCtrl+Shift+R", IDM_EDIT_URLDECODE + MENUITEM "&URL Kodeer\tCtrl+Shift+E", IDM_EDIT_URLENCODE + MENUITEM "URL &Dekodeer\tCtrl+Shift+R", IDM_EDIT_URLDECODE MENUITEM SEPARATOR - MENUITEM "&Ontsnap C Karakters\tCtrl+Alt+E", IDM_EDIT_ESCAPECCHARS - MENUITEM "On-ontsnap C Ka&rakters\tCtrl+Alt+R", IDM_EDIT_UNESCAPECCHARS + MENUITEM "&Ontsnap C Karakters\tCtrl+Alt+E", IDM_EDIT_ESCAPECCHARS + MENUITEM "On-ontsnap C Ka&rakters\tCtrl+Alt+R", IDM_EDIT_UNESCAPECCHARS MENUITEM SEPARATOR - MENUITEM "&Karakter na Hex\tCtrl+Alt+X", IDM_EDIT_CHAR2HEX - MENUITEM "&Hex an Karakters\tCtrl+Alt+C", IDM_EDIT_HEX2CHAR + MENUITEM "&Karakter na Hex\tCtrl+Alt+X", IDM_EDIT_CHAR2HEX + MENUITEM "&Hex an Karakters\tCtrl+Alt+C", IDM_EDIT_HEX2CHAR MENUITEM SEPARATOR - MENUITEM "Verhoog &Nommer\tCtrl+Alt+NK+", CMD_INCREASENUM - MENUITEM "V&erminder Nommer\tCtrl+Alt+NK-", CMD_DECREASENUM + MENUITEM "Verhoog &Nommer\tCtrl+Alt+NK+", CMD_INCREASENUM + MENUITEM "V&erminder Nommer\tCtrl+Alt+NK-", CMD_DECREASENUM MENUITEM SEPARATOR - MENUITEM "&Vind Bypassende Hakie\tCtrl+B", IDM_EDIT_FINDMATCHINGBRACE - MENUITEM "Kies na &Bypassende Hakie\tCtrl+Shift+B", IDM_EDIT_SELTOMATCHINGBRACE + MENUITEM "&Vind Bypassende Hakie\tCtrl+B", IDM_EDIT_FINDMATCHINGBRACE + MENUITEM "Kies na &Bypassende Hakie\tCtrl+Shift+B", IDM_EDIT_SELTOMATCHINGBRACE MENUITEM SEPARATOR - MENUITEM "Kies na &Volgende\tCtrl+Alt+F2", IDM_EDIT_SELTONEXT - MENUITEM "Kies na Vori&ge\tCtrl+Alt+Shift+F2", IDM_EDIT_SELTOPREV + MENUITEM "Kies na &Volgende\tCtrl+Alt+F2", IDM_EDIT_SELTONEXT + MENUITEM "Kies na Vori&ge\tCtrl+Alt+Shift+F2", IDM_EDIT_SELTOPREV END MENUITEM SEPARATOR POPUP "Boe&kmerke" BEGIN - MENUITEM "&Wissel\tCtrl+F2", BME_EDIT_BOOKMARKTOGGLE + MENUITEM "&Wissel\tCtrl+F2", BME_EDIT_BOOKMARKTOGGLE MENUITEM SEPARATOR MENUITEM "Gaan na &Volgende\tF2", BME_EDIT_BOOKMARKNEXT - MENUITEM "Gaan na Vori&ge\tShift+F2", BME_EDIT_BOOKMARKPREV + MENUITEM "Gaan na Vori&ge\tShift+F2", BME_EDIT_BOOKMARKPREV MENUITEM SEPARATOR MENUITEM "&Maak Alles Skoon\tAlt+F2", BME_EDIT_BOOKMARKCLEAR END MENUITEM SEPARATOR POPUP "&Soek" BEGIN - MENUITEM "&Vind...\tCtrl+F", IDM_EDIT_FIND - MENUITEM "&Stoor Vind Text\tAlt+F3", IDM_EDIT_SAVEFIND - MENUITEM "Vind V&olgende\tF3", IDM_EDIT_FINDNEXT - MENUITEM "Vind Vo&rige\tShift+F3", IDM_EDIT_FINDPREV - MENUITEM "Vind Volgende S&eleksie\tCtrl+F3", CMD_FINDNEXTSEL - MENUITEM "Vind Vorige Se&leksie\tCtrl+Shift+F3", CMD_FINDPREVSEL - MENUITEM "Verv&ang...\tCtrl+H", IDM_EDIT_REPLACE - MENUITEM "Vervang Volge&nde\tF4", IDM_EDIT_REPLACENEXT - MENUITEM "&Gaan na...\tCtrl+G", IDM_EDIT_GOTOLINE + MENUITEM "&Vind...\tCtrl+F", IDM_EDIT_FIND + MENUITEM "&Stoor Vind Text\tAlt+F3", IDM_EDIT_SAVEFIND + MENUITEM "Vind V&olgende\tF3", IDM_EDIT_FINDNEXT + MENUITEM "Vind Vo&rige\tShift+F3", IDM_EDIT_FINDPREV + MENUITEM "Vind Volgende S&eleksie\tCtrl+F3", CMD_FINDNEXTSEL + MENUITEM "Vind Vorige Se&leksie\tCtrl+Shift+F3", CMD_FINDPREVSEL + MENUITEM "Verv&ang...\tCtrl+H", IDM_EDIT_REPLACE + MENUITEM "Vervang Volge&nde\tF4", IDM_EDIT_REPLACENEXT + MENUITEM "&Gaan na...\tCtrl+G", IDM_EDIT_GOTOLINE END END POPUP "&Aansig" BEGIN POPUP "&Skema" BEGIN - MENUITEM "&Sintakseskema...\tF12", IDM_VIEW_SCHEME - MENUITEM "&2de Verstek Skema\tShift+F12", IDM_VIEW_USE2NDDEFAULT - MENUITEM "&Pas Skemas Aan...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG - MENUITEM "Globale Standaard Font...\tAlt+F12", IDM_VIEW_FONT - MENUITEM "Huidige Skema se Verstek Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME + MENUITEM "&Sintakseskema...\tF12", IDM_VIEW_SCHEME + MENUITEM "&2de Verstek Skema\tShift+F12", IDM_VIEW_USE2NDDEFAULT + MENUITEM "&Pas Skemas Aan...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM "Globale Standaard Font...\tAlt+F12", IDM_VIEW_FONT + MENUITEM "Huidige Skema se Verstek Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME END MENUITEM SEPARATOR MENUITEM "Woord Oo&rvloei\tCtrl+W", IDM_VIEW_WORDWRAP MENUITEM "&Lang Lyn Merker\tCtrl+Shift+L", IDM_VIEW_LONGLINEMARKER - MENUITEM "Indent&asiegidse\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES + MENUITEM "Indent&asiegidse\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES MENUITEM SEPARATOR MENUITEM "Wys &Oorvloei Simbole\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS MENUITEM "W&ys Oop Spasies\tCtrl+Shift+8", IDM_VIEW_SHOWBLANKS - MENUITEM "Wys Lyn &Einde\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS + MENUITEM "Wys Lyn &Einde\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS MENUITEM SEPARATOR - MENUITEM "Skakel &Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS + MENUITEM "Skakel &Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "&Visuele Hakie Passing\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES POPUP "Merk Huidi&ge Lyn\tCtrl+Shift+I" BEGIN @@ -323,12 +323,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Pas Slegs Sigbaar Aan", IDM_VIEW_MARKOCCUR_VISIBLE MENUITEM SEPARATOR - MENUITEM "Pas &Geval Sensitief", IDM_VIEW_MARKOCCUR_CASE + MENUITEM "Pas &Geval Sensitief", IDM_VIEW_MARKOCCUR_CASE POPUP "Pas &Slegs Die Hele Woord Aan" BEGIN - MENUITEM "AF", IDM_VIEW_MARKOCCUR_WNONE + MENUITEM "AF", IDM_VIEW_MARKOCCUR_WNONE MENUITEM "Pas &Geselekteerde Woord", IDM_VIEW_MARKOCCUR_WORD - MENUITEM "Pas &Huidige Woord", IDM_VIEW_MARKOCCUR_CURRENT + MENUITEM "Pas &Huidige Woord", IDM_VIEW_MARKOCCUR_CURRENT END END MENUITEM SEPARATOR @@ -337,10 +337,10 @@ BEGIN MENUITEM SEPARATOR POPUP "Ver&toning" BEGIN - MENUITEM "Kode &Vou\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING - MENUITEM "&Wissel Voue\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS + MENUITEM "Kode &Vou\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING + MENUITEM "&Wissel Voue\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "Gefokusde &Aansig\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "&Doc Stert Jaag", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "&Doc Stert Jaag", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Rol na Einde Van Die &Ler", IDM_VIEW_SCROLLPASTEOF END POPUP "Nu&tsbalk" @@ -359,54 +359,55 @@ BEGIN END POPUP "&Posisie" BEGIN - MENUITEM "Kopie Posisie Args\tCtrl+Shift+K", CMD_COPYWINPOS - MENUITEM "Snap na Verstek Posisie\tCtrl+Shift+P", CMD_DEFAULTWINPOS - MENUITEM "Stoor as Verstek Posisie", CMD_SAVEASDEFWINPOS - MENUITEM "Herstel Gestoorde Verstek Posisie", CMD_CLEARSAVEDWINPOS - MENUITEM "Snap to Aanvanklike Posisie\tCtrl+F11", CMD_INITIALWINPOS - MENUITEM "Wissel Volle Area Posisie\tF11", CMD_FULLSCRWINPOS - MENUITEM "Klewerige Venster &Posisie", IDM_VIEW_STICKYWINPOS + MENUITEM "Kopie Posisie Args\tCtrl+Shift+K", CMD_COPYWINPOS + MENUITEM "Snap na Verstek Posisie\tCtrl+Shift+P", CMD_DEFAULTWINPOS + MENUITEM "Stoor as Verstek Posisie", CMD_SAVEASDEFWINPOS + MENUITEM "Herstel Gestoorde Verstek Posisie", CMD_CLEARSAVEDWINPOS + MENUITEM "Snap to Aanvanklike Posisie\tCtrl+F11", CMD_INITIALWINPOS + MENUITEM "Wissel Volle Area Posisie\tF11", CMD_FULLSCRWINPOS + MENUITEM "Klewerige Venster &Posisie", IDM_VIEW_STICKYWINPOS END END POPUP "In&stellings" BEGIN - MENUITEM "Voeg Tabbladsye in as &Spasies", IDM_VIEW_TABSASSPACES - MENUITEM "&Tab Instellings...\tCtrl+T", IDM_VIEW_TABSETTINGS + MENUITEM "Voeg Tabbladsye in as &Spasies", IDM_VIEW_TABSASSPACES + MENUITEM "&Tab Instellings...\tCtrl+T", IDM_VIEW_TABSETTINGS MENUITEM "&Woord Omslag Instellings...", IDM_VIEW_WORDWRAPSETTINGS - MENUITEM "&Lang Lyn Instellings...", IDM_VIEW_LONGLINESETTINGS - MENUITEM "Outo-In&dent Teks", IDM_VIEW_AUTOINDENTTEXT - MENUITEM "Outo-Sluit &HTML/XML\tCtrl+Shift+H", IDM_VIEW_AUTOCLOSETAGS - MENUITEM "O&uto-Voltooi Woorde", IDM_VIEW_AUTOCOMPLETEWORDS - MENUITEM "Outo-Voltooi Le&xer-Sleutel-Woorde", IDM_VIEW_AUTOCLEXKEYWORDS - MENUITEM "Versnelde Woord Navi&gasie\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV + MENUITEM "&Lang Lyn Instellings...", IDM_VIEW_LONGLINESETTINGS + MENUITEM "Outo-In&dent Teks", IDM_VIEW_AUTOINDENTTEXT + MENUITEM "Outo-Sluit &HTML/XML\tCtrl+Shift+H", IDM_VIEW_AUTOCLOSETAGS + MENUITEM "O&uto-Voltooi Woorde", IDM_VIEW_AUTOCOMPLETEWORDS + MENUITEM "Outo-Voltooi Le&xer-Sleutel-Woorde", IDM_VIEW_AUTOCLEXKEYWORDS + MENUITEM "Versnelde Woord Navi&gasie\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV MENUITEM SEPARATOR - MENUITEM "Enkel &Ler Instansie", IDM_VIEW_SINGLEFILEINSTANCE - MENUITEM "Lerverandering-&Kennisgewing...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Enkel &Ler Instansie", IDM_VIEW_SINGLEFILEINSTANCE + MENUITEM "Lerverandering-&Kennisgewing...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Esc &Sleutel Funksie" BEGIN - MENUITEM "&Geen", IDM_VIEW_NOESCFUNC - MENUITEM "&Minimaliseer Notepad3", IDM_VIEW_ESCMINIMIZE + MENUITEM "&Geen", IDM_VIEW_NOESCFUNC + MENUITEM "&Minimaliseer Notepad3", IDM_VIEW_ESCMINIMIZE MENUITEM "M&aak Notepad3 Toe", IDM_VIEW_ESCEXIT END - MENUITEM "Stoor Voor L&opende Tools", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Stoor Voor L&opende Tools", IDM_VIEW_SAVEBEFORERUNNINGTOOLS MENUITEM SEPARATOR POPUP "Ont&hou" BEGIN - MENUITEM "Onthou Onlangse &Lers", IDM_VIEW_NOSAVERECENT - MENUITEM "&Bewaar Caret Posisie", IDM_VIEW_NOPRESERVECARET - MENUITEM "Onthou So&ekpatroon", IDM_VIEW_NOSAVEFINDREPL + MENUITEM "Onthou Onlangse &Lers", IDM_VIEW_NOSAVERECENT + MENUITEM "&Bewaar Caret Posisie", IDM_VIEW_NOPRESERVECARET + MENUITEM "Onthou So&ekpatroon", IDM_VIEW_NOSAVEFINDREPL END POPUP "&Venster" BEGIN POPUP "Venster Titel &Vertoning" BEGIN MENUITEM "Slegs &Lernaam", IDM_VIEW_SHOWFILENAMEONLY - MENUITEM "Lernaam en &Gids", IDM_VIEW_SHOWFILENAMEFIRST + MENUITEM "Lernaam en &Gids", IDM_VIEW_SHOWFILENAMEFIRST MENUITEM "Volle &Padnaam", IDM_VIEW_SHOWFULLPATH MENUITEM "&Teks Uittreksel\tCtrl+9", IDM_VIEW_SHOWEXCERPT END MENUITEM "&Hergebruik Venster", IDM_VIEW_REUSEWINDOW - MENUITEM "&Altyd Bo-op\tAlt+T", IDM_VIEW_ALWAYSONTOP + MENUITEM "&Altyd Bo-op\tAlt+T", IDM_VIEW_ALWAYSONTOP MENUITEM "&Minimeer Na Die Laai", IDM_VIEW_MINTOTRAY MENUITEM "&Deursigtige Modus\tAlt+G", IDM_VIEW_TRANSPARENT END @@ -416,7 +417,7 @@ BEGIN BEGIN MENUITEM "Verstek &GDI", IDM_SET_RENDER_TECH_DEFAULT MENUITEM "DirectWrite (&Direct2D)", IDM_SET_RENDER_TECH_D2D - MENUITEM "DirectWrite &Behou", IDM_SET_RENDER_TECH_D2DRETAIN + MENUITEM "DirectWrite &Behou", IDM_SET_RENDER_TECH_D2DRETAIN MENUITEM "Direct&Write GDI DC", IDM_SET_RENDER_TECH_D2DDC END POPUP "Bidirectionele" @@ -435,7 +436,7 @@ BEGIN END POPUP "&Help" BEGIN - MENUITEM "Aanlyn &Dokumentasie\tF1", IDM_HELP_ONLINEDOCUMENTATION + MENUITEM "Aanlyn &Dokumentasie\tF1", IDM_HELP_ONLINEDOCUMENTATION MENUITEM SEPARATOR MENUITEM "Begin Administrasie Program...", IDM_HELP_ADMINEXE MENUITEM "Check &Webwerf vir Opdatering", IDM_HELP_UPDATEWEBSITE @@ -454,12 +455,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Sn&y", IDM_EDIT_CUT MENUITEM "&Kopie", IDM_EDIT_COPY - MENUITEM "&Plak", IDM_EDIT_PASTE + MENUITEM "&Plak", IDM_EDIT_PASTE MENUITEM "&Verwyder", IDM_EDIT_CLEAR MENUITEM SEPARATOR MENUITEM "&Kies Alles", IDM_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Wissel Huidige Vou", IDM_VIEW_TOGGLE_CURRENT_FOLD + MENUITEM "&Wissel Huidige Vou", IDM_VIEW_TOGGLE_CURRENT_FOLD MENUITEM SEPARATOR MENUITEM "Maak &Skakel Oop", CMD_OPEN_HYPERLINK END diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 1c4acf093..429ed012d 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM " & ", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM " & ...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "& Esc" BEGIN MENUITEM "&", IDM_VIEW_NOESCFUNC diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 0b1ac4024..b30852475 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -380,8 +380,9 @@ BEGIN MENUITEM "Auto &Lexer KeyWord Vorschlge", IDM_VIEW_AUTOCLEXKEYWORDS MENUITEM "&Beschleunigte Wort Navigation\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV MENUITEM SEPARATOR - MENUITEM "Eine Instanz per Datei", IDM_VIEW_SINGLEFILEINSTANCE - MENUITEM "Nachricht bei Dateinderung...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Eine &Instanz per Datei", IDM_VIEW_SINGLEFILEINSTANCE + MENUITEM "Nachricht bei &Dateinderung...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Keine Nachrichten &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Esc-&Key Funktion" BEGIN MENUITEM "&Keine", IDM_VIEW_NOESCFUNC diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 0860e27af..6627d11f5 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Esc &Key Function" BEGIN MENUITEM "&None", IDM_VIEW_NOESCFUNC diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 3df4a1688..aaf0be3b0 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Esc &Key Function" BEGIN MENUITEM "&None", IDM_VIEW_NOESCFUNC diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index 9f1701d09..633235e09 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Ins&tancia de archivo nico", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "N&otificacin de cambios en archivo...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "&Funcin de la tecla 'Esc'" BEGIN MENUITEM "&Ninguna", IDM_VIEW_NOESCFUNC diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index eccc98719..38731b204 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Instance de f&ichier unique", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "Notification de modifi&cation de fichier...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Fo&nction de la touche 'Esc'" BEGIN MENUITEM "&Aucune", IDM_VIEW_NOESCFUNC diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 055e94821..627323187 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Esc &Key Function" BEGIN MENUITEM "&None", IDM_VIEW_NOESCFUNC diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 0e2ce2558..cd39e7ee6 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Impedisci di riaprire lo stesso &file", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "Notifica di modifi&che al file...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Azione su tasto '&Esc'" BEGIN MENUITEM "&Nessuna", IDM_VIEW_NOESCFUNC diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index fbb3fe6cd..3677cf993 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "P̃CX^XŃt@CJ(&F)", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "t@C̕ύXʒm(&C)...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "EscL[̓(&K)" BEGIN MENUITEM "Ȃ(&N)", IDM_VIEW_NOESCFUNC diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 01669e2b3..417c49f06 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM " νϽ(&F)", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM " ˸(&C)...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "ESC Ű (&K)" BEGIN MENUITEM " (&N)", IDM_VIEW_NOESCFUNC diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 1b411adb2..708f79b5f 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "En&kel bestand instantie", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "Bestandswijziging notifi&catie...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Esc &toest functie" BEGIN MENUITEM "&Geen", IDM_VIEW_NOESCFUNC diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index 172078193..a54f8221d 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Esc &Key Function" BEGIN MENUITEM "&None", IDM_VIEW_NOESCFUNC diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index ba7d5d363..bddc25174 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Esc &Key Function" BEGIN MENUITEM "&None", IDM_VIEW_NOESCFUNC diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 7552926fb..ac61fac18 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -382,6 +382,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM " & ", IDM_VIEW_SINGLEFILEINSTANCE MENUITEM "& ...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "& Esc" BEGIN MENUITEM "&", IDM_VIEW_NOESCFUNC diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index a427068ef..7082e5994 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -380,8 +380,9 @@ BEGIN MENUITEM "Զȫ﷨ؼ(&K)", IDM_VIEW_AUTOCLEXKEYWORDS MENUITEM "ٵʵ(&G)\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV MENUITEM SEPARATOR - MENUITEM "һļʵ(&F)", IDM_VIEW_SINGLEFILEINSTANCE - MENUITEM "ļ޸֪ͨ(&C)...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "һļʵ(&F)", IDM_VIEW_SINGLEFILEINSTANCE + MENUITEM "ļ޸֪ͨ(&C)...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Esc (&K)" BEGIN MENUITEM "(&N)", IDM_VIEW_NOESCFUNC diff --git a/src/Dialogs.c b/src/Dialogs.c index 811b095cb..8f8d38f45 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -15,6 +15,7 @@ #include "Helpers.h" #include +#include #include #include #include @@ -133,9 +134,19 @@ int MsgBoxLng(int iType, UINT uIdMsg, ...) HWND hwnd = focus ? focus : Globals.hwndMain; hhkMsgBox = SetWindowsHookEx(WH_CBT, &_MsgBoxProc, 0, GetCurrentThreadId()); - //return MessageBox(hwnd, szText, szTitle, iIcon); - //return MessageBoxEx(hwnd, szText, szTitle, iIcon, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)); - return MessageBoxEx(hwnd, szText, szTitle, iIcon, Globals.iPrefLANGID); + DWORD volume = 0; + if (Settings.MuteMessageBeep) { + waveOutGetVolume(NULL, &volume); + waveOutSetVolume(NULL, 0); + } + + int const res = MessageBoxEx(hwnd, szText, szTitle, iIcon, Globals.iPrefLANGID); + + if (Settings.MuteMessageBeep) { + waveOutSetVolume(NULL, volume); + } + + return res; } @@ -161,10 +172,9 @@ static INT_PTR CALLBACK InfoBoxDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPAR if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); } SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam); lpib = (LPINFOBOX)lParam; - SendDlgItemMessage(hwnd, IDC_INFOBOXICON, STM_SETICON, (WPARAM)LoadIcon(NULL, IDI_EXCLAMATION), 0); + SendDlgItemMessage(hwnd, IDC_INFOBOXICON, STM_SETICON, (WPARAM)LoadIcon(NULL, IDI_INFORMATION), 0); SetDlgItemText(hwnd, IDC_INFOBOXTEXT, lpib->lpstrMessage); - if (lpib->bDisableCheckBox) - DialogEnableWindow(hwnd, IDC_INFOBOXCHECK, false); + if (lpib->bDisableCheckBox) { DialogEnableWindow(hwnd, IDC_INFOBOXCHECK, false); } FreeMem(lpib->lpstrMessage); CenterDlgInParent(hwnd); } @@ -213,8 +223,9 @@ INT_PTR InfoBoxLng(int iType, LPCWSTR lpstrSetting, int uidMessage, ...) INFOBOX ib; ib.lpstrMessage = AllocMem(HUGE_BUFFER * sizeof(WCHAR), HEAP_ZERO_MEMORY); - if (ib.lpstrMessage) + if (ib.lpstrMessage) { StringCchVPrintfW(ib.lpstrMessage, HUGE_BUFFER, wchFormat, (LPVOID)((PUINT_PTR)&uidMessage + 1)); + } ib.lpstrSetting = (LPWSTR)lpstrSetting; ib.bDisableCheckBox = (StrIsEmpty(Globals.IniFile) || StrIsEmpty(lpstrSetting) || iMode == 2) ? true : false; @@ -231,7 +242,7 @@ INT_PTR InfoBoxLng(int iType, LPCWSTR lpstrSetting, int uidMessage, ...) break; } - MessageBeep(MB_ICONEXCLAMATION); + AttentionBeep(MB_ICONINFORMATION); HWND focus = GetFocus(); HWND hwnd = focus ? focus : Globals.hwndMain; @@ -1051,7 +1062,7 @@ static INT_PTR CALLBACK OpenWithDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM if (lpdli->ntype != DLE_NONE) EndDialog(hwnd,IDOK); else - MessageBeep(0); + AttentionBeep(0); } break; @@ -1248,7 +1259,7 @@ static INT_PTR CALLBACK FavoritesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARA if (lpdli->ntype != DLE_NONE) EndDialog(hwnd,IDOK); else - MessageBeep(0); + AttentionBeep(0); } break; @@ -2813,7 +2824,7 @@ static INT_PTR CALLBACK WarnLineEndingDlgProc(HWND hwnd, UINT umsg, WPARAM wPara WCHAR tchFmt[128]; for (int i = 0; i < 3; ++i) { WCHAR tchLn[32]; - StringCchPrintf(tchLn, COUNTOF(tchLn), L"%i", fioStatus->eolCount[i]); + StringCchPrintf(tchLn, COUNTOF(tchLn), DOCPOSFMTW, fioStatus->eolCount[i]); FormatNumberStr(tchLn, COUNTOF(tchLn), 0); GetDlgItemText(hwnd, IDC_EOL_SUM_CRLF + i, tchFmt, COUNTOF(tchFmt)); StringCchPrintf(wch, COUNTOF(wch), tchFmt, tchLn); @@ -2822,6 +2833,8 @@ static INT_PTR CALLBACK WarnLineEndingDlgProc(HWND hwnd, UINT umsg, WPARAM wPara CheckDlgButton(hwnd, IDC_WARN_INCONSISTENT_EOLS, SetBtn(Settings.WarnInconsistEOLs)); CenterDlgInParent(hwnd); + + AttentionBeep(MB_ICONEXCLAMATION); } return true; @@ -2856,7 +2869,6 @@ static INT_PTR CALLBACK WarnLineEndingDlgProc(HWND hwnd, UINT umsg, WPARAM wPara // bool WarnLineEndingDlg(HWND hwnd, EditFileIOStatus* fioStatus) { - MessageBeep(MB_ICONEXCLAMATION); const INT_PTR iResult = ThemedDialogBoxParam(Globals.hLngResContainer, MAKEINTRESOURCE(IDD_MUI_WARNLINEENDS), hwnd, @@ -2893,31 +2905,31 @@ static INT_PTR CALLBACK WarnIndentationDlgProc(HWND hwnd, UINT umsg, WPARAM wPar StringCchPrintf(wch, COUNTOF(wch), tchFmt, Globals.fvCurFile.iIndentWidth); SetDlgItemText(hwnd, IDC_INDENT_WIDTH_SPC, wch); - StringCchPrintf(tchCnt, COUNTOF(tchCnt), L"%i", fioStatus->indentCount[I_TAB_LN]); + StringCchPrintf(tchCnt, COUNTOF(tchCnt), DOCPOSFMTW, fioStatus->indentCount[I_TAB_LN]); FormatNumberStr(tchCnt, COUNTOF(tchCnt), 0); GetDlgItemText(hwnd, IDC_INDENT_SUM_TAB, tchFmt, COUNTOF(tchFmt)); StringCchPrintf(wch, COUNTOF(wch), tchFmt, tchCnt); SetDlgItemText(hwnd, IDC_INDENT_SUM_TAB, wch); - StringCchPrintf(tchCnt, COUNTOF(tchCnt), L"%i", fioStatus->indentCount[I_SPC_LN]); + StringCchPrintf(tchCnt, COUNTOF(tchCnt), DOCPOSFMTW, fioStatus->indentCount[I_SPC_LN]); FormatNumberStr(tchCnt, COUNTOF(tchCnt), 0); GetDlgItemText(hwnd, IDC_INDENT_SUM_SPC, tchFmt, COUNTOF(tchFmt)); StringCchPrintf(wch, COUNTOF(wch), tchFmt, tchCnt); SetDlgItemText(hwnd, IDC_INDENT_SUM_SPC, wch); - StringCchPrintf(tchCnt, COUNTOF(tchCnt), L"%i", fioStatus->indentCount[I_MIX_LN]); + StringCchPrintf(tchCnt, COUNTOF(tchCnt), DOCPOSFMTW, fioStatus->indentCount[I_MIX_LN]); FormatNumberStr(tchCnt, COUNTOF(tchCnt), 0); GetDlgItemText(hwnd, IDC_INDENT_SUM_MIX, tchFmt, COUNTOF(tchFmt)); StringCchPrintf(wch, COUNTOF(wch), tchFmt, tchCnt); SetDlgItemText(hwnd, IDC_INDENT_SUM_MIX, wch); - StringCchPrintf(tchCnt, COUNTOF(tchCnt), L"%i", fioStatus->indentCount[I_TAB_MOD_X]); + StringCchPrintf(tchCnt, COUNTOF(tchCnt), DOCPOSFMTW, fioStatus->indentCount[I_TAB_MOD_X]); FormatNumberStr(tchCnt, COUNTOF(tchCnt), 0); GetDlgItemText(hwnd, IDC_INDENT_TAB_MODX, tchFmt, COUNTOF(tchFmt)); StringCchPrintf(wch, COUNTOF(wch), tchFmt, tchCnt); SetDlgItemText(hwnd, IDC_INDENT_TAB_MODX, wch); - StringCchPrintf(tchCnt, COUNTOF(tchCnt), L"%i", fioStatus->indentCount[I_SPC_MOD_X]); + StringCchPrintf(tchCnt, COUNTOF(tchCnt), DOCPOSFMTW, fioStatus->indentCount[I_SPC_MOD_X]); FormatNumberStr(tchCnt, COUNTOF(tchCnt), 0); GetDlgItemText(hwnd, IDC_INDENT_SPC_MODX, tchFmt, COUNTOF(tchFmt)); StringCchPrintf(wch, COUNTOF(wch), tchFmt, tchCnt); @@ -2926,6 +2938,8 @@ static INT_PTR CALLBACK WarnIndentationDlgProc(HWND hwnd, UINT umsg, WPARAM wPar CheckDlgButton(hwnd, Globals.fvCurFile.bTabsAsSpaces ? IDC_INDENT_BY_SPCS : IDC_INDENT_BY_TABS, true); CheckDlgButton(hwnd, IDC_WARN_INCONSISTENT_INDENTS, SetBtn(Settings.WarnInconsistentIndents)); CenterDlgInParent(hwnd); + + AttentionBeep(MB_ICONEXCLAMATION); } return true; @@ -2961,7 +2975,6 @@ static INT_PTR CALLBACK WarnIndentationDlgProc(HWND hwnd, UINT umsg, WPARAM wPar // bool WarnIndentationDlg(HWND hwnd, EditFileIOStatus* fioStatus) { - MessageBeep(MB_ICONEXCLAMATION); const INT_PTR iResult = ThemedDialogBoxParam(Globals.hLngResContainer, MAKEINTRESOURCE(IDD_MUI_WARNINDENTATION), hwnd, diff --git a/src/Helpers.c b/src/Helpers.c index c4d13eb3c..95b3b0a81 100644 --- a/src/Helpers.c +++ b/src/Helpers.c @@ -265,7 +265,6 @@ bool IniSectionSetString(LPWSTR lpCachedIniSection,LPCWSTR lpName,LPCWSTR lpStri } - //============================================================================= // // GetLastErrorToMsgBox() @@ -727,7 +726,7 @@ void PathRelativeToApp( GetModuleFileName(NULL,wchAppPath,COUNTOF(wchAppPath)); PathCanonicalizeEx(wchAppPath,MAX_PATH); PathCchRemoveFileSpec(wchAppPath,COUNTOF(wchAppPath)); - GetWindowsDirectory(wchWinDir,COUNTOF(wchWinDir)); + (void)GetWindowsDirectory(wchWinDir,COUNTOF(wchWinDir)); GetKnownFolderPath(&FOLDERID_Documents, wchUserFiles, COUNTOF(wchUserFiles)); if (bUnexpandMyDocs && diff --git a/src/Helpers.h b/src/Helpers.h index b4554a209..3373b254f 100644 --- a/src/Helpers.h +++ b/src/Helpers.h @@ -177,6 +177,9 @@ inline bool IniSectionSetPos(LPWSTR lpCachedIniSection, LPCWSTR lpName, DocPos p inline COLORREF GetBackgroundColor(HWND hwnd) { return GetBkColor(GetDC(hwnd)); } +// ---------------------------------------------------------------------------- + +inline void AttentionBeep(UINT uType) { if (!Settings.MuteMessageBeep) { MessageBeep(uType); } } DWORD GetLastErrorToMsgBox(LPWSTR lpszFunction, DWORD dwErrID); // ---------------------------------------------------------------------------- @@ -206,6 +209,8 @@ DWORD GetLastErrorToMsgBox(LPWSTR lpszFunction, DWORD dwErrID); // Applications that need to distinguish between server and client versions of Windows should call this function. +// ---------------------------------------------------------------------------- + bool SetClipboardTextW(HWND hwnd, LPCWSTR pszTextW, size_t cchTextW); // ---------------------------------------------------------------------------- diff --git a/src/Notepad3.c b/src/Notepad3.c index f72b07b82..4b8e39160 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -526,8 +526,8 @@ static bool _InsertLanguageMenu(HMENU hMenuBar) HMENU hmenuLanguage = CreatePopupMenu(); - WCHAR wchMenuItemFmt[128]; - WCHAR wchMenuItemStrg[196]; + WCHAR wchMenuItemFmt[128] = L"%s"; + WCHAR wchMenuItemStrg[196] = { L'\0' }; for (int lng = 0; lng < MuiLanguages_CountOf(); ++lng) { if (MUI_LanguageDLLs[lng].bHasDLL) @@ -3093,7 +3093,9 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) EnableCmd(hmenu, IDM_SET_BIDIRECTIONAL_NONE, (Settings.RenderingTechnology > 0)); EnableCmd(hmenu, IDM_SET_BIDIRECTIONAL_L2R, (Settings.RenderingTechnology > 0)); EnableCmd(hmenu, IDM_SET_BIDIRECTIONAL_R2L, (Settings.RenderingTechnology > 0)); - + + CheckCmd(hmenu, IDM_VIEW_MUTE_MESSAGEBEEP, Settings.MuteMessageBeep); + CheckCmd(hmenu,IDM_VIEW_NOSAVERECENT,Settings.SaveRecentFiles); CheckCmd(hmenu,IDM_VIEW_NOPRESERVECARET, Settings.PreserveCaretPos); CheckCmd(hmenu,IDM_VIEW_NOSAVEFINDREPL,Settings.SaveFindReplace); @@ -5243,6 +5245,10 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) SciCall_SetBidirectional(s_SciBidirectional[Settings.Bidirectional]); break; + case IDM_VIEW_MUTE_MESSAGEBEEP: + Settings.MuteMessageBeep = !Settings.MuteMessageBeep; + break; + //case IDM_SET_INLINE_IME: // Settings2.IMEInteraction = (Settings2.IMEInteraction == SC_IME_WINDOWED) ? SC_IME_INLINE : SC_IME_WINDOWED; // SciCall_SetIMEInteraction(Settings2.IMEInteraction); @@ -5903,7 +5909,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_FILE_NEW)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_FILE_NEW,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -5911,7 +5917,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_FILE_OPEN)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_FILE_OPEN,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -5919,7 +5925,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_FILE_BROWSE)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_FILE_BROWSE,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -5927,14 +5933,14 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd, IDM_FILE_RECENT)) SendMessage(hwnd, WM_COMMAND, MAKELONG(IDM_FILE_RECENT, 1), 0); else - MessageBeep(0); + AttentionBeep(0); break; case IDT_FILE_SAVE: if (IsCmdEnabled(hwnd,IDM_FILE_SAVE)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_FILE_SAVE,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -5942,7 +5948,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_EDIT_UNDO)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_EDIT_UNDO,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -5950,7 +5956,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_EDIT_REDO)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_EDIT_REDO,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -5958,7 +5964,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_EDIT_CUT)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_EDIT_CUT,1),0); else - MessageBeep(0); + AttentionBeep(0); //SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_EDIT_CUTLINE,1),0); break; @@ -5975,7 +5981,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_EDIT_PASTE)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_EDIT_PASTE,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -5983,7 +5989,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_EDIT_FIND)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_EDIT_FIND,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -5991,7 +5997,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_EDIT_REPLACE)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_EDIT_REPLACE,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -5999,7 +6005,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_VIEW_WORDWRAP)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_VIEW_WORDWRAP,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6007,7 +6013,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_VIEW_ZOOMIN)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_VIEW_ZOOMIN,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6015,7 +6021,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_VIEW_ZOOMOUT)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_VIEW_ZOOMOUT,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6023,7 +6029,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd, IDM_VIEW_CHASING_DOCTAIL)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_VIEW_CHASING_DOCTAIL,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6031,7 +6037,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_VIEW_SCHEME)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_VIEW_SCHEME,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6039,7 +6045,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_VIEW_SCHEMECONFIG)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_VIEW_SCHEMECONFIG,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6052,7 +6058,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_FILE_SAVEAS)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_FILE_SAVEAS,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6060,7 +6066,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_FILE_SAVECOPY)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_FILE_SAVECOPY,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6076,7 +6082,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_FILE_PRINT)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_FILE_PRINT,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6084,7 +6090,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_FILE_OPENFAV)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_FILE_OPENFAV,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6092,7 +6098,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_FILE_ADDTOFAV)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_FILE_ADDTOFAV,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6100,7 +6106,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_VIEW_TOGGLEFOLDS)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_VIEW_TOGGLEFOLDS,1),0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6108,7 +6114,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd, IDM_VIEW_TOGGLE_VIEW)) SendMessage(hwnd, WM_COMMAND, MAKELONG(IDM_VIEW_TOGGLE_VIEW, 1), 0); else - MessageBeep(0); + AttentionBeep(0); break; @@ -6116,7 +6122,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) if (IsCmdEnabled(hwnd,IDM_FILE_LAUNCH)) SendMessage(hwnd,WM_COMMAND,MAKELONG(IDM_FILE_LAUNCH,1),0); else - MessageBeep(0); + AttentionBeep(0); break; default: @@ -7228,6 +7234,8 @@ void LoadSettings() GET_BOOL_VALUE_FROM_INISECTION(FindReplaceTransparentMode, true); GET_INT_VALUE_FROM_INISECTION(RenderingTechnology, Defaults.RenderingTechnology, 0, 3); // set before GET_INT_VALUE_FROM_INISECTION(Bidirectional, Defaults.Bidirectional, 0, 2); // set before + GET_BOOL_VALUE_FROM_INISECTION(MuteMessageBeep, false); + ///~Settings2.IMEInteraction = clampi(IniSectionGetInt(pIniSection, L"IMEInteraction", Settings2.IMEInteraction), SC_IME_WINDOWED, SC_IME_INLINE); // see TBBUTTON s_tbbMainWnd[] for initial/reset set of buttons @@ -7600,6 +7608,8 @@ void SaveSettings(bool bSaveSettingsNow) SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, FindReplaceTransparentMode); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, RenderingTechnology); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, Bidirectional); + SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, MuteMessageBeep); + ///~IniSectionSetInt(pIniSection, L"IMEInteraction", Settings2.IMEInteraction); Toolbar_GetButtons(s_hwndToolbar, IDT_FILE_NEW, Settings.ToolbarButtons, COUNTOF(Settings.ToolbarButtons)); diff --git a/src/Notepad3.vcxproj b/src/Notepad3.vcxproj index 10cf2c01d..82f576dd4 100644 --- a/src/Notepad3.vcxproj +++ b/src/Notepad3.vcxproj @@ -122,7 +122,7 @@ /utf-8 %(AdditionalOptions) - comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies) + comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;winmm.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies) Debug Windows MachineX86 @@ -185,7 +185,7 @@ /utf-8 %(AdditionalOptions) - comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies) + comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;winmm.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies) Debug Windows MachineX64 @@ -249,7 +249,7 @@ true - comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies) + comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;winmm.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies) No .rdata=.text true @@ -316,7 +316,7 @@ true - comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies) + comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;winmm.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies) No .rdata=.text true diff --git a/src/TypeDefs.h b/src/TypeDefs.h index 2aa3a031c..38adc7937 100644 --- a/src/TypeDefs.h +++ b/src/TypeDefs.h @@ -412,6 +412,7 @@ typedef struct _settings_t int FindReplaceDlgPosY; int CustomSchemesDlgPosX; int CustomSchemesDlgPosY; + bool MuteMessageBeep; RECT PrintMargin; EDITFINDREPLACE EFR_Data;