github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-15 14:15:49 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

A hotkey Ctrl-F1 to JSON options.

Browse source 
Добавлена справка "Ctrl-F1" по командам редактирования настроек JSON.
This commit is contained in:
lsv 2026-02-27 12:08:43 +05:00
parent b1733622e2
commit 90c328085e
3 changed files with 71 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ctl/ctlTreeJSON.cpp
View file

@ -53,11 +53,32 @@ void ctlTreeJSON::OnChar(wxKeyEvent& event) {
}
}
if (event.GetKeyCode() == WXK_F1) {
int x=50;
int y=50;
this->ClientToScreen(&x,&y);
wxPoint screenPos(x,y);
wxString helpstr=R"(<html>
<head>
<meta charset="utf-8">
</head>
<body>
<p><b>Ctrl-F</b> - find and colorize nodes</p>
<p><b>F3</b> - next find node</p>
<p><b>Shift-F3</b> - previos find node</p>
<p><b>Insert</b> - copy select node</p>
<p><b>Delete</b> - delete select node</p>
<p><b>Ctrl-Z</b> - Return source context node.</p>
</body>
</html>)";
showHelpHtml(this,helpstr,screenPos, wxSize(450,300));
return;
}
if (event.GetKeyCode() == WXK_CONTROL_F) {
wxTextEntryDialog dialog(this,
wxT("Please enter find string\n")
_("Please enter find string\n")
,
wxT("Find"),
_("Find"),
m_FindString,
wxOK | wxCANCEL); //setName( dlg.GetValue().wc_str() );
if (dialog.ShowModal() == wxID_OK) {

1
include/utils/misc.h
View file

@ -280,6 +280,7 @@ wxString qtIdent(const wxString &value); // add " if necessary
wxString qtTypeIdent(const wxString &value); // add " if necessary
bool make_identifier(const wxString &strname, wxString &s, wxString &n, bool islower);
void showHelpHtml(wxWindow *parent, const wxString &htmlHelp,wxPoint screenPos, wxSize size);
#endif

70
utils/misc.cpp
View file

@ -1483,28 +1483,52 @@ bool make_identifier(const wxString &strname, wxString &s, wxString &n, bool isl
} else {if (islower) s=s.MakeLower();}
return true;
}
/*
class DirCopyTraverser: public wxDirTraverser {
public:
DirCopyTraverser(const wxString &destBase): m_destBase(destBase) {}
virtual wxDirTraverseResult OnFile(const wxString &file) wxOVERRIDE {
wxFileName srcFile(file);
//wxString relativePath=srcFile.GetPath(wxPATH_DOS,true);
srcFile.MakeRelativeTo(m_destBase);
wxString destFile=m_destBase+wxFileName::GetPathSeparator()+srcFile.GetFullName();
wxFileName destDir(destFile);
destDir.RemoveLastDir();
if (!destDir.DirExists()) destDir.Mkdir(wxS_DIR_DEFAULT,wxPATH_MKDIR_FULL);
if (!wxCopyFile(file,destFile,true)) {
wxLogError("Error copy file %s",file);
return wxDIR_STOP;
//show help window
void showHelpHtml(wxWindow *parent, const wxString &htmlHelp,wxPoint screenPos, wxSize size) {
FunctionPGHelper fh(htmlHelp);
wxString key = "content";
// screen size
wxPoint posScreen;
wxSize sizeScreen;
const int displayNum = wxDisplay::GetFromPoint(screenPos);
if (displayNum != wxNOT_FOUND)
{
const wxRect rectScreen = wxDisplay(displayNum).GetGeometry();
posScreen = rectScreen.GetPosition();
sizeScreen = rectScreen.GetSize();
}
return wxDIR_CONTINUE;
}
virtual wxDirTraverseResult OnDir(const wxString &file) wxOVERRIDE {
return 0;
}
private:
wxString m_destBase;
else // outside of any display?
{
// just use the primary one then
posScreen = wxPoint(0, 0);
sizeScreen = wxGetDisplaySize();
}
wxSize rr(350, 70);
if (size.x!=-1) rr=size;
popuphelp *m_Popup = new popuphelp(parent, key, &fh, screenPos, rr);
if (m_Popup && m_Popup->IsValid() && rr != m_Popup->GetSizePopup()) {
// recreate with new size
rr = m_Popup->GetSizePopup();
delete m_Popup;
m_Popup = new popuphelp((wxWindow*)winMain, key, &fh, screenPos, rr);
}
if (m_Popup && m_Popup->IsValid()) {
wxSize top_sz = m_Popup->GetSizePopup();
wxSize top_new(top_sz);
wxPoint p(screenPos);
wxPoint oldp(p);
if (p.x + top_new.x > sizeScreen.x) p.x = sizeScreen.x - top_new.x - 20;
if (p.y + top_new.y > sizeScreen.y) p.y = sizeScreen.y - top_new.y - 20;
if (oldp == p) p.x = p.x + 20;
m_Popup->Move(p);
wxRect r = m_Popup->GetScreenRect();
m_Popup->Popup();
}
}
*/