Skip to content

Commit ad5fed7

Browse files
aduguidaduguid
committed
Updated script font size in taskpane
1 parent 4bce288 commit ad5fed7

File tree

7 files changed

+282
-48
lines changed

7 files changed

+282
-48
lines changed

‎CS/TaskPane/Script.Designer.cs‎

Lines changed: 33 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CS/TaskPane/Script.cs‎

Lines changed: 50 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,23 @@ namespace ScriptHelp.TaskPane
1212
/// </summary>
1313
public partial class Script : UserControl
1414
{
15+
public float[] FontSize ={8,9,10,12,14,16,18,20,22,24,26,28,36,48,72};
16+
public string[] FontSizeName ={"8","9","10","12","14","16","18","20","22","24","26","28","36","48","72"};
17+
private string fontName;
18+
private int fontSize;
19+
1520
/// <summary>
1621
/// Initialize the controls in the object
1722
/// </summary>
1823
public Script()
1924
{
2025
InitializeComponent();
26+
//foreach (string name in FontSizeName)
27+
//{
28+
// this.cboFontSize.Items.Add(name);
29+
// this.cboFontSize.SelectedItem = "10";
30+
//}
31+
2132
}
2233

2334
/// <summary>
@@ -36,10 +47,10 @@ private void UpdateSqlSyntax()
3647
syntaxHighlighter.AddPattern(new PatternDefinition("''"), new SyntaxStyle(Color.Red));
3748
// single quote strings
3849
syntaxHighlighter.AddPattern(new PatternDefinition(@"\'([^']|\'\')+\'"), new SyntaxStyle(Color.Red));
39-
// in brackets
40-
//syntaxHighlighter.AddPattern(new PatternDefinition(@"\[([^']|\'\')+\]"), new SyntaxStyle(Color.Black)); //was messing up the color for CREATE table statement, not sure if I need this
41-
// keywords1
42-
syntaxHighlighter.AddPattern(new PatternDefinition("XACT_ABORT", "BEGIN", "DELETE", "ROLLBACK", "COMMIT", "CREATE", "TABLE", "TRAN", "TRANSACTION", "OUTPUT", "USING", "BY", "TARGET", "WITH", "AS", "VALUES", "MERGE", "ON", "WHEN", "THEN", "UNION", "UPDATE", "SET", "WHERE", "GO", "APPEND", "INSERT", "INTO", "TRUNCATE", "REMOVE", "SELECT", "FROM", "TYPE", "FOLDER", "CABINET", "ORDER BY", "DESC", "ASC", "GROUP BY", "ALTER", "ADD", "DROP", "GROUP", "PRIMARY", "KEY", "IDENTITY", "IF"), new SyntaxStyle(Color.Blue));
50+
// in brackets
51+
//syntaxHighlighter.AddPattern(new PatternDefinition(@"\[([^']|\'\')+\]"), new SyntaxStyle(Color.Black)); //was messing up the color for CREATE table statement, not sure if I need this
52+
// keywords1
53+
syntaxHighlighter.AddPattern(new PatternDefinition("XACT_ABORT", "BEGIN", "DELETE", "ROLLBACK", "COMMIT", "CREATE", "TABLE", "TRAN", "TRANSACTION", "OUTPUT", "USING", "BY", "TARGET", "WITH", "AS", "VALUES", "MERGE", "ON", "WHEN", "THEN", "UNION", "UPDATE", "SET", "WHERE", "GO", "APPEND", "INSERT", "INTO", "TRUNCATE", "REMOVE", "SELECT", "FROM", "TYPE", "FOLDER", "CABINET", "ORDER BY", "DESC", "ASC", "GROUP BY", "ALTER", "ADD", "DROP", "GROUP", "PRIMARY", "KEY", "IDENTITY", "IF"), new SyntaxStyle(Color.Blue));
4354
// keywords2
4455
syntaxHighlighter.AddPattern(new PatternDefinition("OBJECTS", "objects", "SYS", "sys"), new SyntaxStyle(Color.Green));
4556
// functions
@@ -100,13 +111,13 @@ private void Script_Load(object sender, EventArgs e)
100111
case "DQL":
101112
UpdateDqlSyntax();
102113
break;
103-
case "TXT":
104-
UpdateSqlSyntax();
105-
break;
106-
case "XML":
107-
UpdateSqlSyntax();
108-
break;
109-
}
114+
case "TXT":
115+
UpdateSqlSyntax();
116+
break;
117+
case "XML":
118+
UpdateSqlSyntax();
119+
break;
120+
}
110121
txtScript.Text = Ribbon.AppVariables.ScriptRange;
111122

