mirror of
https://github.com/levinsv/pgadmin3.git
synced 2026-05-21 06:45:27 -06:00
Bookmark color save pgadmin3opt.json
This commit is contained in:
parent
0f91ec5e67
commit
9f39f034c9
1 changed files with 23 additions and 5 deletions
|
|
@ -130,9 +130,27 @@ void ctlSQLBox::Create(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
|
||||||
// Clear all styles
|
// Clear all styles
|
||||||
StyleClearAll();
|
StyleClearAll();
|
||||||
m_name=NULL;
|
m_name=NULL;
|
||||||
|
extern sysSettings* settings;
|
||||||
|
wxJSONValue def(wxJSONType::wxJSONTYPE_OBJECT);
|
||||||
|
wxJSONValue opt(wxJSONType::wxJSONTYPE_OBJECT);
|
||||||
|
wxColour bookmarkcolor(70, 220, 234);
|
||||||
|
int bookmarkalpha=70;
|
||||||
|
def["bookmarkcolor"]= bookmarkcolor.GetAsString(wxC2S_HTML_SYNTAX);
|
||||||
|
def["bookmarkalpha"]=bookmarkalpha;
|
||||||
// Font
|
// Font
|
||||||
extern sysSettings *settings;
|
settings->ReloadJsonFileIfNeed();
|
||||||
|
settings->ReadJsonObect("ctlSQLBox", opt, def);
|
||||||
|
// settings->WriteJsonFile();
|
||||||
|
if (!opt.IsNull()) {
|
||||||
|
wxString txtcolor=opt["bookmarkcolor"].AsString();
|
||||||
|
wxColour cc(txtcolor);
|
||||||
|
if (!cc.IsOk()) opt["bookmarkalpha"]=def["bookmarkalpha"];
|
||||||
|
int tmp=opt["bookmarkalpha"].AsInt();
|
||||||
|
if (tmp<0 || tmp>255) opt["bookmarkalpha"]=def["bookmarkalpha"];
|
||||||
|
}
|
||||||
|
else opt = def;
|
||||||
|
bookmarkcolor = wxColour(opt["bookmarkcolor"].AsString());
|
||||||
|
bookmarkalpha = opt["bookmarkalpha"].AsInt();
|
||||||
|
|
||||||
|
|
||||||
caretWidth=settings->GetWidthCaretForKeyboardLayout();
|
caretWidth=settings->GetWidthCaretForKeyboardLayout();
|
||||||
|
|
@ -222,10 +240,10 @@ void ctlSQLBox::Create(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
|
||||||
MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_BOXMINUS, *wxWHITE, *wxBLACK);
|
MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_BOXMINUS, *wxWHITE, *wxBLACK);
|
||||||
|
|
||||||
MarkerDefine(1,wxSTC_MARK_ARROW,*wxBLACK,*wxGREEN);
|
MarkerDefine(1,wxSTC_MARK_ARROW,*wxBLACK,*wxGREEN);
|
||||||
|
// for bookmark color
|
||||||
IndicatorSetForeground(9, wxColour(70, 220, 234));
|
IndicatorSetForeground(9, bookmarkcolor);
|
||||||
IndicatorSetStyle(9, wxSTC_INDIC_STRAIGHTBOX);
|
IndicatorSetStyle(9, wxSTC_INDIC_STRAIGHTBOX);
|
||||||
IndicatorSetAlpha(9,70);
|
IndicatorSetAlpha(9,bookmarkalpha);
|
||||||
SetProperty(wxT("fold"), wxT("1"));
|
SetProperty(wxT("fold"), wxT("1"));
|
||||||
SetFoldFlags(16);
|
SetFoldFlags(16);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue