pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Help 2.0: made some changes in the Search pad and Config form code 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1509 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mathias Simmack 20 years ago
parent
13d84756ae
commit
e32b4d9fc7
3 changed files with 81 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2Options.xfrm
  2. 32
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
  3. 44
      src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs

84
src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2Options.xfrm
Unescape View File

@ -1,43 +1,45 @@
<Components version="1.0"> <Components version="1.0">
<System.Windows.Forms.UserControl> <System.Windows.Forms.UserControl>
<Name value="HtmlHelp2Options" /> <Name value="HtmlHelp2Options" />
<ClientSize value="{Width=360, Height=320}" /> <ClientSize value="{Width=360, Height=320}" />
<Controls> <Controls>
<System.Windows.Forms.GroupBox> <System.Windows.Forms.GroupBox>
<Name value="groupBox1" /> <Name value="groupBox1" />
<Location value="{X=8,Y=8}" /> <Location value="{X=8,Y=8}" />
<Text value="${res:AddIns.HtmlHelp2.Options.Groupbox}" /> <Text value="${res:AddIns.HtmlHelp2.Options.Groupbox}" />
<Size value="{Width=344, Height=144}" /> <Size value="{Width=344, Height=124}" />
<TabIndex value="0" /> <TabIndex value="0" />
<Anchor value="Top, Left, Right" /> <Anchor value="Top, Left, Right" />
<Controls> <Controls>
<System.Windows.Forms.Button> <!--
<Name value="reregisterButton" /> <System.Windows.Forms.Button>
<Location value="{X=73,Y=107}" /> <Name value="reregisterButton" />
<Text value="${res:AddIns.HtmlHelp2.Options.Reregister}" /> <Location value="{X=73,Y=107}" />
<Size value="{Width=204, Height=23}" /> <Text value="${res:AddIns.HtmlHelp2.Options.Reregister}" />
<Anchor value="Top" /> <Size value="{Width=204, Height=23}" />
<TabIndex value="2" /> <Anchor value="Top" />
</System.Windows.Forms.Button> <TabIndex value="2" />
<System.Windows.Forms.ComboBox> </System.Windows.Forms.Button>
<Name value="help2Collections" /> -->
<TabIndex value="1" /> <System.Windows.Forms.ComboBox>
<Anchor value="Top, Left, Right" /> <Name value="help2Collections" />
<Size value="{Width=312, Height=21}" /> <TabIndex value="1" />
<FormattingEnabled value="True" /> <Anchor value="Top, Left, Right" />
<DropDownStyle value="DropDownList" /> <Size value="{Width=312, Height=21}" />
<Location value="{X=16,Y=80}" /> <FormattingEnabled value="True" />
</System.Windows.Forms.ComboBox> <DropDownStyle value="DropDownList" />
<System.Windows.Forms.Label> <Location value="{X=16,Y=80}" />
<Name value="label1" /> </System.Windows.Forms.ComboBox>
<Location value="{X=16,Y=27}" /> <System.Windows.Forms.Label>
<Text value="${res:AddIns.HtmlHelp2.Options.Label}" /> <Name value="label1" />
<Size value="{Width=312, Height=45}" /> <Location value="{X=16,Y=27}" />
<TabIndex value="0" /> <Text value="${res:AddIns.HtmlHelp2.Options.Label}" />
<Anchor value="Top, Left, Right" /> <Size value="{Width=312, Height=45}" />
</System.Windows.Forms.Label> <TabIndex value="0" />
</Controls> <Anchor value="Top, Left, Right" />
</System.Windows.Forms.GroupBox> </System.Windows.Forms.Label>
</Controls> </Controls>
</System.Windows.Forms.UserControl> </System.Windows.Forms.GroupBox>
</Controls>
</System.Windows.Forms.UserControl>
</Components> </Components>

32
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
Unescape View File