112123
}
@@ -156,15 +167,15 @@ private void btnSave_Click(object sender, EventArgs e)
156167
s.FileName = "Update_" + Ribbon.AppVariables.FirstColumnName + ".dql";
157168
s.Filter = "Documentum Query Language | *.dql";
158169
break;
159-
case "TXT":
160-
s.FileName = Properties.Settings.Default.Table_ColumnTableAlias + ".txt";
161-
s.Filter = "Text File | *.txt";
162-
break;
163-
case "XML":
164-
s.FileName = Properties.Settings.Default.Table_ColumnTableAlias + ".xml";
165-
s.Filter = "Extensible Markup Language | *.xml";
166-
break;
167-
}
170+
case "TXT":
171+
s.FileName = Properties.Settings.Default.Table_ColumnTableAlias + ".txt";
172+
s.Filter = "Text File | *.txt";
173+
break;
174+
case "XML":
175+
s.FileName = Properties.Settings.Default.Table_ColumnTableAlias + ".xml";
176+
s.Filter = "Extensible Markup Language | *.xml";
177+
break;
178+
}
168179
if (s.ShowDialog() == System.Windows.Forms.DialogResult.OK)
169180
{
170181
using (System.IO.StreamWriter sw = new System.IO.StreamWriter(s.FileName))
@@ -183,5 +194,24 @@ private void btnSave_Click(object sender, EventArgs e)
183194
}
184195
}
185196

197+
private void cboFontSize_TextChanged(object sender, EventArgs e)
198+
{
199+
//this.txtScript.FontSize = this.cboFontSize.Text;
200+
//this.txtScript.SelectionFont = new Font("Courier New", (float)Convert.ToDouble(this.cboFontSize.Text), FontStyle.Regular);
201+
//this.txtScript.SelectionFont = new Font("Courier New", 12, FontStyle.Regular);
202+
}
203+
204+
private void cboFontSize_TextUpdate(object sender, EventArgs e)
205+
{
206+
//float fontSize = FontSize[this.cboFontSize.SelectedIndex];
207+
//this.txtScript.Focus();
208+
//this.txtScript.SelectAll();
209+
//this.txtScript.SelectionFont = new Font(this.txtScript.SelectionFont.FontFamily, fontSize, this.txtScript.SelectionFont.Style);
210+
}
211+
212+
private void cboFontSize_Click(object sender, EventArgs e)
213+
{
214+
//this.txtScript.SelectionFont = new Font(this.txtScript.SelectionFont.FontFamily, FontSize[this.cboFontSize.SelectedIndex], this.txtScript.SelectionFont.Style);
215+
}
186216
}
187217
}

‎VB/App_Data/ScriptHelp.sdf‎

0 Bytes
Binary file not shown.

