[Monodevelop-patches-list] r2685 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Commands Gui Gui/BrowserDisplayBinding Gui/Completion Gui/Components Gui/Components/StatusBar Gui/Dialogs Gui/Dialogs/CombineConfiguration Gui/Dialogs/OptionPanels/IDEOptions Gui/Dialogs/OptionPanels/ProjectOptions Gui/Dialogs/ReferenceDialog Gui/Dialogs/Wizard Gui/HtmlControl Gui/Pads/HelpBrowser Gui/Pads/SolutionPad Gui/Workbench Gui/Workbench/Layouts Internal/Codons Internal/Codons/Commands Internal/Parser/ReflectionLayer Internal/Project/Combine Internal/Project/Project Internal/Project/Project/Deployment Internal/Serialization Internal/Templates/ProjectTemplates Services Services/MenuService Services/ParserService Services/StatusBar Services/Tasks
Lluis Sanchez <lluis@ximian.com>
lluis at mono-cvs.ximian.com
Tue Jul 26 18:23:55 EDT 2005
Author: lluis
Date: 2005-07-26 18:23:55 -0400 (Tue, 26 Jul 2005)
New Revision: 2685
Modified:
trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/ProjectCommands.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CodeCompletionData.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CodeCompletionDataProvider.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CommentCompletionDataProvider.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CompletionListWindow.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/ListWindow.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/SdMenuCheckBox.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/SdToolbarCommand.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/StatusBar/SdStatusBar.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineConfigurationPanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineEntryConfigurationsPanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CommonAboutDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewLayoutDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReplaceDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReplaceInFilesDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TipOfTheDay.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/StatusPanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/WizardDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/GuiService.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/HtmlControl/MozillaControl.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/HelpBrowser/HelpViewer.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/DefaultWorkbench.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/WorkbenchSingleton.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/Commands/LinkItemCodon.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/ContextPadCodon.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ReflectionLayer/ReflectionIndexer.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ReflectionLayer/ReflectionMethod.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineConfiguration.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineExecuteDefinition.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/IncludeFilesDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/ProjectReference.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ArrayHandler.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/DataContext.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/CombineEntryDescriptor.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MenuService/MenuService.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyCodeCompletionDatabase.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyInformation.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/DefaultParserService.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ResourceService.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Tasks/StatusProgressMonitor.cs
Log:
2005-07-27 Lluis Sanchez Gual <lluis at novell.com>
* Fix warnings.
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-07-26 22:23:55 UTC (rev 2685)
@@ -1,3 +1,7 @@
+2005-07-27 Lluis Sanchez Gual <lluis at novell.com>
+
+ * Fix warnings.
+
2005-07-22 John Luke <john.luke at gmail.com>
* MonoDevelop.Base.mdp: add Gui/Completion/* to the project
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/ProjectCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/ProjectCommands.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/ProjectCommands.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -173,7 +173,6 @@
internal class DebugEntryHandler: CommandHandler
{
CombineEntry entry;
- string file;
protected override void Run ()
{
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -25,7 +25,6 @@
{
protected HtmlViewPane htmlViewPane;
protected IViewContent parent;
- string title;
public void Selected ()
{
@@ -97,7 +96,7 @@
this.parent = parent;
}
- void onFocused (object o, EventArgs e)
+ protected void onFocused (object o, EventArgs e)
{
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CodeCompletionData.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CodeCompletionData.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CodeCompletionData.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -21,17 +21,15 @@
class CodeCompletionData : ICompletionDataWithMarkup
{
IconService classBrowserIconService = (IconService) ServiceManager.GetService (typeof (IconService));
- IParserService parserService = (IParserService) MonoDevelop.Core.Services.ServiceManager.GetService (typeof (IParserService));
static AmbienceService ambienceService = (AmbienceService) ServiceManager.GetService (typeof (AmbienceService));
string image;
- int overloads;
string text;
string description;
string pango_description;
string documentation;
string completionString;
- IClass c;
+
bool convertedDocumentation = false;
static IAmbience PangoAmbience
@@ -58,9 +56,6 @@
//return overloads;
return overload_data.Count;
}
- set {
- overloads = value;
- }
}
public string Image
@@ -158,8 +153,6 @@
public CodeCompletionData (IClass c)
{
- // save class (for the delegate description shortcut
- this.c = c;
image = classBrowserIconService.GetIcon(c);
text = c.Name;
completionString = c.Name;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CodeCompletionDataProvider.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CodeCompletionDataProvider.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CodeCompletionDataProvider.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -40,7 +40,6 @@
int caretLineNumber;
int caretColumn;
- string fileName;
bool ctrlspace;
public CodeCompletionDataProvider() : this (false)
@@ -57,7 +56,6 @@
public ICompletionData[] GenerateCompletionData(Project project, string fileName, ICompletionWidget widget, char charTyped)
{
completionData = new ArrayList();
- this.fileName = fileName;
// the parser works with 1 based coordinates
caretLineNumber = widget.TriggerLine + 1;
@@ -126,7 +124,7 @@
insertedElements[method.Name] = ccd;
} else {
CodeCompletionData firstMethod = (CodeCompletionData)insertedElements[method.Name];
- ++firstMethod.Overloads;
+// ++firstMethod.Overloads;
firstMethod.AddOverload (ccd);
}
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CommentCompletionDataProvider.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CommentCompletionDataProvider.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CommentCompletionDataProvider.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -27,9 +27,7 @@
/// </summary>
public class CommentCompletionDataProvider : ICompletionDataProvider
{
- static IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IParserService));
-
- int caretLineNumber;
+/* int caretLineNumber;
int caretColumn;
string[][] commentTags = new string[][] {
@@ -53,15 +51,7 @@
new string[] {"summary", "A summary of the object"},
new string[] {"value", "A description of a property"}
};
-
- /// <remarks>
- /// Returns true, if the given coordinates (row, column) are in the region.
- /// </remarks>
- bool IsBetween (int row, int column, IRegion region)
- {
- return row >= region.BeginLine && (row <= region.EndLine || region.EndLine == -1);
- }
-
+*/
public ICompletionData[] GenerateCompletionData (Project project, string fileName, ICompletionWidget widget, char charTyped)
{
/*caretLineNumber = textArea.Caret.Line;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CompletionListWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CompletionListWindow.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/CompletionListWindow.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -9,8 +9,6 @@
{
public class CompletionListWindow : ListWindow, IListDataProvider
{
- string fileName;
- Project project;
ICompletionWidget completionWidget;
ICompletionData[] completionData;
DeclarationViewWindow declarationviewwindow = new DeclarationViewWindow ();
@@ -63,8 +61,6 @@
bool ShowListWindow (char firstChar, ICompletionDataProvider provider, ICompletionWidget completionWidget, Project project, string fileName)
{
this.completionWidget = completionWidget;
- this.fileName = fileName;
- this.project = project;
completionData = provider.GenerateCompletionData (project, fileName, completionWidget, firstChar);
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/ListWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/ListWindow.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Completion/ListWindow.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -249,7 +249,7 @@
int selection = 0;
int page = 0;
int visibleRows = -1;
- int rowWidth, rowHeight;
+ int rowHeight;
bool buttonPressed;
bool disableSelection;
@@ -432,6 +432,8 @@
{
int winHeight = 200;
int lvWidth, lvHeight;
+ int rowWidth;
+
this.GdkWindow.GetSize (out lvWidth, out lvHeight);
layout.GetPixelSize (out rowWidth, out rowHeight);
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/SdMenuCheckBox.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/SdMenuCheckBox.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/SdMenuCheckBox.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -24,7 +24,6 @@
object caller;
ConditionCollection conditionCollection;
string description = String.Empty;
- string localizedText = String.Empty;
ICheckableMenuCommand menuCommand;
object _tag;
@@ -58,7 +57,6 @@
{
this.caller = caller;
this.conditionCollection = conditionCollection;
- this.localizedText = label;
UpdateStatus();
}
@@ -67,7 +65,6 @@
this.menuCommand = menuCommand;
this.caller = caller;
this.conditionCollection = conditionCollection;
- this.localizedText = label;
UpdateStatus();
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/SdToolbarCommand.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/SdToolbarCommand.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/SdToolbarCommand.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -19,7 +19,6 @@
static Tooltips tips = new Tooltips ();
object caller;
ConditionCollection conditionCollection;
- string description = String.Empty;
string localizedText = String.Empty;
ICommand menuCommand = null;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/StatusBar/SdStatusBar.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/StatusBar/SdStatusBar.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Components/StatusBar/SdStatusBar.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -28,7 +28,6 @@
Image currentStatusImage;
bool cancelEnabled;
- const int ctx = 1;
private static GLib.GType gtype;
/*
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineConfigurationPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineConfigurationPanel.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineConfigurationPanel.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -18,12 +18,10 @@
{
[Glade.Widget] Gtk.TreeView configsList;
TreeStore store;
- Combine combine;
CombineConfiguration configuration;
public CombineConfigurationPanelWidget (IProperties CustomizationObject): base ("Base.glade", "CombineConfigurationsPanel")
{
- combine = (Combine)((IProperties)CustomizationObject).GetProperty("Combine");
configuration = (CombineConfiguration)((IProperties)CustomizationObject).GetProperty("Config");
store = new TreeStore (typeof(object), typeof(string), typeof(bool), typeof(string));
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineEntryConfigurationsPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineEntryConfigurationsPanel.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineEntryConfigurationsPanel.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -53,12 +53,11 @@
[Glade.Widget] Gtk.TreeView configsList;
TreeStore store;
- Combine combine;
ConfigurationData configData;
public CombineEntryConfigurationsPanelWidget (IProperties CustomizationObject): base ("Base.glade", "CombineEntryConfigurationsPanel")
{
- combine = (Combine)((IProperties)CustomizationObject).GetProperty("Combine");
+// combine = (Combine)((IProperties)CustomizationObject).GetProperty("Combine");
configData = (ConfigurationData)((IProperties)CustomizationObject).GetProperty("CombineConfigData");
store = new TreeStore (typeof(object), typeof(string));
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -27,7 +27,7 @@
class CombineStartupPanelWidget : GladeWidgetExtract
{
// Gtk Controls
- [Glade.Widget] Label ActionLabel;
+// [Glade.Widget] Label ActionLabel;
[Glade.Widget] RadioButton singleRadioButton;
[Glade.Widget] RadioButton multipleRadioButton;
[Glade.Widget] ComboBox singleCombo;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CommonAboutDialog.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CommonAboutDialog.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -24,8 +24,6 @@
{
Pixbuf image;
int scroll = -220;
- Pango.Font font;
- bool initial = true;
Pango.Layout layout;
internal uint TimerHandle;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -166,7 +166,7 @@
// button events
- void CheckedChange(object sender, EventArgs e)
+ protected void CheckedChange(object sender, EventArgs e)
{
//((ListView)ControlDictionary["templateListView"]).View = ((RadioButton)ControlDictionary["smallIconsRadioButton"]).Checked ? View.List : View.LargeIcon;
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewLayoutDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewLayoutDialog.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewLayoutDialog.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -16,7 +16,7 @@
string[] existentLayouts;
[Glade.Widget] Entry layoutName;
- [Glade.Widget] Button cancelButton;
+// [Glade.Widget] Button cancelButton;
[Glade.Widget] Button newButton;
[Glade.Widget] Dialog newLayoutDialog;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -38,10 +38,11 @@
TreeStore catStore;
[Glade.Widget ("NewProjectDialog")] Dialog dialog;
- [Glade.Widget] Button btn_close, btn_new;
+// [Glade.Widget] Button btn_close;
+ [Glade.Widget] Button btn_new;
- [Glade.Widget] Label lbl_hdr_template, lbl_hdr_location;
- [Glade.Widget] Label lbl_name, lbl_location, lbl_subdirectory;
+// [Glade.Widget] Label lbl_hdr_template, lbl_hdr_location;
+// [Glade.Widget] Label lbl_name, lbl_location, lbl_subdirectory;
[Glade.Widget] Label lbl_will_save_in;
[Glade.Widget] Label lbl_template_descr;
@@ -283,7 +284,7 @@
ActivateIfReady ();
}
- void cancelClicked (object o, EventArgs e)
+ protected void cancelClicked (object o, EventArgs e)
{
dialog.Destroy ();
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -27,7 +27,6 @@
{
BuildPanelWidget widget;
- const string projectAndCombineProperty = "SharpDevelop.UI.ProjectAndCombineOptions";
public override void LoadPanelContents()
{
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -27,7 +27,7 @@
class CodeGenerationPanelWidget : GladeWidgetExtract {
PropertyService p = Runtime.Properties;
- [Glade.Widget] Label hdr_code_generation_options;
+// [Glade.Widget] Label hdr_code_generation_options;
[Glade.Widget] CheckButton
chk_blk_on_same_line,
@@ -35,7 +35,7 @@
chk_blank_lines,
chk_full_type_names;
- [Glade.Widget] Label hdr_comment_generation_options;
+// [Glade.Widget] Label hdr_comment_generation_options;
[Glade.Widget] CheckButton
chk_doc_comments,
@@ -73,8 +73,6 @@
CodeGenerationPanelWidget widget;
- const string codeGenerationProperty = "SharpDevelop.UI.CodeGenerationOptions";
-
public override void LoadPanelContents ()
{
Add (widget = new CodeGenerationPanelWidget ());
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -23,7 +23,6 @@
internal class SelectStylePanel : AbstractOptionPanel
{
SelectStylePanelWidget widget;
- const string selectStyleProperty = "SharpDevelop.UI.SelectStyleOptions";
public override void LoadPanelContents()
{
@@ -38,11 +37,6 @@
class SelectStylePanelWidget : GladeWidgetExtract
{
- //FIXME: Hashtables are wrong here.
- //FIXME: Yes, this is a dirty hack.
- //FIXME: Lets use something else.
- Hashtable MenuToValue = new Hashtable ();
- Hashtable ValueToMenu = new Hashtable ();
[Glade.Widget] public Gtk.CheckButton extensionButton;
[Glade.Widget] public Gtk.CheckButton hiddenButton;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -33,10 +33,8 @@
class GeneralProjectOptionsWidget : GladeWidgetExtract {
// Gtk Controls
- [Glade.Widget] Label informationHeaderLabel;
[Glade.Widget] Label nameLabel;
[Glade.Widget] Label descriptionLabel;
- [Glade.Widget] Label onProjectLoadHeaderLabel;
[Glade.Widget] Entry projectNameEntry;
[Glade.Widget] TextView projectDescriptionTextView;
[Glade.Widget] CheckButton newFilesOnLoadCheckButton;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -25,8 +25,8 @@
TreeStore refTreeStore;
[Widget] Dialog AddReferenceDialog;
[Widget] TreeView ReferencesTreeView;
- [Widget] Button okbutton;
- [Widget] Button cancelbutton;
+// [Widget] Button okbutton;
+// [Widget] Button cancelbutton;
[Widget] Button RemoveReferenceButton;
[Widget] Notebook mainBook;
GacReferencePanel gacRefPanel;
@@ -170,7 +170,7 @@
ReferencesTreeView.ScrollToCell (refTreeStore.GetPath (ni), null, false, 0, 0);
}
- void RemoveReference(object sender, EventArgs e)
+ protected void RemoveReference(object sender, EventArgs e)
{
TreeIter iter;
TreeModel mdl;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReplaceDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReplaceDialog.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReplaceDialog.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -33,9 +33,7 @@
// services
static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
- static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
-
+
// gtk widgets
[Glade.Widget] Gtk.Entry searchPatternEntry;
[Glade.Widget] Gtk.Entry replacePatternEntry;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReplaceInFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReplaceInFilesDialog.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReplaceInFilesDialog.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -31,9 +31,9 @@
[Glade.Widget] Gtk.Entry replacePatternEntry;
[Glade.Widget] Gtk.Button findHelpButton;
[Glade.Widget] Gtk.Button findButton;
- [Glade.Widget] Gtk.Button markAllButton;
+// [Glade.Widget] Gtk.Button markAllButton;
[Glade.Widget] Gtk.Button closeButton;
- [Glade.Widget] Gtk.Button replaceButton;
+// [Glade.Widget] Gtk.Button replaceButton;
[Glade.Widget] Gtk.Button replaceAllButton;
[Glade.Widget] Gtk.Button replaceHelpButton;
[Glade.Widget] Gtk.CheckButton ignoreCaseCheckBox;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TipOfTheDay.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TipOfTheDay.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TipOfTheDay.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -18,7 +18,7 @@
{
internal class TipOfTheDayWindow
{
- [Glade.Widget] Label categoryLabel;
+// [Glade.Widget] Label categoryLabel;
[Glade.Widget] TextView tipTextview;
[Glade.Widget] CheckButton noshowCheckbutton;
[Glade.Widget] Button nextButton;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/TreeViewOptions.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -196,11 +196,11 @@
TreeView.Selection.Changed += new EventHandler (SelectNode);
}
- private void CancelEvent (object o, EventArgs args)
+ internal void CancelEvent (object o, EventArgs args)
{
TreeViewOptionDialog.Hide ();
}
-
+
// Glade tries to find this event (glade signal is wired to it)
protected virtual void OnButtonRelease(object sender, Gtk.ButtonReleaseEventArgs e)
{
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/CurrentPanelPanel.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -25,16 +25,16 @@
{
public class CurrentPanelPanel : DrawingArea
{
- WizardDialog wizard;
- Pixbuf backGround = null;
+// WizardDialog wizard;
+// Pixbuf backGround = null;
- FontDescription normalFont;
+// FontDescription normalFont;
public CurrentPanelPanel(WizardDialog wizard)
{
- normalFont = Style.FontDescription;
+// normalFont = Style.FontDescription;
- this.wizard = wizard;
+// this.wizard = wizard;
//backGround = resourceService.GetBitmap("GeneralWizardBackground");
//RequestSize = new Size (wizard.Width - 220, 30);
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/StatusPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/StatusPanel.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/StatusPanel.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -32,14 +32,14 @@
Pango.Layout ly;
Pango.FontDescription smallFont;
- Pango.FontDescription normalFont;
+// Pango.FontDescription normalFont;
Pango.FontDescription boldFont;
public StatusPanel(WizardDialog wizard)
{
smallFont = Style.FontDescription;
smallFont.Size = (int) (smallFont.Size * 0.75);
- normalFont = Style.FontDescription;
+// normalFont = Style.FontDescription;
boldFont = Style.FontDescription;
boldFont.Weight = Pango.Weight.Bold;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/WizardDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/WizardDialog.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/Wizard/WizardDialog.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -27,12 +27,9 @@
public class WizardDialog : Dialog
{
StatusPanel statusPanel = null;
- CurrentPanelPanel curPanel = null;
Gtk.Frame dialogPanel = new Gtk.Frame();
- DialogMessage DialogMessage;
-
/// <remarks>
/// On this stack the indices of the previous active wizard panels. This
/// is used to restore the path the user gone. (for the back button)
@@ -106,13 +103,11 @@
}
}
- Gtk.Label label1;
-
Gtk.Button backButton;
Gtk.Button nextButton;
Gtk.Button finishButton;
Gtk.Button cancelButton;
- Gtk.Button helpButton;
+// Gtk.Button helpButton;
void CheckFinishedState(object sender, EventArgs e)
{
@@ -257,7 +252,6 @@
return;
}
}
- DialogMessage = DialogMessage.OK;
this.Respond ((int) ResponseType.Close);
}
@@ -268,16 +262,15 @@
return;
}
}
- DialogMessage = DialogMessage.Cancel;
this.Respond ((int) ResponseType.Cancel);
}
- void HelpEvent(object sender, EventArgs e)
+ protected void HelpEvent(object sender, EventArgs e)
{
CurrentWizardPane.ReceiveDialogMessage(DialogMessage.Help);
}
+
-
void InitializeComponents()
{
dialogPanel.Shadow = Gtk.ShadowType.None;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/GuiService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/GuiService.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/GuiService.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -8,7 +8,6 @@
{
DisplayBindingService displayBindingService;
MenuService menuService;
- IWorkbench workbench;
ToolbarService toolbarService;
IconService icons;
ResourceService resourceService;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/HtmlControl/MozillaControl.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/HtmlControl/MozillaControl.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/HtmlControl/MozillaControl.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -13,7 +13,7 @@
{
public class MozillaControl : WebControl, IWebBrowser
{
- private static GLib.GType gtype;
+ internal static GLib.GType gtype;
private string html;
private string css;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/HelpBrowser/HelpViewer.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/HelpBrowser/HelpViewer.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/HelpBrowser/HelpViewer.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -13,9 +13,7 @@
public class HelpViewer : AbstractViewContent
{
-
HTML html_viewer = new HTML ();
- string CurrentUrl;
ScrolledWindow scroller = new ScrolledWindow ();
@@ -86,8 +84,6 @@
public void Render (string text, Node matched_node, string url)
{
- CurrentUrl = url;
-
Gtk.HTMLStream stream = html_viewer.Begin ("text/html");
stream.Write ("<html><body>");
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -965,7 +965,7 @@
}
[CommandUpdateHandler (ViewCommands.TreeDisplayOptionList)]
- void BuildTreeOptionsMenu (CommandArrayInfo info)
+ protected void BuildTreeOptionsMenu (CommandArrayInfo info)
{
ITreeNavigator tnav = GetSelectedNode ();
ITreeOptions currentOptions = tnav.Options;
@@ -977,7 +977,7 @@
}
[CommandHandler (ViewCommands.TreeDisplayOptionList)]
- void OptionToggled (string optionId)
+ protected void OptionToggled (string optionId)
{
Gtk.TreeModel foo;
Gtk.TreeIter iter;
@@ -989,7 +989,7 @@
}
[CommandHandler (ViewCommands.ResetTreeDisplayOptions)]
- void ResetOptions ()
+ protected void ResetOptions ()
{
Gtk.TreeModel foo;
Gtk.TreeIter iter;
@@ -1407,7 +1407,7 @@
return null;
}
- void EnsureFilled ()
+ protected virtual void EnsureFilled ()
{
if (!(bool) store.GetValue (currentIter, TreeViewPad.FilledColumn))
new TreeBuilder (pad, currentIter).FillNode ();
@@ -1429,7 +1429,7 @@
{
}
- void EnsureFilled ()
+ protected override void EnsureFilled ()
{
if (!(bool) store.GetValue (currentIter, TreeViewPad.FilledColumn))
FillNode ();
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/DefaultWorkbench.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/DefaultWorkbench.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/DefaultWorkbench.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -48,7 +48,7 @@
private IWorkbenchLayout layout = null;
- static GType gtype;
+ internal static GType gtype;
public Gtk.MenuBar TopMenu = null;
private Gtk.Toolbar[] toolbars = null;
@@ -155,11 +155,6 @@
Runtime.Gui.CommandService.SetRootWindow (this);
}
- void onDebuggerStarted (object o, EventArgs e)
- {
- Context = WorkbenchContext.Debug;
- }
-
void onDragDataRec (object o, Gtk.DragDataReceivedArgs args)
{
if (args.Info != (uint) TargetList.UriList)
@@ -196,11 +191,11 @@
// FIXME: GTKize
Runtime.ProjectService.CurrentProjectChanged += (ProjectEventHandler) Runtime.DispatchService.GuiDispatch (new ProjectEventHandler(SetProjectTitle));
- Runtime.FileService.FileRemoved += new FileEventHandler(CheckRemovedFile);
- Runtime.FileService.FileRenamed += new FileEventHandler(CheckRenamedFile);
+ Runtime.FileService.FileRemoved += (FileEventHandler) Runtime.DispatchService.GuiDispatch (new FileEventHandler(CheckRemovedFile));
+ Runtime.FileService.FileRenamed += (FileEventHandler) Runtime.DispatchService.GuiDispatch (new FileEventHandler(CheckRenamedFile));
- Runtime.FileService.FileRemoved += new FileEventHandler (Runtime.FileService.RecentOpen.FileRemoved);
- Runtime.FileService.FileRenamed += new FileEventHandler (Runtime.FileService.RecentOpen.FileRenamed);
+ Runtime.FileService.FileRemoved += (FileEventHandler) Runtime.DispatchService.GuiDispatch (new FileEventHandler (Runtime.FileService.RecentOpen.FileRemoved));
+ Runtime.FileService.FileRenamed += (FileEventHandler) Runtime.DispatchService.GuiDispatch (new FileEventHandler (Runtime.FileService.RecentOpen.FileRenamed));
// TopMenu.Selected += new CommandHandler(OnTopMenuSelected);
// TopMenu.Deselected += new CommandHandler(OnTopMenuDeselected);
@@ -479,11 +474,6 @@
}
}
- void SetStandardStatusBar(object sender, EventArgs e)
- {
- Runtime.Gui.StatusBar.SetMessage(GettextCatalog.GetString ("Ready"));
- }
-
void OnActiveWindowChanged(object sender, EventArgs e)
{
if (!closeAll && ActiveWorkbenchWindowChanged != null) {
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -27,7 +27,7 @@
IViewContent content;
ArrayList subViewContents = null;
- ArrayList subDockItems = null;
+// ArrayList subDockItems = null;
TabLabel tabLabel;
Widget tabPage;
@@ -276,8 +276,8 @@
}
- int oldIndex = -1;
- void viewTabControlIndexChanged(object sender, EventArgs e)
+/* int oldIndex = -1;
+ protected void viewTabControlIndexChanged(object sender, EventArgs e)
{
if (oldIndex > 0) {
ISecondaryViewContent secondaryViewContent = subViewContents[oldIndex - 1] as ISecondaryViewContent;
@@ -294,7 +294,7 @@
}
oldIndex = viewTabControl.CurrentPage;
}
-
+*/
object ICommandRouter.GetNextCommandTarget ()
{
commandHandler.SetNextCommandTarget (Parent);
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/WorkbenchSingleton.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/WorkbenchSingleton.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/WorkbenchSingleton.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -18,10 +18,6 @@
{
public class WorkbenchSingleton
{
- const string workbenchMemento = "SharpDevelop.Workbench.WorkbenchMemento";
- const string uiIconStyle = "IconMenuItem.IconMenuStyle";
- const string uiLanguageProperty = "CoreProperties.UILanguage";
-
static IWorkbench workbench = null;
public static IWorkbench Workbench {
@@ -35,7 +31,7 @@
static WorkbenchSingleton()
{
- Runtime.Properties.PropertyChanged += new PropertyEventHandler(TrackPropertyChanges);
+ Runtime.Properties.PropertyChanged += (PropertyEventHandler) Runtime.DispatchService.GuiDispatch (new PropertyEventHandler(TrackPropertyChanges));
}
static void SetWbLayout()
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/Commands/LinkItemCodon.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/Commands/LinkItemCodon.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/Commands/LinkItemCodon.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -47,8 +47,8 @@
[XmlMemberAttribute("link")]
string link;
- [XmlMemberAttribute("description")]
- string description;
+// [XmlMemberAttribute("description")]
+// string description;
public override object BuildItem (object owner, ArrayList subItems, ConditionCollection conditions)
{
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/ContextPadCodon.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/ContextPadCodon.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Codons/ContextPadCodon.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -38,8 +38,8 @@
[CodonNameAttribute ("ContextPad")]
public class ContextPadCodon : AbstractCodon
{
- [XmlMemberAttribute ("defaultVisible")]
- bool visible = true;
+// [XmlMemberAttribute ("defaultVisible")]
+// bool visible = true;
public override object BuildItem (object owner, ArrayList subItems, ConditionCollection conditions)
{
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ReflectionLayer/ReflectionIndexer.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ReflectionLayer/ReflectionIndexer.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ReflectionLayer/ReflectionIndexer.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -15,7 +15,7 @@
[Serializable]
public class ReflectionIndexer : AbstractIndexer
{
- string GetIndexerName(PropertyInfo propertyInfo)
+/* string GetIndexerName(PropertyInfo propertyInfo)
{
StringBuilder propertyName = new StringBuilder("Item(");
ParameterInfo[] p = propertyInfo.GetIndexParameters();
@@ -28,7 +28,7 @@
propertyName.Append(')');
return propertyName.ToString();
}
-
+*/
public ReflectionIndexer(PropertyInfo propertyInfo, XmlDocument docs)
{
// indexers does have the same name as the object that declare the indexers
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ReflectionLayer/ReflectionMethod.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ReflectionLayer/ReflectionMethod.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/ReflectionLayer/ReflectionMethod.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -15,7 +15,7 @@
[Serializable]
public class ReflectionMethod : AbstractMethod
{
- string GetParamList(MethodBase methodBase)
+/* string GetParamList(MethodBase methodBase)
{
StringBuilder propertyName = new StringBuilder("(");
ParameterInfo[] p = methodBase.GetParameters();
@@ -31,7 +31,7 @@
propertyName.Append(')');
return propertyName.ToString();
}
-
+*/
XmlNode FindMatch (XmlNodeList nodes, MethodBase methodBase)
{
ParameterInfo[] p = methodBase.GetParameters ();
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineConfiguration.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineConfiguration.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineConfiguration.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -105,7 +105,7 @@
string entryName;
[ItemProperty ("name")]
- string EntryName {
+ internal string EntryName {
get { return Entry != null ? Entry.Name : entryName; }
set { entryName = value; }
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineExecuteDefinition.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineExecuteDefinition.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineExecuteDefinition.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -25,7 +25,7 @@
string entryName;
[ItemProperty ("entry")]
- string EntryName {
+ internal string EntryName {
get { return Entry != null ? Entry.Name : entryName; }
set { entryName = value; }
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -15,12 +15,12 @@
{
public class AssemblyDeploy : IDeploymentStrategy
{
- static string[] extensions = {
+/* static string[] extensions = {
"",
".exe",
".dll"
};
-
+*/
public void DeployProject(Project project)
{
if (project.DeployInformation.DeployTarget.Length == 0) {
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/IncludeFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/IncludeFilesDialog.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/IncludeFilesDialog.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -29,8 +29,8 @@
[Glade.Widget] Button deselectAllButton;
[Glade.Widget] RadioButton newFilesOnlyRadioButton;
[Glade.Widget] RadioButton allFilesRadioButton;
- [Glade.Widget] Label newFilesInProjectLabel;
- [Glade.Widget] Label viewLabel;
+// [Glade.Widget] Label newFilesInProjectLabel;
+// [Glade.Widget] Label viewLabel;
[Glade.Widget] TreeView IncludeFileListView;
[Glade.Widget] Dialog IncludeFilesDialogWidget;
public ListStore store;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/ProjectReference.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/ProjectReference.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Project/ProjectReference.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -55,12 +55,6 @@
reference = referencedProject.Name;
}
- bool IsAssembly {
- get {
- return referenceType == ReferenceType.Assembly;
- }
- }
-
[ReadOnly(true)]
[LocalizedProperty("${res:MonoDevelop.Internal.Project.ProjectReference.ReferenceType}",
Description ="${res:MonoDevelop.Internal.Project.ProjectReference.ReferenceType.Description})")]
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ArrayHandler.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ArrayHandler.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/ArrayHandler.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -33,12 +33,10 @@
{
internal class ArrayHandler: ICollectionHandler
{
- Type _type;
Type _elementType;
public ArrayHandler (Type type)
{
- _type = type;
_elementType = type.GetElementType ();
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/DataContext.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/DataContext.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Serialization/DataContext.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -35,7 +35,6 @@
public class DataContext
{
Hashtable configurationTypes = new Hashtable ();
- object[] emptyAttributes = new object[0];
public virtual SerializationContext CreateSerializationContext ()
{
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/CombineEntryDescriptor.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/CombineEntryDescriptor.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/CombineEntryDescriptor.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -46,14 +46,14 @@
internal class CombineEntryDescriptor: ICombineEntryDescriptor
{
string name;
- string relativePath;
+// string relativePath;
string typeName;
XmlElement template;
protected CombineEntryDescriptor (XmlElement element)
{
name = element.GetAttribute ("name");
- relativePath = element.GetAttribute ("directory");
+// relativePath = element.GetAttribute ("directory");
typeName = element.GetAttribute ("type");
template = element;
}
@@ -61,7 +61,6 @@
public string CreateEntry (ProjectCreateInformation projectCreateInformation, string defaultLanguage)
{
StringParserService stringParserService = Runtime.StringParserService;
- FileUtilityService fileUtilityService = Runtime.FileUtilityService;
Type type = Type.GetType (typeName);
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -27,7 +27,6 @@
internal class ProjectDescriptor: ICombineEntryDescriptor
{
string name;
- string relativePath;
string projectType;
ArrayList files = new ArrayList(); // contains FileTemplate classes
@@ -65,7 +64,6 @@
protected ProjectDescriptor(string name, string relativePath)
{
this.name = name;
- this.relativePath = relativePath;
}
public string CreateEntry (ProjectCreateInformation projectCreateInformation, string defaultLanguage)
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -202,15 +202,6 @@
}
}
- static void LoadProjectTemplate(string fileName)
- {
- try {
-
- } catch (Exception e) {
- throw new ApplicationException("error while loading " + fileName + " original exception was : " + e.ToString());
- }
- }
-
static ProjectTemplate()
{
LoadTemplates ((ProjectTemplateCodon[])(AddInTreeSingleton.AddInTree.GetTreeNode ("/MonoDevelop/ProjectTemplates").BuildChildItems (new object ()).ToArray (typeof (ProjectTemplateCodon))));
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MenuService/MenuService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MenuService/MenuService.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MenuService/MenuService.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -94,13 +94,11 @@
class QuickInsertHandler
{
- Gtk.Button popupControl;
Gtk.Menu quickInsertMenu;
//public QuickInsertHandler(Control popupControl, CommandBarContextMenu quickInsertMenu)
public QuickInsertHandler(Gtk.Button popupControl, Gtk.Menu quickInsertMenu)
{
- this.popupControl = popupControl;
this.quickInsertMenu = quickInsertMenu;
popupControl.Clicked += new EventHandler(showQuickInsertMenu);
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyCodeCompletionDatabase.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyCodeCompletionDatabase.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyCodeCompletionDatabase.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -53,7 +53,8 @@
using (AssemblyDatabaseHelper helper = GetExternalHelper (true))
{
- helper.GetAssemblyInfo (assemblyName, out this.assemblyName, out assemblyFile, out name, out refUris);
+ if (!helper.GetAssemblyInfo (assemblyName, out this.assemblyName, out assemblyFile, out name, out refUris))
+ return;
}
this.baseDir = baseDir;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyInformation.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyInformation.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/AssemblyInformation.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -51,7 +51,7 @@
{
}
- byte[] GetBytes(string fileName)
+/* byte[] GetBytes (string fileName)
{
Runtime.LoggingService.Info (fileName);
FileStream fs = System.IO.File.OpenRead(fileName);
@@ -61,7 +61,8 @@
fs.Close();
return outArray;
}
-
+*/
+
public void Load(string fileName, bool nonLocking)
{
// AssemblyReader assembly = new AssemblyReader();
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/DefaultParserService.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ParserService/DefaultParserService.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -169,15 +169,6 @@
return asm.Location;
}
- string sys_version;
- string GetSysVersion () {
- if (sys_version != null)
- return sys_version;
- sys_version = typeof (object).Assembly.GetName ().Version.ToString ();
- return sys_version;
- }
-
-
private bool ContinueWithProcess(IProgressMonitor progressMonitor)
{
while (Gtk.Application.EventsPending ())
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ResourceService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ResourceService.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ResourceService.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -38,8 +38,6 @@
public class ResourceService : AbstractService
{
- Hashtable userStrings = null;
- Hashtable userIcons = null;
static Gtk.IconFactory iconFactory = null;
static Hashtable stockMappings = null;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -112,7 +112,6 @@
{
Debug.Assert(statusBar != null);
if (message == null) message = "";
- lastMessage = message;
statusBar.SetMessage(stringParserService.Parse(message));
}
@@ -121,7 +120,6 @@
{
Debug.Assert(statusBar != null);
if (message == null) message = "";
- lastMessage = message;
statusBar.SetMessage(image, stringParserService.Parse(message));
}
@@ -129,8 +127,5 @@
{
SetMessage ("");
}
-
- bool wasError = false;
- string lastMessage = "";
}
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Tasks/StatusProgressMonitor.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Tasks/StatusProgressMonitor.cs 2005-07-22 22:08:47 UTC (rev 2684)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Tasks/StatusProgressMonitor.cs 2005-07-26 22:23:55 UTC (rev 2685)
@@ -35,13 +35,11 @@
{
internal class StatusProgressMonitor: BaseProgressMonitor
{
- string title;
Gtk.Image icon;
bool showErrorDialogs;
public StatusProgressMonitor (string title, string iconName, bool showErrorDialogs)
{
- this.title = title;
this.showErrorDialogs = showErrorDialogs;
icon = Runtime.Gui.Resources.GetImage (iconName, Gtk.IconSize.Menu);
Runtime.Gui.StatusBar.BeginProgress (title);
More information about the Monodevelop-patches-list
mailing list