[Monodevelop-patches-list] r1344 - in trunk/MonoDevelop: po src/Main/Base src/Main/Base/Gui/Dialogs/OptionPanels src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Fri Apr 2 05:52:01 EST 2004
Author: tberman
Date: 2004-04-02 05:52:01 -0500 (Fri, 02 Apr 2004)
New Revision: 1344
Modified:
trunk/MonoDevelop/po/POTFILES.in
trunk/MonoDevelop/src/Main/Base/ChangeLog
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
Log:
gettextify, didnt add all the files to POTFILES.in because some have no translation calls. removing old i18n calls, need to go through the glade file now and make sure they all still look fine.
Modified: trunk/MonoDevelop/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/po/POTFILES.in 2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/po/POTFILES.in 2004-04-02 10:52:01 UTC (rev 1344)
@@ -4,3 +4,5 @@
src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
src/Main/Base/Gui/Dialogs/NewFileDialog.cs
src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
+src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
+src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-04-02 10:52:01 UTC (rev 1344)
@@ -1,3 +1,13 @@
+2004-04-02 Todd berman <tberman at sevenl.net>
+
+ * Gui/Dialogs/OptionPanels/ExternalToolPanel.cs:
+ * Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs:
+ * Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs:
+ * Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs:
+ * Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs:
+ gettextify
+
+
2004-04-02 Todd Berman <tberman at sevenl.net>
* Gui/Dialogs/NewProjectDialog.cs:
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2004-04-02 10:52:01 UTC (rev 1344)
@@ -40,41 +40,41 @@
public class ExternalToolPanelWidget : GladeWidgetExtract
{
static string[,] argumentQuickInsertMenu = new string[,] {
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.FullItemPath}", "${ItemPath}"},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.FullItemDirectory}", "${ItemDir}"},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.ItemFileName}", "${ItemFileName}"},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.ItemExtension}", "${ItemExt}"},
+ {GettextCatalog.GetString ("Item Path"), "${ItemPath}"},
+ {GettextCatalog.GetString ("_Item Directory"), "${ItemDir}"},
+ {GettextCatalog.GetString ("Item file name"), "${ItemFileName}"},
+ {GettextCatalog.GetString ("Item extension"), "${ItemExt}"},
{"-", ""},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CurrentLine}", "${CurLine}"},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CurrentColumn}", "${CurCol}"},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CurrentText}", "${CurText}"},
+ {GettextCatalog.GetString ("Current line"), "${CurLine}"},
+ {GettextCatalog.GetString ("Current column"), "${CurCol}"},
+ {GettextCatalog.GetString ("Current text"), "${CurText}"},
{"-", ""},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.FullTargetPath}", "${TargetPath}"},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.TargetDirectory}", "${TargetDir}"},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.TargetName}", "${TargetName}"},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.TargetExtension}", "${TargetExt}"},
+ {GettextCatalog.GetString ("Target Path"), "${TargetPath}"},
+ {GettextCatalog.GetString ("_Target Directory"), "${TargetDir}"},
+ {GettextCatalog.GetString ("Target Name"), "${TargetName}"},
+ {GettextCatalog.GetString ("Target Extension"), "${TargetExt}"},
{"-", ""},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.ProjectDirectory}", "${ProjectDir}"},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.ProjectFileName}", "${ProjectFileName}"},
+ {GettextCatalog.GetString ("_Project Directory"), "${ProjectDir}"},
+ {GettextCatalog.GetString ("Project file name"), "${ProjectFileName}"},
{"-", ""},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CombineDirectory}", "${CombineDir}"},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CombineFileName}", "${CombineFileName}"},
+ {GettextCatalog.GetString ("_Solution Directory"), "${CombineDir}"},
+ {GettextCatalog.GetString ("Solution File Name"), "${CombineFileName}"},
{"-", ""},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.SharpDevelopStartupPath}", "${StartupPath}"},
+ {GettextCatalog.GetString ("MonoDevelop Startup Directory"), "${StartupPath}"},
};
static string[,] workingDirInsertMenu = new string[,] {
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.FullItemDirectory}", "${ItemDir}"},
+ {GettextCatalog.GetString ("_Item Directory"), "${ItemDir}"},
{"-", ""},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.TargetDirectory}", "${TargetDir}"},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.TargetName}", "${TargetName}"},
+ {GettextCatalog.GetString ("_Target Directory"), "${TargetDir}"},
+ {GettextCatalog.GetString ("Target Name"), "${TargetName}"},
{"-", ""},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.ProjectDirectory}", "${ProjectDir}"},
+ {GettextCatalog.GetString ("_Project Directory"), "${ProjectDir}"},
{"-", ""},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CombineDirectory}", "${CombineDir}"},
+ {GettextCatalog.GetString ("_Solution Directory"), "${CombineDir}"},
{"-", ""},
- {"${res:Dialog.Options.ExternalTool.QuickInsertMenu.SharpDevelopStartupPath}", "${StartupPath}"},
- };
+ {GettextCatalog.GetString ("MonoDevelop Startup Directory"), "${StartupPath}"},
+ };
// Services
FileUtilityService FileUtilityService = (FileUtilityService) ServiceManager.Services.GetService(
@@ -119,30 +119,6 @@
{
// instantiate controls
toolListBoxStore = new ListStore (typeof (string), typeof (ExternalTool));
- promptArgsCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.ExternalTool.PromptForArgsCheckBox}");
- useOutputPadCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.ExternalTool.UseOutputWindow}");
- titleLabel.TextWithMnemonic = StringParserService.Parse(
- "${res:Dialog.Options.ExternalTool.TitleLabel}");
- argumentLabel.TextWithMnemonic = StringParserService.Parse(
- "${res:Dialog.Options.ExternalTool.ArgumentLabel}");
- commandLabel.TextWithMnemonic = StringParserService.Parse(
- "${res:Dialog.Options.ExternalTool.CommandLabel}");
- workingDirLabel.TextWithMnemonic = StringParserService.Parse(
- "${res:Dialog.Options.ExternalTool.WorkingDirLabel}");
-// moveUpButton.Label = StringParserService.Parse(
-// "${res:Dialog.Options.ExternalTool.MoveUpButton}");
-// moveUpButton.UseUnderline = true;
-// moveDownButton.Label = StringParserService.Parse(
-// "${res:Dialog.Options.ExternalTool.MoveDownButton}");
-// moveDownButton.UseUnderline = true;
-// removeButton.Label = StringParserService.Parse(
-// "${res:Global.RemoveButtonText}");
-// removeButton.UseUnderline = true;
-// addButton.Label = StringParserService.Parse(
-// "${res:Global.AddButtonText}");
-// addButton.UseUnderline = true;
dependendControls = new Widget[] {
titleTextBox, commandTextBox, argumentTextBox,
@@ -158,14 +134,10 @@
toolListBox.Reorderable = false;
toolListBox.HeadersVisible = true;
- toolListBox.Selection.Mode = SelectionMode.Multiple;
+ toolListBox.Selection.Mode = SelectionMode.Multiple;
toolListBox.Model = toolListBoxStore;
- toolListBox.AppendColumn (
- StringParserService.Parse("${res:Dialog.Options.ExternalTool.ToolsLabel}"),
- new CellRendererText (),
- "text",
- 0);
+ toolListBox.AppendColumn (GettextCatalog.GetString ("_Tools"), new CellRendererText (), "text", 0);
MenuService.CreateQuickInsertMenu (argumentTextBox,
argumentQuickInsertButton,
@@ -187,7 +159,7 @@
void browseEvent (object sender, EventArgs e)
{
- using (Gtk.FileSelection fs = new Gtk.FileSelection ("File to Open")) {
+ using (Gtk.FileSelection fs = new Gtk.FileSelection (GettextCatalog.GetString ("File to Open"))) {
int response = fs.Run ();
string name = fs.Filename;
fs.Hide ();
@@ -337,7 +309,7 @@
void addEvent (object sender, EventArgs e)
{
- TreeIter itr = toolListBoxStore.AppendValues ("New Tool", new ExternalTool());
+ TreeIter itr = toolListBoxStore.AppendValues (GettextCatalog.GetString ("New Tool"), new ExternalTool());
toolListBoxItemCount ++;
toolListBox.Selection.UnselectAll ();
toolListBox.Selection.SelectIter (itr);
@@ -376,7 +348,7 @@
{
foreach (Widget control in controls) {
if (control == null) {
- MessageService.ShowError ("Control not found!");
+ MessageService.ShowError (GettextCatalog.GetString ("Control not found!"));
} else {
control.Sensitive = enabled;
}
@@ -397,14 +369,13 @@
ExternalTool tool = toolListBox.Model.GetValue (current, 1) as ExternalTool;
if (!FileUtilityService.IsValidFileName (tool.Command)) {
- MessageService.ShowError (String.Format(
- "The command of tool \"{0}\" is invalid.",
+ MessageService.ShowError (String.Format(GettextCatalog.GetString ("The command of tool \"{0}\" is invalid."),
tool.MenuCommand));
return false;
}
if ((tool.InitialDirectory != "") && (!FileUtilityService.IsValidFileName(tool.InitialDirectory))) {
- MessageService.ShowError (String.Format("The working directory of tool \"{0}\" is invalid.",
+ MessageService.ShowError (String.Format(GettextCatalog.GetString ("The working directory of tool \"{0}\" is invalid.") ,
tool.MenuCommand));
return false;
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs 2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs 2004-04-02 10:52:01 UTC (rev 1344)
@@ -69,17 +69,6 @@
// getting internationalized strings
//
// FIXME i8n the following line
- buildAndRunOptionsLabel.Text = "Build and run options";
- saveChangesRadioButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.SaveChangesRadioButton}");
- promptChangesRadioButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.PromptToSaveRadioButton}");
- noSaveRadioButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.DontSaveRadioButton}");
- showOutputCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ShowOutputPadCheckBox}");
- showTaskListCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ShowTaskListPadCheckBox}");
//
// reading properties
//
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs 2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs 2004-04-02 10:52:01 UTC (rev 1344)
@@ -43,17 +43,6 @@
public CodeGenerationPanelWidget () : base ("Base.glade", "CodeGenerationOptionsPanel")
{
- i18nizeHeader (hdr_code_generation_options, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.CodeGenerationOptionsGroupBox}");
- i18nizeHeader (hdr_comment_generation_options, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.CommentGenerationOptionsGroupBox}");
-
- i18nize (chk_blk_on_same_line, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.StartBlockOnTheSameLineCheckBox}");
- i18nize (chk_else_on_same_line, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.ElseOnClosingCheckBox}");
- i18nize (chk_blank_lines, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.BlankLinesBetweenMembersCheckBox}");
- i18nize (chk_full_type_names, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.UseFullTypeNamesCheckBox}");
-
- i18nize (chk_doc_comments, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.GenerateDocCommentsCheckBox}");
- i18nize (chk_other_comments, "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.GenerateAdditionalCommentsCheckBox}");
-
chk_blk_on_same_line.Active = p.GetProperty("StartBlockOnSameLine", true);
chk_else_on_same_line.Active = p.GetProperty("ElseOnClosing", true);
chk_blank_lines.Active = p.GetProperty("BlankLinesBetweenMembers", true);
@@ -80,19 +69,6 @@
p.SetProperty ("GenerateDocumentComments", chk_doc_comments.Active);
p.SetProperty ("GenerateAdditionalComments", chk_other_comments.Active);
}
-
- void i18nizeHeader (Label l, string key)
- {
- // TODO: use the real pango stuff
- // otherwise, excaping is a problem
- l.Markup = "<b>" + StringParserService.Parse (key) + "</b>";
-
- }
-
- void i18nize (CheckButton c, string key)
- {
- c.Label = StringParserService.Parse (key);
- }
}
CodeGenerationPanelWidget widget;
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2004-04-02 10:52:01 UTC (rev 1344)
@@ -78,34 +78,11 @@
//
// load the internationalized strings.
//
- loadLabel.Markup = "<b> " + StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.LoadSaveOptions.LoadLabel}") + " </b>";
- saveLabel.Markup = "<b> " + StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.LoadSaveOptions.SaveLabel}")+ "</b>";
-
- loadUserDataCheckButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.LoadSaveOptions.LoadUserDataCheckBox}");
- loadPrevProjectCheckButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.LoadPrevProjectCheckBox}");
- createBackupCopyCheckButton.Label =StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.LoadSaveOptions.CreateBackupCopyCheckBox}");
-
- terminatorLabel.TextWithMnemonic = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.LoadSaveOptions.LineTerminatorStyleGroupBox}");
- windowsRadioButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.LoadSaveOptions.WindowsRadioButton}");
- //macintoshRadioButton.Label = StringParserService.Parse(
- // "${res:Dialog.Options.IDEOptions.LoadSaveOptions.MacintoshRadioButton}");
- unixRadioButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.LoadSaveOptions.UnixRadioButton}");
-
projectLocationTextBox.GtkEntry.Text = PropertyService.GetProperty(
"MonoDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath",
System.IO.Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal),
"MonoDevelopProjects")).ToString();
projectLocationTextBox.DirectoryEntry = true;
- locationLabel.TextWithMnemonic = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ProjectLocationLabel}");
//
// setup the properties
//
@@ -161,7 +138,7 @@
return true;
}
- }
+ }
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs 2004-04-02 10:14:24 UTC (rev 1343)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs 2004-04-02 10:52:01 UTC (rev 1344)
@@ -66,19 +66,6 @@
public ProjectAndCombinePanelWidget () : base ("Base.glade", "ProjectAndCombinePanel")
{
- //
- // getting internationalized strings
- //
- saveChangesRadioButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.SaveChangesRadioButton}");
- promptChangesRadioButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.PromptToSaveRadioButton}");
- noSaveRadioButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.DontSaveRadioButton}");
- showOutputCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ShowOutputPadCheckBox}");
- showTaskListCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.ProjectAndCombineOptions.ShowTaskListPadCheckBox}");
//
// reading properties
//
More information about the Monodevelop-patches-list
mailing list