[Monodevelop-patches-list] r767 - in trunk/MonoDevelop: data/resources/glade src/AddIns/DisplayBindings/TextEditor/Gui/OptionPanels
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Tue Feb 3 17:30:17 EST 2004
Author: dkor
Date: 2004-02-03 17:30:16 -0500 (Tue, 03 Feb 2004)
New Revision: 767
Modified:
trunk/MonoDevelop/data/resources/glade/texteditoraddin.glade
trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs
Log:
Rearangement of the GeneralTextEditorPanel UI
Modified: trunk/MonoDevelop/data/resources/glade/texteditoraddin.glade
===================================================================
--- trunk/MonoDevelop/data/resources/glade/texteditoraddin.glade 2004-02-03 22:05:31 UTC (rev 766)
+++ trunk/MonoDevelop/data/resources/glade/texteditoraddin.glade 2004-02-03 22:30:16 UTC (rev 767)
@@ -1389,6 +1389,7 @@
<child>
<widget class="GtkCheckButton" id="enableFoldingCheckBox">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Enable code _folding-</property>
<property name="use_underline">True</property>
@@ -1498,107 +1499,19 @@
</child>
<child>
- <widget class="GtkVBox" id="vbox42">
+ <widget class="GtkVBox" id="vbox44">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkLabel" id="textFontLabel">
+ <widget class="GnomeFontPicker" id="fontNameDisplayTextBox">
<property name="visible">True</property>
- <property name="label" translatable="yes">Text Font:-</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="hbox23">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label47">
- <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="GnomeFontPicker" id="fontNameDisplayTextBox">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
- <property name="show_size">True</property>
- <property name="use_font_in_label">False</property>
- <property name="label_font_size">14</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="browseButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Select-</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </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">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="enableAAFontRenderingCheckBox">
- <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Render font aliased-</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
+ <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
+ <property name="show_size">True</property>
+ <property name="use_font_in_label">True</property>
+ <property name="label_font_size">12</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1609,8 +1522,8 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
</widget>
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2004-02-03 22:05:31 UTC (rev 766)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2004-02-03 22:30:16 UTC (rev 767)
@@ -49,13 +49,11 @@
// int encoding = Encoding.UTF8.CodePage;
// int selectedIndex = 0;
- [Glade.Widget] Label genOptions, fontOptions, textFontLabel;
+ [Glade.Widget] Label genOptions, fontOptions;
// encOptions, encVBox; // if you uncoment change to "," above
[Glade.Widget] CheckButton enableCodeCompletionCheckBox,
- enableFoldingCheckBox, enableDoublebufferingCheckBox,
- enableAAFontRenderingCheckBox;
+ enableFoldingCheckBox, enableDoublebufferingCheckBox;
// [Glade.Widget] OptionMenu textEncodingComboBox;
- [Glade.Widget] Button browseButton;
[Glade.Widget] FontPicker fontNameDisplayTextBox;
[Glade.Widget] VBox encodingBox;
@@ -83,19 +81,8 @@
enableDoublebufferingCheckBox.Active = ((IProperties) CustomizationObject).GetProperty(
"DoubleBuffer", true);
- textFontLabel.TextWithMnemonic = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.General.TextfontLabel}");
-
fontNameDisplayTextBox.FontName = ((IProperties) CustomizationObject).GetProperty("DefaultFont", "Courier 12").ToString();
- browseButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.General.SelectButtonText}");
- browseButton.Clicked += new EventHandler(SelectEvent);
- enableAAFontRenderingCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.General.AntialiasedFontCheckBox}");
- enableAAFontRenderingCheckBox.Active = ((IProperties) CustomizationObject).GetProperty(
- "UseAntiAliasFont", false);
-
// encVBox.TextWithMnemonic = StringParserService.Parse(
// "${res:Dialog.Options.IDEOptions.TextEditor.General.FontGroupBox.FileEncodingLabel}");
@@ -126,8 +113,6 @@
((IProperties) CustomizationObject).SetProperty (
"DoubleBuffer", enableDoublebufferingCheckBox.Active);
((IProperties) CustomizationObject).SetProperty (
- "UseAntiAliasFont", enableAAFontRenderingCheckBox.Active);
- ((IProperties) CustomizationObject).SetProperty (
"EnableCodeCompletion", enableCodeCompletionCheckBox.Active);
((IProperties) CustomizationObject).SetProperty (
"EnableFolding", enableFoldingCheckBox.Active);
@@ -144,10 +129,6 @@
// selectedIndex = ((OptionMenu) o).History;
// }
- private void SelectEvent(object sender, EventArgs e)
- {
- fontNameDisplayTextBox.Click();
- }
}
}
}
More information about the Monodevelop-patches-list
mailing list