Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For install Ubuntu. #380

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ build*/
*.db
# Visual Studio 2015 cache/options directory
.vs/
.vscode/
#XCode
.DS_Store
xcuserdata
Expand Down
2 changes: 1 addition & 1 deletion BUILD.txt
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Assumes a 'project' dir in you home directory, change to suit
The usual 'make install' will work as normal, you may want to configure the
build for 'release':
$ cmake -DCMAKE_BUILD_TYPE=Release ..
$ make
$ make -j4
$ sudo make install

------------
Expand Down
2 changes: 1 addition & 1 deletion src/gui/AdvancedSearchFrame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ void AdvancedSearchFrame::OnListCtrlResultsItemSelected(wxListEvent& event)
p = sql.find(sfind, p+1);
if (p == int(wxString::npos))
break;
stc_ddl->StartStyling(p);
stc_ddl->StartStyling(p, 0);
stc_ddl->SetStyling(len, 1+color%2);
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/gui/EditBlobDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ void EditBlobDialogSTC::setIsNull(bool isNull)
{
wxStyledTextCtrl::SetText("[null]");
SelectAll();
StartStyling(0);
StartStyling(0, 0);
SetStyling(GetTextLength(), 0x0A);
}
else
{
StartStyling(0);
StartStyling(0, 0);
SetStyling(GetTextLength(), 0);
}
isNullM = isNull;
Expand Down Expand Up @@ -787,7 +787,7 @@ bool EditBlobDialog::loadFromStreamAsBinary(wxInputStream& stream, bool isNull,
}
}
// Set text styling
blob_binary->StartStyling(0);
blob_binary->StartStyling(0, 0);
for (int i = 0; i < blob_binary->GetLineCount(); i++)
blob_binary->SetStyleBytes(CharsPerLine, &styleBytes[0]);
progressEnd();
Expand Down
7 changes: 4 additions & 3 deletions src/gui/ExecuteSqlFrame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
#include "sql/StatementBuilder.h"
#include "statementHistory.h"


#include "gui/FRStyle.h"

class SqlEditorDropTarget : public wxDropTarget
Expand Down Expand Up @@ -333,7 +334,7 @@ void SqlEditor::setup()
SetMargins(0, 0);
SetMarginWidth(FR_LINENUMBERNARGIN, 40);
SetMarginType(FR_LINENUMBERNARGIN, wxSTC_MARGIN_NUMBER);
SetAutomaticFold(wxSTC_AUTOMATICFOLD_SHOW);
//SetAutomaticFold(wxSTC_AUTOMATICFOLD_SHOW);

if (config().get("sqlEditorShowEdge", false))
{
Expand All @@ -342,7 +343,7 @@ void SqlEditor::setup()
}

if (!config().get("sqlEditorSmartHomeKey", true))
CmdKeyAssign(wxSTC_KEY_HOME, wxSTC_KEYMOD_NORM, wxSTC_CMD_HOMEDISPLAY);
CmdKeyAssign(wxSTC_KEY_HOME, wxSTC_SCMOD_NORM, wxSTC_CMD_HOMEDISPLAY);

setupStyles();

Expand Down Expand Up @@ -3074,7 +3075,7 @@ void ExecuteSqlFrame::log(wxString s, TextType type)
if (type == ttSql)
style = 2;

styled_text_ctrl_stats->StartStyling(startpos);
styled_text_ctrl_stats->StartStyling(startpos, 0);
styled_text_ctrl_stats->SetStyling(endpos-startpos-1, style);
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/FRStyleManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ void FRStyleManager::assignMargin(wxStyledTextCtrl* text)
text->SetProperty(wxT("fold.comment"), wxT("1"));
text->SetProperty(wxT("fold.sql.only.begin"), wxT("1"));
text->SetFoldFlags(wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED | wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED);
text->SetAutomaticFold(wxSTC_AUTOMATICFOLD_SHOW | wxSTC_AUTOMATICFOLD_CLICK | wxSTC_AUTOMATICFOLD_CHANGE);
//text->SetAutomaticFold(wxSTC_AUTOMATICFOLD_SHOW | wxSTC_AUTOMATICFOLD_CLICK | wxSTC_AUTOMATICFOLD_CHANGE);

text->SetMarginWidth(FR_FOLDMARGIN, 14);
text->SetMarginMask(FR_FOLDMARGIN, wxSTC_MASK_FOLDERS);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/StatementHistoryDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ void StatementHistoryDialog::OnListBoxSelect(wxCommandEvent& WXUNUSED(event))
p = sql.find(searchString, p+1);
if (p == int(wxString::npos))
break;
textctrl_statement->StartStyling(p);
textctrl_statement->StartStyling(p, 0);
textctrl_statement->SetStyling(searchString.Length(), 1);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/controls/LogTextControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void LogTextControl::addStyledText(const wxString& message, LogStyle style)
bool atEnd = lenBefore == GetCurrentPos();
AppendText(message);
int len = GetLength();
StartStyling(lenBefore);
StartStyling(lenBefore, 0);
SetStyling(len - lenBefore - 1, int(style));
if (atEnd)
GotoPos(len);
Expand Down
8 changes: 6 additions & 2 deletions src/sql/SqlStatement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -499,12 +499,16 @@ SqlStatement::SqlStatement(const wxString& sql, Database *db, const wxString&
else if (tokensM[idx] == kwPAGE_SIZE)
{
idx++;
tokenStringsM[idx].ToInt(&createPageSizeM);
//tokenStringsM[idx].ToInt(&createPageSizeM);
int value = wxAtoi(tokenStringsM[idx]);
createPageSizeM = value;
}
else if (tokensM[idx] == kwDIALECT)
{
idx++;
tokenStringsM[idx].ToInt(&createDialectM);
//tokenStringsM[idx].ToInt(&createDialectM);
int value = wxAtoi(tokenStringsM[idx]);
createPageSizeM = value;
}
idx++;
}
Expand Down
Loading