diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-11-30 13:28:18 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-11-30 13:28:18 +0300 |
| commit | 0bd330eedee899893ef921284a265d635d027f6b (patch) | |
| tree | f295c3ca9950ba6cd01ca49439dbb89c745a751d /plugins | |
| parent | 932c6454190cccc4a3dd26b42e439f26104df1dc (diff) | |
fixes #3991 (NewStory: доработка контекстного меню журнала)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/NewStory/src/history_control.cpp | 22 | ||||
| -rw-r--r-- | plugins/NewStory/src/history_menus.cpp | 4 |
2 files changed, 8 insertions, 18 deletions
diff --git a/plugins/NewStory/src/history_control.cpp b/plugins/NewStory/src/history_control.cpp index d7f1217477..0f7fd29da9 100644 --- a/plugins/NewStory/src/history_control.cpp +++ b/plugins/NewStory/src/history_control.cpp @@ -436,22 +436,12 @@ CMStringW NewstoryListData::GatherSelected(bool bTextOnly) if (!p->m_bSelected) continue; - if (p->m_bOfflineFile) { - DB::EventInfo dbei(p->hEvent); - DB::FILE_BLOB blob(dbei); - if (p->m_bOfflineDownloaded) - ret.Append(blob.getLocalName()); - else - ret.Append(_A2T(blob.getUrl())); - } - else { - if (bTextOnly) - ret.Append(p->wtext); - else { // copy text only - CMStringW wszText(p->formatString()); - RemoveBbcodes(wszText); - ret.Append(wszText); - } + if (bTextOnly) + ret.Append(p->wtext); + else { // copy text only + CMStringW wszText(p->formatString()); + RemoveBbcodes(wszText); + ret.Append(wszText); } ret.Append(L"\r\n"); } diff --git a/plugins/NewStory/src/history_menus.cpp b/plugins/NewStory/src/history_menus.cpp index 2404fa0a6b..607525a4db 100644 --- a/plugins/NewStory/src/history_menus.cpp +++ b/plugins/NewStory/src/history_menus.cpp @@ -52,8 +52,8 @@ HMENU NSMenu_Build(NewstoryListData *data, ItemData *item) if (item->m_bOfflineFile) { Menu_ModifyItem(hmiCopyUrl, (item->m_bOfflineDownloaded) ? TranslateT("Copy file path") : TranslateT("Copy URL")); Menu_ShowItem(hmiCopyUrl, true); - Menu_ShowItem(hmiSaveAs, true); - Menu_ShowItem(hmiDownload, !item->m_bOfflineDownloaded); + Menu_ShowItem(hmiSaveAs, bNotProtected); + Menu_ShowItem(hmiDownload, !item->m_bOfflineDownloaded && bNotProtected); Menu_ShowItem(hmiOpenFolder, item->m_bOfflineDownloaded); } |