@ -66,6 +66,7 @@ namespace HtmlHelp2
enableStemming.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.LookForSimilarWords}"); enableStemming.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.LookForSimilarWords}");
reuseMatches.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.SearchInPreviouslyFoundTopics}"); reuseMatches.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.SearchInPreviouslyFoundTopics}");
hiliteTopics.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.HighlightMatches}"); hiliteTopics.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.HighlightMatches}");
useCurrentLang.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.UseCurrentProjectLanguageForSearch}");
label1.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.FilteredBy}"); label1.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.FilteredBy}");
label2.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.LookFor}"); label2.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.LookFor}");
} }
@ -90,7 +91,6 @@ namespace HtmlHelp2
panel3.Controls.Add(searchButton); panel3.Controls.Add(searchButton);
searchButton.Enabled = false; searchButton.Enabled = false;
searchButton.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.Search}");
searchButton.Click += new EventHandler(SearchButtonClick); searchButton.Click += new EventHandler(SearchButtonClick);
panel3.Controls.Add(titlesOnly); panel3.Controls.Add(titlesOnly);
panel3.Controls.Add(enableStemming); panel3.Controls.Add(enableStemming);
@ -99,33 +99,28 @@ namespace HtmlHelp2
panel3.Controls.Add(useCurrentLang); panel3.Controls.Add(useCurrentLang);
titlesOnly.Width = pw; titlesOnly.Width = pw;
titlesOnly.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.SearchInTitlesOnly}");
titlesOnly.Top = searchButton.Top + searchButton.Height + 10; titlesOnly.Top = searchButton.Top + searchButton.Height + 10;
titlesOnly.TextAlign = ContentAlignment.MiddleLeft; titlesOnly.TextAlign = ContentAlignment.MiddleLeft;
titlesOnly.Enabled = HtmlHelp2Environment.IsReady; titlesOnly.Enabled = HtmlHelp2Environment.IsReady;
enableStemming.Width = pw; enableStemming.Width = pw;
enableStemming.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.LookForSimilarWords}");
enableStemming.Top = titlesOnly.Top + titlesOnly.Height - 4; enableStemming.Top = titlesOnly.Top + titlesOnly.Height - 4;
enableStemming.TextAlign = ContentAlignment.MiddleLeft; enableStemming.TextAlign = ContentAlignment.MiddleLeft;
enableStemming.Enabled = HtmlHelp2Environment.IsReady; enableStemming.Enabled = HtmlHelp2Environment.IsReady;
reuseMatches.Width = pw; reuseMatches.Width = pw;
reuseMatches.Top = enableStemming.Top + enableStemming.Height - 4; reuseMatches.Top = enableStemming.Top + enableStemming.Height - 4;
reuseMatches.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.SearchInPreviouslyFoundTopics}");
reuseMatches.Enabled = false; reuseMatches.Enabled = false;
reuseMatches.TextAlign = ContentAlignment.MiddleLeft; reuseMatches.TextAlign = ContentAlignment.MiddleLeft;
hiliteTopics.Width = pw; hiliteTopics.Width = pw;
hiliteTopics.Top = reuseMatches.Top + reuseMatches.Height - 4; hiliteTopics.Top = reuseMatches.Top + reuseMatches.Height - 4;
hiliteTopics.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.HighlightMatches}");
hiliteTopics.TextAlign = ContentAlignment.MiddleLeft; hiliteTopics.TextAlign = ContentAlignment.MiddleLeft;
hiliteTopics.Enabled = HtmlHelp2Environment.IsReady; hiliteTopics.Enabled = HtmlHelp2Environment.IsReady;
hiliteTopics.Checked = true; hiliteTopics.Checked = true;
useCurrentLang.Width = pw; useCurrentLang.Width = pw;
useCurrentLang.Top = hiliteTopics.Top + hiliteTopics.Height; useCurrentLang.Top = hiliteTopics.Top + hiliteTopics.Height;
useCurrentLang.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.UseCurrentProjectLanguageForSearch}");
useCurrentLang.TextAlign = ContentAlignment.MiddleLeft; useCurrentLang.TextAlign = ContentAlignment.MiddleLeft;
useCurrentLang.Enabled = HtmlHelp2Environment.IsReady; useCurrentLang.Enabled = HtmlHelp2Environment.IsReady;
useCurrentLang.Visible = ProjectService.CurrentProject != null; useCurrentLang.Visible = ProjectService.CurrentProject != null;
@ -153,7 +148,6 @@ namespace HtmlHelp2
// Filter label // Filter label
mainPanel.Controls.Add(label1); mainPanel.Controls.Add(label1);
label1.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.FilteredBy}");
label1.Dock = DockStyle.Top; label1.Dock = DockStyle.Top;
label1.TextAlign = ContentAlignment.MiddleLeft; label1.TextAlign = ContentAlignment.MiddleLeft;
label1.Enabled = HtmlHelp2Environment.IsReady; label1.Enabled = HtmlHelp2Environment.IsReady;
@ -170,10 +164,11 @@ namespace HtmlHelp2
searchTerm.Enabled = HtmlHelp2Environment.IsReady; searchTerm.Enabled = HtmlHelp2Environment.IsReady;
mainPanel.Controls.Add(label2); mainPanel.Controls.Add(label2);
label2.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.LookFor}");
label2.Dock = DockStyle.Top; label2.Dock = DockStyle.Top;
label2.TextAlign = ContentAlignment.MiddleLeft; label2.TextAlign = ContentAlignment.MiddleLeft;
label2.Enabled = HtmlHelp2Environment.IsReady; label2.Enabled = HtmlHelp2Environment.IsReady;
this.RedrawContent();
ProjectService.SolutionLoaded += this.SolutionLoaded; ProjectService.SolutionLoaded += this.SolutionLoaded;
ProjectService.SolutionClosed += this.SolutionUnloaded; ProjectService.SolutionClosed += this.SolutionUnloaded;
@ -181,10 +176,10 @@ namespace HtmlHelp2
private void FilterChanged(object sender, EventArgs e) private void FilterChanged(object sender, EventArgs e)
{ {
object selectedItem = filterCombobox.SelectedItem; string selectedFilterName = filterCombobox.SelectedItem.ToString();
if (selectedItem != null) if (selectedFilterName.Length > 0)
{ {
selectedQuery = HtmlHelp2Environment.FindFilterQuery(selectedItem.ToString()); selectedQuery = HtmlHelp2Environment.FindFilterQuery(selectedFilterName);
} }
} }
@ -193,8 +188,8 @@ namespace HtmlHelp2
{ {
mainPanel.Refresh(); mainPanel.Refresh();
string currentFilterName = filterCombobox.SelectedItem.ToString(); string selectedFilterName = filterCombobox.SelectedItem.ToString();
if (String.Compare(currentFilterName, HtmlHelp2Environment.CurrentFilterName) != 0) if (string.Compare(selectedFilterName, HtmlHelp2Environment.CurrentFilterName) != 0)
{ {
filterCombobox.SelectedIndexChanged -= new EventHandler(FilterChanged); filterCombobox.SelectedIndexChanged -= new EventHandler(FilterChanged);
filterCombobox.SelectedIndex = filterCombobox.Items.IndexOf(HtmlHelp2Environment.CurrentFilterName); filterCombobox.SelectedIndex = filterCombobox.Items.IndexOf(HtmlHelp2Environment.CurrentFilterName);
@ -215,7 +210,7 @@ namespace HtmlHelp2
private void SearchButtonClick(object sender, EventArgs e) private void SearchButtonClick(object sender, EventArgs e)
{ {
if (searchTerm.Text != "") if (searchTerm.Text.Length > 0)
{ {
this.AddTermToList(searchTerm.Text); this.AddTermToList(searchTerm.Text);
this.PerformFTS(searchTerm.Text); this.PerformFTS(searchTerm.Text);
@ -224,12 +219,12 @@ namespace HtmlHelp2
private void SearchTextChanged(object sender, EventArgs e) private void SearchTextChanged(object sender, EventArgs e)
{ {
searchButton.Enabled = (searchTerm.Text != ""); searchButton.Enabled = (searchTerm.Text.Length > 0);
} }
private void KeyPressed(object sender, KeyPressEventArgs e) private void KeyPressed(object sender, KeyPressEventArgs e)
{ {
if (e.KeyChar == (char)13 && searchTerm.Text != null) if (e.KeyChar == (char)13 && searchTerm.Text.Length > 0)
{ {
e.Handled = true; e.Handled = true;
this.AddTermToList(searchTerm.Text); this.AddTermToList(searchTerm.Text);
@ -317,6 +312,11 @@ namespace HtmlHelp2
catch (Exception ex) catch (Exception ex)
{ {
LoggingService.Error("Help 2.0: cannot get matching search word; " + ex.ToString()); LoggingService.Error("Help 2.0: cannot get matching search word; " + ex.ToString());
foreach (Control control in this.mainPanel.Controls)
{
control.Enabled = false;
}
} }
finally finally
{ {

44
src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs
Unescape View File

@ -30,8 +30,8 @@ namespace HtmlHelp2.OptionsPanel
public override void LoadPanelContents() public override void LoadPanelContents()
{ {
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("HtmlHelp2.Resources.HtmlHelp2Options.xfrm")); SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("HtmlHelp2.Resources.HtmlHelp2Options.xfrm"));
ControlDictionary["reregisterButton"].Click += ReregisterButtonClick; // ControlDictionary["reregisterButton"].Click += ReregisterButtonClick;
ControlDictionary["reregisterButton"].Visible = false; // ControlDictionary["reregisterButton"].Visible = false;
this.InitializeComponents(); this.InitializeComponents();
} }
@ -96,26 +96,26 @@ namespace HtmlHelp2.OptionsPanel
} }
#region ReRegister #region ReRegister
void ReregisterButtonClick(object sender, EventArgs e) // void ReregisterButtonClick(object sender, EventArgs e)
{ // {
System.Threading.ThreadPool.QueueUserWorkItem(DoReregister); // System.Threading.ThreadPool.QueueUserWorkItem(DoReregister);
} // }
//
void DoReregister(object state) // void DoReregister(object state)
{ // {
try // try
{ // {
ProcessStartInfo info = new ProcessStartInfo("cmd", "/c call echo Unregistering... & unregister.bat & echo. & echo Registering... & call register.bat & pause"); // ProcessStartInfo info = new ProcessStartInfo("cmd", "/c call echo Unregistering... & unregister.bat & echo. & echo Registering... & call register.bat & pause");
info.WorkingDirectory = Path.Combine(FileUtility.ApplicationRootPath, "bin\\setup\\help"); // info.WorkingDirectory = Path.Combine(FileUtility.ApplicationRootPath, "bin\\setup\\help");
Process p = Process.Start(info); // Process p = Process.Start(info);
p.WaitForExit(45000); // p.WaitForExit(45000);
WorkbenchSingleton.SafeThreadAsyncCall(typeof(HtmlHelp2Environment), "ReloadNamespace"); // WorkbenchSingleton.SafeThreadAsyncCall(typeof(HtmlHelp2Environment), "ReloadNamespace");
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
MessageService.ShowError(ex); // MessageService.ShowError(ex);
} // }
} // }
#endregion #endregion
} }
} }

Write Preview
Loading…
Cancel
Save