‎VB/Scripts/Data.vb‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
Imports System
2+
Imports System.IO
3+
Imports System.Data
4+
Imports System.Data.SqlServerCe
5+
Imports System.Security.AccessControl
6+
7+
Public Class Data
8+
9+
Const dataFolder As String = "App_Data"
10+
11+
Public Shared Function Connection() As String
12+
Data.SetUserPath()
13+
Dim databaseFile As String = "Data Source=" + Path.Combine(My.Settings.App_PathLocalData, My.Application.Info.ProductName + ".sdf")
14+
Return databaseFile
15+
End Function
16+
17+
Public Shared TableAliasTable As New DataTable()
18+
Public Shared DateFormatTable As New DataTable()
19+
Public Shared GraphDataTable As New DataTable()
20+
21+
Public Shared Sub CreateTableAliasTable()
22+
Try
23+
Dim columnName As String = "TableName"
24+
Dim dcTableName As New DataColumn(columnName, GetType(String))
25+
TableAliasTable.Rows.Clear()
26+
Dim columns As DataColumnCollection = TableAliasTable.Columns
27+
If columns.Contains(columnName) = False Then
28+
TableAliasTable.Columns.Add(dcTableName)
29+
End If
30+
31+
Dim tableName As String = "TableAlias"
32+
Dim sql As String = Convert.ToString((Convert.ToString("SELECT * FROM ") & tableName) + " ORDER BY ") & columnName
33+
34+
Using da = New SqlCeDataAdapter(sql, Connection())
35+
da.Fill(TableAliasTable)
36+
End Using
37+
38+
TableAliasTable.DefaultView.Sort = columnName & Convert.ToString(" asc")
39+
40+
Catch ex As Exception
41+
'ErrorHandler.DisplayMessage(ex)
42+
43+
End Try
44+
45+
End Sub
46+
47+
Public Shared Sub CreateDateFormatTable()
48+
Try
49+
Dim columnName As String = "FormatString"
50+
Dim dcFormatString As New DataColumn(columnName, GetType(String))
51+
DateFormatTable.Rows.Clear()
52+
Dim columns As DataColumnCollection = DateFormatTable.Columns
53+
If columns.Contains(columnName) = False Then
54+
DateFormatTable.Columns.Add(dcFormatString)
55+
End If
56+
57+
Dim tableName As String = "DateFormat"
58+
Dim sql As String = Convert.ToString((Convert.ToString("SELECT * FROM ") & tableName) + " ORDER BY ") & columnName
59+
60+
Using da = New SqlCeDataAdapter(sql, Connection())
61+
da.Fill(DateFormatTable)
62+
End Using
63+
64+
DateFormatTable.DefaultView.Sort = columnName & Convert.ToString(" asc")
65+
66+
Catch ex As Exception
67+
'ErrorHandler.DisplayMessage(ex)
68+
69+
End Try
70+
71+
End Sub
72+
73+
Public Shared Sub CreateGraphDataTable()
74+
Try
75+
Dim columnName As String = "ORDR_NBR"
76+
Dim dcFormatString As New DataColumn(columnName, GetType(String))
77+
GraphDataTable.Rows.Clear()
78+
Dim columns As DataColumnCollection = GraphDataTable.Columns
79+
If columns.Contains(columnName) = False Then
80+
GraphDataTable.Columns.Add(dcFormatString)
81+
End If
82+
83+
Dim tableName As String = "GraphData"
84+
Dim sql As String = Convert.ToString((Convert.ToString("SELECT * FROM ") & tableName) + " ORDER BY ") & columnName
85+
86+
Using da = New SqlCeDataAdapter(sql, Connection())
87+
da.Fill(GraphDataTable)
88+
End Using
89+
90+
GraphDataTable.DefaultView.Sort = columnName & Convert.ToString(" asc")
91+
92+
Catch ex As Exception
93+
'ErrorHandler.DisplayMessage(ex)
94+
95+
Finally
96+
97+
End Try
98+
99+
End Sub
100+
101+
Public Shared Sub SetServerPath()
102+
Try
103+
Dim versionNumber As String = "" 'AssemblyInfo.versionFolderNumber TODO: FIX THIS
104+
'return Path.Combine(My.Settings.App_PathDeploy, "Application Files", AssemblyInfo.Product + versionNumber, dataFolder, AssemblyInfo.Product + ".sdf.deploy"); //for internal server
105+
Dim baseUrl As New Uri(My.Settings.App_PathDeploy)
106+
Dim relativeUrl As String = (Convert.ToString("Application Files/" + My.Application.Info.ProductName) & versionNumber) + "/" + dataFolder + "/"
107+
Dim combined As New Uri(baseUrl, relativeUrl)
108+
109+
My.Settings.App_PathDeployData = combined.ToString()
110+
111+
Catch ex As Exception
112+
'ErrorHandler.DisplayMessage(ex)
113+
114+
End Try
115+
116+
End Sub
117+
118+
Public Shared Sub SetUserPath()
119+
Dim userFilePath As String = String.Empty
120+
Try
121+
If System.Deployment.Application.ApplicationDeployment.IsNetworkDeployed Then
122+
Dim versionNumber As String = "" 'AssemblyInfo.versionFolderNumber TODO: FIX THIS
123+
Dim localAppData As String = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
124+
'userFilePath = Path.Combine(localAppData, AssemblyInfo.Copyright.Replace(" ", "_"), AssemblyInfo.Product, dataFolder)
125+
'if (!Directory.Exists(userFilePath)) Directory.CreateDirectory(userFilePath);
126+
System.IO.Directory.CreateDirectory(userFilePath)
127+
Dim info As New DirectoryInfo(userFilePath)
128+
Dim security As DirectorySecurity = info.GetAccessControl()
129+
security.AddAccessRule(New FileSystemAccessRule("Everyone", FileSystemRights.Modify, InheritanceFlags.ContainerInherit, PropagationFlags.None, AccessControlType.Allow))
130+
security.AddAccessRule(New FileSystemAccessRule("Everyone", FileSystemRights.Modify, InheritanceFlags.ObjectInherit, PropagationFlags.None, AccessControlType.Allow))
131+
132+
info.SetAccessControl(security)
133+
Else
134+
userFilePath = "C:\Users\tduguid\Source\Repos\ScriptHelp2\VB\App_Data\" 'System.IO.Path.Combine(AssemblyInfo.GetClickOnceLocation(), dataFolder)
135+
End If
136+
137+
My.Settings.App_PathLocalData = userFilePath
138+
139+
Catch ex As Exception
140+
'ErrorHandler.DisplayMessage(ex)
141+
142+
End Try
143+
144+
End Sub
145+
146+
End Class

