From 5841b403cf5010801f6eb485a42a27effce816fd Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Thu, 26 Sep 2019 14:40:50 +0200 Subject: [PATCH] + fix: menu position for "path to clipboard" --- language/np3_de_de/menu_de_de.rc | 21 ++++++++------- language/np3_en_us/menu_en_us.rc | 13 +++++---- src/Notepad3.c | 45 ++++++++++++++++---------------- 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index ac56f5737..c7f7d6934 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -68,8 +68,16 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Verschlüsselungs Passwort...", IDM_SETPASS MENUITEM SEPARATOR + POPUP "Pfad in Zwischenablage" + BEGIN + MENUITEM "Kopiere &Dateinamen\tCtrl+F9", IDM_EDIT_INSERT_FILENAME + MENUITEM "Kopiere &Verzeichnispfad", IDM_EDIT_INSERT_DIRNAME + MENUITEM "Kopiere &Gesamtpfad\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME + END POPUP "&Starte" BEGIN + MENUITEM "Öffne Datei-&Explorer", IDM_FILE_EXPLORE_DIR + MENUITEM SEPARATOR MENUITEM "&Neues Fenster\tAlt+N", IDM_FILE_NEWWINDOW MENUITEM "&Leeres Fenster\tAlt+Shift+N", IDM_FILE_NEWWINDOW2 MENUITEM SEPARATOR @@ -161,10 +169,10 @@ BEGIN MENUITEM "&Hoch schieben\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP MENUITEM "&Runter schieben\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN MENUITEM SEPARATOR - MENUITEM "Cut Select&ion or Current Line\tCtrl+X", IDM_EDIT_CUT - MENUITEM "Cut Selection Whole &Line(s)\tCtrl+Shift+X", IDM_EDIT_CUTLINE - MENUITEM "&Copy Selection or Current Line\tCtrl+C", IDM_EDIT_COPY - MENUITEM "Cop&y Selection Whole Line(s)\tCtrl+Shift+C", IDM_EDIT_COPYLINE + MENUITEM "Selekt&ion oder aktuelle Zeile ausschneiden\tCtrl+X", IDM_EDIT_CUT + MENUITEM "Ganze &Zeilen ausschneiden\tCtrl+Shift+X", IDM_EDIT_CUTLINE + MENUITEM "&Kopiere Selektion oder aktuelle Zeile\tCtrl+C", IDM_EDIT_COPY + MENUITEM "Kopiere &ganze Zeilen\tCtrl+Shift+C", IDM_EDIT_COPYLINE MENUITEM SEPARATOR MENUITEM "&Dupliziere Zeile/Selektion\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION MENUITEM "Ver&tausche Zeilen\tAlt+D", IDM_EDIT_LINETRANSPOSE @@ -255,11 +263,6 @@ BEGIN BEGIN MENUITEM "Kopiere &GUID in die Zwischenablage\tCtrl+Shift+.", IDM_EDIT_INSERT_GUID MENUITEM SEPARATOR - MENUITEM "Kopiere &Dateiname in die Zwischenablage\tCtrl+F9", IDM_EDIT_INSERT_FILENAME - MENUITEM "Kopiere &Verzeichnispfad in die Zwischenablage", IDM_EDIT_INSERT_DIRNAME - MENUITEM "Kopiere &Gesamtpfad in die Zwischenablage\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME - MENUITEM "Öffne Verzeichnis im Datei-Explorer", IDM_FILE_EXPLORE_DIR - MENUITEM SEPARATOR MENUITEM "&Escape C Zeichen\tCtrl+Alt+E", IDM_EDIT_ESCAPECCHARS MENUITEM "&Unescape C Zeichen\tCtrl+Alt+R", IDM_EDIT_UNESCAPECCHARS MENUITEM SEPARATOR diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index d1aa1909a..04c2e3fad 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -68,8 +68,16 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Set Encr&yption Passphrase...", IDM_SETPASS MENUITEM SEPARATOR + POPUP "Path to Clipboard" + BEGIN + MENUITEM "Copy &Filename only\tCtrl+F9", IDM_EDIT_INSERT_FILENAME + MENUITEM "Copy &Directory-Path only", IDM_EDIT_INSERT_DIRNAME + MENUITEM "Copy &Full-Path\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME + END POPUP "&Launch" BEGIN + MENUITEM "Open File &Explorer", IDM_FILE_EXPLORE_DIR + MENUITEM SEPARATOR MENUITEM "&New Window\tAlt+N", IDM_FILE_NEWWINDOW MENUITEM "&Empty Window\tAlt+Shift+N", IDM_FILE_NEWWINDOW2 MENUITEM SEPARATOR @@ -255,11 +263,6 @@ BEGIN BEGIN MENUITEM "Copy &GUID to Clipboard\tCtrl+Shift+.", IDM_EDIT_INSERT_GUID MENUITEM SEPARATOR - MENUITEM "Copy &Filename to Clipboard\tCtrl+F9", IDM_EDIT_INSERT_FILENAME - MENUITEM "Copy &Directory-Path to Clipboard", IDM_EDIT_INSERT_DIRNAME - MENUITEM "Copy &Full-Path to Clipboard\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME - MENUITEM "Open Directory in &Explorer", IDM_FILE_EXPLORE_DIR - MENUITEM SEPARATOR MENUITEM "&Escape C Chars\tCtrl+Alt+E", IDM_EDIT_ESCAPECCHARS MENUITEM "&Unescape C Chars\tCtrl+Alt+R", IDM_EDIT_UNESCAPECCHARS MENUITEM SEPARATOR diff --git a/src/Notepad3.c b/src/Notepad3.c index e957f259d..0565123ab 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -3119,26 +3119,30 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) DocLn const iCurLine = SciCall_LineFromPosition(iCurPos); bool const bPosInSel = Sci_IsPosInSelection(iCurPos); bool const mrs = Sci_IsMultiOrRectangleSelection(); + bool const cf = StrIsNotEmpty(Globals.CurrentFile); - int i = StrIsEmpty(Globals.CurrentFile) ? FALSE : TRUE; - - EnableCmd(hmenu,IDM_FILE_REVERT,i); - EnableCmd(hmenu, CMD_RELOADASCIIASUTF8, i); - EnableCmd(hmenu, CMD_RELOADFORCEDETECTION, i); - EnableCmd(hmenu, CMD_RECODEANSI, i); - EnableCmd(hmenu, CMD_RECODEOEM, i); - EnableCmd(hmenu, CMD_RELOADNOFILEVARS, i); - EnableCmd(hmenu, CMD_RECODEDEFAULT, i); - EnableCmd(hmenu, CMD_RECODEGB18030, i); - EnableCmd(hmenu, IDM_FILE_LAUNCH, i); + EnableCmd(hmenu,IDM_FILE_REVERT, cf); + EnableCmd(hmenu, CMD_RELOADASCIIASUTF8, cf); + EnableCmd(hmenu, CMD_RELOADFORCEDETECTION, cf); + EnableCmd(hmenu, CMD_RECODEANSI, cf); + EnableCmd(hmenu, CMD_RECODEOEM, cf); + EnableCmd(hmenu, CMD_RELOADNOFILEVARS, cf); + EnableCmd(hmenu, CMD_RECODEDEFAULT, cf); + EnableCmd(hmenu, CMD_RECODEGB18030, cf); + EnableCmd(hmenu, IDM_FILE_LAUNCH, cf); EnableCmd(hmenu,IDM_FILE_LAUNCH_ELEVATED, !s_bIsElevated); - EnableCmd(hmenu,IDM_FILE_LAUNCH,i); - EnableCmd(hmenu,IDM_FILE_PROPERTIES,i); - EnableCmd(hmenu,IDM_FILE_CREATELINK,i); - EnableCmd(hmenu,IDM_FILE_ADDTOFAV,i); + EnableCmd(hmenu,IDM_FILE_LAUNCH,cf); + EnableCmd(hmenu,IDM_FILE_PROPERTIES,cf); + EnableCmd(hmenu,IDM_FILE_CREATELINK,cf); + EnableCmd(hmenu,IDM_FILE_ADDTOFAV,cf); - EnableCmd(hmenu,IDM_FILE_READONLY,i); + EnableCmd(hmenu,IDM_FILE_READONLY,cf); + EnableCmd(hmenu, IDM_EDIT_INSERT_FILENAME, cf); + EnableCmd(hmenu, IDM_EDIT_INSERT_DIRNAME, cf); + EnableCmd(hmenu, IDM_EDIT_INSERT_PATHNAME, cf); + EnableCmd(hmenu, IDM_ENCODING_RECODE, cf); + CheckCmd(hmenu,IDM_FILE_READONLY,s_bFileReadOnly); CheckCmd(hmenu, IDM_FILE_PRESERVE_FILEMODTIME, Flags.bPreserveFileModTime); @@ -3151,7 +3155,7 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) EnableCmd(hmenu,IDM_LINEENDINGS_LF,!ro); EnableCmd(hmenu,IDM_LINEENDINGS_CR,!ro); - EnableCmd(hmenu,IDM_ENCODING_RECODE,i); + int i; if (Encoding_IsUNICODE_REVERSE(Encoding_Current(CPI_GET))) { i = IDM_ENCODING_UNICODEREV; @@ -3288,8 +3292,6 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) EnableCmd(hmenu,IDM_EDIT_INSERT_SHORTDATE,!ro); EnableCmd(hmenu,IDM_EDIT_INSERT_LONGDATE,!ro); - EnableCmd(hmenu,IDM_EDIT_INSERT_FILENAME,!ro); - EnableCmd(hmenu,IDM_EDIT_INSERT_PATHNAME,!ro); EnableCmd(hmenu, IDM_EDIT_INSERT_GUID, !ro); @@ -3693,15 +3695,12 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) case IDM_FILE_EXPLORE_DIR: { - if (StrIsEmpty(Globals.CurrentFile)) - break; - if (Settings.SaveBeforeRunningTools && !FileSave(false, true, false, false, Flags.bPreserveFileModTime)) break; PIDLIST_ABSOLUTE pidl = NULL; DWORD rfg = 0; - SHILCreateFromPath(Globals.CurrentFile, &pidl, &rfg); + SHILCreateFromPath(StrIsEmpty(Globals.CurrentFile) ? Globals.WorkingDirectory : Globals.CurrentFile, &pidl, &rfg); if (pidl) { SHOpenFolderAndSelectItems(pidl, 0, NULL, 0); ILFree(pidl);