* TSQLQuery editor:

+ add create const button
* use FPC lineending instead of Delphi sLineBreak when building constants
Addresses issue #26825

git-svn-id: trunk@46545 -
This commit is contained in:
reiniero 2014-10-13 12:17:26 +00:00
parent cfd6dc20e4
commit a61a3a715a
2 changed files with 54 additions and 3 deletions

View File

@ -85,6 +85,16 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
ParentShowHint = False
ShowHint = True
end
object TBConst: TToolButton
Left = 118
Hint = 'Create string constant'
Top = 2
Caption = 'TBConst'
ImageIndex = 5
OnClick = TBConstClick
ParentShowHint = False
ShowHint = True
end
end
object PageControl: TPageControl
Left = 0
@ -520,6 +530,7 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
ShiftMask = [ssShift, ssAlt, ssCtrl]
Command = emcMouseLink
end>
MouseTextActions = <>
MouseSelActions = <
item
ClickDir = cdDown
@ -749,7 +760,7 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
left = 408
top = 152
Bitmap = {
4C69050000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
4C69060000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00EAC39DFFE6BF96FFE4BB92FFE4BB92FFD1A06CF5D09E6DF6CC96
5FDAC479427EB2673C09FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00E5BE96FFFFFFFEFFFDF3E9FFFDF3EAFFFCF2E8FFFAEFE3FFFAF2
@ -909,7 +920,39 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
FF00008B9C13008D9EE24FC3D2FD5BD3E1FF30B5C6FA0890A1F6008D9FA9008B
9C14FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00008B9C1F008C9DED008D9EEC008D9E9E008B9C21FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00
FF00FFFFFF00FFFFFF00FFFFFF00C77947AACC8655CECC8857DECB8856DBCC88
56DBCB8757DBCA8350D0C479426EB2673C08FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00CA8554D0FFFFFFDBFDF3E9DEFDF3EADEFCF2
E8DEFAEFE3DEFAF2E7DEEABB88DECF85559CB4693D0AFFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00CB8656DAFEF5EDDEFCDEC5DEFBE0C7DEF9DC
C2DEF5D3B4DEFEF9F3DEFAE2C4DEECC193DEC37D4880FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00CB8655DBFEF6F0DEFCE2CDDEFCE3CDDEFADF
C8DEF7D9BCDEF5E9DDDEFAF3EBDEFBF8F3DECD9565DCFFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00CB8655DBFEF7F1DEFCE5D2DEFCE4D1DEFBE2
CCDEF9DDC4DEEAC39DFFE6BF96FFE4BB92FFE4BB92FFD1A06CF5D09E6DF6CC96
5FDAC479427EB2673C09FFFFFF00CB8654DBFFF7F2DEFEE7D5DEFEE7D5DEFDE5
D1DEFAE0CADEE5BE96FFFFFFFEFFFDF3E9FFFDF3EAFFFCF2E8FFFAEFE3FFFAF2
E7FFEABB88FFCF8555B3B4693D0CCB8553DBFFF7F0DEFFE7D5DEFDE7D6DEFDE6
D4DEFCE4D0DEE4BB93FFFEF5EDFFFCDEC5FFFBE0C7FFF9DCC2FFF5D3B4FFFEF9
F3FFFAE2C4FFECC193FFC37D4893CA8452DBFFF7F1DEFFE9D9DEFFEADBDEFFE9
D9DEFFE7D7DEE4BB92FFFEF6F0FFFCE2CDFFFCE3CDFFFADFC8FFF7D9BCFFF5E9
DDFFFAF3EBFFFBF8F3FFCA8353FECC8352DBFBF5EEDEFFE9D9DEFFEADBDEFFE9
D9DEFFE7D7DEE4BB92FFFEF7F1FFFCE5D2FFFCE4D1FFFBE2CCFFF9DDC4FFF6D7
BBFFF3D1AFFFFAEFE4FFCC8758FECF8253DEEFF1E7DEFFE9D9DEFFEADBDEFFE9
D9DEFFE7D7DEE4BB91FFFFF7F2FFFEE7D5FFFEE7D5FFFDE5D1FFFAE0CAFFF9DE
C4FFF7D9BCFFFDF2E7FFCC8757FEC87C4ED3FCF3ECDEFAF1E8DEFAF0E7DEFBF1
E9DEFBF2EADEE4BA91FFFFF7F0FFFFE7D5FFFDE7D6FFFDE6D4FFFCE4D0FFFBE3
CBFFFADCC2FFFEF3E8FFCC8656FEC7794AB9C8794BCEC87545DDC77545D4C875
45D4C77545D4CA8452FFFFF7F1FFFFE9D9FFFFEADBFFFFE9D9FFFFE7D7FFFFE5
D2FFFFE2CBFFFFF7F1FFCB8555FEFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00CC8352FBFBF5EEFFFFE9D9FFFFEADBFFFFE9D9FFFFE7D7FFFFE5
D2FFFFE2CBFFFBF6EFFFCC8355FEFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00CF8253FFEFF1E7FFFFE9D9FFFFEADBFFFFE9D9FFFFE7D7FFFFE5
D2FFFFE2CBFFEFF2E8FFCE8156FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00C77949EDFCF3ECFFFAF1E8FFFAF0E7FFFBF1E9FFFBF2EAFFFBF2
EAFFFBF2EBFFFDF4EEFFCA8054F9FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00C57342C1C67545E6C87545FEC77545F3C87545F3C77545F3C775
45F3C87546F4C57444E8CA7F53F1
}
end
object PMSQL: TPopupMenu
@ -1000,6 +1043,7 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
end
object MICreateConstant: TMenuItem
Caption = 'Create string constant'
ImageIndex = 5
OnClick = MICreateConstantClick
end
object MIMeta: TMenuItem

View File

@ -41,6 +41,7 @@ type
SQLQuery: TSQLQuery;
MetaTabSheet: TTabSheet;
SQLMeta: TSQLQuery;
TBConst: TToolButton;
ToolBar: TToolBar;
OpenToolButton: TToolButton;
SaveToolButton: TToolButton;
@ -59,6 +60,7 @@ type
procedure SQLEditorMouseDown(Sender: TObject; Button: TMouseButton;
{%H-}Shift: TShiftState; X, Y: Integer);
procedure TBCheckClick(Sender: TObject);
procedure TBConstClick(Sender: TObject);
private
{ private declarations }
FMetaFromSynedit: Boolean;
@ -296,7 +298,7 @@ begin
begin
S:=SQLEditor.Lines[i];
If (C<>'') then
C:=C+'+sLineBreak+'+sLineBreak;
C:=C+'+LineEnding+'+LineEnding;
C:=C+''''+StringReplace(S,'''','''''',[rfReplaceAll])+'''';
end;
C:='SQL = '+C+';';
@ -361,6 +363,11 @@ begin
CheckSQLSyntax(SQLEditor.Lines);
end;
procedure TSQLStringsPropertyEditorDlg.TBConstClick(Sender: TObject);
begin
CreateConstant;
end;
procedure TSQLStringsPropertyEditorDlg.CheckSQLSyntax(SQL: TStrings);
Var
S : TStream;