‎VB/Scripts/Ribbon.vb‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Public Class Ribbon
1515
Implements Office.IRibbonExtensibility
1616
Private ribbon As Office.IRibbonUI
1717

18+
Public Shared ribbonref As Office.IRibbonUI
19+
1820
Public Shared mySettings As Settings
1921
Public Shared myTaskPaneSettings As Microsoft.Office.Tools.CustomTaskPane
2022

@@ -98,7 +100,8 @@ Public Class Ribbon
98100
Public Sub Ribbon_Load(ByVal ribbonUI As Office.IRibbonUI)
99101
Try
100102
Me.ribbon = ribbonUI
101-
'ribbonref = Me
103+
'ribbonref = Me.ribbon
104+
ribbonref = ribbon
102105
'ThisAddIn.e_ribbon = ribbonUI
103106
'AssemblyInfo.SetAddRemoveProgramsIcon("ExcelAddin.ico")
104107
'AssemblyInfo.SetAssemblyFolderVersion()
@@ -865,7 +868,7 @@ Public Class Ribbon
865868
myTableData.Dispose()
866869
End If
867870
myTableData = New TableData()
868-
myTaskPaneTableData = Globals.ThisAddIn.CustomTaskPanes.Add(myTableData, "List of " + ribbon.AppVariables.TableName + " for " + My.Application.Info.Title)
871+
myTaskPaneTableData = Globals.ThisAddIn.CustomTaskPanes.Add(myTableData, "List of " + AppVariables.TableName + " for " + My.Application.Info.Title)
869872
myTaskPaneTableData.DockPosition = Office.MsoCTPDockPosition.msoCTPDockPositionRight
870873
myTaskPaneTableData.DockPositionRestrict = Office.MsoCTPDockPositionRestrict.msoCTPDockPositionRestrictNoChange
871874
myTaskPaneTableData.Width = 300
@@ -874,6 +877,7 @@ Public Class Ribbon
874877

875878
Catch ex As Exception
876879
ErrorHandler.DisplayMessage(ex)
880+
877881
End Try
878882

879883
End Sub

‎VB/TaskPane/Script.Designer.vb‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)