[Monodevelop-patches-list] r2222 - in trunk/MonoDevelop/Core/src: AddIns/DisplayBindings/SourceEditor AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels MonoDevelop.Base MonoDevelop.Base/Gui/Dialogs/CombineConfiguration MonoDevelop.Base/Gui/Dialogs/OptionPanels MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Wed Feb 2 13:52:40 EST 2005
Author: jluke
Date: 2005-02-02 13:52:39 -0500 (Wed, 02 Feb 2005)
New Revision: 2222
Modified:
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade
trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs
Log:
some glade improvements to the OptionPanels,
mostly using Gnome.FileEntry consistently
Property changes on: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
MonoDevelop.SourceEditor.dll
MonoDevelop.SourceEditor.dll.mdb
MonoDevelop.SourceEditor.dll.config
AssemblyInfo.cs
SourceEditor.pidb
+ Makefile
Makefile.in
MonoDevelop.SourceEditor.dll
MonoDevelop.SourceEditor.dll.mdb
MonoDevelop.SourceEditor.dll.config
AssemblyInfo.cs
SourceEditor.pidb
*.bak
*.gladep
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-02-02 16:29:09 UTC (rev 2221)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-02-02 18:52:39 UTC (rev 2222)
@@ -1,3 +1,12 @@
+2005-02-02 John Luke <john.luke at gmail.com>
+
+ * EditorBindings.glade:
+ * Gui/OptionPanels/MarkersTextEditorPanel.cs:
+ * Gui/OptionPanels/GeneralTextEditorPanel.cs:
+ use Gnome.FileEntry where appropriate
+ remove window-ish editor props (show line endings, etc)
+ remove double buffering pref (we always are)
+
2005-02-01 John Luke <john.luke at gmail.com>
* Gui.SourceEditorBuffer.cs: use ErrorInfo
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade 2005-02-02 16:29:09 UTC (rev 2221)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/EditorBindings.glade 2005-02-02 18:52:39 UTC (rev 2222)
@@ -202,8 +202,8 @@
<widget class="GtkButton" id="editButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Edit</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-edit</property>
+ <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
</widget>
@@ -403,25 +403,6 @@
<property name="fill">False</property>
</packing>
</child>
-
- <child>
- <widget class="GtkCheckButton" id="enableDoublebufferingCheckBox">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable double buffering</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -900,168 +881,6 @@
<property name="fill">False</property>
</packing>
</child>
-
- <child>
- <widget class="GtkVBox" id="vbox50">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="characterMarkersLabel">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="label" translatable="yes">Character Markers</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox27">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label49">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox52">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkCheckButton" id="showSpaceCharsCheckBox">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show _spaces</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="showTabCharsCheckBox">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show _tabs</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="showEOLMarkersCheckBox">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show _EOL markers</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="showInvalidLinesCheckBox">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show _invalid lines</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1145,25 +964,6 @@
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="showHRulerCheckBox">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show _horizontal ruler</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkHBox" id="hbox26">
<property name="visible">True</property>
<property name="homogeneous">False</property>
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2005-02-02 16:29:09 UTC (rev 2221)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2005-02-02 18:52:39 UTC (rev 2222)
@@ -50,7 +50,7 @@
[Glade.Widget] Label genOptions, fontOptions;
// encOptions, encVBox; // if you uncoment change to "," above
[Glade.Widget] CheckButton enableCodeCompletionCheckBox,
- enableFoldingCheckBox, enableDoublebufferingCheckBox;
+ enableFoldingCheckBox;
// [Glade.Widget] ComboBox textEncodingComboBox;
[Glade.Widget] FontButton fontNameDisplayTextBox;
[Glade.Widget] VBox encodingBox;
@@ -64,9 +64,6 @@
enableFoldingCheckBox.Active = ((IProperties) CustomizationObject).GetProperty("EnableFolding", true);
- enableDoublebufferingCheckBox.Active = ((IProperties) CustomizationObject).GetProperty(
- "DoubleBuffer", true);
-
string font_name = ((IProperties) CustomizationObject).GetProperty("DefaultFont", "__default_monospace").ToString ();
switch (font_name) {
@@ -112,16 +109,11 @@
// encoding = CharacterEncodings.GetEncodingByIndex(i).CodePage;
// textEncodingComboBox.Changed += new EventHandler (OnOptionChanged);
-
- // FIXME: enable the sensitivity on these widgets when the implementation has been added
- enableDoublebufferingCheckBox.Sensitive = false;
}
public void Store (IProperties CustomizationObject)
{
((IProperties) CustomizationObject).SetProperty (
- "DoubleBuffer", enableDoublebufferingCheckBox.Active);
- ((IProperties) CustomizationObject).SetProperty (
"EnableCodeCompletion", enableCodeCompletionCheckBox.Active);
((IProperties) CustomizationObject).SetProperty (
"EnableFolding", enableFoldingCheckBox.Active);
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs 2005-02-02 16:29:09 UTC (rev 2221)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs 2005-02-02 18:52:39 UTC (rev 2222)
@@ -55,68 +55,36 @@
[Glade.Widget] Label rulersLabel;
[Glade.Widget] Label atColumnLabel;
[Glade.Widget] CheckButton showLineNumberCheckBox;
- [Glade.Widget] CheckButton showInvalidLinesCheckBox;
[Glade.Widget] CheckButton showBracketHighlighterCheckBox;
[Glade.Widget] CheckButton showErrorsCheckBox;
- [Glade.Widget] CheckButton showHRulerCheckBox;
- [Glade.Widget] CheckButton showEOLMarkersCheckBox;
[Glade.Widget] CheckButton showVRulerCheckBox;
- [Glade.Widget] CheckButton showTabCharsCheckBox;
- [Glade.Widget] CheckButton showSpaceCharsCheckBox;
[Glade.Widget] SpinButton vRulerRowTextBox;
public MarkersTextEditorPanelWidget (IProperties CustomizationObject) :
base ("EditorBindings.glade", "MarkersTextEditorPanel")
{
- // Load Text
-
- // FIXME i8n the following labels:
-
- // Load Values
-
showLineNumberCheckBox.Active = ((IProperties)CustomizationObject).GetProperty(
"ShowLineNumbers", true);
- showInvalidLinesCheckBox.Active = ((IProperties)CustomizationObject).GetProperty(
- "ShowInvalidLines", true);
showBracketHighlighterCheckBox.Active = ((IProperties)CustomizationObject).GetProperty(
"ShowBracketHighlight", true);
showErrorsCheckBox.Active = ((IProperties)CustomizationObject).GetProperty(
"ShowErrors", true);
- showHRulerCheckBox.Active = ((IProperties)CustomizationObject).GetProperty(
- "ShowHRuler", false);
- showEOLMarkersCheckBox.Active = ((IProperties)CustomizationObject).GetProperty(
- "ShowEOLMarkers", false);
showVRulerCheckBox.Active = ((IProperties)CustomizationObject).GetProperty(
"ShowVRuler", false);
- showTabCharsCheckBox.Active = ((IProperties)CustomizationObject).GetProperty(
- "ShowTabs", false);
- showSpaceCharsCheckBox.Active = ((IProperties)CustomizationObject).GetProperty(
- "ShowSpaces", false);
vRulerRowTextBox.Value = ((IProperties)CustomizationObject).GetProperty("VRulerRow", 80);
-
- // FIXME: reenable these widget's when they're implemented
- showInvalidLinesCheckBox.Sensitive = false;
- showHRulerCheckBox.Sensitive = false;
}
public void Store (IProperties CustomizationObject)
{
- ((IProperties)CustomizationObject).SetProperty("ShowInvalidLines", showInvalidLinesCheckBox.Active);
((IProperties)CustomizationObject).SetProperty("ShowLineNumbers", showLineNumberCheckBox.Active);
((IProperties)CustomizationObject).SetProperty("ShowBracketHighlight", showBracketHighlighterCheckBox.Active);
((IProperties)CustomizationObject).SetProperty("ShowErrors", showErrorsCheckBox.Active);
- ((IProperties)CustomizationObject).SetProperty("ShowHRuler", showHRulerCheckBox.Active);
- ((IProperties)CustomizationObject).SetProperty("ShowEOLMarkers", showEOLMarkersCheckBox.Active);
((IProperties)CustomizationObject).SetProperty("ShowVRuler", showVRulerCheckBox.Active);
- ((IProperties)CustomizationObject).SetProperty("ShowTabs", showTabCharsCheckBox.Active);
- ((IProperties)CustomizationObject).SetProperty("ShowSpaces", showSpaceCharsCheckBox.Active);
-
try {
((IProperties)CustomizationObject).SetProperty("VRulerRow", vRulerRowTextBox.Value);
}
- catch (Exception) {
- }
+ catch { }
}
}
}
Property changes on: trunk/MonoDevelop/Core/src/MonoDevelop.Base
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
MonoDevelop.Base.dll
MonoDevelop.Base.dll.mdb
MonoDevelop.Base.dll.config
AssemblyInfo.cs
MonoDevelop.Base.pidb
+ Makefile
Makefile.in
MonoDevelop.Base.dll
MonoDevelop.Base.dll.mdb
MonoDevelop.Base.dll.config
AssemblyInfo.cs
MonoDevelop.Base.pidb
*.bak
Base.gladep
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade 2005-02-02 16:29:09 UTC (rev 2221)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Base.glade 2005-02-02 18:52:39 UTC (rev 2222)
@@ -716,7 +716,7 @@
<widget class="GtkCheckButton" id="chk_combine_directory">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Create seperate c_ombine subdirectory</property>
+ <property name="label" translatable="yes">Create seperate _Solution subdirectory</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -1331,7 +1331,7 @@
<widget class="GtkCheckButton" id="extensionButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Show Extensions in project scout</property>
+ <property name="label" translatable="yes">Show extensions in project scout</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -1401,7 +1401,7 @@
<child>
<widget class="GtkLabel" id="locationLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">Default _solution location</property>
+ <property name="label" translatable="yes">Default _Solution location</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1423,10 +1423,11 @@
<widget class="GnomeFileEntry" id="projectLocationTextBox">
<property name="visible">True</property>
<property name="max_saved">10</property>
- <property name="directory_entry">False</property>
- <property name="modal">False</property>
+ <property name="browse_dialog_title" translatable="yes">Select default location</property>
+ <property name="directory_entry">True</property>
+ <property name="modal">True</property>
<property name="use_filechooser">True</property>
- <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
<child internal-child="entry">
<widget class="GtkEntry" id="combo-entry1">
@@ -1666,146 +1667,6 @@
<property name="fill">False</property>
</packing>
</child>
-
- <child>
- <widget class="GtkLabel" id="terminatorLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Line Terminator Style</property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox12">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkHBox" id="hbox13">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label24">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox21">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkRadioButton" id="windowsRadioButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Windows</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="macintoshRadioButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Macintosh</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">windowsRadioButton</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="unixRadioButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Unix</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">windowsRadioButton</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -2495,6 +2356,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">combo-entry2</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2558,7 +2420,7 @@
<child>
<widget class="GtkLabel" id="workingDirLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Working Dir.</property>
+ <property name="label" translatable="yes">_Working Directory</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2698,16 +2560,17 @@
</child>
<child>
- <widget class="GtkTable" id="table5">
+ <widget class="GnomeFileEntry" id="browseButton">
<property name="visible">True</property>
- <property name="n_rows">1</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">0</property>
+ <property name="max_saved">10</property>
+ <property name="browse_dialog_title" translatable="yes">Select command</property>
+ <property name="directory_entry">False</property>
+ <property name="modal">True</property>
+ <property name="use_filechooser">True</property>
+ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- <child>
- <widget class="GtkEntry" id="commandTextBox">
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="combo-entry2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
@@ -2718,41 +2581,14 @@
<property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
</child>
-
- <child>
- <widget class="GtkButton" id="browseButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Browse</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -2773,7 +2609,7 @@
<widget class="GtkCheckButton" id="promptArgsCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Prompt for Arguments</property>
+ <property name="label" translatable="yes">_Prompt for arguments</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3227,7 +3063,7 @@
<widget class="GtkHBox" id="hbox27">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label50">
@@ -3251,31 +3087,10 @@
</child>
<child>
- <widget class="GtkLabel" id="label51">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkCheckButton" id="autoInsertNewFilesCheckButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Automaticly _include found files</property>
+ <property name="label" translatable="yes">Automatically _include found files</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3514,13 +3329,17 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox32">
+ <widget class="GnomeFileEntry" id="selectScriptButton">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="max_saved">10</property>
+ <property name="browse_dialog_title" translatable="yes">Select deploy script</property>
+ <property name="directory_entry">False</property>
+ <property name="modal">True</property>
+ <property name="use_filechooser">True</property>
+ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
- <child>
- <widget class="GtkEntry" id="deployScriptEntry">
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="combo-entry3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
@@ -3531,28 +3350,7 @@
<property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
</child>
-
- <child>
- <widget class="GtkButton" id="selectScriptFileButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -3714,7 +3512,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">deployTargetEntry</property>
+ <property name="mnemonic_widget">combo-entry4</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3724,16 +3522,28 @@
</child>
<child>
- <widget class="GtkEntry" id="deployTargetEntry">
+ <widget class="GnomeFileEntry" id="deployTargetButton">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
+ <property name="max_saved">10</property>
+ <property name="browse_dialog_title" translatable="yes">Select target location</property>
+ <property name="directory_entry">True</property>
+ <property name="modal">True</property>
+ <property name="use_filechooser">True</property>
+ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="combo-entry4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -3741,22 +3551,6 @@
<property name="fill">True</property>
</packing>
</child>
-
- <child>
- <widget class="GtkButton" id="selectTargetButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -4386,7 +4180,7 @@
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Select All</property>
+ <property name="label" translatable="yes">Select _All</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -4398,8 +4192,8 @@
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Clear Selection</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
</widget>
@@ -4617,16 +4411,28 @@
</child>
<child>
- <widget class="GtkEntry" id="buildOutputLoc">
+ <widget class="GnomeFileEntry" id="outputDirButton">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
+ <property name="max_saved">10</property>
+ <property name="browse_dialog_title" translatable="yes">Select output directory</property>
+ <property name="directory_entry">True</property>
+ <property name="modal">True</property>
+ <property name="use_filechooser">True</property>
+ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="combo-entry5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -4634,22 +4440,6 @@
<property name="fill">True</property>
</packing>
</child>
-
- <child>
- <widget class="GtkButton" id="OutputDirBrowse">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Browse...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">6</property>
@@ -4745,7 +4535,7 @@
<widget class="GtkTable" id="table10">
<property name="visible">True</property>
<property name="n_rows">3</property>
- <property name="n_columns">3</property>
+ <property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
@@ -4788,7 +4578,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">outputDirectoryEntry</property>
+ <property name="mnemonic_widget">combo-entry6</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -4826,7 +4616,7 @@
</child>
<child>
- <widget class="GtkEntry" id="outputDirectoryEntry">
+ <widget class="GtkEntry" id="assemblyNameEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
@@ -4840,35 +4630,16 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="browseButton">
+ <widget class="GtkEntry" id="parametersEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="assemblyNameEntry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
@@ -4879,30 +4650,42 @@
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="parametersEntry">
+ <widget class="GnomeFileEntry" id="outputPathButton">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
+ <property name="max_saved">10</property>
+ <property name="browse_dialog_title" translatable="yes">Select output path</property>
+ <property name="directory_entry">True</property>
+ <property name="modal">True</property>
+ <property name="use_filechooser">True</property>
+ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="combo-entry6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -5031,7 +4814,7 @@
<widget class="GtkTable" id="table9">
<property name="visible">True</property>
<property name="n_rows">3</property>
- <property name="n_columns">3</property>
+ <property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
@@ -5039,7 +4822,7 @@
<child>
<widget class="GtkLabel" id="label95">
<property name="visible">True</property>
- <property name="label" translatable="yes">Execute Co_mmand</property>
+ <property name="label" translatable="yes">Execute co_mmand</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5049,7 +4832,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">executeScriptEntry</property>
+ <property name="mnemonic_widget">combo-entry7</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -5064,7 +4847,7 @@
<child>
<widget class="GtkLabel" id="label96">
<property name="visible">True</property>
- <property name="label" translatable="yes">_After Build</property>
+ <property name="label" translatable="yes">_After build</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5074,7 +4857,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">executeAfterEntry</property>
+ <property name="mnemonic_widget">combo-entry8</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -5099,7 +4882,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">executeBeforeEntry</property>
+ <property name="mnemonic_widget">combo-entry9</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -5112,16 +4895,27 @@
</child>
<child>
- <widget class="GtkEntry" id="executeScriptEntry">
+ <widget class="GnomeFileEntry" id="executeButton">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
+ <property name="max_saved">10</property>
+ <property name="directory_entry">False</property>
+ <property name="modal">True</property>
+ <property name="use_filechooser">True</property>
+ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="combo-entry7">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -5133,16 +4927,27 @@
</child>
<child>
- <widget class="GtkEntry" id="executeAfterEntry">
+ <widget class="GnomeFileEntry" id="afterButton">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
+ <property name="max_saved">10</property>
+ <property name="directory_entry">False</property>
+ <property name="modal">True</property>
+ <property name="use_filechooser">True</property>
+ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="combo-entry8">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -5154,16 +4959,27 @@
</child>
<child>
- <widget class="GtkEntry" id="executeBeforeEntry">
+ <widget class="GnomeFileEntry" id="beforeButton">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
+ <property name="max_saved">10</property>
+ <property name="directory_entry">False</property>
+ <property name="modal">True</property>
+ <property name="use_filechooser">True</property>
+ <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="combo-entry9">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -5173,63 +4989,6 @@
<property name="y_options"></property>
</packing>
</child>
-
- <child>
- <widget class="GtkButton" id="browseButton2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="browseButton3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="browseButton4">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-02 16:29:09 UTC (rev 2221)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-02-02 18:52:39 UTC (rev 2222)
@@ -1,5 +1,16 @@
2005-02-02 John Luke <john.luke at gmail.com>
+ * Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
+ * Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs
+ * Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
+ * Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
+ * Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
+ * Base.glade: use Gnome.FileEntry where appropriate
+ remove disabled line endings prefs
+ a few other spacing, spelling, capitalization improvements
+
+2005-02-02 John Luke <john.luke at gmail.com>
+
* Parser/ICompilationUnitBase.cs:
* Parser/Implementations/AbstractCompilationUnit.cs: adjust to ErrorInfo
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs 2005-02-02 16:29:09 UTC (rev 2221)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs 2005-02-02 18:52:39 UTC (rev 2222)
@@ -26,8 +26,7 @@
class CombineBuildOptionsWidget : GladeWidgetExtract
{
// Gtk Controls
- [Glade.WidgetAttribute] Entry buildOutputLoc;
- [Glade.WidgetAttribute] Button OutputDirBrowse;
+ [Glade.Widget] Gnome.FileEntry outputDirButton;
Combine combine;
@@ -35,23 +34,12 @@
base ("Base.glade", "CombineBuildOptions")
{
this.combine = (Combine)((IProperties)CustomizationObject).GetProperty("Combine");
- buildOutputLoc.Text = combine.OutputDirectory + System.IO.Path.DirectorySeparatorChar;
- OutputDirBrowse.Clicked += new EventHandler (onClicked);
+ outputDirButton.Filename = combine.OutputDirectory + System.IO.Path.DirectorySeparatorChar;
}
- void onClicked (object o, EventArgs e)
- {
- FolderDialog fd = new FolderDialog ("Output Directory");
- fd.SetFilename (buildOutputLoc.Text);
- int response = fd.Run ();
- if (response == (int) ResponseType.Ok)
- buildOutputLoc.Text = fd.Filename + System.IO.Path.DirectorySeparatorChar;
- fd.Hide ();
- }
-
public bool Store()
{
- combine.OutputDirectory = buildOutputLoc.Text;
+ combine.OutputDirectory = outputDirButton.Filename;
return true;
}
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2005-02-02 16:29:09 UTC (rev 2221)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2005-02-02 18:52:39 UTC (rev 2222)
@@ -80,7 +80,6 @@
[Glade.Widget] ListStore toolListBoxStore;
[Glade.Widget] Gtk.TreeView toolListBox;
[Glade.Widget] Gtk.Entry titleTextBox;
- [Glade.Widget] Gtk.Entry commandTextBox;
[Glade.Widget] Gtk.Entry argumentTextBox;
[Glade.Widget] Gtk.Entry workingDirTextBox;
[Glade.Widget] CheckButton promptArgsCheckBox;
@@ -89,7 +88,7 @@
[Glade.Widget] Label argumentLabel;
[Glade.Widget] Label commandLabel;
[Glade.Widget] Label workingDirLabel;
- [Glade.Widget] Button browseButton;
+ [Glade.Widget] Gnome.FileEntry browseButton;
[Glade.Widget] Button argumentQuickInsertButton;
[Glade.Widget] Button workingDirQuickInsertButton;
[Glade.Widget] Button moveUpButton;
@@ -109,7 +108,7 @@
toolListBoxStore = new ListStore (typeof (string), typeof (ExternalTool));
dependendControls = new Widget[] {
- titleTextBox, commandTextBox, argumentTextBox,
+ titleTextBox, argumentTextBox,
workingDirTextBox, promptArgsCheckBox, useOutputPadCheckBox,
titleLabel, argumentLabel, commandLabel,
workingDirLabel, browseButton, argumentQuickInsertButton,
@@ -140,23 +139,10 @@
addButton.Clicked += new EventHandler (addEvent);
moveUpButton.Clicked += new EventHandler (moveUpEvent);
moveDownButton.Clicked += new EventHandler (moveDownEvent);
- browseButton.Clicked += new EventHandler (browseEvent);
selectEvent (this, EventArgs.Empty);
}
- void browseEvent (object sender, EventArgs e)
- {
- using (FileSelector fs = new FileSelector (GettextCatalog.GetString ("File to Open"))) {
- int response = fs.Run ();
- string name = fs.Filename;
- fs.Hide ();
- if (response == (int) Gtk.ResponseType.Ok) {
- commandTextBox.Text = name;
- }
- }
- }
-
void moveUpEvent (object sender, EventArgs e)
{
if(toolListBox.Selection.CountSelectedRows () == 1)
@@ -212,7 +198,7 @@
lv.SetValue (selectedIter, 0, titleTextBox.Text);
selectedItem.MenuCommand = titleTextBox.Text;
- selectedItem.Command = commandTextBox.Text;
+ selectedItem.Command = browseButton.Filename;
selectedItem.Arguments = argumentTextBox.Text;
selectedItem.InitialDirectory = workingDirTextBox.Text;
selectedItem.PromptForArguments = promptArgsCheckBox.Active;
@@ -225,7 +211,6 @@
SetEnabledStatus (toolListBox.Selection.CountSelectedRows () > 0, removeButton);
titleTextBox.Changed -= new EventHandler (setToolValues);
- commandTextBox.Changed -= new EventHandler (setToolValues);
argumentTextBox.Changed -= new EventHandler (setToolValues);
workingDirTextBox.Changed -= new EventHandler (setToolValues);
promptArgsCheckBox.Toggled -= new EventHandler (setToolValues);
@@ -242,7 +227,7 @@
SetEnabledStatus (true, dependendControls);
titleTextBox.Text = selectedItem.MenuCommand;
- commandTextBox.Text = selectedItem.Command;
+ browseButton.Filename = selectedItem.Command;
argumentTextBox.Text = selectedItem.Arguments;
workingDirTextBox.Text = selectedItem.InitialDirectory;
promptArgsCheckBox.Active = selectedItem.PromptForArguments;
@@ -250,7 +235,7 @@
} else {
SetEnabledStatus (false, dependendControls);
titleTextBox.Text = String.Empty;
- commandTextBox.Text = String.Empty;
+ browseButton.Filename = String.Empty;
argumentTextBox.Text = String.Empty;
workingDirTextBox.Text = String.Empty;
promptArgsCheckBox.Active = false;
@@ -258,7 +243,6 @@
}
titleTextBox.Changed += new EventHandler (setToolValues);
- commandTextBox.Changed += new EventHandler (setToolValues);
argumentTextBox.Changed += new EventHandler (setToolValues);
workingDirTextBox.Changed += new EventHandler (setToolValues);
promptArgsCheckBox.Toggled += new EventHandler (setToolValues);
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2005-02-02 16:29:09 UTC (rev 2221)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2005-02-02 18:52:39 UTC (rev 2222)
@@ -49,20 +49,10 @@
[Glade.Widget] public Gtk.CheckButton loadUserDataCheckButton;
[Glade.Widget] public Gtk.CheckButton createBackupCopyCheckButton;
[Glade.Widget] public Gtk.CheckButton loadPrevProjectCheckButton;
- [Glade.Widget] public Gtk.RadioButton windowsRadioButton;
- [Glade.Widget] public Gtk.RadioButton macintoshRadioButton;
- [Glade.Widget] public Gtk.RadioButton unixRadioButton;
[Glade.Widget] public Gtk.Label loadLabel;
[Glade.Widget] public Gtk.Label saveLabel;
- [Glade.Widget] public Gtk.Label terminatorLabel;
[Glade.Widget] public Gtk.Label locationLabel;
- public enum LineTerminatorStyle {
- Windows,
- Macintosh,
- Unix
- }
-
public LoadSavePanelWidget () : base ("Base.glade", "LoadSavePanel")
{
//
@@ -82,25 +72,6 @@
"SharpDevelop.CreateBackupCopy", false);
loadPrevProjectCheckButton.Active = (bool) Runtime.Properties.GetProperty(
"SharpDevelop.LoadPrevProjectOnStartup", false);
-
- if (LineTerminatorStyle.Windows.Equals (
- Runtime.Properties.GetProperty (
- "SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Unix))) {
- windowsRadioButton.Active = true;}
- else if (LineTerminatorStyle.Macintosh.Equals (
- Runtime.Properties.GetProperty
- ("SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Unix))) {
- macintoshRadioButton.Active = true;}
- else if (LineTerminatorStyle.Unix.Equals (
- Runtime.Properties.GetProperty (
- "SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Unix))) {
- unixRadioButton.Active = true;}
-
- // FIXME: renable all terminator style radio buttons when they're implemented.
- unixRadioButton.Sensitive = false;
- macintoshRadioButton.Sensitive = false;
- windowsRadioButton.Sensitive = false;
- terminatorLabel.Sensitive = false;
}
public bool Store ()
@@ -109,13 +80,6 @@
Runtime.Properties.SetProperty ("SharpDevelop.LoadDocumentProperties", loadUserDataCheckButton.Active);
Runtime.Properties.SetProperty ("SharpDevelop.CreateBackupCopy", createBackupCopyCheckButton.Active);
- if (windowsRadioButton.Active) {
- Runtime.Properties.SetProperty ("SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Windows);}
- else if (macintoshRadioButton.Active) {
- Runtime.Properties.SetProperty ("SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Macintosh);}
- else if (unixRadioButton.Active){
- Runtime.Properties.SetProperty ("SharpDevelop.LineTerminatorStyle", LineTerminatorStyle.Unix);}
-
// check for correct settings
string projectPath = projectLocationTextBox.GtkEntry.Text;
if (projectPath.Length > 0) {
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs 2005-02-02 16:29:09 UTC (rev 2221)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs 2005-02-02 18:52:39 UTC (rev 2222)
@@ -32,11 +32,9 @@
[Glade.Widget] RadioButton projectFileRadioButton;
[Glade.Widget] RadioButton compiledAssemblyRadioButton;
[Glade.Widget] RadioButton scriptFileRadioButton;
- [Glade.Widget] Button selectScriptFileButton;
- [Glade.Widget] Button selectTargetButton;
- [Glade.Widget] Entry deployTargetEntry;
- [Glade.Widget] Entry deployScriptEntry;
- [Glade.Widget] VBox deployScriptBox;
+ [Glade.Widget] Gnome.FileEntry selectScriptButton;
+ [Glade.Widget] Gnome.FileEntry selectTargetButton;
+ //[Glade.Widget] VBox deployScriptBox;
[Glade.Widget] VBox deployTargetBox;
[Glade.Widget] Gtk.TreeView includeTreeView;
public ListStore store;
@@ -53,8 +51,6 @@
projectFileRadioButton.Clicked += new EventHandler(RadioButtonClicked);
compiledAssemblyRadioButton.Clicked += new EventHandler(RadioButtonClicked);
scriptFileRadioButton.Clicked += new EventHandler(RadioButtonClicked);
- selectScriptFileButton.Clicked += new EventHandler(SelectScriptFileEvent);
- selectTargetButton.Clicked += new EventHandler(SelectTargetFolderEvent);
store = new ListStore (typeof(bool), typeof(string));
includeTreeView.Selection.Mode = SelectionMode.None;
@@ -72,8 +68,8 @@
}
}
- deployTargetEntry.Text = project.DeployInformation.DeployTarget;
- deployScriptEntry.Text = project.DeployInformation.DeployScript;
+ selectTargetButton.Filename = project.DeployInformation.DeployTarget;
+ selectScriptButton.Filename = project.DeployInformation.DeployScript;
projectFileRadioButton.Active = project.DeployInformation.DeploymentStrategy == DeploymentStrategy.File;
compiledAssemblyRadioButton.Active = project.DeployInformation.DeploymentStrategy == DeploymentStrategy.Assembly;
@@ -82,32 +78,10 @@
RadioButtonClicked(null, null);
}
- //FIXME : Finish details in this dialog.
- void SelectScriptFileEvent(object sender, EventArgs e)
- {
- using (FileSelector fs = new FileSelector (GettextCatalog.GetString ("Select your File"))) { // Put correct title
- if ( fs.Run () == (int) ResponseType.Ok) {
- deployScriptEntry.Text = fs.Filename;
- }
- fs.Hide ();
- }
- }
-
- void SelectTargetFolderEvent(object sender, EventArgs e)
- {
- using (FileSelector fs = new FileSelector (GettextCatalog.GetString ("Select the target directory"))) {
- if ( fs.Run () == (int) ResponseType.Ok) {
- deployTargetEntry.Text = fs.Filename;
- }
- fs.Hide ();
- }
- }
-
void RadioButtonClicked(object sender, EventArgs e)
{
deployTargetBox.Sensitive = compiledAssemblyRadioButton.Active || projectFileRadioButton.Active;
- deployScriptEntry.Sensitive = scriptFileRadioButton.Active;
- selectScriptFileButton.Sensitive = scriptFileRadioButton.Active;
+ selectScriptButton.Sensitive = scriptFileRadioButton.Active;
}
private void ItemToggled (object o, ToggledArgs args)
@@ -123,27 +97,27 @@
public bool Store ()
{
- if (deployTargetEntry.Text.Length > 0) {
- if (!fileUtilityService.IsValidFileName(deployTargetEntry.Text)) {
+ if (selectTargetButton.Filename.Length > 0) {
+ if (!fileUtilityService.IsValidFileName(selectTargetButton.Filename)) {
Runtime.MessageService.ShowError (GettextCatalog.GetString ("Invalid deploy target specified"));
return false;
}
}
- if (deployScriptEntry.Text.Length > 0) {
- if (!fileUtilityService.IsValidFileName(deployScriptEntry.Text)) {
+ if (selectScriptButton.Filename.Length > 0) {
+ if (!fileUtilityService.IsValidFileName(selectScriptButton.Filename)) {
Runtime.MessageService.ShowError (GettextCatalog.GetString ("Invalid deploy script specified"));
return false;
}
}
- if (!System.IO.File.Exists(deployScriptEntry.Text)) {
+ if (!System.IO.File.Exists(selectScriptButton.Filename)) {
Runtime.MessageService.ShowError (GettextCatalog.GetString ("Deploy script doesn't exists"));
return false;
}
- project.DeployInformation.DeployTarget = deployTargetEntry.Text;
- project.DeployInformation.DeployScript = deployScriptEntry.Text;
+ project.DeployInformation.DeployTarget = selectTargetButton.Filename;
+ project.DeployInformation.DeployScript = selectScriptButton.Filename;
if (projectFileRadioButton.Active) {
project.DeployInformation.DeploymentStrategy = DeploymentStrategy.File;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs 2005-02-02 16:29:09 UTC (rev 2221)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs 2005-02-02 18:52:39 UTC (rev 2222)
@@ -30,35 +30,27 @@
// Gtk Controls
//
[Glade.Widget] Entry assemblyNameEntry;
- [Glade.Widget] Entry outputDirectoryEntry;
+ [Glade.Widget] Gnome.FileEntry outputPathButton;
[Glade.Widget] Entry parametersEntry;
- [Glade.Widget] Entry executeBeforeEntry;
- [Glade.Widget] Entry executeScriptEntry;
- [Glade.Widget] Entry executeAfterEntry;
+ [Glade.Widget] Gnome.FileEntry beforeButton;
+ [Glade.Widget] Gnome.FileEntry executeButton;
+ [Glade.Widget] Gnome.FileEntry afterButton;
[Glade.Widget] CheckButton pauseConsoleOutputCheckButton;
[Glade.Widget] CheckButton externalConsoleCheckButton;
- [Glade.Widget] Button browseButton;
- [Glade.Widget] Button browseButton2;
- [Glade.Widget] Button browseButton3;
- [Glade.Widget] Button browseButton4;
DotNetProjectConfiguration configuration;
public OutputOptionsPanelWidget(IProperties CustomizationObject) : base ("Base.glade", "OutputOptionsPanel")
{
configuration = (DotNetProjectConfiguration)((IProperties)CustomizationObject).GetProperty("Config");
- browseButton.Clicked += new EventHandler (SelectFolder);
- browseButton2.Clicked += new EventHandler (SelectFile4);
- browseButton3.Clicked += new EventHandler (SelectFile3);
- browseButton4.Clicked += new EventHandler (SelectFile2);
externalConsoleCheckButton.Toggled += new EventHandler (ExternalConsoleToggle);
assemblyNameEntry.Text = configuration.OutputAssembly;
- outputDirectoryEntry.Text = configuration.OutputDirectory;
+ outputPathButton.Filename = configuration.OutputDirectory;
parametersEntry.Text = configuration.CommandLineParameters;
- executeScriptEntry.Text = configuration.ExecuteScript;
- executeBeforeEntry.Text = configuration.ExecuteBeforeBuild;
- executeAfterEntry.Text = configuration.ExecuteAfterBuild;
+ executeButton.Filename = configuration.ExecuteScript;
+ beforeButton.Filename = configuration.ExecuteBeforeBuild;
+ afterButton.Filename = configuration.ExecuteAfterBuild;
externalConsoleCheckButton.Active = configuration.ExternalConsole;
pauseConsoleOutputCheckButton.Active = configuration.PauseConsoleOutput;
@@ -75,75 +67,22 @@
return false;
}
- if (!Runtime.FileUtilityService.IsValidFileName (outputDirectoryEntry.Text)) {
+ if (!Runtime.FileUtilityService.IsValidFileName (outputPathButton.Filename)) {
Runtime.MessageService.ShowError (GettextCatalog.GetString ("Invalid output directory specified"));
return false;
}
configuration.OutputAssembly = assemblyNameEntry.Text;
- configuration.OutputDirectory = outputDirectoryEntry.Text;
+ configuration.OutputDirectory = outputPathButton.Filename;
configuration.CommandLineParameters = parametersEntry.Text;
- configuration.ExecuteBeforeBuild = executeBeforeEntry.Text;
- configuration.ExecuteAfterBuild = executeAfterEntry.Text;
- configuration.ExecuteScript = executeScriptEntry.Text;
+ configuration.ExecuteBeforeBuild = beforeButton.Filename;
+ configuration.ExecuteAfterBuild = afterButton.Filename;
+ configuration.ExecuteScript = executeButton.Filename;
configuration.ExternalConsole = externalConsoleCheckButton.Active;
configuration.PauseConsoleOutput = pauseConsoleOutputCheckButton.Active;
return true;
}
- void SelectFolder(object sender, EventArgs e)
- {
- using (FileSelector fdiag = new FileSelector (GettextCatalog.GetString ("Select the directory in which the assembly will be created"))) {
- if (fdiag.Run () == (int) ResponseType.Ok) {
- outputDirectoryEntry.Text = fdiag.Filename;
- }
-
- fdiag.Hide ();
- }
- }
-
- void SelectFile2(object sender, EventArgs e)
- {
- using (FileSelector fdiag = new FileSelector ("")) {
- //fdiag.Filter = StringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*");
- fdiag.SelectMultiple = false;
-
- if(fdiag.Run () == (int) ResponseType.Ok) {
- executeBeforeEntry.Text = fdiag.Filename;
- }
-
- fdiag.Hide ();
- }
- }
-
- void SelectFile3(object sender, EventArgs e)
- {
- using (FileSelector fdiag = new FileSelector ("")) {
- //fdiag.Filter = StringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*");
- fdiag.SelectMultiple = false;
-
- if(fdiag.Run () == (int) ResponseType.Ok) {
- executeAfterEntry.Text = fdiag.Filename;
- }
-
- fdiag.Hide ();
- }
- }
-
- void SelectFile4(object sender, EventArgs e)
- {
- using (FileSelector fdiag = new FileSelector ("")) {
- //fdiag.Filter = StringParserService.Parse("${res:SharpDevelop.FileFilter.AllFiles}|*.*");
- fdiag.SelectMultiple = false;
-
- if(fdiag.Run () == (int) ResponseType.Ok) {
- executeScriptEntry.Text = fdiag.Filename;
- }
-
- fdiag.Hide ();
- }
- }
-
void ExternalConsoleToggle (object sender, EventArgs e)
{
if (externalConsoleCheckButton.Active) {
@@ -157,7 +96,6 @@
}
OutputOptionsPanelWidget widget;
-
public override void LoadPanelContents()
{
Add (widget = new OutputOptionsPanelWidget ((IProperties) CustomizationObject));
More information about the Monodevelop-patches-list
mailing list