[Monodevelop-patches-list] r2180 - in trunk/MonoDevelop/Core/src: AddIns/prj2make-sharp-lib MonoDevelop.Base MonoDevelop.Base/Commands MonoDevelop.Base/Gui/Dialogs/CombineConfiguration MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions MonoDevelop.Base/Gui/Workbench/Layouts MonoDevelop.Base/Internal/Parser/SharpAssemblyLayer MonoDevelop.Base/Internal/Templates/ProjectTemplates MonoDevelop.Gui.Widgets MonoDevelop.Gui.Widgets/FolderDialog MonoDevelop.Startup
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Thu Jan 27 04:31:40 EST 2005
Author: jluke
Date: 2005-01-27 04:31:40 -0500 (Thu, 27 Jan 2005)
New Revision: 2180
Modified:
trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/MsPrjHelper.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade
trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/FileCommands.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/ToolsCommands.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyAttribute.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FolderDialog/BaseFileEntry.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Startup/MonoDevelopMain.cs
Log:
more warnings and ComboBox stuff
Modified: trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/MsPrjHelper.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/MsPrjHelper.cs 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/MsPrjHelper.cs 2005-01-27 09:31:40 UTC (rev 2180)
@@ -502,7 +502,7 @@
int i = 0;
FileStream fsOut = null;
XmlSerializer xmlSer = null;
- StringBuilder MakefileBuilder = new StringBuilder();
+ //StringBuilder MakefileBuilder = new StringBuilder();
MonoDevelop.Prj2Make.Schema.Cmbx.Combine cmbxObj = new MonoDevelop.Prj2Make.Schema.Cmbx.Combine();
cmbxFileName = String.Format ("{0}.cmbx",
Path.Combine(Path.GetDirectoryName(slnFileName),
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade 2005-01-27 09:31:40 UTC (rev 2180)
@@ -1307,98 +1307,6 @@
</child>
</widget>
-<widget class="GtkDialog" id="GPLDialog">
- <property name="border_width">6</property>
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="title" translatable="yes">GNU GENERAL PUBLIC LICENSE</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">600</property>
- <property name="default_height">400</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="has_separator">False</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="closebutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-close</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-7</property>
- <signal name="clicked" handler="OnCloseButtonClicked" last_modification_time="Sat, 24 Jan 2004 01:26:19 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">False</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
<widget class="GtkWindow" id="SelectStylePanel">
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
@@ -1517,7 +1425,7 @@
<property name="max_saved">10</property>
<property name="directory_entry">False</property>
<property name="modal">False</property>
- <property name="use_filechooser">False</property>
+ <property name="use_filechooser">True</property>
<property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
<child internal-child="entry">
@@ -3961,10 +3869,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="singleOptionMenu">
+ <widget class="GtkComboBox" id="singleCombo">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4060,7 +3966,7 @@
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
@@ -4182,10 +4088,8 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="actionOptionMenu">
+ <widget class="GtkComboBox" id="actionCombo">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">-1</property>
</widget>
<packing>
<property name="padding">0</property>
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-01-27 09:31:40 UTC (rev 2180)
@@ -2,6 +2,16 @@
* Base.glade: update to newer glade format
+ * Commands/ToolsCommands.cs:
+ * Commands/FileCommands.cs:
+ * Gui/Workbench/Layouts/SdiWorkspaceLayout.cs:
+ * Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs:
+ * Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs:
+ * Base.glade:
+ * Internal/Parser/SharpAssemblyLayer/SharpAssemblyAttribute.cs:
+ * Internal/Templates/ProjectTemplates/ProjectTemplate.cs:
+ use ComboBox instead of OptioMenu and fix a bunch of little warnings
+
2005-01-27 Lluis Sanchez Gual <lluis at novell.com>
* Services/ParserService/CodeCompletionDatabase.cs: Moved classes to
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/FileCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/FileCommands.cs 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/FileCommands.cs 2005-01-27 09:31:40 UTC (rev 2180)
@@ -24,17 +24,17 @@
{
public class CreateNewProject : AbstractMenuCommand
{
- public override void Run()
+ public override void Run ()
{
- NewProjectDialog npdlg = new NewProjectDialog(true);
+ new NewProjectDialog (true);
}
}
public class CreateNewFile : AbstractMenuCommand
{
- public override void Run()
+ public override void Run ()
{
- NewFileDialog nfd = new NewFileDialog ();
+ new NewFileDialog ();
}
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/ToolsCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/ToolsCommands.cs 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/ToolsCommands.cs 2005-01-27 09:31:40 UTC (rev 2180)
@@ -23,14 +23,8 @@
{
public override void Run()
{
- TreeViewOptions optionsDialog = new TreeViewOptions((IProperties)Runtime.Properties.GetProperty("MonoDevelop.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new DefaultProperties()),
+ new TreeViewOptions((IProperties)Runtime.Properties.GetProperty("MonoDevelop.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new DefaultProperties()),
AddInTreeSingleton.AddInTree.GetTreeNode("/SharpDevelop/Dialogs/OptionsDialog"));
- //optionsDialog.ShowAll ();
- // optionsDialog.FormBorderStyle = FormBorderStyle.FixedDialog;
-
- // optionsDialog.Owner = (Form)WorkbenchSingleton.Workbench;
- // optionsDialog.ShowDialog();
- //}
}
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs 2005-01-27 09:31:40 UTC (rev 2180)
@@ -30,8 +30,8 @@
[Glade.Widget] Label ActionLabel;
[Glade.Widget] RadioButton singleRadioButton;
[Glade.Widget] RadioButton multipleRadioButton;
- [Glade.Widget] OptionMenu singleOptionMenu;
- [Glade.Widget] OptionMenu actionOptionMenu;
+ [Glade.Widget] ComboBox singleCombo;
+ [Glade.Widget] ComboBox actionCombo;
[Glade.Widget] Button moveUpButton;
[Glade.Widget] Button moveDownButton;
[Glade.Widget] VBox multipleBox;
@@ -49,32 +49,38 @@
singleRadioButton.Active = combine.SingleStartupProject;
singleRadioButton.Clicked += new EventHandler(OnSingleRadioButtonClicked);
multipleRadioButton.Active = !combine.SingleStartupProject;
- singleRadioButton.Clicked += new EventHandler(OptionsChanged);
+ //singleRadioButton.Clicked += new EventHandler(OptionsChanged);
// Setting up OptionMenus
- Menu singleMenu = new Menu ();
- for (int i =0; i < combine.Entries.Count; i++) {
+ ListStore store = new ListStore (typeof (string));
+ int active = -1;
+ for (int i = 0; i < combine.Entries.Count; i++) {
CombineEntry entry = (CombineEntry) combine.Entries[i];
- singleMenu.Append( new MenuItem(entry.Name));
-
- if (combine.SingleStartProjectName == entry.Name){
- singleMenu.SetActive ( (uint) i);
- }
+ store.AppendValues (entry.Name);
+
+ if (combine.SingleStartProjectName == entry.Name)
+ active = i;
}
- singleOptionMenu.Menu = singleMenu;
+ singleCombo.Model = store;
- Menu actionMenu = new Menu ();
- actionMenu.Append( new MenuItem (GettextCatalog.GetString ("None")));
- actionMenu.Append( new MenuItem (GettextCatalog.GetString ("Execute")));
- actionOptionMenu.Menu = actionMenu ;
- actionOptionMenu.Changed += new EventHandler(OptionsChanged);
+ CellRendererText cr = new CellRendererText ();
+ singleCombo.PackStart (cr, true);
+ singleCombo.AddAttribute (cr, "text", 0);
+ singleCombo.Active = active;
+ store = new ListStore (typeof (string));
+ store.AppendValues (GettextCatalog.GetString ("None"));
+ store.AppendValues (GettextCatalog.GetString ("Execute"));
+ actionCombo.Model = store;
+ actionCombo.PackStart (cr, true);
+ actionCombo.AddAttribute (cr, "text", 0);
+ actionCombo.Changed += new EventHandler(OptionsChanged);
+
// Populating entryTreeView
CombineExecuteDefinition edef;
store = new ListStore (typeof(string), typeof(string), typeof(CombineExecuteDefinition) );
entryTreeView.Model = store;
- TreeIter iter = new TreeIter ();
string entryHeader = Runtime.StringParserService.Parse("Entry");
entryTreeView.AppendColumn (entryHeader, new CellRendererText (), "text", 0);
string actionHeader = Runtime.StringParserService.Parse( "Action");
@@ -86,14 +92,14 @@
for (int n = 0; n < combine.CombineExecuteDefinitions.Count; n++) {
edef = (CombineExecuteDefinition)combine.CombineExecuteDefinitions[n];
string action = edef.Type == EntryExecuteType.None ? GettextCatalog.GetString ("None") : GettextCatalog.GetString ("Execute");
- iter = store.AppendValues (edef.Entry.Name, action, edef);
+ store.AppendValues (edef.Entry.Name, action, edef);
}
} else {
// add an empty set of execute definitions
for (int n = 0; n < combine.Entries.Count; n++) {
edef = new CombineExecuteDefinition ((CombineEntry) combine.Entries[n],EntryExecuteType.None);
string action = edef.Type == EntryExecuteType.None ? GettextCatalog.GetString ("None") : GettextCatalog.GetString ("Execute");
- iter = store.AppendValues (edef.Entry.Name, action, edef);
+ store.AppendValues (edef.Entry.Name, action, edef);
}
// tell the user we encountered and worked around an issue
@@ -154,56 +160,49 @@
void OnSingleRadioButtonClicked(object sender, EventArgs e)
{
multipleBox.Sensitive = multipleRadioButton.Active;
- singleOptionMenu.Sensitive = singleRadioButton.Active;
+ singleCombo.Sensitive = singleRadioButton.Active;
}
- void OptionsChanged(object sender, EventArgs e)
+ void OptionsChanged (object sender, EventArgs e)
{
- if(entryTreeView.Selection.CountSelectedRows() == 0){
- return;
- }
- TreeIter selectedItem;
- TreeModel ls;
- ((ListStore)entryTreeView.Model).GetIter(
- out selectedItem, (TreePath) entryTreeView.Selection.GetSelectedRows(out ls)[0]);
+ TreeIter iter;
+ TreeModel model;
+ ComboBox combo = sender as ComboBox;
- int index = GetSelectedIndex(entryTreeView);
- CombineExecuteDefinition edef = (CombineExecuteDefinition) store.GetValue(selectedItem, 2);
- switch (actionOptionMenu.History) {
- case 0:
- edef.Type = EntryExecuteType.None;
- break;
- case 1:
- edef.Type = EntryExecuteType.Execute;
- break;
- default:
- break;
- }
- store.SetValue(selectedItem, 2, edef);
- string action = edef.Type == EntryExecuteType.None ? GettextCatalog.GetString ("None") : GettextCatalog.GetString ("Execute");
- store.SetValue(selectedItem, 1, action);
+ if (entryTreeView.Selection.GetSelected (out model, out iter))
+ {
+ CombineExecuteDefinition edef = (CombineExecuteDefinition) model.GetValue (iter, 2);
+ switch (combo.Active) {
+ case 0:
+ edef.Type = EntryExecuteType.None;
+ break;
+ case 1:
+ edef.Type = EntryExecuteType.Execute;
+ break;
+ default:
+ break;
+ }
+ model.SetValue (iter, 2, edef);
+ string action = edef.Type == EntryExecuteType.None ? GettextCatalog.GetString ("None") : GettextCatalog.GetString ("Execute");
+ model.SetValue (iter, 1, action);
+ }
}
void SelectedEntryChanged(object sender, EventArgs e)
{
- if(entryTreeView.Selection.CountSelectedRows() == 0){
- return;
+ TreeIter iter;
+ TreeModel model;
+ TreeSelection selection = sender as TreeSelection;
+
+ if (selection.GetSelected (out model, out iter))
+ {
+ string txt = (string) model.GetValue (iter, 1);
+ if (txt == GettextCatalog.GetString ("None"))
+ actionCombo.Active = 0;
+ else
+ actionCombo.Active = 1;
}
-
- TreeIter selectedItem;
- TreeModel ls;
-
- ((ListStore)entryTreeView.Model).GetIter(
- out selectedItem, (TreePath) entryTreeView.Selection.GetSelectedRows(out ls)[0]);
-
- string txt = (string) store.GetValue(selectedItem,1);
-
- if (txt == GettextCatalog.GetString ("None")) {
- actionOptionMenu.SetHistory (0);
- } else {
- actionOptionMenu.SetHistory (1);
- }
}
// added this event to get the last select row index from gtk TreeView
@@ -227,7 +226,7 @@
public bool Store()
{
- combine.SingleStartProjectName = ((CombineEntry)combine.Entries[singleOptionMenu.History]).Name;
+ combine.SingleStartProjectName = ((CombineEntry)combine.Entries[singleCombo.Active]).Name;
combine.SingleStartupProject = singleRadioButton.Active;
// write back new combine execute definitions
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-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs 2005-01-27 09:31:40 UTC (rev 2180)
@@ -43,10 +43,6 @@
//FIXME: Lets use something else.
Hashtable MenuToValue = new Hashtable ();
Hashtable ValueToMenu = new Hashtable ();
- public Gtk.Menu ambienceMenu;
- [Glade.Widget] public Gtk.OptionMenu option;
-
-
[Glade.Widget] public Gtk.CheckButton extensionButton;
[Glade.Widget] public Gtk.CheckButton hiddenButton;
@@ -56,33 +52,12 @@
extensionButton.Active = Runtime.Properties.GetProperty("MonoDevelop.Gui.ProjectBrowser.ShowExtensions", true);
hiddenButton.Active = Runtime.Properties.GetProperty("MonoDevelop.Gui.FileScout.ShowHidden", false);
-// commented out by jba - 23 feb 04, deosn't seem to be used
-// ambienceMenu = new Gtk.Menu ();
-// option.Menu = ambienceMenu;
-// IAddInTreeNode treeNode = AddInTreeSingleton.AddInTree.GetTreeNode("/SharpDevelop/Workbench/Ambiences");
-//
-// string active = p.GetProperty ("SharpDevelop.UI.CurrentAmbience", "CSharp");
-//
-// //FIXME: Yes, I know for is better here
-// uint im = 0;
-// foreach (IAddInTreeNode childNode in treeNode.ChildNodes.Values)
-// {
-// Gtk.MenuItem i = Gtk.MenuItem.NewWithLabel (childNode.Codon.ID);
-// ambienceMenu.Append(i);
-// MenuToValue[i] = childNode.Codon.ID;
-// if (childNode.Codon.ID == active) {
-// option.SetHistory (im);
-// }
-// im++;
-// }
-
}
public void Store()
{
Runtime.Properties.SetProperty("MonoDevelop.Gui.ProjectBrowser.ShowExtensions", extensionButton.Active);
Runtime.Properties.SetProperty("MonoDevelop.Gui.FileScout.ShowHidden", hiddenButton.Active);
-// p.SetProperty("SharpDevelop.UI.CurrentAmbience", (string)MenuToValue[ambienceMenu.Active]);
}
}
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2005-01-27 09:31:40 UTC (rev 2180)
@@ -437,13 +437,10 @@
public IWorkbenchWindow ShowView(IViewContent content)
{
- string title;
Gtk.Image mimeimage = null;
if (content.IsUntitled) {
- title = content.UntitledName;
mimeimage = new Gtk.Image (FileIconLoader.GetPixbufForType ("gnome-fs-regular").ScaleSimple (16, 16, Gdk.InterpType.Bilinear));
} else {
- title = Path.GetFileName (content.ContentName);
mimeimage = new Gtk.Image (FileIconLoader.GetPixbufForFile (content.ContentName, 16, 16));
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyAttribute.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyAttribute.cs 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Parser/SharpAssemblyLayer/SharpAssemblyAttribute.cs 2005-01-27 09:31:40 UTC (rev 2180)
@@ -79,7 +79,7 @@
sigOffset += 1; // skip calling convention
int numReturnTypes = assembly.Reader.LoadBlob(ref sigOffset);
- SharpAssemblyReturnType dummy = new SharpAssemblyReturnType(assembly, ref sigOffset);
+ new SharpAssemblyReturnType(assembly, ref sigOffset);
SharpAssemblyReturnType[] returnTypes = new SharpAssemblyReturnType[numReturnTypes];
for (int i = 0; i < returnTypes.Length; ++i) {
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Templates/ProjectTemplates/ProjectTemplate.cs 2005-01-27 09:31:40 UTC (rev 2180)
@@ -179,7 +179,7 @@
IProperties customizer = new DefaultProperties();
customizer.SetProperty("ProjectCreateInformation", projectCreateInformation);
customizer.SetProperty("ProjectTemplate", this);
- WizardDialog wizard = new WizardDialog("Project Wizard", customizer, wizardpath);
+ //WizardDialog wizard = new WizardDialog("Project Wizard", customizer, wizardpath);
//if (wizard.ShowDialog() == DialogResult.OK) {
// lastCombine = combineDescriptor.CreateCombine(projectCreateInformation, this.languagename);
//} else {
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-01-27 09:31:40 UTC (rev 2180)
@@ -2,6 +2,8 @@
* Makefile.am:
* FileBrowser/FileBrowser.cs: use Gnome.Vfs
+ * FolderDialog/BaseFileEntry.cs: add new keyword
+ to prevent warning
2005-01-27 Lluis Sanchez Gual <lluis at novell.com>
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FolderDialog/BaseFileEntry.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FolderDialog/BaseFileEntry.cs 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FolderDialog/BaseFileEntry.cs 2005-01-27 09:31:40 UTC (rev 2180)
@@ -37,7 +37,7 @@
set { default_path = value; }
}
- public string Path {
+ public new string Path {
get { return System.IO.Path.Combine (default_path, text.Text); }
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/ChangeLog 2005-01-27 09:31:40 UTC (rev 2180)
@@ -1,3 +1,8 @@
+2005-01-27 John Luke <john.luke at gmail.com>
+
+ * MonoDevelopMain.cs: remove unused code that
+ caused warnings
+
2005-01-14 Lluis Sanchez Gual <lluis at novell.com>
* MonoDevelopMain.cs: Use new api for checking for combine files.
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/MonoDevelopMain.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/MonoDevelopMain.cs 2005-01-27 08:32:06 UTC (rev 2179)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/MonoDevelopMain.cs 2005-01-27 09:31:40 UTC (rev 2180)
@@ -94,10 +94,9 @@
if (Assembly.GetEntryAssembly ().GetName ().Version.Revision != 0)
version += "." + Assembly.GetEntryAssembly ().GetName ().Version.Revision;
- Gnome.Program program = new Gnome.Program (name, version, Gnome.Modules.UI, remainingArgs);
+ new Gnome.Program (name, version, Gnome.Modules.UI, remainingArgs);
Gdk.Threads.Init();
commandLineArgs = remainingArgs;
- bool noLogo = false;
SplashScreenForm.SetCommandLineArgs(remainingArgs);
More information about the Monodevelop-patches-list
mailing list