[Monodevelop-patches-list] r1535 - in branches/MonoDevelop-generate-what: . build/AddIns build/AddIns/AddIns/BackendBindings build/AddIns/AddIns/Misc/StartPage build/data/templates/file build/data/templates/file/CSharp build/data/templates/file/Nemerle build/data/templates/file/SharpDevelop build/data/templates/project build/data/templates/project/ILAsm build/data/templates/project/Java build/data/templates/project/Misc build/data/templates/project/Nemerle data/resources data/resources/glade docs gdldock/gdl gdldock/sources/gdl libmonodevelop po samples samples/HtmlControl src src/AddIns src/AddIns/BackendBindings src/AddIns/BackendBindings/CSharpBinding src/AddIns/BackendBindings/CSharpBinding/Gui src/AddIns/BackendBindings/CSharpBinding/Parser src/AddIns/BackendBindings/CSharpBinding/Parser/SharpDevelopTree src/AddIns/BackendBindings/CSharpBinding/Project src/AddIns/BackendBindings/ILAsmBinding src/AddIns/BackendBindings/JavaBinding src/AddIns/BackendBindings/JavaBinding/Gui src/AddIns/Backe ndBindings/JavaBinding/Project src/AddIns/BackendBindings/NemerleBinding src/AddIns/DebuggerAddIn src/AddIns/DisplayBindings/SourceEditor src/AddIns/DisplayBindings/SourceEditor/CodeCompletion src/AddIns/DisplayBindings/SourceEditor/Commands src/AddIns/DisplayBindings/SourceEditor/Gui src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels src/AddIns/DisplayBindings/SourceEditor/Gui/Pads src/AddIns/DisplayBindings/SourceEditor/Search src/AddIns/Misc src/AddIns/Misc/StartPage src/AddIns/Nunit src/AddIns/prj2make-sharp-lib src/Libraries src/Libraries/MonoDevelop.Core src/Libraries/MonoDevelop.Core/AddIns src/Libraries/MonoDevelop.Core/Services src/Libraries/MonoDevelop.Gui.Utils src/Libraries/MonoDevelop.Gui.Utils/FileIcons src/Libraries/MonoDevelop.Gui.Widgets src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser src/Libraries/MonoDevelop.Gui.Widgets/FolderDialog src/Libraries/MonoDevelop.Gui.Widgets/Tree src/Libraries/SharpRef actory src/Libraries/SharpRefactory/src/Lexer src/Libraries/SharpRefactory/src/Parser/AST src/Libraries/SharpRefactory/src/Parser/generated src/Main/Base src/Main/Base/Commands src/Main/Base/Commands/ClassBrowserCommands src/Main/Base/Commands/ProjectBrowserCommands src/Main/Base/Gui src/Main/Base/Gui/BrowserDisplayBinding src/Main/Base/Gui/CompletionDatabaseWizard src/Main/Base/Gui/Components src/Main/Base/Gui/Components/StatusBar src/Main/Base/Gui/Dialogs src/Main/Base/Gui/Dialogs/OptionPanels src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions src/Main/Base/Gui/Dialogs/ReferenceDialog src/Main/Base/Gui/ErrorHandlers src/Main/Base/Gui/HtmlControl src/Main/Base/Gui/Pads src/Main/Base/Gui/Pads/ClassScout src/Main/Base/Gui/Pads/HelpBrowser src/Main/Base/Gui/Pads/ProjectBrowser src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder src/Main/Base/Gui/Workbench src/Main/Base/Gui/Work bench/Layouts src/Main/Base/Internal/Codons src/Main/Base/Internal/Codons/LanguageBinding src/Main/Base/Internal/Codons/MenuItems src/Main/Base/Internal/Conditions src/Main/Base/Internal/ExternalTool src/Main/Base/Internal/Parser src/Main/Base/Internal/Parser/Implementations src/Main/Base/Internal/Parser/ReflectionLayer src/Main/Base/Internal/Project/Combine src/Main/Base/Internal/Project/Project src/Main/Base/Internal/Project/Project/Deployment src/Main/Base/Internal/Templates src/Main/Base/Internal/Templates/ProjectTemplates src/Main/Base/Services src/Main/Base/Services/AmbienceService src/Main/Base/Services/DisplayBinding src/Main/Base/Services/File src/Main/Base/Services/ParserService src/Main/Base/Services/Project src/Main/Base/Services/StatusBar src/Main/Base/Services/Tasks src/Main/Base/Services/Toolbar src/Main/StartUp src/Tools src/Tools/SharpCoco
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Wed Apr 28 05:15:54 EDT 2004
Author: iainmc
Date: 2004-04-28 05:15:53 -0400 (Wed, 28 Apr 2004)
New Revision: 1535
Added:
branches/MonoDevelop-generate-what/build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml
branches/MonoDevelop-generate-what/build/AddIns/AddIns/Misc/StartPage/StartPage.addin.xml
branches/MonoDevelop-generate-what/build/AddIns/ChangeLog
branches/MonoDevelop-generate-what/build/AddIns/MonoDevelopNewEditor.addin.xml
branches/MonoDevelop-generate-what/build/AddIns/SharpDevelopCore.addin.xml
branches/MonoDevelop-generate-what/build/data/templates/file/Nemerle/
branches/MonoDevelop-generate-what/build/data/templates/project/ILAsm/
branches/MonoDevelop-generate-what/build/data/templates/project/Java/IkvmConsoleApplicationProject.xpt
branches/MonoDevelop-generate-what/build/data/templates/project/Java/IkvmGladeApplicationProject.xpt
branches/MonoDevelop-generate-what/build/data/templates/project/Java/IkvmGnomeApplicationProject.xpt
branches/MonoDevelop-generate-what/build/data/templates/project/Java/IkvmGtkApplicationProject.xpt
branches/MonoDevelop-generate-what/build/data/templates/project/Nemerle/
branches/MonoDevelop-generate-what/data/resources/glade/ChangeLog
branches/MonoDevelop-generate-what/data/resources/glade/Nemerle.glade
branches/MonoDevelop-generate-what/docs/Translations.html
branches/MonoDevelop-generate-what/libmonodevelop/
branches/MonoDevelop-generate-what/mkinstalldirs
branches/MonoDevelop-generate-what/po/
branches/MonoDevelop-generate-what/samples/RecentFiles/
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/ILAsmBinding/
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaCompiler.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaRuntime.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Parser/
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/NemerleBinding/
branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/MonoDevelopDebugger.addin.xml
branches/MonoDevelop-generate-what/src/AddIns/Nunit/MonoDevelopNunit.addin.xml
branches/MonoDevelop-generate-what/src/AddIns/prj2make-sharp-lib/
branches/MonoDevelop-generate-what/src/Libraries/ChangeLog
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/ChangeLog
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/Services/GettextCatalog.cs
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/Navbar/
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/FileScout/
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Conditions/WorkbenchContextCondition.cs
branches/MonoDevelop-generate-what/src/Main/StartUp/ChangeLog
branches/MonoDevelop-generate-what/src/Main/StartUp/MonoDevelopMain.cs
branches/MonoDevelop-generate-what/src/Tools/
Removed:
branches/MonoDevelop-generate-what/build/AddIns/AddIns/BackendBindings/BackendBindings.addin
branches/MonoDevelop-generate-what/build/AddIns/AddIns/Misc/StartPage/StartPage.addin
branches/MonoDevelop-generate-what/build/AddIns/MonoDevelopNewEditor.addin
branches/MonoDevelop-generate-what/build/AddIns/SharpDevelopCore.addin
branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleOptionPanel.xft
branches/MonoDevelop-generate-what/gdldock/gdl/DockObject.custom
branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/MonoDevelopDebugger.addin
branches/MonoDevelop-generate-what/src/AddIns/Nunit/MonoDevelopNunit.addin
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/PropertyGrid/
branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/bin/
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/FileScout.cs
branches/MonoDevelop-generate-what/src/Main/StartUp/SharpDevelopMain.cs
Modified:
branches/MonoDevelop-generate-what/
branches/MonoDevelop-generate-what/AUTHORS
branches/MonoDevelop-generate-what/ChangeLog
branches/MonoDevelop-generate-what/Makefile.am
branches/MonoDevelop-generate-what/autogen.sh
branches/MonoDevelop-generate-what/build/AddIns/
branches/MonoDevelop-generate-what/build/AddIns/AddIns/BackendBindings/Makefile.am
branches/MonoDevelop-generate-what/build/AddIns/AddIns/Misc/StartPage/Makefile.am
branches/MonoDevelop-generate-what/build/AddIns/Makefile.am
branches/MonoDevelop-generate-what/build/data/templates/file/CSharp/GtkSharpWindow.xft
branches/MonoDevelop-generate-what/build/data/templates/file/Makefile.am
branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleMenuCommand.xft
branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExamplePad.xft
branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleView.xft
branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/Makefile.am
branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/SimpleCommand.xft
branches/MonoDevelop-generate-what/build/data/templates/project/Java/JavaApplicationProject.xpt
branches/MonoDevelop-generate-what/build/data/templates/project/Java/JavaConsoleApplicationProject.xpt
branches/MonoDevelop-generate-what/build/data/templates/project/Java/Makefile.am
branches/MonoDevelop-generate-what/build/data/templates/project/Makefile.am
branches/MonoDevelop-generate-what/build/data/templates/project/Misc/BlankCombine.xpt
branches/MonoDevelop-generate-what/configure.in
branches/MonoDevelop-generate-what/data/resources/AddIn.xsd
branches/MonoDevelop-generate-what/data/resources/glade/
branches/MonoDevelop-generate-what/data/resources/glade/Base.glade
branches/MonoDevelop-generate-what/data/resources/glade/EditorBindings.glade
branches/MonoDevelop-generate-what/data/resources/glade/Makefile.am
branches/MonoDevelop-generate-what/data/resources/glade/texteditoraddin.glade
branches/MonoDevelop-generate-what/docs/SourceMap.html
branches/MonoDevelop-generate-what/docs/WritingAddIns.html
branches/MonoDevelop-generate-what/gdldock/gdl/ChangeLog
branches/MonoDevelop-generate-what/gdldock/gdl/Gdl.metadata
branches/MonoDevelop-generate-what/gdldock/gdl/Makefile.am
branches/MonoDevelop-generate-what/gdldock/sources/gdl/Makefile.am
branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-dock-item.c
branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-dock-paned.c
branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-i18n.h
branches/MonoDevelop-generate-what/monodevelop.applications
branches/MonoDevelop-generate-what/monodevelop.in
branches/MonoDevelop-generate-what/monodevelop.keys
branches/MonoDevelop-generate-what/monodevelop.mime
branches/MonoDevelop-generate-what/monodevelop.xml
branches/MonoDevelop-generate-what/po/ja_JP.po
branches/MonoDevelop-generate-what/samples/HtmlControl/Makefile
branches/MonoDevelop-generate-what/samples/HtmlControl/Test.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpLanguageBinding.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/CSharpVisitor.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/Parser.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/SharpDevelopTree/Constructor.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpCompilerParameters.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/ChangeLog
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaLanguageBinding.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Makefile.am
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs
branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/Makefile.am
branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/ChangeLog
branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/Makefile.am
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionData.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ICompletionData.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TemplateCompletionDataProvider.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TextUtilities.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Commands/ToolCommands.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/EditTemplateGroupDialog.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/BehaviorTextEditorPanel.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceInFilesManager.cs
branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs
branches/MonoDevelop-generate-what/src/AddIns/Makefile.am
branches/MonoDevelop-generate-what/src/AddIns/Misc/Makefile.am
branches/MonoDevelop-generate-what/src/AddIns/Misc/StartPage/Makefile.am
branches/MonoDevelop-generate-what/src/AddIns/Misc/StartPage/StartPage.addin
branches/MonoDevelop-generate-what/src/AddIns/Nunit/Makefile.am
branches/MonoDevelop-generate-what/src/Libraries/Makefile.am
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/AddIns/AddInTreeSingleton.cs
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/Makefile.am
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/ChangeLog
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/FolderDialog/BaseFileEntry.cs
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am
branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeNodeCollection.cs
branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/Makefile.am
branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Lexer/Tokens.cs
branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Parser/AST/AbstractASTVisitor.cs
branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Parser/generated/Error.cs
branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog
branches/MonoDevelop-generate-what/src/Main/Base/Commands/AutostartCommands.cs
branches/MonoDevelop-generate-what/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs
branches/MonoDevelop-generate-what/src/Main/Base/Commands/FileCommands.cs
branches/MonoDevelop-generate-what/src/Main/Base/Commands/HelpCommands.cs
branches/MonoDevelop-generate-what/src/Main/Base/Commands/MenuItemBuilders.cs
branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs
branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs
branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectCommands.cs
branches/MonoDevelop-generate-what/src/Main/Base/Commands/RunCommands.cs
branches/MonoDevelop-generate-what/src/Main/Base/Commands/ToolsCommands.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractBaseViewContent.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractPadContent.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractViewContent.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/BrowserDisplayBinding/BrowserDisplayBinding.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/GenerateDatabase.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdMenu.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdMenuCheckBox.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdToolbarCommand.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/StatusBar/SdStatusBar.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewLayoutDialog.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ViewGPLDialog.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/WordCountDialog.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/ErrorHandlers/CombineLoadError.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/HtmlControl/MozillaControl.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/IWorkbenchLayout.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/OpenTaskView.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/TerminalPad.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/WorkbenchMemento.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/DialogPanelCodon.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/LanguageBinding/ILanguageBinding.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/ExternalTool/ExternalTool.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/ExternalTool/ToolLoader.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ICompilationUnitBase.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/IParser.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/Implementations/AbstractCompilationUnit.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/Implementations/AbstractMethod.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionClass.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionEvent.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionField.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionIndexer.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionMethod.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionParameter.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionProperty.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Combine/Combine.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Combine/CombineEntry.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/AbstractProject.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/FileTemplate.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs
branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs
branches/MonoDevelop-generate-what/src/Main/Base/Makefile.am
branches/MonoDevelop-generate-what/src/Main/Base/Services/AmbienceService/AmbienceReflectionDecorator.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/DisplayBinding/DisplayBindingService.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/File/DefaultFileService.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/File/FdoRecentFiles.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/File/RecentItem.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/MessageService.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/MonodocService.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/AssemblyInformation.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/IParserService.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/DefaultProjectService.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/IProjectService.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/ResourceNotFoundException.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/Tasks/Task.cs
branches/MonoDevelop-generate-what/src/Main/Base/Services/Toolbar/ToolbarService.cs
branches/MonoDevelop-generate-what/src/Main/StartUp/Makefile.am
branches/MonoDevelop-generate-what/src/Makefile.am
branches/MonoDevelop-generate-what/src/Tools/SharpCoco/
Log:
Get up to date with HEAD.
Property changes on: branches/MonoDevelop-generate-what
___________________________________________________________________
Name: svn:ignore
- depcomp
install-sh
aclocal.m4
missing
autom4te.cache
libtool
config.status
mkinstalldirs
Makefile
COPYING
INSTALL
ltmain.sh
config.sub
config.guess
monodevelop
config.log
Makefile.in
configure
monodevelop*.tar.gz
monodevelop*.spec
*.diff
FixmeTodo.list
+ depcomp
install-sh
aclocal.m4
missing
autom4te.cache
libtool
config.status
mkinstalldirs
Makefile
COPYING
INSTALL
ltmain.sh
config.sub
config.guess
monodevelop
config.log
Makefile.in
configure
monodevelop*.tar.gz
monodevelop*.spec
*.diff
FixmeTodo.list
intltool-*
Modified: branches/MonoDevelop-generate-what/AUTHORS
===================================================================
--- branches/MonoDevelop-generate-what/AUTHORS 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/AUTHORS 2004-04-28 09:15:53 UTC (rev 1535)
@@ -0,0 +1,21 @@
+Todd Berman
+Pedro Abelleira Seco
+John Luke
+Daniel Kornhauser
+Alex Graveley
+nricciar
+John Bou Antoun
+Ben Maurer
+Jeroen Zwartepoorte
+Gustavo Giráldez
+Miguel de Icaza
+Nick Drochak
+Pawel Rozanski
+Vincent Daron
+Erik Dasque
+Iain McCoy
+Inigo Illan
+Richard Torkar
+
+and Mike Krueger and the SharpDevelop team
+
Modified: branches/MonoDevelop-generate-what/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/ChangeLog 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/ChangeLog 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,3 +1,113 @@
+2004-04-27 Francisco "Paco" Martinez <paco at mfcon.com>
+
+ * configure.in: output src/Addin/prj2make-sharp-lib/Makefile and
+ src/Addin/prj2make-sharp-lib/AssemblyInfo.cs
+ * src/Addin/Makefile.am: add prj2make-sharp-lib to subdirs
+ * src/Addin/prj2make-sharp-lib -- This is an addin to
+ manipulate project and workspace file types created by
+ MS Visual Studio .NET 2003
+
+2004-04-27 Todd Berman <tberman at sevenl.net>
+
+ * configure.in: bump gtksourceview-sharp dep.
+
+2004-04-26 Pawel Rozanski <tokugawa at afn.no-ip.org>
+
+ * monodevelop.xml: mime for Nemerle source
+ * monodevelop.keys: added text/x-java,text/x-msil,
+ text/x-nemerle,text/x-vb
+ * monodevelop.applications: as above
+ * monodevelop.mime: changed to x-prjx, x-cmbx
+
+2004-04-25 John Luke <jluke at cfl.rr.com>
+
+ * AUTHORS: add people that have contributed
+
+2004-04-25 Atsushi Enomoto <atsushi at ximian.com>
+
+ * configure.in: ja_JP.po support.
+
+2004-04-19 Todd Berman <tberman at sevenl.net>
+
+ * configure.in: bump the monodoc dep to 0.13.99
+
+2004-04-19 Todd Berman <tberman at sevenl.net>
+
+ * configure.in: add french translation
+ * po/fr.po: add french translation from Vincent Daron
+
+2004-04-12 John Luke <jluke at cfl.rr.com>
+
+ import ILAsmBinding from SD svn
+
+ * configure.in: make hard dependencies in one check
+ and fail if any are missing, remove all the fluff at
+ the bottom because if its not there it should have
+ already failed
+
+2004-04-12 Todd Berman <tberman at sevenl.net>
+
+ * configure.in: bump to 0.18.99 gtk-sharp
+
+2004-04-11 Kevin Breit <mrproper at ximian.com>
+
+ * /build/data/templates/file/CSharp/GtkSharpWindow.xft: Added a ; to
+ fix a syntax error
+
+2004-04-08 John Luke <jluke at cfl.rr.com>
+
+ * configure.in: output src/Tools/Makefile and
+ src/Tools/SharpCoco/Makefile
+ * src/Makefile.am: add Tools to subdirs
+
+2004-04-07 John Luke <jluke at cfl.rr.com>
+
+ * monodevelop.in: conditionally set LD_LIBRARY_PATH based on advice from
+ http://www.gnome.org/~markmc/blog/07042004
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * Gui/CompletionDatabaseWizard/DownloadGenerator.cs:
+ * Gui/CompletionDatabaseWizard/UseExistingGenerator.cs:
+ * Gui/CompletionDatabaseWizard/GenerateDatabase.cs:
+ * Gui/CompletionDatabaseWizard/druid.cs:
+ * Gui/Workbench/Layouts/SdiWorkspaceWindow.cs:
+ * Gui/Workbench/DefaultWorkbench.cs:
+ * Gui/Components/StatusBar/SdStatusBar.cs:
+ * Gui/AbstractPadContent.cs:
+ * Gui/Pads/FileScout.cs:
+ * Gui/Pads/ClassScout/ClassScout.cs:
+ * Gui/Pads/OpenTaskView.cs:
+ * Gui/Pads/ProjectBrowser/ProjectBrowserView.cs:
+ * Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs:
+ * Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs:
+ * Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs:
+ * Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs:
+ * Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs:
+ * Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs:
+ * Gui/Pads/HelpBrowser/MonodocTreePad.cs:
+ * Gui/Pads/HelpBrowser/HelpViewer.cs:
+ * Gui/AbstractBaseViewContent.cs:
+ * Gui/AbstractViewContent.cs:
+ * Gui/BrowserDisplayBinding/HtmlViewPane.cs:
+ * Gui/ErrorHandlers/CombineLoadError.cs:
+ gettextify
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * configure.in: added po/Makefile.in.in, and other gettext related
+ stuff. added libmonodevelop/Makefile
+ * Makefile.am: added po and libmonodevelop to subdirs
+ * autogen.sh: added intltoolize to autogen.sh
+
+2004-03-31 Todd Berman <tberman at sevenl.net>
+
+ * configure.in: bumping to 0.3
+
+2004-03-31 Todd Berman <tberman at sevenl.net>
+
+ * configure.in: required 0.31 for a utf related stream fix.
+
2004-03-25 Todd Berman <tberman at sevenl.net>
* configure.in: updated for switchover to gecko-sharp
Modified: branches/MonoDevelop-generate-what/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,6 +1,6 @@
# leave gdldock first
# (mkdir ../../build/bin/ hack)
-SUBDIRS = gdldock src build data
+SUBDIRS = gdldock libmonodevelop src build data po
bin_SCRIPTS = monodevelop
@@ -59,7 +59,8 @@
# we can't use the variables that are conditionally defined
EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) $(pixmap_DATA) \
monodevelop.mime monodevelop.keys monodevelop.applications \
- monodevelop.xml
+ monodevelop.xml mkinstalldirs intltool-extract.in \
+ intltool-merge.in intltool-update.in
-DISTCLEANFILES = monodevelop
+DISTCLEANFILES = monodevelop intltool-extract intltool-merge intltool-update
Modified: branches/MonoDevelop-generate-what/autogen.sh
===================================================================
--- branches/MonoDevelop-generate-what/autogen.sh 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/autogen.sh 2004-04-28 09:15:53 UTC (rev 1535)
@@ -36,7 +36,13 @@
NO_AUTOMAKE=yes
}
+(intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`intltoolize' installed to compile MonoDevelop."
+ DIE=1
+}
+
# if no automake, don't bother testing for aclocal
test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
echo
@@ -71,6 +77,14 @@
fi
fi
+echo "Running glib-gettextize ..."
+glib-gettextize --force --copy ||
+ { echo "**Error**: glib-gettextize failed."; exit 1; }
+
+echo "Running intltoolize ..."
+intltoolize --force --copy --automake ||
+ { echo "**Error**: intltoolize failed."; exit 1; }
+
echo "Running aclocal $ACLOCAL_FLAGS ..."
aclocal $ACLOCAL_FLAGS || {
echo
@@ -90,6 +104,7 @@
echo "Running automake --gnu $am_opt ..."
automake --add-missing --gnu $am_opt ||
{ echo "**Error**: automake failed."; exit 1; }
+
echo "Running autoconf ..."
WANT_AUTOCONF="2.5" autoconf || { echo "**Error**: autoconf failed."; exit 1; }
Property changes on: branches/MonoDevelop-generate-what/build/AddIns
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
MonoDevelop.Debugger.dll
MonoDevelopDebugger.addin
MonoDevelop.Nunit.dll
MonoDevelopNunit.addin
+ Makefile
Makefile.in
MonoDevelop.Debugger.dll
MonoDevelopDebugger.addin.xml
MonoDevelop.Nunit.dll
MonoDevelopNunit.addin
prj2make-sharp-lib.dll
prj2make-sharp-lib.addin.xml
Deleted: branches/MonoDevelop-generate-what/build/AddIns/AddIns/BackendBindings/BackendBindings.addin
===================================================================
--- branches/MonoDevelop-generate-what/build/AddIns/AddIns/BackendBindings/BackendBindings.addin 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/AddIns/AddIns/BackendBindings/BackendBindings.addin 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,207 +0,0 @@
-<AddIn name = "SharpDevelop Bindings"
- author = "Mike Krueger"
- copyright = "GPL"
- url = "http://www.icsharpcode.net"
- description = "NCvs core module"
- version = "1.0.0">
-
- <Runtime>
- <Import assembly = "CSharpBinding.dll"/>
- <Import assembly = "JavaBinding.dll"/>
-<!-- ORIGINAL #D COMMENT <Import assembly = "JScriptLanguageModule.dll"/> -->
-<!-- <Import assembly = "VBNetBinding.dll"/> -->
- </Runtime>
-
- <Extension path = "/SharpDevelop/Workbench/Ambiences">
- <Class id = "CSharp"
- class = "MonoDevelop.Services.CSharpAmbience"/>
-<!-- <Class id = "VB.NET"
- class = "MonoDevelop.Services.VBAmbience"/>-->
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/FileFilter">
- <FileFilter id = "CSharp"
- insertbefore="AllFiles"
- name = "${res:SharpDevelop.FileFilter.CSharpFiles}"
- extensions = "*.cs"/>
-<!-- <FileFilter id = "VBNET"
- insertbefore="AllFiles"
- name = "${res:SharpDevelop.FileFilter.VBNetFiles}"
- extensions = "*.vb"/>-->
-<!--ORIGINAL #D COMMENT <FileFilter id = "JScript"
- insertbefore="AllFiles"
- name = "${res:SharpDevelop.FileFilter.JScriptFiles}"
- extensions = "*.js"/> -->
- <FileFilter id = "Java"
- insertbefore="AllFiles"
- name = "${res:SharpDevelop.FileFilter.JavaFiles}"
- extensions = "*.java"/>
- <FileFilter id = "Assemblies"
- insertbefore="AllFiles"
- name = "${res:SharpDevelop.FileFilter.AssemblyFiles}"
- extensions = "*.exe,*.dll"/>
-
- <FileFilter id = "Html"
- insertbefore="AllFiles"
- name = "${res:SharpDevelop.FileFilter.WebFiles}"
- extensions = "*.htm,*.html,*.aspx,*.ascx,*.asp"/>
-
- <FileFilter id = "Xml"
- insertbefore="AllFiles"
- name = "${res:SharpDevelop.FileFilter.XmlFiles}"
- extensions = "*.xml"/>
- <FileFilter id = "Resources"
- insertbefore="AllFiles"
- name = "${res:SharpDevelop.FileFilter.ResourceFiles}"
- extensions = "*.resources,*.resx"/>
- <FileFilter id = "SharpDevelop templates"
- insertbefore="AllFiles"
- name = "${res:SharpDevelop.FileFilter.SharpDevelopTemplates}"
- extensions = "*.xft,*.xpt"/>
- <FileFilter id = "SharpDevelop XFrms"
- insertbefore="AllFiles"
- name = "${res:SharpDevelop.FileFilter.XmlForms}"
- extensions = "*.xfrm"/>
- </Extension>
-
- <Extension path = "/Workspace/Parser">
- <Class id = "CSharpParser"
- class = "CSharpBinding.Parser.TParser"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">
- <Conditional activeproject="C#">
- <DialogPanel id = "CSharpCodeGenerationPanel"
- label = "${res:Dialog.Options.PrjOptions.CodeGenerationPanel.PanelName}"
- class = "CSharpBinding.CodeGenerationPanel"/>
- <DialogPanel id = "CSharpOutputOptionsPanel"
- label = "${res:Dialog.Options.PrjOptions.OutputOptionsPanel.PanelName}"
- class = "CSharpBinding.OutputOptionsPanel"/>
-<!-- not able to choose runtime in MD (jba 4 march 04)
- <DialogPanel id = "CSharpRuntimeCompilerPanel"
- label = "Runtime/Compiler"
- class = "CSharpBinding.ChooseRuntimePanel"/> -->
- </Conditional>
-<!-- <Conditional activeproject="VBNET">
- <DialogPanel id = "VBCodeGenerationPanel"
- label = "${res:Dialog.Options.PrjOptions.CodeGenerationPanel.PanelName}"
- class = "VBBinding.CodeGenerationPanel"/>
- <DialogPanel id = "VBOutputOptionsPanel"
- label = "${res:Dialog.Options.PrjOptions.OutputOptionsPanel.PanelName}"
- class = "VBBinding.OutputOptionsPanel"/>
- <DialogPanel id = "VBDOCConfigurationPanel"
- label = "VB.DOC"
- class = "VBBinding.VBDOCConfigurationPanel"/>
- </Conditional>-->
-<!--ORIGINAL #D COMMENT <Conditional activeproject="JScript">
- <DialogPanel id = "JScriptProjectPanel"
- label = "${res:Dialog.Options.PrjOptions.CodeGenerationPanel.PanelName}"
- class = "JScriptBinding.ProjectConfigurationPropertyPanel"/>
-
- </Conditional> -->
-
- <Conditional activeproject="Java">
- <DialogPanel id = "JavaProjectPanel"
- label = "${res:Dialog.Options.PrjOptions.CodeGenerationPanel.PanelName}"
- class = "JavaBinding.ProjectConfigurationPropertyPanel"/>
-
- </Conditional>
- </Extension>
-
-
- <Extension path = "/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
-<!-- <DialogPanel id = "VBSpecificOptions"
- label = "${res:Dialog.Options.IDEOptions.TextEditor.VB.PanelName}"
- insertafter = "Behavior"
- class = "VBBinding.TextEditorOptionsPanel"/>-->
- </Extension>
-
-<!-- <Extension path = "/AddIns/DefaultTextEditor/Formater">
- <Conditional textcontent = "C#">
- <Class id ="CSharpFormatter" insertbefore="DefaultFormatter" class = "CSharpBinding.FormattingStrategy.CSharpFormattingStrategy"/>
- </Conditional>
- <Conditional textcontent = "VBNET">
- <Class id ="VBNetFormatter" insertbefore="DefaultFormatter" class ="VBBinding.FormattingStrategy.VBFormattingStrategy"/>
- </Conditional>
- <Conditional textcontent = "Java">
- <Class id ="JavaFormatter" insertbefore="DefaultFormatter" class = "JavaBinding.FormattingStrategy.JavaFormattingStrategy"/>
- </Conditional>
- </Extension> -->
-
- <Extension path = "/Workspace/Icons">
- <!-- C# -->
- <Icon id = "C#Prj"
- language = "C#"
- resource = "C#.ProjectIcon"/>
-
- <Icon id = "C#File"
- extensions = ".cs"
- resource = "C#.FileIcon"/>
-
- <!-- VB.NET -->
- <Icon id = "VBPrj"
- language = "VBNET"
- resource = "VB.ProjectIcon"/>
- <Icon id = "VBFile"
- extensions = ".vb"
- resource = "VB.FileIcon"/>
-
- <!-- Java -->
- <Icon id = "JavaPrj"
- language = "Java"
- resource = "Java.ProjectIcon"/>
- <Icon id = "JavaFile"
- extensions = ".java"
- resource = "Java.FileIcon"/>
-
- <!-- Java Script -->
- <Icon id = "JScriptPrj"
- language = "JScript"
- resource = "JScript.ProjectIcon"/>
- <Icon id = "JScriptFile"
- extensions = ".js"
- resource = "JScript.FileIcon"/>
-
- <!-- C++ -->
- <Icon id = "C++Project"
- language = "C++"
- resource = "C++.ProjectIcon"/>
- <Icon id = "C++File"
- extensions = ".cpp"
- resource = "C++.FileIcon"/>
-
- <!-- Resources -->
- <Icon id = "ResourceFileIcon"
- extensions = ".resources,.resx"
- resource = "Icons.16x16.ResourceFileIcon" />
- <!-- XML -->
- <Icon id = "XmlFileIcon"
- extensions = ".xml"
- resource = "FileIcons.XmlIcon" />
- <!-- TextFiles -->
- <Icon id = "TextFileIcon"
- extensions = ".txt,.doc"
- resource = "Icons.16x16.TextFileIcon"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/LanguageBindings">
- <LanguageBinding id = "CSharp"
- supportedextensions = ".cs"
- class = "CSharpBinding.CSharpLanguageBinding" />
-<!-- <LanguageBinding id = "VBNET"
- supportedextensions = ".vb"
- class = "VBBinding.VBLanguageBinding" />-->
- <LanguageBinding id = "Java"
- supportedextensions = ".java"
- class = "JavaBinding.JavaLanguageBinding" />
-<!--ORIGINAL #D COMMENT <LanguageBinding id = "JScript"
- supportedextensions = ".js"
- class = "JScriptBinding.JScriptLanguageBinding" /> -->
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/NodeBuilders">
- <Class id = "JavaNodeBuilder"
- insertbefore = "DefaultBuilder"
- class = "JavaBinding.JavaNodeBuilder"/>
- </Extension>
-</AddIn>
Copied: branches/MonoDevelop-generate-what/build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml (from rev 1534, trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/BackendBindings.addin.xml)
Modified: branches/MonoDevelop-generate-what/build/AddIns/AddIns/BackendBindings/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/build/AddIns/AddIns/BackendBindings/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/AddIns/AddIns/BackendBindings/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -2,9 +2,9 @@
monodevelopdir = $(prefix)/lib/monodevelop
backendbindingsdir = $(monodevelopdir)/AddIns/AddIns/BackendBindings
-backendbindings_DATA = BackendBindings.addin
+backendbindings_DATA = BackendBindings.addin.xml
EXTRA_DIST = $(backendbindings_DATA)
-CLEANFILES = CSharpBinding.dll JavaBinding.dll
+CLEANFILES = CSharpBinding.dll JavaBinding.dll NemerleBinding.dll ILAsmBinding.dll
Modified: branches/MonoDevelop-generate-what/build/AddIns/AddIns/Misc/StartPage/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/build/AddIns/AddIns/Misc/StartPage/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/AddIns/AddIns/Misc/StartPage/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -2,7 +2,7 @@
monodevelopdir = $(prefix)/lib/monodevelop
startpagedir = $(monodevelopdir)/AddIns/AddIns/Misc/StartPage
-startpage_DATA = StartPage.addin
+startpage_DATA = StartPage.addin.xml
EXTRA_DIST = $(startpage_DATA)
CLEANFILES = MonoDevelop.StartPage.dll
Deleted: branches/MonoDevelop-generate-what/build/AddIns/AddIns/Misc/StartPage/StartPage.addin
===================================================================
--- branches/MonoDevelop-generate-what/build/AddIns/AddIns/Misc/StartPage/StartPage.addin 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/AddIns/AddIns/Misc/StartPage/StartPage.addin 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,30 +0,0 @@
-<AddIn name = "#develop Start Page"
- author = "Georg Brandl"
- copyright = "GPL"
- url = "http://www.icsharpcode.net"
- description = "VS like Start Page for #develop"
- version = "1.0.0">
-
- <Runtime>
- <Import assembly="MonoDevelop.StartPage.dll"/>
- </Runtime>
-
- <!--<Extension path = "/SharpDevelop/Workbench/MainMenu/View">
- <MenuItem id = "ShowStartPage"
- insertafter = "ViewItemsSeparator"
- insertbefore = "StartPageSeparator"
- label = "${res:XML.MainMenu.ViewMenu.ShowStartPage}"
- class = "MonoDevelop.StartPage.ShowStartPageCommand"/>
- <MenuItem id = "StartPageSeparator"
- insertbefore = "FullScreen"
- label = "-"/>
- </Extension> -->
-
- <!-- TODO: Conditional to reflect Settings option -->
- <Extension path = "/Workspace/Autostart">
- <Class id = "ShowStartPageCommand"
- insertbefore = "StartWorkbenchCommand"
- insertafter = "InitializeWorkbenchCommand"
- class = "MonoDevelop.StartPage.ShowStartPageCommand"/>
- </Extension>
-</AddIn>
Copied: branches/MonoDevelop-generate-what/build/AddIns/AddIns/Misc/StartPage/StartPage.addin.xml (from rev 1534, trunk/MonoDevelop/build/AddIns/AddIns/Misc/StartPage/StartPage.addin.xml)
Copied: branches/MonoDevelop-generate-what/build/AddIns/ChangeLog (from rev 1534, trunk/MonoDevelop/build/AddIns/ChangeLog)
Modified: branches/MonoDevelop-generate-what/build/AddIns/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/build/AddIns/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/AddIns/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -3,11 +3,11 @@
monodevelopdir = $(prefix)/lib/monodevelop
addindir = $(monodevelopdir)/AddIns
-addin_DATA = MonoDevelopNewEditor.addin SharpDevelopCore.addin
+addin_DATA = MonoDevelopNewEditor.addin.xml SharpDevelopCore.addin.xml
EXTRA_DIST = $(addin_DATA)
# for conditionally built addins
-CLEANFILES = MonoDevelopDebugger.addin MonoDevelop.Debugger.dll \
-MonoDevelopNunit.addin MonoDevelop.Nunit.dll
+CLEANFILES = MonoDevelopDebugger.addin.xml MonoDevelop.Debugger.dll \
+MonoDevelopNunit.addin.xml MonoDevelop.Nunit.dll
Deleted: branches/MonoDevelop-generate-what/build/AddIns/MonoDevelopNewEditor.addin
===================================================================
--- branches/MonoDevelop-generate-what/build/AddIns/MonoDevelopNewEditor.addin 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/AddIns/MonoDevelopNewEditor.addin 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,419 +0,0 @@
-<AddIn name = "New Editor"
- author = "Ben Maurer"
- copyright = ""
- url = ""
- description = ""
- version = "1.0.0">
-
- <Runtime>
- <Import assembly="../bin/MonoDevelop.SourceEditor.dll"/>
- <!-- <Import assembly="../bin/MonoDevelop.TextEditor.dll"/> -->
- <!-- <Import assembly="../bin/MonoDevelop.DefaultTexteditor.dll"/> -->
- </Runtime>
-
- <Extension path = "/SharpDevelop/Dialogs/OptionsDialog/CodingOptions">
- <DialogPanel id = "CodeTemplates"
- label = "${res:Dialog.Options.CodeTemplatesText}"
- class = "MonoDevelop.EditorBindings.Gui.OptionPanels.CodeTemplatePane"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu">
- <!-- AddIn to the Project Add Menu -->
- <!-- <Conditional ownerstate="ProjectSelected">
- <MenuItem id = "ExportToHtml"
- insertafter = "GenerateDocumentation"
- insertbefore = "Separator5"
- label = "${res:ProjectComponent.ContextMenu.HtmlExport}"
- class = "MonoDevelop.DefaultEditor.Commands.ExportProjectToHtml"/>
- </Conditional> -->
- </Extension>
-
- <!-- <Extension path = "/SharpDevelop/Workbench/MainMenu/Project">
- <Conditional activeproject="*">
- <MenuItem id = "ExportToHtml"
- insertafter = "GenerateDocumentation"
- insertbefore = "Separator2"
- label = "${res:ProjectComponent.ContextMenu.HtmlExport}"
- class = "MonoDevelop.DefaultEditor.Commands.ExportProjectToHtml"/>
- </Conditional>
- </Extension> -->
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ProjectBrowserNode">
- <!-- AddIn to the project browser context menu -->
- <!-- <Conditional activeproject="*">
- <MenuItem id = "ExportToHtml"
- insertafter = "GenerateDocumentation"
- insertbefore = "SetAsStartupProjectSeparator"
- label = "${res:ProjectComponent.ContextMenu.HtmlExport}"
- class = "MonoDevelop.DefaultEditor.Commands.ExportProjectToHtml"/>
- </Conditional> -->
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/Views">
- <Class id = "CompilerMessageView"
- class = "MonoDevelop.EditorBindings.Gui.Pads.CompilerMessageView"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/ViewContent/DefaultTextEditor/ContextMenu">
- <MenuItem id = "Cut"
- label = "${res:XML.TextAreaContextMenu.Cut}"
- icon = "Icons.16x16.CutIcon"
- shortcut = "Control|X"
- class = "MonoDevelop.Commands.Cut"/>
- <MenuItem id = "Copy"
- label = "${res:XML.TextAreaContextMenu.Copy}"
- icon = "Icons.16x16.CopyIcon"
- shortcut = "Control|C"
- class = "MonoDevelop.Commands.Copy"/>
- <MenuItem id = "Paste"
- label = "${res:XML.TextAreaContextMenu.Paste}"
- icon = "Icons.16x16.PasteIcon"
- shortcut = "Control|V"
- class = "MonoDevelop.Commands.Paste"/>
- <MenuItem id = "Delete"
- label = "${res:XML.MainMenu.EditMenu.Delete}"
- icon = "Icons.16x16.DeleteIcon"
- class = "MonoDevelop.Commands.Delete"/>
- <MenuItem id = "Separator1" label = "-" />
- <MenuItem id = "Save"
- label = "${res:XML.MainMenu.FileMenu.Save}"
- icon = "Icons.16x16.SaveIcon"
- shortcut = "Control|S"
- class = "MonoDevelop.Commands.SaveFile"/>
- <MenuItem id = "SaveAs"
- label = "${res:XML.MainMenu.FileMenu.SaveAs}"
- class = "MonoDevelop.Commands.SaveFileAs"/>
- <MenuItem id = "File"
- label = "${res:XML.MainMenu.FileMenu.Close}"
- class ="MonoDevelop.Commands.CloseFile"/>
- <MenuItem id = "Separator2" label = "-" />
- <MenuItem id = "Comment"
- icon = "Icons.16x16.CommentRegion"
- label = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
- class= "MonoDevelop.DefaultEditor.Commands.CommentRegion"/>
-<!-- <MenuItem id = "Uncomment"
- icon = "Icons.16x16.UnCommentRegion"
- label = "${res:XML.TextAreaContextMenu.UncommentSelection}"
- class= "MonoDevelop.DefaultEditor.Commands.UncommentRegion"/>-->
- <MenuItem id = "Indent"
- label = "${res:XML.TextAreaContextMenu.Indent}"
- shortcut = "Control|I"
- class = "MonoDevelop.DefaultEditor.Commands.IndentSelection" />
-
- <MenuItem id = "FileMode" label = "${res:XML.TextAreaContextMenu.FileMode}">
- <MenuItem id = "HighlightBuilder" label = "boguslabel" class = "MonoDevelop.DefaultEditor.Commands.HighlightingTypeBuilder" />
- </MenuItem>
-
- <MenuItem id = "Separator3" label = "-" />
- <MenuItem id = "Options"
- label = "${res:XML.TextAreaContextMenu.BufferOptions}"
- icon = "Icons.16x16.PropertiesIcon"
- class ="MonoDevelop.DefaultEditor.Commands.ShowBufferOptions"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/ToolBar/Standard">
- <Conditional action="Disable">
- <Or>
- <Condition activewindow="MonoDevelop.SourceEditor.Gui.SourceEditorDisplayBindingWrapper"/>
- <Condition openproject="*"/>
- </Or>
-
- <ToolbarItem id = "Find"
- icon = "Icons.16x16.FindIcon"
- tooltip = "${res:XML.MainMenu.SearchMenu.Find.Description}"
- class = "MonoDevelop.DefaultEditor.Commands.Find"/>
- <ToolbarItem id = "FindNext"
- icon = "Icons.16x16.FindNextIcon"
- tooltip = "${res:XML.MainMenu.SearchMenu.FindNext.Description}"
- class = "MonoDevelop.DefaultEditor.Commands.FindNext"/>
- <ToolbarItem id = "Replace"
- icon = "Icons.16x16.ReplaceIcon"
- tooltip = "${res:XML.MainMenu.SearchMenu.Replace.Description}"
- class = "MonoDevelop.DefaultEditor.Commands.Replace"/>
- </Conditional>
- <ToolbarItem id = "SearchSeparator" tooltip = "-"/>
- <Conditional activewindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable">
-<!-- <ToolbarItem id = "Comment"
- icon = "Icons.16x16.CommentRegion"
- tooltip = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
- class = "MonoDevelop.DefaultEditor.Commands.CommentRegion"/> -->
-<!-- <ToolbarItem id = "Uncomment"
- icon = "Icons.16x16.UnCommentRegion"
- tooltip = "${res:XML.TextAreaContextMenu.UncommentSelection}"
- class = "MonoDevelop.DefaultEditor.Commands.UncommentRegion"/> -->
-
-<!-- <ToolbarItem id = "SearchSeparator2" tooltip = "-"/> -->
- <ToolbarItem id = "ToggleBookmark"
- icon = "Icons.16x16.ToggleBookmark"
- tooltip = "${res:XML.MainMenu.SearchMenu.ToggleBookmark.Description}"
- class = "MonoDevelop.EditorBindings.Commands.ToggleBookmark"/>
- <ToolbarItem id = "PrevBookmark"
- icon = "Icons.16x16.GotoPrevbookmark"
- tooltip = "${res:XML.MainMenu.SearchMenu.PrevBookmark.Description}"
- class = "MonoDevelop.EditorBindings.Commands.PrevBookmark"/>
- <ToolbarItem id = "NextBookmark"
- icon = "Icons.16x16.GotoNextbookmark"
- tooltip = "${res:XML.MainMenu.SearchMenu.NextBookmark.Description}"
- class = "MonoDevelop.EditorBindings.Commands.NextBookmark"/>
- <ToolbarItem id = "ClearBookmarks"
- icon = "Icons.16x16.ClearAllBookmarks"
- tooltip = "${res:XML.MainMenu.SearchMenu.ClrBookmark.Description}"
- class = "MonoDevelop.EditorBindings.Commands.ClearBookmarks"/>
- </Conditional>
- </Extension>
-
-
- <Extension path = "/SharpDevelop/Workbench/MainMenu">
- <MenuItem id = "Search" insertafter ="View" insertbefore ="Tools" label = "${res:XML.MainMenu.SearchMenu}">
- <Conditional action="Disable">
- <Or>
- <Condition openwindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider"/>
- <Condition openproject="*"/>
- </Or>
-
- <MenuItem id = "Find"
- label = "${res:XML.MainMenu.SearchMenu.Find}"
- icon = "Icons.16x16.FindIcon"
- description = "${res:XML.MainMenu.SearchMenu.Find.Description}"
- shortcut = "Control|F"
- class = "MonoDevelop.DefaultEditor.Commands.Find"/>
- <MenuItem id = "FindNext"
- label = "${res:XML.MainMenu.SearchMenu.FindNext}"
- icon = "Icons.16x16.FindNextIcon"
- description = "${res:XML.MainMenu.SearchMenu.FindNext.Description}"
- shortcut = "F3"
- class = "MonoDevelop.DefaultEditor.Commands.FindNext"/>
- <MenuItem id = "Replace"
- label = "${res:XML.MainMenu.SearchMenu.Replace}"
- icon = "Icons.16x16.ReplaceIcon"
- description = "${res:XML.MainMenu.SearchMenu.Replace.Description}"
- shortcut = "Control|R"
- class = "MonoDevelop.DefaultEditor.Commands.Replace"/>
- </Conditional>
-
- <MenuItem id = "SearchSeparator" label = "-" />
- <MenuItem id = "FindInFiles"
- label = "${res:XML.MainMenu.SearchMenu.FindInFiles}"
- icon = "Icons.16x16.FindInFiles"
- description = "${res:XML.MainMenu.SearchMenu.FindInFiles.Description}"
- class = "MonoDevelop.DefaultEditor.Commands.FindInFiles"/>
- <MenuItem id = "ReplaceInFiles"
- label = "${res:XML.MainMenu.SearchMenu.ReplaceInFiles}"
- icon = "Icons.16x16.ReplaceInFiles"
- description = "${res:XML.MainMenu.SearchMenu.ReplaceInFiles.Description}"
- class = "MonoDevelop.DefaultEditor.Commands.ReplaceInFiles"/>
-
- <MenuItem id = "SearchInFilesSeparator" label = "-" />
- <Conditional activewindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable">
-
- <MenuItem id = "ToggleBookmark"
- label = "${res:XML.MainMenu.SearchMenu.ToggleBookmark}"
- description = "${res:XML.MainMenu.SearchMenu.ToggleBookmark.Description}"
- shortcut = "Control|F2"
- icon = "Icons.16x16.ToggleBookmark"
- class = "MonoDevelop.EditorBindings.Commands.ToggleBookmark"/>
- <MenuItem id = "PrevBookmark"
- label = "${res:XML.MainMenu.SearchMenu.PrevBookmark}"
- description = "${res:XML.MainMenu.SearchMenu.PrevBookmark.Description}"
- shortcut = "Alt|F2"
- icon = "Icons.16x16.GotoPrevbookmark"
- class = "MonoDevelop.EditorBindings.Commands.PrevBookmark"/>
- <MenuItem id = "NextBookmark"
- label = "${res:XML.MainMenu.SearchMenu.NextBookmark}"
- description = "${res:XML.MainMenu.SearchMenu.NextBookmark.Description}"
- shortcut = "F2"
- icon = "Icons.16x16.GotoNextbookmark"
- class = "MonoDevelop.EditorBindings.Commands.NextBookmark"/>
- <MenuItem id = "ClearBookmarks"
- label = "${res:XML.MainMenu.SearchMenu.ClrBookmark}"
- description = "${res:XML.MainMenu.SearchMenu.ClrBookmark.Description}"
- icon = "Icons.16x16.ClearAllBookmarks"
- class = "MonoDevelop.EditorBindings.Commands.ClearBookmarks"/>
- <MenuItem id = "Separator2" label = "-" />
- <MenuItem id = "GotoLineNr"
- label = "${res:XML.MainMenu.SearchMenu.GotoLineNr}"
- description = "${res:XML.MainMenu.SearchMenu.GotoLineNr.Description}"
- shortcut = "Control|G"
- class = "MonoDevelop.DefaultEditor.Commands.GotoLineNumber"/>
- <MenuItem id = "Separator3" label = "-" />
- <MenuItem id = "GotoBrace"
- label = "${res:XML.MainMenu.SearchMenu.GotoBrace}"
- description = "${res:XML.MainMenu.SearchMenu.GotoBrace.Description}"
- shortcut = "Control|B"
- class = "MonoDevelop.DefaultEditor.Commands.GotoMatchingBrace"/>
- </Conditional>
- </MenuItem>
- </Extension>
-
- <!--
- <Extension path = "/SharpDevelop/Workbench/MainMenu/Window">
- <Conditional activewindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable">
- <MenuItem id = "SplitTextEditor"
- insertafter="NxtPrvSeparator"
- insertbefore="CloseAll"
- label = "${res:XML.MainMenu.WindowMenu.Split}"
- icon = "Icons.16x16.SplitWindow"
- description = "${res:XML.MainMenu.WindowMenu.Split.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.SplitTextEditor"/>
- </Conditional>
- </Extension>
- -->
-
- <!-- <Extension path = "/SharpDevelop/Workbench/MainMenu/Edit">
- <MenuItem insertafter = "Delete" insertbefore = "SelectAll" id = "Separator2" label = "-" />
- <MenuItem insertafter = "Separator2" insertbefore = "Separator3" id = "Format" label = "${res:XML.MainMenu.EditMenu.FormatMenu}">
- <Conditional activewindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable">
-
- <MenuItem id = "RemoveLeadingWs"
- label = "${res:XML.MainMenu.EditMenu.FormatMenu.RlWs}"
- description = "${res:XML.MainMenu.EditMenu.FormatMenu.RlWs.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.RemoveLeadingWS"/>
- <MenuItem id = "RemoveTrailingWs"
- label = "${res:XML.MainMenu.EditMenu.FormatMenu.RtWs}"
- description = "${res:XML.MainMenu.EditMenu.FormatMenu.RtWs.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.RemoveTrailingWS"/>
- <MenuItem id = "Seperator1" label = "-" />
- <MenuItem id = "UpperCase"
- label = "${res:XML.MainMenu.EditMenu.FormatMenu.UpperCase}"
- icon = "Icons.16x16.LowerToUpperCase"
- description = "${res:XML.MainMenu.EditMenu.FormatMenu.UpperCase.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.ToUpperCase"/>
- <MenuItem id = "LowerCase"
- label = "${res:XML.MainMenu.EditMenu.FormatMenu.LowerCase}"
- icon = "Icons.16x16.UpperToLowerCase"
- description = "${res:XML.MainMenu.EditMenu.FormatMenu.LowerCase.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.ToLowerCase"/>
- <MenuItem id = "Capitalize"
- label = "${res:XML.MainMenu.EditMenu.FormatMenu.Capitalize}"
- description = "${res:XML.MainMenu.EditMenu.FormatMenu.Capitalize.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.CapitalizeAction"/>
- <MenuItem id = "InvertCase"
- label = "${res:XML.MainMenu.EditMenu.FormatMenu.InvertCase}"
- description = "${res:XML.MainMenu.EditMenu.FormatMenu.InvertCase.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.InvertCaseAction"/>
- <MenuItem id = "Separator2" label = "-" />
- <MenuItem id = "SortSelection"
- label = "${res:XML.MainMenu.EditMenu.FormatMenu.SortLines}"
- description = "${res:XML.MainMenu.EditMenu.FormatMenu.SortLines.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.SortSelection"/>
- <MenuItem id = "Separator3" label = "-" />
- <MenuItem id = "Tabs2Spaces"
- label = "${res:XML.MainMenu.EditMenu.FormatMenu.Tab2Space}"
- description = "${res:XML.MainMenu.EditMenu.FormatMenu.Tab2Space.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.ConvertTabsToSpaces"/>
- <MenuItem id = "Spaces2Tabs"
- label = "${res:XML.MainMenu.EditMenu.FormatMenu.Space2Tab}"
- description = "${res:XML.MainMenu.EditMenu.FormatMenu.Space2Tab.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.ConvertSpacesToTabs"/>
- <MenuItem id = "LeadingTabs2Spaces"
- label = "${res:XML.MainMenu.EditMenu.FormatMenu.LdTab2Space}"
- description = "${res:XML.MainMenu.EditMenu.FormatMenu.LdTab2Space.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.ConvertLeadingTabsToSpaces"/>
- <MenuItem id = "LeadingSpaces2Tabs"
- label = "${res:XML.MainMenu.EditMenu.FormatMenu.LdSpace2Tab}"
- description = "${res:XML.MainMenu.EditMenu.FormatMenu.LdSpace2Tab.Description}"
- class ="MonoDevelop.DefaultEditor.Commands.ConvertLeadingSpacesToTabs"/>
- </Conditional>
- </MenuItem>
- <MenuItem insertafter = "Format" insertbefore = "Separator3" id = "Folding" label = "${res:XML.MainMenu.EditMenu.FoldingMenu}">
- <Conditional activewindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable">
- <MenuItem id = "ToggleFolding"
- label = "${res:XML.MainMenu.EditMenu.FoldingMenu.ToggleFolding}"
- description = "Toggles the current selected folding"
- shortcut = "Shift|Control|M"
- class = "MonoDevelop.DefaultEditor.Commands.ToggleFolding"/>
- <MenuItem id = "ToggleAllFoldings"
- label = "${res:XML.MainMenu.EditMenu.FoldingMenu.ToggleAllFoldings}"
- description = "Toggles all foldings"
- shortcut = "Shift|Control|L"
- class = "MonoDevelop.DefaultEditor.Commands.ToggleAllFoldings"/>
- <MenuItem id = "ShowDefinitionsOnly"
- label = "${res:XML.MainMenu.EditMenu.FoldingMenu.ShowDefinitions}"
- description = "Shows only the definitions"
- shortcut = "Shift|Control|P"
- class = "MonoDevelop.DefaultEditor.Commands.ShowDefinitionsOnly"/>
- </Conditional>
- </MenuItem>
- <MenuItem insertafter = "Separator2" insertbefore = "SelectAll" id = "Separator3" label = "-" />
- </Extension> -->
-
- <Extension path = "/SharpDevelop/ViewContent/DefaultTextEditor/OptionsDialog">
- <DialogPanel id = "General"
- label = "${res:Dialog.Options.IDEOptions.TextEditor.General.PanelName}"
- class = "MonoDevelop.EditorBindings.Gui.OptionPanels.GeneralTextEditorPanel"/>
- <DialogPanel id = "Markers"
- label = "${res:Dialog.Options.IDEOptions.TextEditor.Markers.PanelName}"
- class = "MonoDevelop.EditorBindings.Gui.OptionPanels.MarkersTextEditorPanel"/>
- <DialogPanel id = "Behavior"
- label = "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.PanelName}"
- class = "MonoDevelop.EditorBindings.Gui.OptionPanels.BehaviorTextEditorPanel"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Dialogs/OptionsDialog">
- <DialogPanel id = "TextEditorOptions"
- insertafter = "CodingOptions"
- insertbefore = "ToolsOptions"
- label = "${res:Dialog.Options.IDEOptions.TextEditorOptionsText}">
- <DialogPanel id = "General"
- label = "${res:Dialog.Options.IDEOptions.TextEditor.General.PanelName}"
- class = "MonoDevelop.EditorBindings.Gui.OptionPanels.GeneralTextEditorPanel"/>
- <DialogPanel id = "Markers"
- label = "${res:Dialog.Options.IDEOptions.TextEditor.Markers.PanelName}"
- class = "MonoDevelop.EditorBindings.Gui.OptionPanels.MarkersTextEditorPanel"/>
- <DialogPanel id = "Behavior"
- label = "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.PanelName}"
- class = "MonoDevelop.EditorBindings.Gui.OptionPanels.BehaviorTextEditorPanel"/>
- </DialogPanel>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/MainMenu/Tools">
- <Conditional activewindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable">
- <!--<MenuItem id = "InsertColor"
- insertafter = "Separator1" insertbefore = "Separator2"
- label = "${res:XML.MainMenu.ToolMenu.InsColor}"
- description = "${res:XML.MainMenu.ToolMenu.InsColor.Description}"
- class = "MonoDevelop.DefaultEditor.Commands.ShowColorDialog"/> -->
- <MenuItem id = "Separator2" label = "-" />
-
- <!-- <MenuItem id = "GenerateCodeAction"
- insertafter = "Separator2"
- label = "${res:XML.MainMenu.ToolMenu.GenerateCode}"
- description = "${res:XML.MainMenu.ToolMenu.GenerateCode.Description}"
- class = "MonoDevelop.DefaultEditor.Commands.GenerateCodeAction"/>
- <MenuItem id = "ShowQuickHelp"
- label = "${res:XML.MainMenu.ToolMenu.QuickXmlDoc}"
- description = "${res:XML.MainMenu.ToolMenu.QuickXmlDoc.Description}"
- shortcut = "Control|Q"
- class = "MonoDevelop.DefaultEditor.Commands.QuickDocumentation"/>
- <MenuItem id = "Separator3" label = "-" /> -->
- </Conditional>
- </Extension>
-
- <Extension path = "/SharpDevelop/DefaultEditor/SearchAndReplace/WildcardHelpPath">
- <MenuItem id = "*Char"
- label = "* Zero or more of any character" />
- <MenuItem id = "?Char"
- label = "? Any single character" />
- <MenuItem id = "#Char"
- label = "# Any single digit" />
- <MenuItem id = "[]Char"
- label = "[] Any one character in the set" />
- <MenuItem id = "[!]Char"
- label = "[!] Any one character not in the set" />
- </Extension>
-
- <!-- Note : Most actions are put directly into the control, because
- they're used for the standalone version too, only put keys in the
- tree that are sharpdevelop specific, general keys put into TextAreaControl.GenerateDefaultActions -->
- <Extension path = "/AddIns/DefaultTextEditor/EditActions">
- <EditAction id = "TemplateCompletion" class = "MonoDevelop.DefaultEditor.Actions.TemplateCompletion" keys = "Control|J"/>
- <EditAction id = "IndentSelection" class = "MonoDevelop.TextEditor.Actions.IndentSelection" keys = "Control|I"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/DisplayBindings">
- <DisplayBinding id = "NewText"
- supportedformats = "Text Files,Source Files"
- class = "MonoDevelop.SourceEditor.Gui.SourceEditorDisplayBinding" />
- </Extension>
-
-</AddIn>
Copied: branches/MonoDevelop-generate-what/build/AddIns/MonoDevelopNewEditor.addin.xml (from rev 1534, trunk/MonoDevelop/build/AddIns/MonoDevelopNewEditor.addin.xml)
Deleted: branches/MonoDevelop-generate-what/build/AddIns/SharpDevelopCore.addin
===================================================================
--- branches/MonoDevelop-generate-what/build/AddIns/SharpDevelopCore.addin 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/AddIns/SharpDevelopCore.addin 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,1022 +0,0 @@
-<AddIn name = "SharpDevelop Core"
- author = "Mike Krueger"
- copyright = "GPL"
- url = "http://www.icsharpcode.net"
- description = "SharpDevelop core module"
- version = "1.0.0">
-
- <Runtime>
- <Import assembly="../bin/MonoDevelop.Base.dll"/>
- </Runtime>
-
- <Extension path = "/SharpDevelop/Workbench/Ambiences">
- <Class id = ".NET"
- class = "MonoDevelop.Services.NetAmbience"/>
- </Extension>
-
-
- <Extension path = "/Workspace/Autostart">
- <Class id = "InitializeWorkbenchCommand"
- class = "MonoDevelop.Commands.InitializeWorkbenchCommand"/>
- <Class id = "StartCodeCompletionWizard"
- class = "MonoDevelop.Commands.StartCodeCompletionWizard"/>
- <Class id = "StartParserServiceThread"
- class = "MonoDevelop.Commands.StartParserServiceThread"/>
- <!-- #assembly preload -->
-<!-- <Class id = "StartSharpAssemblyPreloadThread"
- class = "MonoDevelop.Commands.StartSharpAssemblyPreloadThread"/>-->
- <Class id = "StartWorkbenchCommand"
- class = "MonoDevelop.Commands.StartWorkbenchCommand"/>
- </Extension>
-
- <Extension path = "/Workspace/Services">
- <Class id = "MonodocService"
- class = "MonoDevelop.Services.MonodocService"/>
- <Class id = "ProjectService"
- class = "MonoDevelop.Services.DefaultProjectService"/>
- <Class id = "FileService"
- class = "MonoDevelop.Services.DefaultFileService"/>
- <Class id = "ParserService"
- class = "MonoDevelop.Services.DefaultParserService"/>
- <Class id = "TaskService"
- class = "MonoDevelop.Services.TaskService"/>
- <Class id = "StatusBarService"
- class = "MonoDevelop.Services.DefaultStatusBarService"/>
- <Class id = "ToolbarService"
- class = "MonoDevelop.Services.ToolbarService"/>
- <Class id = "LanguageService"
- class = "MonoDevelop.Services.LanguageService"/>
- <Class id = "ClassBrowserIconsService"
- class = "MonoDevelop.Services.ClassBrowserIconsService"/>
- <Class id = "LanguageBindingService"
- class = "MonoDevelop.Services.LanguageBindingService"/>
- <Class id = "DisplayBindingService"
- class = "MonoDevelop.Services.DisplayBindingService"/>
- <Class id = "AmbienceService"
- class = "MonoDevelop.Services.AmbienceService"/>
- <Class id = "MenuService"
- class = "MonoDevelop.Services.MenuService"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/DisplayBindings">
- <DisplayBinding id = "Browser"
- supportedformats = "Web Pages"
- class = "MonoDevelop.BrowserDisplayBinding.BrowserDisplayBinding"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/NodeBuilders">
- <Class id = "DefaultBuilder"
- class = "MonoDevelop.Gui.Pads.ProjectBrowser.DefaultDotNetNodeBuilder"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ClassScout/ContextMenu/ClassNode">
- <MenuItem id = "Export"
- label = "ExportSignature"
- class = "MonoDevelop.Commands.ClassScoutCommands.ExportClassSignature"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/CombineBrowserNode">
- <MenuItem id = "Compile"
- label = "${res:XML.MainMenu.RunMenu.Compile}"
- class = "MonoDevelop.Commands.Compile"/>
- <MenuItem id = "CompileAll"
- label = "${res:XML.MainMenu.RunMenu.CompileAll}"
- class = "MonoDevelop.Commands.CompileAll"/>
- <MenuItem id = "CombineBuildGroupSeparator" label = "-" />
-
- <MenuItem id = "CombineAddMenu" label = "${res:ProjectComponent.ContextMenu.AddMenu}" >
- <MenuItem id = "AddNewProject"
- label = "${res:ProjectComponent.ContextMenu.AddNewProject}"
- icon = "Icons.16x16.NewProjectIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.AddNewProjectToCombine"/>
- <MenuItem id = "AddNewCombine"
- label = "${res:ProjectComponent.ContextMenu.AddNewCombine}"
- icon = "Icons.16x16.NewProjectIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.AddNewCombineToCombine"/>
- <MenuItem id = "Separator1" label = "-" />
- <MenuItem id = "AddProject"
- label = "${res:ProjectComponent.ContextMenu.AddProject}"
- class = "MonoDevelop.Commands.ProjectBrowser.AddProjectToCombine"/>
- <MenuItem id = "AddCombine"
- label = "${res:ProjectComponent.ContextMenu.AddCombine}"
- class = "MonoDevelop.Commands.ProjectBrowser.AddCombineToCombine"/>
- </MenuItem>
- <MenuItem id = "RemoveCombine"
- label = "${res:ProjectComponent.ContextMenu.Remove}"
- icon = "Icons.16x16.DeleteIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.RemoveEntryEvent"/>
-
- <MenuItem id = "RenameCombine"
- label = "${res:ProjectComponent.ContextMenu.Rename}"
- shortcut = "F2"
- class = "MonoDevelop.Commands.ProjectBrowser.RenameEntryEvent"/>
-
- <MenuItem id = "CombineOptionsSeparator" label = "-" />
-
- <MenuItem id = "CombineOptions"
- label = "${res:ProjectComponent.ContextMenu.CombineOptions}"
- icon = "Icons.16x16.PropertiesIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.CombineOptions"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ResourceFolderNode">
- <MenuItem id = "AddResource"
- label = "${res:ProjectComponent.ContextMenu.AddResourceFile}"
- class = "MonoDevelop.Commands.ProjectBrowser.AddResourceToProject"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ReferenceFolderNode">
- <MenuItem id = "AddReference"
- label = "${res:ProjectComponent.ContextMenu.AddReference}"
- class = "MonoDevelop.Commands.ProjectBrowser.AddReferenceToProject"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ReferenceNode">
- <MenuItem id = "OpenFile"
- label = "${res:ProjectComponent.ContextMenu.Open}"
- icon = "Icons.16x16.OpenFileIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.OpenFileEvent"/>
- <MenuItem id = "OpenSeparator" label = "-" />
- <MenuItem id = "Remove"
- label = "${res:ProjectComponent.ContextMenu.Remove}"
- icon = "Icons.16x16.DeleteIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.RemoveEntryEvent"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/DefaultFileNode">
- <MenuItem id = "OpenFile"
- label = "${res:ProjectComponent.ContextMenu.Open}"
- icon = "Icons.16x16.OpenFileIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.OpenFileEvent"/>
- <MenuItem id = "OpenSeparator" label = "-" />
- <MenuItem id = "Remove"
- label = "${res:ProjectComponent.ContextMenu.Remove}"
- icon = "Icons.16x16.DeleteIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.RemoveEntryEvent"/>
- <MenuItem id = "Rename"
- label = "${res:ProjectComponent.ContextMenu.Rename}"
- shortcut = "F2"
- class = "MonoDevelop.Commands.ProjectBrowser.RenameEntryEvent"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ProjectFileNode">
- <MenuItem id = "OpenFile"
- label = "${res:ProjectComponent.ContextMenu.Open}"
- icon = "Icons.16x16.OpenFileIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.OpenFileEvent"/>
- <MenuItem id = "OpenSeparator" label = "-" />
- <MenuItem id = "Add" label = "${res:ProjectComponent.ContextMenu.AddMenu}">
- <MenuItem id = "NewFiles"
- label = "${res:ProjectComponent.ContextMenu.NewFiles}"
- icon = "Icons.16x16.NewDocumentIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.AddNewFileEvent"/>
- <MenuItem id = "AddFiles"
- label = "${res:ProjectComponent.ContextMenu.AddFiles}"
- class = "MonoDevelop.Commands.ProjectBrowser.AddFilesToProject"/>
- <MenuItem id = "Separator1" label = "-" />
- <MenuItem id = "NewFolder"
- label = "${res:ProjectComponent.ContextMenu.NewFolder}"
- icon = "Icons.16x16.NewFolderIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.NewFolderEvent"/>
- </MenuItem>
- <MenuItem id = "Include" label = "${res:ProjectComponent.ContextMenu.IncludeMenu}">
- <MenuItem id = "IncludeFileIn" label = "boguslabel"
- class = "MonoDevelop.Commands.IncludeFilesBuilder" />
- </MenuItem>
- <MenuItem id = "IncludeSeparator" label = "-" />
- <MenuItem id = "Remove"
- label = "${res:ProjectComponent.ContextMenu.Remove}"
- icon = "Icons.16x16.DeleteIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.RemoveEntryEvent"/>
- <MenuItem id = "Rename"
- label = "${res:ProjectComponent.ContextMenu.Rename}"
- shortcut = "F2"
- class = "MonoDevelop.Commands.ProjectBrowser.RenameEntryEvent"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/DefaultDirectoryNode">
- <MenuItem id = "Add" label = "${res:ProjectComponent.ContextMenu.AddMenu}">
- <MenuItem id = "NewFiles"
- label = "${res:ProjectComponent.ContextMenu.NewFiles}"
- icon = "Icons.16x16.NewDocumentIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.AddNewFileEvent"/>
- <MenuItem id = "AddFiles"
- label = "${res:ProjectComponent.ContextMenu.AddFiles}"
- class = "MonoDevelop.Commands.ProjectBrowser.AddFilesToProject"/>
- <MenuItem id = "Separator1" label = "-" />
- <MenuItem id = "NewFolder"
- label = "${res:ProjectComponent.ContextMenu.NewFolder}"
- icon = "Icons.16x16.NewFolderIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.NewFolderEvent"/>
- </MenuItem>
- <MenuItem id = "AddSeparator" label = "-" />
- <MenuItem id = "Remove"
- label = "${res:ProjectComponent.ContextMenu.Remove}"
- icon = "Icons.16x16.DeleteIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.RemoveEntryEvent"/>
- <MenuItem id = "Rename"
- label = "${res:ProjectComponent.ContextMenu.Rename}"
- shortcut = "F2"
- class = "MonoDevelop.Commands.ProjectBrowser.RenameEntryEvent"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ProjectBrowserNode">
- <MenuItem id = "BuildProject"
- label = "${res:XML.MainMenu.RunMenu.BuildProject}"
- icon = "Icons.16x16.BuildCurrentSelectedProject"
- class = "MonoDevelop.Commands.BuildCurrentProject"/>
- <MenuItem id = "RebuildProject"
- label = "${res:XML.MainMenu.RunMenu.RebuildProject}"
- class = "MonoDevelop.Commands.RebuildCurrentProject"/>
- <MenuItem id = "BuildGroupSeparator" label = "-" />
- <MenuItem id = "Add" label = "${res:ProjectComponent.ContextMenu.AddMenu}">
- <MenuItem id = "NewFiles"
- label = "${res:ProjectComponent.ContextMenu.NewFiles}"
- icon = "Icons.16x16.NewDocumentIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.AddNewFileEvent"/>
- <MenuItem id = "AddFiles"
- label = "${res:ProjectComponent.ContextMenu.AddFiles}"
- class = "MonoDevelop.Commands.ProjectBrowser.AddFilesToProject"/>
- <MenuItem id = "Separator1" label = "-" />
- <MenuItem id = "NewFolder"
- label = "${res:ProjectComponent.ContextMenu.NewFolder}"
- icon = "Icons.16x16.NewFolderIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.NewFolderEvent"/>
- </MenuItem>
- <MenuItem id = "AddSeparator" label = "-" />
- <MenuItem id = "Remove"
- label = "${res:ProjectComponent.ContextMenu.Remove}"
- icon = "Icons.16x16.DeleteIcon"
- class = "MonoDevelop.Commands.ProjectBrowser.RemoveEntryEvent"/>
- <MenuItem id = "Rename"
- label = "${res:ProjectComponent.ContextMenu.Rename}"
- shortcut = "F2"
- class = "MonoDevelop.Commands.ProjectBrowser.RenameEntryEvent"/>
- <!-- <MenuItem id = "RemoveRenameSeparator" label = "-" /> -->
- <!-- <MenuItem id = "RunTests"
- label = "${res:ProjectComponent.ContextMenu.RunTests}"
- class = "MonoDevelop.Commands.RunTestsInProject"/>
- <MenuItem id = "Deploy"
- label = "${res:ProjectComponent.ContextMenu.Deploy}" />
- <MenuItem id = "TestsDeploySeparator" label = "-" /> -->
-
-<!-- <MenuItem id = "ViewDocumentation"
- label = "${res:ProjectComponent.ContextMenu.ViewDocumentation}"
- class = "MonoDevelop.Commands.ViewProjectDocumentation"/> -->
-
- <!-- <MenuItem id = "GenerateDocumentation"
- label = "${res:ProjectComponent.ContextMenu.GenerateDocumentation}"
- class = "MonoDevelop.Commands.GenerateProjectDocumentation"/> -->
-
- <MenuItem id = "SetAsStartupProjectSeparator" label = "-" />
- <MenuItem id = "SetAsStartupProject"
- label = "${res:ProjectComponent.ContextMenu.SetAsStartupProject}"
- class = "MonoDevelop.Commands.ProjectBrowser.SetAsStartupProject"/>
-
- <MenuItem id = "OptionsSeparator" label = "-" />
- <MenuItem id = "ProjectOptions"
- label = "${res:ProjectComponent.ContextMenu.Options}"
- icon = "Icons.16x16.PropertiesIcon"
- class = "MonoDevelop.Commands.ViewProjectOptions"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/ProjectOptions/ConfigNodeMenu">
- <MenuItem id = "Add"
- label = "${res:ProjectComponent.ContextMenu.AddMenu}"
- class = "MonoDevelop.Commands.AddProjectConfiguration"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/ProjectOptions/SelectedConfigMenu">
- <MenuItem id = "Rename"
- label = "Rename"
- class = "MonoDevelop.Commands.RenameProjectConfiguration"/>
- <MenuItem id = "Remove"
- label = "Remove"
- class = "MonoDevelop.Commands.RemoveProjectConfiguration"/>
- <MenuItem id = "RenameRemoveSeparator"
- label = "-"/>
- <MenuItem id = "SetActive"
- label = "Set as active"
- class = "MonoDevelop.Commands.SetActiveProjectConfiguration"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/ProjectOptions/GeneralOptions">
- <DialogPanel id = "Common"
- label = "General">
- <DialogPanel id = "GeneralProjectPanel"
- label = "${res:Dialog.Options.ProjectOptionsText}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.GeneralProjectOptions"/>
- <DialogPanel id = "Compile"
- label = "${res:Dialog.Options.PrjOptions.CompileFile.PanelName}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.CompileFileProjectOptions"/>
-<!-- <DialogPanel id = "Deploy"
- label = "${res:Dialog.Options.PrjOptions.DeployFile.PanelName}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.DeployFileProjectOptions"/> -->
- </DialogPanel>
- </Extension>
-
- <!-- TODO : complete the combine options dialog -->
-
- <Extension path = "/SharpDevelop/Workbench/CombineOptions">
- <DialogPanel id = "Common"
- label = "${res:Dialog.Options.CombineOptions.CommonOptions}">
- <DialogPanel id = "Startup"
- label = "${res:Dialog.Options.CombineOptions.Startup.PanelName}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.CombineStartupPanel"/>
-
-<!-- <DialogPanel id = "Dependency"
- label = "${res:Dialog.Options.CombineOptions.Dependencies.PanelName}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.CombineDependencyPanel"/> -->
-
- </DialogPanel>
-
- <!-- ORIGINAL #D COMMENT
- <DialogPanel id = "Configuration"
- label = "${res:Dialog.Options.CombineOptions.ConfigurationOptions}">
- <DialogPanel id = "Configuration"
- label = "${res:Dialog.Options.CombineOptions.Configurations.PanelName}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.CombineConfigurationPanel"/>
- </DialogPanel> -->
-
- </Extension>
-
-<!-- not using these, since the OpenFileTab has been removed (replaced with TabLabel) jba 5 march 2004
- <Extension path = "/SharpDevelop/Workbench/OpenFileTab/ContextMenu">
- <MenuItem id = "Close"
- label = "${res:OpenFileTabEventHandler.ContextMenu.Close}"
- class = "MonoDevelop.Commands.TabStrip.CloseFileTab"/>
- <MenuItem id = "CloseSeparator" label = "-" />
- <Conditional action="Disable">
- <And>
- <Condition ownerstate="FileDirty"/>
- <Not>
- <Condition ownerstate="FileUntitled"/>
- </Not>
- </And>
-
- <MenuItem id = "Save"
- label = "${res:OpenFileTabEventHandler.ContextMenu.Save}"
- icon = "Icons.16x16.SaveIcon"
- class = "MonoDevelop.Commands.TabStrip.SaveFileTab"/>
- </Conditional>
- <MenuItem id = "SaveAs"
- label = "${res:OpenFileTabEventHandler.ContextMenu.SaveAs}"
- icon = "Icons.16x16.SaveAsIcon"
- class = "MonoDevelop.Commands.TabStrip.SaveFileAsTab"/>
-
- <MenuItem id = "SaveSeparator" label = "-" />
- <Conditional action="Disable">
- <Not>
- <Condition ownerstate="FileUntitled" />
- </Not>
- <MenuItem id = "CopyPathName"
- label = "${res:OpenFileTabEventHandler.CopyPathName}"
- class = "MonoDevelop.Commands.TabStrip.CopyPathName"/>
- </Conditional>
- </Extension>
--->
-
- <Extension path = "/SharpDevelop/Workbench/FileFilter">
- <FileFilter id = "AllFiles"
- name = "${res:SharpDevelop.FileFilter.AllFiles}"
- extensions = "*.*"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/Views">
- <Class id = "ProjectScout"
- class = "MonoDevelop.Gui.Pads.ProjectBrowser.ProjectBrowserView"/>
- <Class id = "ClassScout"
- class = "MonoDevelop.Gui.Pads.ClassScout"/>
- <Class id = "FileScout"
- class = "MonoDevelop.Gui.Pads.FileScout"/>
- <Class id = "OpenTaskView"
- class = "MonoDevelop.Gui.Pads.OpenTaskView"/>
- <Class id = "HelpBrowser"
- class = "MonoDevelop.Gui.Pads.HelpTree"/>
-<!--
- <Class id = "SideBar"
- class = "MonoDevelop.Gui.Pads.SideBarView"/>
-
-
- <Class id = "PropertyPad"
- class = "MonoDevelop.Gui.Pads.PropertyPad"/>
-
- <Class id = "HelpBrowser"
- class = "MonoDevelop.Gui.Pads.HelpBrowser"/>
--->
- </Extension>
-
-
- <Extension path = "/SharpDevelop/Dialogs/OptionsDialog">
- <DialogPanel id = "UIOptions"
- label = "${res:Dialog.Options.TreeViewOptions.SharpDevelopOptionsText}">
-<!-- <DialogPanel id = "SelectCulture"
- label = "${res:Dialog.Options.IDEOptions.SelectCulture.PanelName}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.IDEOptionPanel"/>-->
- <DialogPanel id = "SelectStyle"
- label = "${res:Dialog.Options.IDEOptions.SelectVisualStyle.PanelName}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.SelectStylePanel"/>
- <DialogPanel id = "LoadSave"
- label = "${res:Dialog.Options.IDEOptions.LoadSaveOptions.PanelName}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.LoadSavePanel"/>
- <!-- i8n the file -->
- <DialogPanel id = "Build"
- label = "Build"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.BuildPanel"/>
- </DialogPanel>
- <DialogPanel id = "CodingOptions"
- label = "${res:Dialog.Options.IDEOptions.CodingOptionsText}">
- <DialogPanel id = "CodeGeneration"
- label = "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.Title}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.CodeGenerationPanel"/>
- </DialogPanel>
-
- <DialogPanel id = "ToolsOptions"
- label = "${res:Dialog.Options.IDEOptions.ToolsOptionsText}">
- <DialogPanel id = "ExternalTools"
- label = "${res:Dialog.Options.ExternalToolsText}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.ExternalToolPane"/>
- <!-- ORIGINAL #D COMMENT <DialogPanel id = "HtmlHelp"
- label = "${res:Dialog.Options.IDEOptions.HelpGeneratingPanelText}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.HelpGeneratingPanel"/>-->
- </DialogPanel>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/Combine/FileFilter">
- <FileFilter id = "Combine"
- name = "${res:SharpDevelop.FileFilter.CombineFiles}"
- extensions = "*.cmbx"/>
- <FileFilter id = "Project"
- name = "${res:SharpDevelop.FileFilter.ProjectFiles}"
- extensions = "*.prjx"/>
- <FileFilter id = "AllFiles"
- name = "${res:SharpDevelop.FileFilter.AllFiles}"
- extensions = "*.*"/>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/ToolBar">
- <ToolbarItem id = "Standard">
- <ToolbarItem id = "New"
- icon = "Icons.16x16.NewDocumentIcon"
- tooltip = "${res:XML.MainMenu.FileMenu.New.File.Description}"
- class = "MonoDevelop.Commands.CreateNewFile"/>
- <ToolbarItem id = "Open"
- icon = "Icons.16x16.OpenFileIcon"
- tooltip = "${res:XML.MainMenu.FileMenu.Open.File.Description}"
- class = "MonoDevelop.Commands.OpenFile"/>
- <Conditional activewindow="*" action="Disable">
- <ToolbarItem id = "Save"
- icon = "Icons.16x16.SaveIcon"
- tooltip = "${res:XML.MainMenu.FileMenu.Save.Description}"
- class = "MonoDevelop.Commands.SaveFile"/>
-
- <ToolbarItem id = "SaveAll"
- icon = "Icons.16x16.SaveAllIcon"
- tooltip = "${res:XML.MainMenu.FileMenu.SaveAll.Description}"
- class = "MonoDevelop.Commands.SaveAllFiles"/>
- </Conditional>
- <ToolbarItem id = "Separator1" tooltip = "-"/>
- <!-- <Conditional activewindow="*" action="Disable"> -->
- <ToolbarItem id = "Cut"
- icon = "Icons.16x16.CutIcon"
- tooltip = "${res:XML.MainMenu.EditMenu.Cut.Description}"
- class = "MonoDevelop.Commands.Cut"/>
- <ToolbarItem id = "Copy"
- icon = "Icons.16x16.CopyIcon"
- tooltip = "${res:XML.MainMenu.EditMenu.Copy.Description}"
- class = "MonoDevelop.Commands.Copy"/>
- <ToolbarItem id = "Paste"
- icon = "Icons.16x16.PasteIcon"
- tooltip = "${res:XML.MainMenu.EditMenu.Paste.Description}"
- class = "MonoDevelop.Commands.Paste"/>
- <ToolbarItem id = "Delete"
- icon = "Icons.16x16.DeleteIcon"
- tooltip = "${res:XML.MainMenu.EditMenu.Delete.Description}"
- class = "MonoDevelop.Commands.Delete"/>
- <!-- </Conditional> -->
- <ToolbarItem id = "CutSeparator" insertafter ="Delete" insertbefore ="Find" tooltip = "-"/>
- <!-- <Conditional action="Disable">
- <Or>
- <Condition activewindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextAreaControlProvider"/>
- <Condition iscombineopen="True"/>
- </Or>
- </Conditional> -->
-
- <ToolbarItem id = "CompileSeparator" insertafter = "ClearBookmarks" tooltip = "-"/>
- <Conditional action="Disable">
- <Or>
- <Condition activewindow="MonoDevelop.DefaultEditor.Gui.Editor.ITextAreaControlProvider"/>
- <Condition iscombineopen="True"/>
- </Or>
- <ToolbarItem id = "Compile"
- icon = "Icons.16x16.BuildCombine"
- tooltip = "${res:XML.MainMenu.RunMenu.Compile.Description}"
- class = "MonoDevelop.Commands.Compile"/>
-
- <ToolbarItem id = "BuildProject"
- icon = "Icons.16x16.BuildCurrentSelectedProject"
- tooltip = "${res:XML.MainMenu.RunMenu.BuildProject.Description}"
- class = "MonoDevelop.Commands.BuildCurrentProject"/>
- <ToolbarItem id = "Run"
- icon = "Icons.16x16.RunProgramIcon"
- tooltip = "${res:XML.MainMenu.RunMenu.Run.Description}"
- class = "MonoDevelop.Commands.RunCommand"/>
- </Conditional>
- </ToolbarItem>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/MainMenu">
- <MenuItem id = "File" label = "${res:XML.MainMenu.FileMenu}">
- <MenuItem id = "New" label = "${res:XML.MainMenu.FileMenu.New}">
- <MenuItem id = "File"
- label = "${res:XML.MainMenu.FileMenu.New.File}"
- icon = "Icons.16x16.NewDocumentIcon"
- description = "${res:XML.MainMenu.FileMenu.New.File.Description}"
- shortcut = "Control|N"
- class = "MonoDevelop.Commands.CreateNewFile"/>
-
- <MenuItem id = "Project"
- label = "${res:XML.MainMenu.FileMenu.New.Project}"
- icon = "Icons.16x16.NewProjectIcon"
- description = "${res:XML.MainMenu.FileMenu.New.Project.Description}"
- shortcut = "Control|Shift|N"
- class = "MonoDevelop.Commands.CreateNewProject"/>
- </MenuItem>
-
- <MenuItem id = "Open" label = "${res:XML.MainMenu.FileMenu.Open}">
- <MenuItem id = "File"
- label = "${res:XML.MainMenu.FileMenu.Open.File}"
- icon = "Icons.16x16.OpenFileIcon"
- description = "${res:XML.MainMenu.FileMenu.Open.File.Description}"
- shortcut = "Control|O"
- class = "MonoDevelop.Commands.OpenFile"/>
-
- <MenuItem id = "Project"
- label = "${res:XML.MainMenu.FileMenu.Open.Project}"
- icon = "Icons.16x16.OpenProjectIcon"
- description = "${res:XML.MainMenu.FileMenu.Open.Project.Description}"
- shortcut = "Control|Shift|O"
- class = "MonoDevelop.Commands.OpenCombine"/>
- </MenuItem>
-
- <MenuItem id = "Close" label = "${res:XML.MainMenu.FileMenu.Close}">
- <Conditional activewindow="*" action="Disable">
- <MenuItem id = "CloseFile"
- label = "${res:XML.MainMenu.FileMenu.Close.File}"
- description = "${res:XML.MainMenu.FileMenu.Close.File.Desription}"
- icon = "Icons.16x16.CloseIcon"
- shortcut = "Control|W"
- class ="MonoDevelop.Commands.CloseFile"/>
- </Conditional>
- <Conditional iscombineopen="True" action="Disable">
- <MenuItem id = "CloseCombine"
- label = "${res:XML.MainMenu.FileMenu.Close.Project}"
- description = "${res:XML.MainMenu.FileMenu.Close.Project.Desription}"
- icon = "Icons.16x16.CloseCombineIcon"
- shortcut = "Control|Shift|W"
- class = "MonoDevelop.Commands.ClearCombine"/>
- </Conditional>
- </MenuItem>
-
- <MenuItem id = "ReloadSeparator" label = "-" />
- <MenuItem id = "Reloadfile"
- label = "${res:XML.MainMenu.FileMenu.Reload}"
- shortcut = "Control|U"
- description = "${res:XML.MainMenu.FileMenu.Reload.Description}"
- class = "MonoDevelop.Commands.ReloadFile" />
-
- <MenuItem id = "SaveSeparator" label = "-" />
-
- <Conditional activewindow="*" action="Disable">
- <MenuItem id = "Save"
- label = "${res:XML.MainMenu.FileMenu.Save}"
- icon = "Icons.16x16.SaveIcon"
- description = "${res:XML.MainMenu.FileMenu.Save.Description}"
- shortcut = "Control|S"
- class = "MonoDevelop.Commands.SaveFile"/>
- <MenuItem id = "SaveAs"
- label = "${res:XML.MainMenu.FileMenu.SaveAs}"
- icon = "Icons.16x16.SaveAsIcon"
- description = "${res:XML.MainMenu.FileMenu.SaveAs.Description}"
- class = "MonoDevelop.Commands.SaveFileAs"/>
- <MenuItem id = "SaveAll"
- label = "${res:XML.MainMenu.FileMenu.SaveAll}"
- icon = "Icons.16x16.SaveAllIcon"
- shortcut = "Control|Shift|S"
- description = "${res:XML.MainMenu.FileMenu.SaveAll.Description}"
- class = "MonoDevelop.Commands.SaveAllFiles"/>
- </Conditional>
- <!--
- <MenuItem id = "PrintSeparator" label = "-" />
- <Conditional activewindow="*" action="Disable">
- <MenuItem id = "Print"
- label = "${res:XML.MainMenu.FileMenu.Print}"
- icon = "Icons.16x16.Print"
- description = "${res:XML.MainMenu.FileMenu.Print.Description}"
- shortcut = "Control|P"
- class = "MonoDevelop.Commands.Print"/>
- <MenuItem id = "PrintPreview"
- label = "${res:XML.MainMenu.FileMenu.PrintPreview}"
- icon = "Icons.16x16.PreView"
- description = "${res:XML.MainMenu.FileMenu.PrintPreview.Description}"
- class = "MonoDevelop.Commands.PrintPreview"/>
- </Conditional>
- -->
- <MenuItem id = "RecentSeparator" label = "-" />
- <MenuItem id = "RecentFiles" attribute = "RecentFiles" label = "${res:XML.MainMenu.FileMenu.RecentFiles}">
- <MenuItem id = "RecentFilesBuilder" label = "boguslabel" class = "MonoDevelop.Commands.RecentFilesMenuBuilder" />
- <MenuItem id = "RecentFilesSeparator" label = "-" />
- <MenuItem id = "ClearRecentFiles"
- label = "${res:XML.MainMenu.FileMenu.ClearRecentFiles}"
- description = "${res:XML.MainMenu.FileMenu.ClearRecentFiles.Description}"
- class = "MonoDevelop.Commands.ClearRecentFiles" />
- </MenuItem>
-
- <MenuItem id = "RecentProjects" attribute = "RecentProjects" label = "${res:XML.MainMenu.FileMenu.RecentProjects}">
- <MenuItem id = "RecentProjectsBuilder" label = "boguslabel" class = "MonoDevelop.Commands.RecentProjectsMenuBuilder" />
- <MenuItem id = "RecentProjectsSeparator" label = "-" />
- <MenuItem id = "ClearRecentFiles"
- label = "${res:XML.MainMenu.FileMenu.ClearRecentProjects}"
- description = "${res:XML.MainMenu.FileMenu.ClearRecentProjects.Description}"
- class = "MonoDevelop.Commands.ClearRecentProjects" />
- </MenuItem>
-
- <MenuItem id = "ExitSeparator" label = "-" />
- <MenuItem id = "Exit"
- label = "${res:XML.MainMenu.FileMenu.Exit}"
- icon = "Icons.16x16.QuitIcon"
- description = "${res:XML.MainMenu.FileMenu.Exit.Description}"
- class = "MonoDevelop.Commands.ExitWorkbenchCommand" />
- </MenuItem>
-
- <MenuItem id = "Edit" label = "${res:XML.MainMenu.EditMenu}">
- <Conditional activewindow="*" action="Disable">
- <MenuItem id = "Undo"
- label = "${res:XML.MainMenu.EditMenu.Undo}"
- icon = "Icons.16x16.UndoIcon"
- description = "${res:XML.MainMenu.EditMenu.Undo.Description}"
- shortcut = "Control|Z"
- class = "MonoDevelop.Commands.Undo"/>
- <MenuItem id = "Redo"
- label = "${res:XML.MainMenu.EditMenu.Redo}"
- icon = "Icons.16x16.RedoIcon"
- description = "${res:XML.MainMenu.EditMenu.Redo.Description}"
- shortcut = "Control|Y"
- class = "MonoDevelop.Commands.Redo"/>
- </Conditional>
- <MenuItem id = "Separator1" label = "-" />
- <Conditional activewindow="*" action="Disable">
- <MenuItem id = "Cut"
- label = "${res:XML.MainMenu.EditMenu.Cut}"
- icon = "Icons.16x16.CutIcon"
- description = "${res:XML.MainMenu.EditMenu.Cut.Description}"
- shortcut = "Control|X"
- class = "MonoDevelop.Commands.Cut"/>
- <MenuItem id = "Copy"
- label = "${res:XML.MainMenu.EditMenu.Copy}"
- icon = "Icons.16x16.CopyIcon"
- description = "${res:XML.MainMenu.EditMenu.Copy.Description}"
- shortcut = "Control|C"
- class = "MonoDevelop.Commands.Copy"/>
- <MenuItem id = "Paste"
- label = "${res:XML.MainMenu.EditMenu.Paste}"
- icon = "Icons.16x16.PasteIcon"
- description = "${res:XML.MainMenu.EditMenu.Paste.Description}"
- shortcut = "Control|V"
- class = "MonoDevelop.Commands.Paste"/>
- <MenuItem id = "Delete"
- label = "${res:XML.MainMenu.EditMenu.Delete}"
- icon = "Icons.16x16.DeleteIcon"
- description = "${res:XML.MainMenu.EditMenu.Delete.Description}"
- class = "MonoDevelop.Commands.Delete"/>
- <MenuItem id = "SelectAll"
- label = "${res:XML.MainMenu.EditMenu.SelectAll}"
- description = "${res:XML.MainMenu.EditMenu.SelectAll.Description}"
- shortcut = "Control|A"
- class = "MonoDevelop.Commands.SelectAll"/>
- </Conditional>
- <MenuItem id = "Separator4" label = "-" />
- <Conditional action="Disable">
- <Or>
- <Condition activewindow="*"/>
- <Condition iscombineopen="True"/>
- </Or>
- <MenuItem id = "WordCount"
- label = "${res:XML.MainMenu.EditMenu.WordCount}"
- description = "${res:XML.MainMenu.EditMenu.WordCount.Description}"
- class = "MonoDevelop.Commands.WordCount"/>
- </Conditional>
- </MenuItem>
-
- <MenuItem id = "View" label = "${res:XML.MainMenu.ViewMenu}">
- <MenuItem id = "ViewBuilder" label = "" class = "MonoDevelop.Commands.ViewMenuBuilder" />
- <MenuItem id = "ViewItemsSeparator" label = "-" />
- <MenuItem id = "ViewLayouts" label = "Layouts">
- <MenuItem id = "ViewLayoutsBuilder" label = "" class = "MonoDevelop.Commands.LayoutsMenuBuilder" />
- <MenuItem id = "ViewLayoutsSeparator" label = "-" />
- <MenuItem id = "ViewLayoutsNew" label = "New" class = "MonoDevelop.Commands.NewLayoutCommand" />
- </MenuItem>
- <MenuItem id = "ViewItemsSeparator2" label = "-" />
- <MenuItem id = "FullScreen"
- label = "${res:XML.MainMenu.ViewMenu.FullScreen}"
- icon = "Icons.16x16.FullScreen"
- description = "${res:XML.MainMenu.ViewMenu.FullScreen.Description}"
- class = "MonoDevelop.Commands.ToggleFullscreenCommand" />
- </MenuItem>
-
- <!-- <Conditional iscombineopen="True">
- <MenuItem id = "Project" label = "${res:XML.MainMenu.ProjectMenu}">
- <Conditional activeproject="*" action="Disable">
- <MenuItem id = "RunTests"
- label = "${res:XML.MainMenu.ProjectMenu.RunTests}"
- description = "${res:XML.MainMenu.ProjectMenu.RunTests.Description}"
- class = "MonoDevelop.Commands.RunTestsInProject"/>
-
- <MenuItem id = "Deploy"
- label = "${res:XML.MainMenu.ProjectMenu.Deploy}"
- description = "${res:XML.MainMenu.ProjectMenu.Deploy.Description}"
- class = "MonoDevelop.Commands.DeployProject"/>
- <MenuItem id = "Separator1" label = "-" />
- <MenuItem id = "ViewDocumentation"
- label = "${res:ProjectComponent.ContextMenu.ViewDocumentation}"
- class = "MonoDevelop.Commands.ViewProjectDocumentation"/>
-
- <MenuItem id = "GenerateDocumentation"
- label = "${res:ProjectComponent.ContextMenu.GenerateDocumentation}"
- class = "MonoDevelop.Commands.GenerateProjectDocumentation"/>
-
- <MenuItem id = "Separator2" label = "-" />
- <MenuItem id = "Options"
- label = "${res:XML.MainMenu.ProjectMenu.Options}"
- description = "${res:XML.MainMenu.ProjectMenu.Options.Description}"
- class = "MonoDevelop.Commands.ViewProjectOptions"/>
- </Conditional>
- </MenuItem>
- </Conditional> -->
-
- <MenuItem id = "Run" label = "${res:XML.MainMenu.RunMenu}">
- <Conditional action="Disable">
- <Or>
- <Condition activewindow="MonoDevelop.SourceEditor.Gui.SourceEditorDisplayBindingWrapper"/>
- <Condition iscombineopen="True"/>
- </Or>
-
- <MenuItem id = "Compile"
- label = "${res:XML.MainMenu.RunMenu.Compile}"
- description = "${res:XML.MainMenu.RunMenu.Compile.Description}"
- shortcut = "F8"
- icon = "Icons.16x16.BuildCombine"
- class = "MonoDevelop.Commands.Compile"/>
- <MenuItem id = "CompileAll"
- label = "${res:XML.MainMenu.RunMenu.CompileAll}"
- description = "${res:XML.MainMenu.RunMenu.CompileAll.Description}"
- shortcut = "Control|F8"
- class = "MonoDevelop.Commands.CompileAll"/>
- <MenuItem id = "Separator1" label = "-" />
- <!-- <Conditional activeproject="*">
- <MenuItem id = "BuildProject"
- label = "${res:XML.MainMenu.RunMenu.BuildProject}"
- description = "${res:XML.MainMenu.RunMenu.BuildProject.Description}"
- shortcut = "F9"
- icon = "Icons.16x16.BuildCurrentSelectedProject"
- class = "MonoDevelop.Commands.BuildCurrentProject"/>
- <MenuItem id = "RebuildProject"
- label = "${res:XML.MainMenu.RunMenu.RebuildProject}"
- description = "${res:XML.MainMenu.RunMenu.RebuildProject.Description}"
- shortcut = "Alt|F9"
- class = "MonoDevelop.Commands.RebuildCurrentProject"/>
- <MenuItem id = "Separator2" label = "-" />
- </Conditional> -->
- <MenuItem id = "Run"
- label = "${res:XML.MainMenu.RunMenu.Run}"
- icon = "Icons.16x16.RunProgramIcon"
- description = "${res:XML.MainMenu.RunMenu.Run.Description}"
- shortcut = "F5"
- class = "MonoDevelop.Commands.RunCommand"/>
-
- </Conditional>
- </MenuItem>
-
- <MenuItem id = "Tools"
- label = "${res:XML.MainMenu.ToolMenu}">
- <MenuItem id = "ToolBuilder" label = "boguslabel" class = "MonoDevelop.Commands.ToolMenuBuilder" />
- <!-- <MenuItem id = "Separator1" label = "-" /> -->
-
- <!-- <MenuItem id = "Separator4" label = "-" /> -->
- <!-- <Conditional action = "Disable">
- <Or>
- <Condition activewindow="MonoDevelop.FormDesigner.FormDesignerDisplayBindingWrapper"/>
- <Condition activewindow="MonoDevelop.FormDesigner.CSharpDesignerDisplayBindingWrapper"/>
- <Condition activewindow="MonoDevelop.DefaultEditor.Gui.Editor.TextEditorDisplayBindingWrapper"/>
- </Or>
- <MenuItem id = "ConvertBuffer"
- label = "${res:XML.MainMenu.ToolMenu.ConvertBufferToVBNET}"
- description = "${res:XML.MainMenu.ToolMenu.ConvertBufferToVBNET.Description}"
- class = "MonoDevelop.Commands.VBConvertBuffer"/>
- </Conditional> -->
-
- <!-- ORIGINAL #D COMMENT <MenuItem id = "ConvertProject"
- label = "Convert C# Project to VB.NET"
- description = "Converts the current selected C# project to VB.NET"
- class = "MonoDevelop.Commands.VBConvertProject"/>-->
-
- <!-- <MenuItem id = "Separator5" label = "-" /> -->
-
- <MenuItem id = "Options"
- label = "${res:XML.MainMenu.ToolMenu.Options}"
- icon = "Icons.16x16.Options"
- description = "${res:XML.MainMenu.ToolMenu.Options.Description}"
- class = "MonoDevelop.Commands.OptionsCommand"/>
- </MenuItem>
-
-<!-- ORIGINAL #D COMMENT <MenuItem id = "AddIns" label = "${res:XML.MainMenu.PluginMenu}">
- <MenuItem label = "-" />
- <MenuItem label = "${res:XML.MainMenu.PluginMenu.Manager}" description = "${res:XML.MainMenu.PluginMenu.Manager.Description}" class = "SharpDevelop.Actions.Edit.ShowPlugInManager"/>
- </MenuItem>-->
-
- <MenuItem id = "Window" label = "${res:XML.MainMenu.WindowMenu}">
- <Conditional action="Disable">
- <Condition activewindow="*" />
- <MenuItem id = "NextWindow"
- label = "${res:XML.MainMenu.WindowMenu.NxtWindow}"
- icon = "Icons.16x16.NextWindowIcon"
- description = "${res:XML.MainMenu.WindowMenu.NxtWindow.Description}"
- shortcut = "Control|Page_Down"
- class = "MonoDevelop.Commands.SelectNextWindow" />
- <MenuItem id = "PrevWindow"
- label = "${res:XML.MainMenu.WindowMenu.PrvWindow}"
- icon = "Icons.16x16.PrevWindowIcon"
- description = "${res:XML.MainMenu.WindowMenu.PrvWindow.Description}"
- shortcut = "Control|Page_Up"
- class = "MonoDevelop.Commands.SelectPrevWindow" />
- <MenuItem id ="NxtPrvSeparator" label = "-" />
- <MenuItem id = "CloseAll"
- label = "${res:XML.MainMenu.FileMenu.CloseAll}"
- icon = "Icons.16x16.CloseAllDocuments"
- description = "${res:XML.MainMenu.FileMenu.CloseAll.Description}"
- class = "MonoDevelop.Commands.CloseAllWindows" />
- </Conditional>
- <MenuItem id = "ContentBuilder" label = "boguslabel" class="MonoDevelop.Commands.OpenContentsMenuBuilder"/>
- </MenuItem>
-
- <MenuItem id = "Help" label = "${res:XML.MainMenu.HelpMenu}">
- <MenuItem id = "Help"
- label = "${res:XML.MainMenu.HelpMenu.Topics}"
- icon = "Icons.16x16.HelpIcon"
- description = "${res:XML.MainMenu.HelpMenu.Topics.Description}"
- shortcut = "Alt|F1"
- class = "MonoDevelop.Commands.ShowHelp"/>
- <MenuItem id = "TipOfTheDay"
- label = "${res:XML.MainMenu.HelpMenu.Tips}"
- icon = "Icons.16x16.TipOfTheDay"
- description = "${res:XML.MainMenu.HelpMenu.Tips.Description}"
- class = "MonoDevelop.Commands.ViewTipOfTheDay" />
-
- <MenuItem id = "Separator1" label = "-" />
- <MenuItem id = "ViewGPL"
- label = "${res:XML.MainMenu.HelpMenu.GPL}"
- icon = "Icons.16x16.CopyLeftIcon"
- description = "${res:XML.MainMenu.HelpMenu.GPL.Description}"
- class = "MonoDevelop.Commands.ViewGPL" />
-
- <!-- <MenuItem id = "ViewReadme"
- label = "${res:XML.MainMenu.HelpMenu.ReadMe}"
- description = "${res:XML.MainMenu.HelpMenu.ReadMe.Description}"
- link = "home://../doc/ReadMe.html" />
- <MenuItem id = "ViewStyleguide"
- label = "${res:XML.MainMenu.HelpMenu.StyleGuide}"
- description = "${res:XML.MainMenu.HelpMenu.StyleGuide.Description}"
- link = "home://../doc/CodingStyleGuide.pdf" /> -->
- <MenuItem id = "Separator2" label = "-" />
- <MenuItem id = "Web" label = "${res:XML.MainMenu.HelpMenu.WebMenu}">
- <!-- <MenuItem id = "ASP" label = "&AlphaSierraPapa" icon = "Icons.16x16.WebSearchIcon" description = "Visit my sponsors" link = "http://www.alphasierrapapa.com/" /> -->
- <MenuItem id = "MonoDevelop" label = "MonoDevelop" icon = "Icons.16x16.WebSearchIcon" link = "http://www.monodevelop.com" />
- <!-- <MenuItem id = "SharpDevelop" label = "SharpDevelop">
- <MenuItem id = "Downloads" label = "Downloads" icon = "Icons.16x16.WebSearchIcon" link = "http://www.icsharpcode.net/opensource/sd/download/" />
- <MenuItem id = "Forum" label = "Community Forums" icon = "Icons.16x16.WebSearchIcon" link = "http://www.icsharpcode.net/opensource/sd/forum/" />
- <MenuItem id = "Announcement" label = "Announcement List" icon = "Icons.16x16.WebSearchIcon" link = "http://www.icsharpcode.net/opensource/sd/announcementlist.asp" />
- <MenuItem id = "Mail" label = "Send Us a Mail" icon = "Icons.16x16.WebSearchIcon" link = "http://www.icsharpcode.net/opensource/sd/ContactUs.asp" />
- </MenuItem> -->
- <MenuItem id = "C#" label = "C#">
- <MenuItem id = "cshrp.net" label = "cshrp.net" icon = "Icons.16x16.WebSearchIcon" link = "http://www.cshrp.net/" />
- <MenuItem id = "C# Help" label = "C# Help" icon = "Icons.16x16.WebSearchIcon" link = "http://www.csharphelp.com" />
- <MenuItem id = "C# Corner" label = "C# Corner" icon = "Icons.16x16.WebSearchIcon" link = "http://www.c-sharpcorner.com" />
- <MenuItem id = "GotDotNet" label = "GotDotNet" icon = "Icons.16x16.WebSearchIcon" description = "Visit one of the best NET sites on the web" link = "http://www.gotdotnet.com/" />
- </MenuItem>
- <!-- <MenuItem id = "IntegratedProjects" label = "Integrated Projects">
- <MenuItem id = "Magic Library" label = "Magic Library" icon = "Icons.16x16.WebSearchIcon" description = "One of the best .NET control libraries around." link = "http://www.dotnetmagic.com" />
- <MenuItem id = "NAnt" label = "NAnt" icon = "Icons.16x16.WebSearchIcon" description = "THE .NET building tool." link = "http://nant.sourceforge.net/" />
- <MenuItem id = "NDoc" label = "NDoc" icon = "Icons.16x16.WebSearchIcon" description = "I used the NDoc as the SharpDevelop documentation generator. Look out it is cool." link = "http://ndoc.sourceforge.net/" />
- <MenuItem id = "#ZipLib" label = "#ZipLib" icon = "Icons.16x16.WebSearchIcon" description = "I used the NDoc as the SharpDevelop documentation generator. Look out it is cool." link = "http://www.icsharpcode.net/OpenSource/NZipLib" />
- <MenuItem id = "#CvsLib" label = "#CvsLib" icon = "Icons.16x16.WebSearchIcon" description = "I used the NDoc as the SharpDevelop documentation generator. Look out it is cool." link = "http://www.icsharpcode.net/OpenSource/NetCvsLib" />
- </MenuItem> -->
- <MenuItem id = "Mono" label = "Mono Project" icon = "Icons.16x16.WebSearchIcon" description = "A free .NET implementation effort, worth visiting" link = "http://www.go-mono.com" />
- </MenuItem>
- <MenuItem id = "Separator3" label = "-" />
- <MenuItem id = "About"
- label = "${res:XML.MainMenu.HelpMenu.About}"
- icon = "Icons.16x16.AboutIcon"
- description = "${res:XML.MainMenu.HelpMenu.About.Description}"
- class = "MonoDevelop.Commands.AboutSharpDevelop" />
- </MenuItem>
- </Extension>
-
-
- <Extension path = "/SharpDevelop/Workbench/SharpDevelopSideBar/ContextMenu">
- <Conditional ownerstate="TabCanBeDeleted" action="Disable">
- <MenuItem id = "DeleteTab"
- label = "${res:SideBarComponent.ContextMenu.DeleteTab}"
- class = "MonoDevelop.Commands.SideBarDeleteTabHeader"/>
- </Conditional>
-
- <MenuItem id = "RenameTab"
- label = "${res:SideBarComponent.ContextMenu.RenameTab}"
- class = "MonoDevelop.Commands.SideBarRenameTabHeader"/>
-
- <MenuItem id = "Separator1" label = "-" />
- <MenuItem id = "AddTab"
- label = "${res:SideBarComponent.ContextMenu.AddTab}"
- class = "MonoDevelop.Commands.SideBarAddTabHeader"/>
-
- <MenuItem id = "Separator2" label = "-" />
- <Conditional ownerstate="CanMoveUp" action="Disable">
- <MenuItem id = "MoveTabUp"
- label = "${res:SideBarComponent.ContextMenu.MoveTabUp}"
- class = "MonoDevelop.Commands.SideBarMoveTabUp"/>
- </Conditional>
-
- <Conditional ownerstate="CanMoveDown" action="Disable">
- <MenuItem id = "MoveTabDown"
- label = "${res:SideBarComponent.ContextMenu.MoveTabDown}"
- class = "MonoDevelop.Commands.SideBarMoveTabDown"/>
- </Conditional>
- </Extension>
-
- <Extension path = "/SharpDevelop/Workbench/SharpDevelopSideBar/SideTab/ContextMenu">
- <MenuItem id = "RenameTabItem"
- label = "${res:SideBarComponent.ContextMenu.RenameTabItem}"
- class = "MonoDevelop.Commands.SideBarRenameTabItem" />
- <MenuItem id = "DeleteTabItem"
- label = "${res:SideBarComponent.ContextMenu.DeleteTabItem}"
- class = "MonoDevelop.Commands.SideBarDeleteTabItem"/>
- <Conditional ownerstate="TabCanBeDeleted">
- <MenuItem id = "Separator1" label = "-" />
- <Conditional ownerstate="CanMoveItemUp" action="Disable">
- <MenuItem id = "MoveItemUp"
- label = "${res:SideBarComponent.ContextMenu.MoveTabItemUp}"
- class = "MonoDevelop.Commands.SideBarMoveActiveItemUp"/>
- </Conditional>
-
- <Conditional ownerstate="CanMoveItemDown" action="Disable">
- <MenuItem id = "MoveItemDown"
- label = "${res:SideBarComponent.ContextMenu.MoveTabItemDown}"
- class = "MonoDevelop.Commands.SideBarMoveActiveItemDown"/>
- </Conditional>
- </Conditional>
- </Extension>
-
- <Extension path = "/SharpDevelop/CompletionDatabaseWizard">
- <DialogPanel id = "SetupPanel"
- label = "${res:Dialog.Wizards.CodeCompletionDatabaseWizard.SetupPanel.Title}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.CompletionDatabaseWizard.SetupPanel"/>
- <DialogPanel id = "ChooseLocationPanel"
- label = "${res:Dialog.Wizards.CodeCompletionDatabaseWizard.ChooseLocationPanel.Title}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.CompletionDatabaseWizard.ChooseLocationPanel"/>
- <DialogPanel id = "UseExistingFilePanel"
- label = "${res:Dialog.Wizards.CodeCompletionDatabaseWizard.UseExistingFilePanel.Title}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.CompletionDatabaseWizard.UseExistingFilePanel"/>
- <DialogPanel id = "CreateDatabasePanel"
- label = "${res:Dialog.Wizards.CodeCompletionDatabaseWizard.CreateDatabasePanel.Title}"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.CompletionDatabaseWizard.CreateDatabasePanel"/>
- <DialogPanel id = "CreationSuccessful"
- label = "Finished"
- class = "MonoDevelop.Gui.Dialogs.OptionPanels.CompletionDatabaseWizard.CreationFinishedPanel"/>
- </Extension>
-
- <!-- web references -->
-
-<!-- ORIGINAL #D COMMENT
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ReferenceFolderNode">
- <MenuItem id = "AddWebReference"
- label = "Add Web Reference"
- class = "MonoDevelop.Commands.ProjectBrowser.AddWebReferenceToProject"/>
- </Extension>
--->
- <!-- ORIGINAL #D COMMENT
- <Extension path = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ReferenceNode">
- <MenuItem id = "Refresh"
- label = "Refresh"
- class = "MonoDevelop.Commands.ProjectBrowser.RefreshWebReference"/>
- </Extension> -->
-
- <Extension path = "/SharpDevelop/Views/PropertyPad/ContextMenu">
- <MenuItem id = "ResetProperty"
- label = "${res:MonoDevelop.Gui.Pads.PropertyPad.ContextMenu.Reset}"
- class = "MonoDevelop.Gui.Pads.PropertyPadResetCommand"/>
- <MenuItem id = "Separator" label = "-" />
- <MenuItem id = "ShowDescription"
- label = "${res:MonoDevelop.Gui.Pads.PropertyPad.ContextMenu.ShowDescription}"
- class = "MonoDevelop.Gui.Pads.PropertyPadShowDescriptionCommand"/>
- </Extension>
-
-</AddIn>
Copied: branches/MonoDevelop-generate-what/build/AddIns/SharpDevelopCore.addin.xml (from rev 1534, trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml)
Modified: branches/MonoDevelop-generate-what/build/data/templates/file/CSharp/GtkSharpWindow.xft
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/file/CSharp/GtkSharpWindow.xft 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/file/CSharp/GtkSharpWindow.xft 2004-04-28 09:15:53 UTC (rev 1535)
@@ -15,7 +15,7 @@
<![CDATA[// created on ${Date} at ${Time}
using System;
using Gtk;
-using GtkSharp
+using GtkSharp;
namespace MyWindow
{
Modified: branches/MonoDevelop-generate-what/build/data/templates/file/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/file/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/file/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,4 +1,4 @@
-SUBDIRS = CSharp SharpDevelop VBNet
+SUBDIRS = CSharp SharpDevelop VBNet Nemerle
monodevelopdir = $(prefix)/lib/monodevelop
templatedir = $(monodevelopdir)/data/templates/file
Copied: branches/MonoDevelop-generate-what/build/data/templates/file/Nemerle (from rev 1534, trunk/MonoDevelop/build/data/templates/file/Nemerle)
Property changes on: branches/MonoDevelop-generate-what/build/data/templates/file/Nemerle
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Modified: branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleMenuCommand.xft
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleMenuCommand.xft 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleMenuCommand.xft 2004-04-28 09:15:53 UTC (rev 1535)
@@ -2,9 +2,9 @@
<Template Originator="Mike Krueger" Language="C#" Created="09/04/2003" LastModified="09/04/2003">
<TemplateConfiguration>
- <Name>Simple #Develop menu command</Name>
+ <Name>Simple MonoDevelop menu command</Name>
<Icon>C#.File.FullFile</Icon>
- <Category>SharpDevelop</Category>
+ <Category>MonoDevelop</Category>
<LanguageName>C#</LanguageName>
<Description>Creates a menu command which is usable for main and context menus</Description>
</TemplateConfiguration>
@@ -12,10 +12,8 @@
<TemplateFiles>
<File DefaultExtension=".cs" DefaultName="EmptyC#file">
<![CDATA[using System;
-using System.Windows.Forms;
+using MonoDevelop.Core.AddIns.Codons;
-using ICSharpCode.Core.AddIns.Codons;
-
namespace MyMenuCommand
{
/// <summary>
Deleted: branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleOptionPanel.xft
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleOptionPanel.xft 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleOptionPanel.xft 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Mike Krueger" Language="C#" Created="09/04/2003" LastModified="09/04/2003">
-
- <TemplateConfiguration>
- <Name>Simple #Develop option panel</Name>
- <Icon>C#.File.FullFile</Icon>
- <Category>SharpDevelop</Category>
- <LanguageName>C#</LanguageName>
- <Description>Creates a #D option panel (for example the project option panels)</Description>
- </TemplateConfiguration>
-
- <TemplateFiles>
- <File DefaultExtension=".cs" DefaultName="EmptyC#file">
- <![CDATA[using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows.Forms;
-
-using ICSharpCode.Core.AddIns.Codons;
-using ICSharpCode.Core.Properties;
-using ICSharpCode.Core.Services;
-using ICSharpCode.SharpDevelop.Internal.Project;
-using ICSharpCode.SharpDevelop.Gui.Dialogs;
-
-namespace MyOptionPanel
-{
- /// <summary>
- /// Summary of SampleOptionPanel
- /// </summary>
- public class SampleOptionPanel : AbstractOptionPanel
- {
- public override void LoadPanelContents()
- {
- // TODO initialize the panel here
- }
-
- public override bool StorePanelContents()
- {
- // TODO save your options here
- return true;
- }
- }
-}]]>
- </File>
- </TemplateFiles>
-
- <FileOptions/>
-
-</Template>
Modified: branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExamplePad.xft
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExamplePad.xft 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExamplePad.xft 2004-04-28 09:15:53 UTC (rev 1535)
@@ -2,9 +2,9 @@
<Template Originator="Mike Krueger" Language="C#" Created="09/04/2003" LastModified="09/04/2003">
<TemplateConfiguration>
- <Name>Simple #Develop pad</Name>
+ <Name>Simple MonoDevelop pad</Name>
<Icon>C#.File.FullFile</Icon>
- <Category>SharpDevelop</Category>
+ <Category>MonoDevelop</Category>
<LanguageName>C#</LanguageName>
<Description>Creates a #D pad content (for example the #D scouts)</Description>
</TemplateConfiguration>
@@ -12,8 +12,8 @@
<TemplateFiles>
<File DefaultExtension=".cs" DefaultName="EmptyC#file">
<![CDATA[using System;
-using System.Windows.Forms;
-using ICSharpCode.SharpDevelop.Gui;
+using Gtk;
+using MonoDevelop.Gui;
namespace MyPad
{
@@ -24,9 +24,9 @@
{
#region AbstractPadContent requirements
/// <summary>
- /// The <see cref="System.Windows.Forms.Control"/> representing the pad
+ /// The <see cref="Gtk.Widget"/> representing the pad
/// </summary>
- public override Control Control {
+ public override Widget Control {
get {
//
// TODO : Give back a working Windows.Forms Control
Modified: branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleView.xft
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleView.xft 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/ExampleView.xft 2004-04-28 09:15:53 UTC (rev 1535)
@@ -2,9 +2,9 @@
<Template Originator="Mike Krueger" Language="C#" Created="09/04/2003" LastModified="09/04/2003">
<TemplateConfiguration>
- <Name>Simple #Develop view</Name>
+ <Name>Simple MonoDevelop view</Name>
<Icon>C#.File.FullFile</Icon>
- <Category>SharpDevelop</Category>
+ <Category>MonoDevelop</Category>
<LanguageName>C#</LanguageName>
<Description>Creates a #Develop view content (for example text editor or resource editor)</Description>
</TemplateConfiguration>
@@ -12,8 +12,8 @@
<TemplateFiles>
<File DefaultExtension=".cs" DefaultName="EmptyC#file">
<![CDATA[using System;
-using System.Windows.Forms;
-using ICSharpCode.SharpDevelop.Gui;
+using Gtk;
+using MonoDevelop.Gui;
namespace MyView
{
@@ -24,9 +24,9 @@
{
#region AbstractViewContent requirements
/// <summary>
- /// The <see cref="System.Windows.Forms.Control"/> representing the view
+ /// The <see cref="Gtk.Widget"/> representing the view
/// </summary>
- public override Control Control {
+ public override Widget Control {
get {
//
// TODO : Give back a working Windows.Forms Control
Modified: branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -4,7 +4,6 @@
mdtemplate_DATA = ExampleMenuCommand.xft \
ExamplePad.xft \
- ExampleOptionPanel.xft \
ExampleView.xft \
SimpleCommand.xft
Modified: branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/SimpleCommand.xft
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/SimpleCommand.xft 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/file/SharpDevelop/SimpleCommand.xft 2004-04-28 09:15:53 UTC (rev 1535)
@@ -2,9 +2,9 @@
<Template Originator="Mike Krueger" Language="C#" Created="09/04/2003" LastModified="09/04/2003">
<TemplateConfiguration>
- <Name>Simple #Develop command</Name>
+ <Name>Simple MonoDevelop command</Name>
<Icon>C#.File.FullFile</Icon>
- <Category>SharpDevelop</Category>
+ <Category>MonoDevelop</Category>
<LanguageName>C#</LanguageName>
<Description>Creates a command which is usable for many circumstances</Description>
</TemplateConfiguration>
@@ -12,10 +12,8 @@
<TemplateFiles>
<File DefaultExtension=".cs" DefaultName="EmptyC#file">
<![CDATA[using System;
-using System.Windows.Forms;
+using MonoDevelop.Core.AddIns.Codons;
-using ICSharpCode.Core.AddIns.Codons;
-
namespace MyCommand
{
/// <summary>
Copied: branches/MonoDevelop-generate-what/build/data/templates/project/ILAsm (from rev 1534, trunk/MonoDevelop/build/data/templates/project/ILAsm)
Property changes on: branches/MonoDevelop-generate-what/build/data/templates/project/ILAsm
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Copied: branches/MonoDevelop-generate-what/build/data/templates/project/Java/IkvmConsoleApplicationProject.xpt (from rev 1534, trunk/MonoDevelop/build/data/templates/project/Java/IkvmConsoleApplicationProject.xpt)
Copied: branches/MonoDevelop-generate-what/build/data/templates/project/Java/IkvmGladeApplicationProject.xpt (from rev 1534, trunk/MonoDevelop/build/data/templates/project/Java/IkvmGladeApplicationProject.xpt)
Copied: branches/MonoDevelop-generate-what/build/data/templates/project/Java/IkvmGnomeApplicationProject.xpt (from rev 1534, trunk/MonoDevelop/build/data/templates/project/Java/IkvmGnomeApplicationProject.xpt)
Copied: branches/MonoDevelop-generate-what/build/data/templates/project/Java/IkvmGtkApplicationProject.xpt (from rev 1534, trunk/MonoDevelop/build/data/templates/project/Java/IkvmGtkApplicationProject.xpt)
Modified: branches/MonoDevelop-generate-what/build/data/templates/project/Java/JavaApplicationProject.xpt
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/project/Java/JavaApplicationProject.xpt 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/project/Java/JavaApplicationProject.xpt 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Template originator = "Gary Gray"
created = "09/05/2001"
- lastModified = "02/01/2003">
+ lastModified = "04/06/2004">
<!-- Template Header -->
<TemplateConfiguration>
@@ -24,7 +24,7 @@
</Options>
<Project name = "${ProjectName}" directory = ".">
- <Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "abc" MainClass ="application" />
+ <Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "" MainClass ="application" />
<Files>
<File name = "application.java">
Modified: branches/MonoDevelop-generate-what/build/data/templates/project/Java/JavaConsoleApplicationProject.xpt
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/project/Java/JavaConsoleApplicationProject.xpt 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/project/Java/JavaConsoleApplicationProject.xpt 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Template originator = "Shinsaku Nakagawa"
created = "03/27/2003"
- lastModified = "03/27/2003">
+ lastModified = "04/06/2004">
<!-- Template Header -->
<TemplateConfiguration>
@@ -24,7 +24,7 @@
</Options>
<Project name = "${ProjectName}" directory = ".">
- <Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "abc" MainClass ="application" />
+ <Options Target = "Class" PauseConsoleOutput = "False" ClassPath = "" MainClass ="application" />
<Files>
<File name = "application.java">
Modified: branches/MonoDevelop-generate-what/build/data/templates/project/Java/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/project/Java/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/project/Java/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -3,8 +3,9 @@
javatemplatedir = $(monodevelopdir)/data/templates/project/Java
javatemplate_DATA = EmptyJavaProject.xpt \
- JavaConsoleApplicationProject.xpt \
- JavaApplicationProject.xpt
+ IkvmConsoleApplicationProject.xpt \
+ IkvmGtkApplicationProject.xpt \
+ JavaConsoleApplicationProject.xpt
all:
Modified: branches/MonoDevelop-generate-what/build/data/templates/project/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/project/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/project/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,4 +1,4 @@
-SUBDIRS = Java CSharp Misc VBNet
+SUBDIRS = Java CSharp Misc VBNet Nemerle ILAsm
all:
Modified: branches/MonoDevelop-generate-what/build/data/templates/project/Misc/BlankCombine.xpt
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/project/Misc/BlankCombine.xpt 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/build/data/templates/project/Misc/BlankCombine.xpt 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<Template originator = "Mike Krueger"
created = "07/06/2001"
- lastModified = "02/01/2003">
+ lastModified = "04/09/2004">
<!-- Template Header -->
<TemplateConfiguration>
<Name>${res:Templates.Project.Misc.BlankCombine.Name}</Name>
- <Category>SharpDevelop</Category>
+ <Category>MonoDevelop</Category>
<Icon>Icons.32x32.CombineIcon</Icon>
<LanguageName/>
<Description>${res:Templates.Project.Misc.BlankCombine.Description}</Description>
Copied: branches/MonoDevelop-generate-what/build/data/templates/project/Nemerle (from rev 1534, trunk/MonoDevelop/build/data/templates/project/Nemerle)
Property changes on: branches/MonoDevelop-generate-what/build/data/templates/project/Nemerle
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Modified: branches/MonoDevelop-generate-what/configure.in
===================================================================
--- branches/MonoDevelop-generate-what/configure.in 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/configure.in 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,11 +1,14 @@
AC_INIT(README)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(monodevelop, 0.2)
+AM_INIT_AUTOMAKE(monodevelop, 0.3)
AM_MAINTAINER_MODE
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
+AC_PROG_INTLTOOL([0.25])
+AM_PATH_GLIB_2_0
+
AC_PATH_PROG(MONO, mono)
AC_PATH_PROG(MCS, mcs)
AC_PATH_PROG(XDGMIME, update-mime-database, no)
@@ -24,39 +27,47 @@
AC_MSG_ERROR([You need to install pkg-config])
fi
-dnl Find mono
-MONO_REQUIRED_VERSION=0.30
+dnl hard dependencies
+MONO_REQUIRED_VERSION=0.31
+GTKSHARP_REQUIRED_VERSION=0.18.99
+GTKSOURCEVIEW_REQUIRED_VERSION=0.7
+GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.2
+GECKOSHARP_REQUIRED_VERSION=0.1
+GNOMEVFS_REQUIRED_VERSION=2.0
+MONODOC_REQUIRED_VERSION=0.13.99
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, mono >= $MONO_REQUIRED_VERSION, enable_mono=yes, enable_mono=no)
+PKG_CHECK_MODULES(BASE_DEPENDENCIES,
+mono >= $MONO_REQUIRED_VERSION
+gtk-sharp >= $GTKSHARP_REQUIRED_VERSION
+glade-sharp >= $GTKSHARP_REQUIRED_VERSION
+gconf-sharp >= $GTKSHARP_REQUIRED_VERSION
+gnome-sharp >= $GTKSHARP_REQUIRED_VERSION
+gtkhtml-sharp >= $GTKSHARP_REQUIRED_VERSION
+gtksourceview-1.0 >= $GTKSOURCEVIEW_REQUIRED_VERSION
+gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION
+gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION
+gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED_VERSION
+monodoc >= $MONODOC_REQUIRED_VERSION)
-dnl Find gtk-sharp
-GTKSHARP_REQUIRED_VERSION=0.18
-
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp >= $GTKSHARP_REQUIRED_VERSION, enable_gtksharp=yes, enable_gtksharp=no)
gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp`
AC_SUBST(gtksharp_prefix)
-
-GTKSOURCEVIEW_REQUIRED_VERSION=0.7
-
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtksourceview-1.0 >= $GTKSOURCEVIEW_REQUIRED_VERSION, enable_gtksourceview=yes, enable_gtksourceview=no)
-
-GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.1
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION, enable_gtksourceviewsharp=yes, enable_gtksourceviewsharp=no)
GTKSOURCEVIEW_SHARP="`pkg-config --libs gtksourceview-sharp`"
AC_SUBST(GTKSOURCEVIEW_SHARP)
-
-GECKOSHARP_REQUIRED_VERSION=0.1
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION, enable_geckosharp=yes, enable_geckosharp=no)
-if test "x$enable_geckosharp" = "xno"; then
- AC_MSG_ERROR([You need to install gecko-sharp])
-fi
GECKO_SHARP="`pkg-config --libs gecko-sharp`"
AC_SUBST(GECKO_SHARP)
+MONODOC="`pkg-config --libs monodoc`"
+AC_SUBST(MONODOC)
+GTKSHARP="`pkg-config --libs gtk-sharp`"
+AC_SUBST(GTKSHARP)
+GLADESHARP="`pkg-config --libs glade-sharp`"
+AC_SUBST(GLADESHARP)
+GNOMESHARP="`pkg-config --libs gnome-sharp`"
+AC_SUBST(GNOMESHARP)
+GCONFSHARP="`pkg-config --libs gconf-sharp`"
+AC_SUBST(GCONFSHARP)
+GTKHTMLSHARP="`pkg-config --libs gtkhtml-sharp`"
+AC_SUBST(GTKHTMLSHARP)
-dnl find gnome-vfs
-GNOMEVFS_REQUIRED_VERSION=2.0
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED_VERSION, enable_gnomevfs=yes, enable_gnomevfs=no)
-
dnl GdlDock requirements and configuration
GTK_REQUIRED=2.2.0
LIBXML_REQUIRED=2.2.8
@@ -74,28 +85,12 @@
GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`"
AC_SUBST(GLIB_MKENUMS)
-
-dnl should this be a hard dep?
-dnl ORBIT2_REQUIRED_VERSION=2.8.3
-
-dnl PKG_CHECK_MODULES(BASE_DEPENDENCIES, ORBit-2.0 >= $ORBIT2_REQUIRED_VERSION)
-
-dnl find mozilla-gtkmozembed
-MOZGTK_REQUIRED_VERSION=1.2
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, mozilla-gtkmozembed >= $MOZGTK_REQUIRED_VERSION, enable_gtkmoz=yes, enable_gtkmoz=no)
-
dnl find mono debugger
MONO_DEBUGGER_REQUIRED_VERSION=0.6
PKG_CHECK_MODULES(MONO_DEBUGGER, mono-debugger >= $MONO_DEBUGGER_REQUIRED_VERSION, enable_debugger=yes, enable_debugger=no)
debugger_prefix=`pkg-config --variable=prefix mono-debugger`
AC_SUBST(debugger_prefix)
-dnl find monodoc
-MONODOC_REQUIRED_VERSION=0.12
-PKG_CHECK_MODULES(MONODOC, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no)
-monodoc_libflags=`pkg-config --libs monodoc`
-AC_SUBST(monodoc_libflags)
-
MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
AC_SUBST(MOZILLA_HOME)
@@ -111,17 +106,27 @@
AM_CONDITIONAL(ENABLE_DEBUGGER, test "x$enable_debugger" = "xyes")
AM_CONDITIONAL(ENABLE_XDGMIME, test "x$enable_xdgmime" = "xyes")
+dnl Intl
+ALL_LINGUAS="en_CA fr ja_JP"
+GETTEXT_PACKAGE=monodevelop
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
+AM_GLIB_GNU_GETTEXT
+
AC_OUTPUT([
Makefile
gdldock/Makefile
gdldock/gdl/Makefile
gdldock/sources/Makefile
gdldock/sources/gdl/Makefile
+libmonodevelop/Makefile
src/Makefile
src/AddIns/Makefile
src/AddIns/BackendBindings/Makefile
src/AddIns/BackendBindings/CSharpBinding/Makefile
src/AddIns/BackendBindings/JavaBinding/Makefile
+src/AddIns/BackendBindings/ILAsmBinding/Makefile
+src/AddIns/BackendBindings/NemerleBinding/Makefile
src/AddIns/DisplayBindings/Makefile
src/AddIns/DisplayBindings/SourceEditor/Makefile
src/AddIns/Misc/Makefile
@@ -136,8 +141,9 @@
src/Libraries/MonoDevelop.Gui.Utils/Makefile
src/Libraries/MonoDevelop.Gui.Widgets/Makefile
src/Libraries/SharpAssembly/Makefile
-src/Libraries/CsVbRefactory/Makefile
src/Libraries/SharpRefactory/Makefile
+src/Tools/Makefile
+src/Tools/SharpCoco/Makefile
build/Makefile
build/data/Makefile
build/data/resources/Makefile
@@ -149,11 +155,14 @@
build/data/templates/file/Makefile
build/data/templates/file/CSharp/Makefile
build/data/templates/file/SharpDevelop/Makefile
+build/data/templates/file/Nemerle/Makefile
build/data/templates/file/VBNet/Makefile
build/data/templates/project/Makefile
build/data/templates/project/CSharp/Makefile
build/data/templates/project/Java/Makefile
+build/data/templates/project/ILAsm/Makefile
build/data/templates/project/Misc/Makefile
+build/data/templates/project/Nemerle/Makefile
build/data/templates/project/VBNet/Makefile
build/doc/Makefile
build/AddIns/Makefile
@@ -173,6 +182,9 @@
src/Libraries/MonoDevelop.Gui.Utils/AssemblyInfo.cs
src/Libraries/MonoDevelop.Core/AssemblyInfo.cs
monodevelop
+po/Makefile.in
+src/AddIns/prj2make-sharp-lib/Makefile
+src/AddIns/prj2make-sharp-lib/AssemblyInfo.cs
])
echo "---"
@@ -181,13 +193,6 @@
echo " * Installation prefix = $prefix"
echo " * GNOME prefix = $gnome_prefix"
echo ""
-echo " * Gtk# $GTKSHARP_REQUIRED_VERSION: $enable_gtksharp"
-echo " * gnomevfs $GNOMEVFS_REQUIRED_VERSION: $enable_gnomevfs"
-echo " * gtkmozembed $MOZGTK_REQUIRED_VERSION: $enable_gtkmoz"
-echo " * gtksourceview $GTKSOURCEVIEW_REQUIRED_VERSION: $enable_gtksourceview"
-echo " * gtksourceview-sharp $GTKSOURCEVIEWSHARP_REQUIRED_VERSION: $enable_gtksourceviewsharp"
-echo " * mono $MONO_REQUIRED_VERSION: $enable_mono"
-echo " * monodoc $MONODOC_REQUIRED_VERSION: $enable_monodoc"
echo " * mono-debugger $MONO_DEBUGGER_REQUIRED_VERSION: $enable_debugger"
echo ""
echo " NOTE: if any of the above say 'no' you may install the"
Modified: branches/MonoDevelop-generate-what/data/resources/AddIn.xsd
===================================================================
--- branches/MonoDevelop-generate-what/data/resources/AddIn.xsd 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/data/resources/AddIn.xsd 2004-04-28 09:15:53 UTC (rev 1535)
@@ -49,6 +49,7 @@
<xs:attribute name="openproject" type="xs:string" use="optional"/>
<xs:attribute name="textcontent" type="xs:string" use="optional"/>
<xs:attribute name="ownerstate" type="xs:string" use="optional"/>
+ <xs:attribute name="context" type="xs:string" use="optional"/>
<xs:attribute name="string" type="xs:string" use="optional"/>
<xs:attribute name="equals" type="xs:string" use="optional"/>
<xs:attribute name="action" use="optional">
@@ -129,7 +130,7 @@
<xs:element ref="DialogPanel"/>
<xs:element ref="Condition"/>
</xs:choice>
- <xs:attribute name="label" type="xs:string" use="required"/>
+ <xs:attribute name="_label" type="xs:string" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -178,7 +179,7 @@
<xs:element ref="MenuItem"/>
<xs:element ref="Conditional"/>
</xs:choice>
- <xs:attribute name="label" type="xs:string" use="required"/>
+ <xs:attribute name="_label" type="xs:string" use="required"/>
<xs:attribute name="description" type="xs:string" use="optional"/>
<xs:attribute name="icon" type="xs:string" use="optional"/>
<xs:attribute name="shortcut" type="xs:string" use="optional"/>
Property changes on: branches/MonoDevelop-generate-what/data/resources/glade
___________________________________________________________________
Name: svn:ignore
- *.bak
Makefile
Makefile.in
+ *.bak
Makefile
Makefile.in
*.gladep
Modified: branches/MonoDevelop-generate-what/data/resources/glade/Base.glade
===================================================================
--- branches/MonoDevelop-generate-what/data/resources/glade/Base.glade 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/data/resources/glade/Base.glade 2004-04-28 09:15:53 UTC (rev 1535)
@@ -8,7 +8,7 @@
<property name="width_request">640</property>
<property name="height_request">480</property>
<property name="visible">True</property>
- <property name="title" translatable="yes">dialog1</property>
+ <property name="title" translatable="yes">Options</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -301,7 +301,7 @@
</widget>
<widget class="GtkDialog" id="NewProjectDialog">
- <property name="title" translatable="yes">New Combine</property>
+ <property name="title" translatable="yes">New Solution</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
@@ -794,7 +794,7 @@
<widget class="GtkDialog" id="AddReferenceDialog">
<property name="visible">True</property>
- <property name="title" translatable="yes">dialog1</property>
+ <property name="title" translatable="yes">Add References</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -1439,7 +1439,7 @@
<child>
<widget class="GtkLabel" id="locationLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">Default _combine 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>
@@ -1501,7 +1501,7 @@
<child>
<widget class="GtkLabel" id="loadLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Load</b>-</property>
+ <property name="label" translatable="yes"><b>Load</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1562,7 +1562,7 @@
<widget class="GtkCheckButton" id="loadUserDataCheckButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Load user-specific settings with the document-</property>
+ <property name="label" translatable="yes">Load user-specific settings with the document</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1580,7 +1580,7 @@
<widget class="GtkCheckButton" id="loadPrevProjectCheckButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Load previous combine on startup-</property>
+ <property name="label" translatable="yes">_Load previous solution on startup</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1631,7 +1631,7 @@
<child>
<widget class="GtkLabel" id="saveLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Save</b>-</property>
+ <property name="label" translatable="yes"><b>Save</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1686,7 +1686,7 @@
<widget class="GtkCheckButton" id="createBackupCopyCheckButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Allways create backup copy-</property>
+ <property name="label" translatable="yes">Always create backup copy</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1703,7 +1703,7 @@
<child>
<widget class="GtkLabel" id="terminatorLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">Line Terminator Style-</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>
@@ -1764,7 +1764,7 @@
<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="label" translatable="yes">Windows</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1782,7 +1782,7 @@
<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="label" translatable="yes">Macintosh</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1801,7 +1801,7 @@
<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="label" translatable="yes">Unix</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -2118,7 +2118,7 @@
<widget class="GtkCheckButton" id="showOutputCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Show _output pad when build starts-</property>
+ <property name="label" translatable="yes">Show _output pad when build starts</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -2136,7 +2136,7 @@
<widget class="GtkCheckButton" id="showTaskListCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Show _task list pad if build finished with errors-</property>
+ <property name="label" translatable="yes">Show _task list pad if build finished with errors</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -2208,7 +2208,7 @@
<widget class="GtkRadioButton" id="saveChangesRadioButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Save Changes to open documents-</property>
+ <property name="label" translatable="yes">_Save Changes to open documents</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -2226,7 +2226,7 @@
<widget class="GtkRadioButton" id="promptChangesRadioButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Prompt to save changes to open documents-</property>
+ <property name="label" translatable="yes">_Prompt to save changes to open documents</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -2245,7 +2245,7 @@
<widget class="GtkRadioButton" id="noSaveRadioButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Don't save changes to open documents -</property>
+ <property name="label" translatable="yes">_Don't save changes to open documents </property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -2833,7 +2833,7 @@
<child>
<widget class="GtkLabel" id="informationHeaderLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Project Information-</b></property>
+ <property name="label" translatable="yes"><b>Project Information</b></property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2899,7 +2899,7 @@
<child>
<widget class="GtkLabel" id="nameLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Name-</property>
+ <property name="label" translatable="yes">_Name</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2993,7 +2993,7 @@
<child>
<widget class="GtkLabel" id="descriptionLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Description-</property>
+ <property name="label" translatable="yes">_Description</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3092,7 +3092,7 @@
<widget class="GtkCheckButton" id="enableViewStateCheckButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable _viewstate-</property>
+ <property name="label" translatable="yes">Enable _viewstate</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -3136,7 +3136,7 @@
<child>
<widget class="GtkLabel" id="onProjectLoadHeaderLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>On Project Load- </b></property>
+ <property name="label" translatable="yes"><b>On Project Load</b></property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3185,7 +3185,7 @@
<widget class="GtkCheckButton" id="newFilesOnLoadCheckButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Search for new _files on load-</property>
+ <property name="label" translatable="yes">Search for new _files on load</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -3258,7 +3258,7 @@
<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">Automaticly _include found files</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -3307,7 +3307,7 @@
<child>
<widget class="GtkLabel" id="includeLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Include files in compile run-</property>
+ <property name="label" translatable="yes">_Include files in compile run</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3788,7 +3788,7 @@
<widget class="GtkRadioButton" id="singleRadioButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Single Startup Project-</property>
+ <property name="label" translatable="yes">_Single Startup Project</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -3866,7 +3866,7 @@
<widget class="GtkRadioButton" id="multipleRadioButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Multiple Startup Project-</property>
+ <property name="label" translatable="yes">_Multiple Startup Project</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -4029,7 +4029,7 @@
<child>
<widget class="GtkLabel" id="ActionLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">Action-</property>
+ <property name="label" translatable="yes">Action</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4154,7 +4154,7 @@
<child>
<widget class="GtkLabel" id="newFilesInProjectLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">label68</property>
+ <property name="label" translatable="yes">New Files</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4218,7 +4218,7 @@
<child>
<widget class="GtkLabel" id="viewLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">label70</property>
+ <property name="label" translatable="yes">View</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4273,7 +4273,7 @@
<widget class="GtkRadioButton" id="newFilesOnlyRadioButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">radiobutton1</property>
+ <property name="label" translatable="yes">New Files Only</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -4291,7 +4291,7 @@
<widget class="GtkRadioButton" id="allFilesRadioButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">radiobutton2</property>
+ <property name="label" translatable="yes">All Files</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -4339,7 +4339,7 @@
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">button1</property>
+ <property name="label" translatable="yes">Select All</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
</widget>
@@ -4350,7 +4350,7 @@
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">button3</property>
+ <property name="label" translatable="yes">Clear Selection</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
</widget>
Copied: branches/MonoDevelop-generate-what/data/resources/glade/ChangeLog (from rev 1534, trunk/MonoDevelop/data/resources/glade/ChangeLog)
Modified: branches/MonoDevelop-generate-what/data/resources/glade/EditorBindings.glade
===================================================================
--- branches/MonoDevelop-generate-what/data/resources/glade/EditorBindings.glade 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/data/resources/glade/EditorBindings.glade 2004-04-28 09:15:53 UTC (rev 1535)
@@ -32,7 +32,7 @@
<child>
<widget class="GtkLabel" id="extensionLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">extensionLabel</property>
+ <property name="label" translatable="yes">Extension</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -64,7 +64,7 @@
<widget class="GtkButton" id="addGroupButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">button6</property>
+ <property name="label" translatable="yes">Add Group</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
</widget>
@@ -79,7 +79,7 @@
<widget class="GtkButton" id="editGroupButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">button1</property>
+ <property name="label" translatable="yes">Edit Group</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
</widget>
@@ -94,7 +94,7 @@
<widget class="GtkButton" id="removeGroupButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">button2</property>
+ <property name="label" translatable="yes">Remove Group</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
</widget>
@@ -180,8 +180,8 @@
<widget class="GtkButton" id="removeButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">button3</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
</widget>
<packing>
@@ -196,7 +196,7 @@
<widget class="GtkButton" id="editButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">button4</property>
+ <property name="label" translatable="yes">Edit</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
</widget>
@@ -212,8 +212,8 @@
<widget class="GtkButton" id="addButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">button5</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-add</property>
+ <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
</widget>
<packing>
@@ -299,7 +299,7 @@
<child>
<widget class="GtkLabel" id="genOptions">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>General Options-</b></property>
+ <property name="label" translatable="yes"><b>General Options</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -354,7 +354,7 @@
<widget class="GtkCheckButton" id="enableCodeCompletionCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable code _completion-</property>
+ <property name="label" translatable="yes">Enable code _completion</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -373,7 +373,7 @@
<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="label" translatable="yes">Enable code _folding</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -391,7 +391,7 @@
<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="label" translatable="yes">Enable double buffering</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -435,7 +435,7 @@
<child>
<widget class="GtkLabel" id="fontOptions">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Font-</b></property>
+ <property name="label" translatable="yes"><b>Font</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -533,7 +533,7 @@
<widget class="GtkRadioButton" id="use_cust">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Use cusom font:</property>
+ <property name="label" translatable="yes">_Use custom font:</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -636,7 +636,7 @@
<child>
<widget class="GtkLabel" id="encOptions">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>File encoding-</b></property>
+ <property name="label" translatable="yes"><b>File encoding</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -690,7 +690,7 @@
<child>
<widget class="GtkLabel" id="encVBox">
<property name="visible">True</property>
- <property name="label" translatable="yes">Choose _encoding-</property>
+ <property name="label" translatable="yes">Choose _encoding</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -769,7 +769,7 @@
<child>
<widget class="GtkLabel" id="markersLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b> Markers- </b></property>
+ <property name="label" translatable="yes"><b>Markers</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -824,7 +824,7 @@
<widget class="GtkCheckButton" id="showInvalidLinesCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Underline errors-</property>
+ <property name="label" translatable="yes">_Underline errors</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -842,7 +842,7 @@
<widget class="GtkCheckButton" id="showLineNumberCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Show _line numbers-</property>
+ <property name="label" translatable="yes">Show _line numbers</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -860,7 +860,7 @@
<widget class="GtkCheckButton" id="showBracketHighlighterCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Highlight _matching bracket-</property>
+ <property name="label" translatable="yes">Highlight _matching bracket</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -884,7 +884,7 @@
<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="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>
@@ -940,7 +940,7 @@
<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="label" translatable="yes">Show _spaces</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -959,7 +959,7 @@
<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="label" translatable="yes">Show _tabs</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -978,7 +978,7 @@
<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="label" translatable="yes">Show _EOL markers</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -997,7 +997,7 @@
<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="label" translatable="yes">Show _invalid lines</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1062,7 +1062,7 @@
<child>
<widget class="GtkLabel" id="rulersLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b> Rulers-</b></property>
+ <property name="label" translatable="yes"><b>Rulers</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1117,7 +1117,7 @@
<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="label" translatable="yes">Show _horizontal ruler</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1135,13 +1135,13 @@
<widget class="GtkHBox" id="hbox26">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">3</property>
<child>
<widget class="GtkCheckButton" id="showVRulerCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Show _column ruler,-</property>
+ <property name="label" translatable="yes">Show _column ruler,</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1158,7 +1158,7 @@
<child>
<widget class="GtkLabel" id="atColumnLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">at column- </property>
+ <property name="label" translatable="yes">at column</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1305,7 +1305,7 @@
<child>
<widget class="GtkLabel" id="indentLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">I_ndentations-</property>
+ <property name="label" translatable="yes">I_ndentation</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1421,7 +1421,7 @@
<child>
<widget class="GtkLabel" id="tabSizeLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Tab size-</property>
+ <property name="label" translatable="yes">_Tab size</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1464,7 +1464,7 @@
<child>
<widget class="GtkLabel" id="indentSizeLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Indentation size-</property>
+ <property name="label" translatable="yes">_Indentation size</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1513,7 +1513,7 @@
<widget class="GtkCheckButton" id="convertTabsToSpacesCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">C_onvert Tabs to Spaces-</property>
+ <property name="label" translatable="yes">C_onvert Tabs to Spaces</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1558,7 +1558,7 @@
<child>
<widget class="GtkLabel" id="behaviourGroupBoxLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Behavior-</b></property>
+ <property name="label" translatable="yes"><b>Behavior</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1613,7 +1613,7 @@
<widget class="GtkCheckButton" id="caretBehindEOLCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Can mouve caret behidn EOL-</property>
+ <property name="label" translatable="yes">_Can move caret behind EOL</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1631,7 +1631,7 @@
<widget class="GtkCheckButton" id="autoInsertTemplatesCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Automatic template insertion-</property>
+ <property name="label" translatable="yes">_Automatic template insertion</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1649,7 +1649,7 @@
<widget class="GtkCheckButton" id="autoinsertCurlyBraceCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">A_uto insert curly braces-</property>
+ <property name="label" translatable="yes">A_uto insert curly braces</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1667,7 +1667,7 @@
<widget class="GtkCheckButton" id="hideMouseCursorCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Hide mouse cursor shile typing-</property>
+ <property name="label" translatable="yes">_Hide mouse cursor while typing</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
Modified: branches/MonoDevelop-generate-what/data/resources/glade/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/data/resources/glade/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/data/resources/glade/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1 +1 @@
-EXTRA_DIST = Base.glade EditorBindings.glade texteditoraddin.glade CSharp.glade
+EXTRA_DIST = Base.glade EditorBindings.glade texteditoraddin.glade CSharp.glade Nemerle.glade
Copied: branches/MonoDevelop-generate-what/data/resources/glade/Nemerle.glade (from rev 1534, trunk/MonoDevelop/data/resources/glade/Nemerle.glade)
Modified: branches/MonoDevelop-generate-what/data/resources/glade/texteditoraddin.glade
===================================================================
--- branches/MonoDevelop-generate-what/data/resources/glade/texteditoraddin.glade 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/data/resources/glade/texteditoraddin.glade 2004-04-28 09:15:53 UTC (rev 1535)
@@ -374,7 +374,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">label1</property>
+ <property name="label" translatable="yes">Find:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -450,7 +450,7 @@
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes">label2</property>
+ <property name="label" translatable="yes">Replace:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -520,7 +520,7 @@
<widget class="GtkCheckButton" id="ignoreCaseCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton1</property>
+ <property name="label" translatable="yes">Case sensitive</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -538,7 +538,7 @@
<widget class="GtkCheckButton" id="searchWholeWordOnlyCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton2</property>
+ <property name="label" translatable="yes">Whole words only</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -562,7 +562,7 @@
<widget class="GtkCheckButton" id="useSpecialSearchStrategyCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton4</property>
+ <property name="label" translatable="yes">Use special search strategy:</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -723,7 +723,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">label1</property>
+ <property name="label" translatable="yes">Find:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -799,7 +799,7 @@
<child>
<widget class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="label" translatable="yes">label6</property>
+ <property name="label" translatable="yes">Filemask:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -852,7 +852,7 @@
<child>
<widget class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="label" translatable="yes">label7</property>
+ <property name="label" translatable="yes">Directory:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -915,7 +915,7 @@
<widget class="GtkCheckButton" id="includeSubdirectoriesCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton1</property>
+ <property name="label" translatable="yes">Recurse subdirectories</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -933,7 +933,7 @@
<widget class="GtkCheckButton" id="ignoreCaseCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton1</property>
+ <property name="label" translatable="yes">Case sensitive</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -951,7 +951,7 @@
<widget class="GtkCheckButton" id="searchWholeWordOnlyCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton2</property>
+ <property name="label" translatable="yes">Whole word only</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -975,7 +975,7 @@
<widget class="GtkCheckButton" id="useSpecialSearchStrategyCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton4</property>
+ <property name="label" translatable="yes">Use special search strategy:</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1202,7 +1202,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">label1</property>
+ <property name="label" translatable="yes">Find:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1278,7 +1278,7 @@
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes">label2</property>
+ <property name="label" translatable="yes">Replace:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1353,7 +1353,7 @@
<child>
<widget class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="label" translatable="yes">label6</property>
+ <property name="label" translatable="yes">Filemask:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1406,7 +1406,7 @@
<child>
<widget class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="label" translatable="yes">label7</property>
+ <property name="label" translatable="yes">Directory:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1469,7 +1469,7 @@
<widget class="GtkCheckButton" id="includeSubdirectoriesCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton1</property>
+ <property name="label" translatable="yes">Recurse subdirectories</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1487,7 +1487,7 @@
<widget class="GtkCheckButton" id="ignoreCaseCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton1</property>
+ <property name="label" translatable="yes">Case sensitive</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1505,7 +1505,7 @@
<widget class="GtkCheckButton" id="searchWholeWordOnlyCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton2</property>
+ <property name="label" translatable="yes">Whole word only</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1529,7 +1529,7 @@
<widget class="GtkCheckButton" id="useSpecialSearchStrategyCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton4</property>
+ <property name="label" translatable="yes">Use special search strategy:</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1609,18 +1609,6 @@
<property name="fill">False</property>
</packing>
</child>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <placeholder/>
- </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1768,7 +1756,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">label1</property>
+ <property name="label" translatable="yes">Find:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1842,7 +1830,7 @@
<widget class="GtkCheckButton" id="ignoreCaseCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton1</property>
+ <property name="label" translatable="yes">Case sensitive</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1860,7 +1848,7 @@
<widget class="GtkCheckButton" id="searchWholeWordOnlyCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton2</property>
+ <property name="label" translatable="yes">Whole word only</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -1884,7 +1872,7 @@
<widget class="GtkCheckButton" id="useSpecialSearchStrategyCheckBox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton4</property>
+ <property name="label" translatable="yes">Use special search strategy:</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
Modified: branches/MonoDevelop-generate-what/docs/SourceMap.html
===================================================================
--- branches/MonoDevelop-generate-what/docs/SourceMap.html 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/docs/SourceMap.html 2004-04-28 09:15:53 UTC (rev 1535)
@@ -106,6 +106,8 @@
<h3>Credits and Errata</h3>
<p>Send comments to <a href="mailto:jluke at cfl.rr.com">jluke at cfl.rr.com</a> or the <a href="mailto:monodevelop-list at lists.ximian.com">monodevelop mailing list</a>.</p>
- <p>Last updated March 24, 2004</p>
+ <p><a href="http://opensource.org/licenses/mit-license.php">MIT License</a></p>
+ <p>Last updated April 14, 2004</p>
</body>
</html>
+
Copied: branches/MonoDevelop-generate-what/docs/Translations.html (from rev 1534, trunk/MonoDevelop/docs/Translations.html)
Modified: branches/MonoDevelop-generate-what/docs/WritingAddIns.html
===================================================================
--- branches/MonoDevelop-generate-what/docs/WritingAddIns.html 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/docs/WritingAddIns.html 2004-04-28 09:15:53 UTC (rev 1535)
@@ -14,10 +14,11 @@
intended as a simple and quick overview.</p>
<h3>Terms</h3>
- <p>AddIn - what other systems term a plugin, also used for the core
- application.<br />
- Pad - content area like the project browser or output pad. <br />
- View - main content area, like the SourceEditor.<br />
+ <p><b>AddIn</b> - what many other systems refer to as a plugin. In this case the whole application is also a plugin<br />
+ <b>Pad</b> - content area like the project browser or output pad. <br />
+ <b>View</b> - main content area, like the SourceEditor.<br />
+ <b>Language binding</b> - compilation, execution, and project management for a programming language<br />
+ <b>Service</b> - reponsible for one part of the program, for example the MessageService is delegated the reponsiblity of displaying messages to the user.
</p>
<h3>AddIn assembly</h3>
@@ -36,6 +37,7 @@
{
public class ExampleService : AbstractService
{
+ // Do stuff here
}
}
</pre>
@@ -53,13 +55,15 @@
</pre>
</p>
- <h3>.addin file</h3>
+ <h3>.addin.xml file</h3>
+ <p><b>Note:</b> MonoDevelop had to change to .addin.xml extension for
+ using gettext in translations. SharpDevelop uses .addin</p>
<p>The addin file basically maps the "entry" points of your code
into the various parts of the IDE. You specify services to load,
append menus in a certain place, and virtually everything else.
Since the entire application is an AddIn there is no limit.
It supports conditional directives and other advanced constructs.
- In the following sample MonoDevelopNunit.addin file, you can see
+ In the following sample MonoDevelopNunit.addin.xml file, you can see
it specifies the name of the assembly to load, specifies a service
to load into the /Workspace/Services node, two views and some menus.
Last, it is important to note the class attribute that is used to
@@ -103,22 +107,28 @@
</AddIn>
</xmp>
+ <h3>AddIn tree</h3>
+ <p>The various addins are loaded and merge into an AddInTree, which
+ is how the IDE knows what and where to load</p>
+
<h3>AddIn xml format</h3>
<p>There is an AddIn.xsd file that specifies the required/optional
xml format. Perhaps someone would like to make a RelaxNG one also.
- See data/resources/AddIn.xsd</p>
+ See <code>data/resources/AddIn.xsd</code></p>
<h3>Building and installing</h3>
- <p>We currently support both running in a self-contained build/
- directly as well as installing to $(prefix)/lib/monodevelop so you
- will want to make sure both your .addin file and .dll are placed
- into the AddIn directory in both places. Note: this this may change
+ <p>We currently support both running in a self-contained <code>build/</code>
+ directory as well as installing to <code>$(prefix)/lib/monodevelop</code> so you
+ will want to make sure both your .addin.xml file and .dll are placed
+ into the AddIn directory in both places. <b>Note:</b> this this may change
at some point in the future.</p>
<h3>Existing Examples</h3>
<ul>
<li>SourceEditor</li>
<li>CSharpBinding</li>
+ <li>JavaBinding</li>
+ <li>NemerleBinding</li>
<li>DebuggerAddin</li>
<li>Monodoc</li>
<li>StartPage (not fully ported)</li>
@@ -129,7 +139,9 @@
<p>Although SharpDevelop and MonoDevelop currently use the same
format this may not always be the case. Also, while non-gui addins
could possibly be reused, MonoDevelop and SharpDevelop use different
- GUI toolkits that will likely prevent sharing many things.</p>
+ GUI toolkits that will likely prevent sharing many things. Any
+ suggestions on making sharing things as easy as possible would be
+ appreciated.</p>
<h3>AddIn ideas</h3>
<p>There are various things that would be nice to have implemented
@@ -146,8 +158,10 @@
<li>Also, there are some additional things that SharpDevelop already has that could be ported to MonoDevelop.</li>
</ul></p>
- <h3>Credits and Errata</h3>
+ <h3>Credits, License, Errata</h3>
<p>Send comments to <a href="mailto:jluke at cfl.rr.com">jluke at cfl.rr.com</a> or the <a href="mailto:monodevelop-list at lists.ximian.com">monodevelop mailing list</a>.</p>
- <p>Last updated March 24, 2004</p>
+ <p>Licensed under the <a href="http://opensource.org/licenses/mit-license.php">MIT License</a></p>
+ <p>Last updated April 14, 2004</p>
</body>
</html>
+
Modified: branches/MonoDevelop-generate-what/gdldock/gdl/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/gdldock/gdl/ChangeLog 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/gdldock/gdl/ChangeLog 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,3 +1,9 @@
+2004-04-06 John Luke <jluke at cfl.rr.com>
+
+ * Makefile.am: kill DockObject.custom
+ * DockObject.custom: kill in favor of metadata rule
+ * Gdl.metadata: unhide GdlDockObject.Present and mark child param null_ok
+
2004-03-28 Todd Berman <tberman at sevenl.net>
* Makefile.am: this should be more forgiving
Deleted: branches/MonoDevelop-generate-what/gdldock/gdl/DockObject.custom
===================================================================
--- branches/MonoDevelop-generate-what/gdldock/gdl/DockObject.custom 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/gdldock/gdl/DockObject.custom 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,14 +0,0 @@
-// DockObject.custom - customizations to Gdl.DockObject
-//
-// Authors: Gustavo Giráldez <gustavo.giraldez at gmx.net>
-
-[DllImport("gdldock")]
-static extern void gdl_dock_object_present(IntPtr raw, IntPtr child);
-
-public void Present (Gdl.DockObject child) {
- if (child != null)
- gdl_dock_object_present (Handle, child.Handle);
- else
- gdl_dock_object_present (Handle, IntPtr.Zero);
-}
-
Modified: branches/MonoDevelop-generate-what/gdldock/gdl/Gdl.metadata
===================================================================
--- branches/MonoDevelop-generate-what/gdldock/gdl/Gdl.metadata 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/gdldock/gdl/Gdl.metadata 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,7 +1,7 @@
<metadata>
<attr path="/api/namespace/object[@cname='GdlDockObject']/signal[@name='Detach']" name="name">Detached</attr>
<attr path="/api/namespace/object[@cname='GdlDockObject']/signal[@name='Dock']" name="name">Docked</attr>
- <attr path="/api/namespace/object[@cname='GdlDockObject']/method[@name='Present']" name="hidden">1</attr>
+ <attr path="/api/namespace/object[@cname='GdlDockObject']/method[@name='Present']/parameters/parameter[@name='child']" name="null_ok">1</attr>
<attr path="/api/namespace/object[@cname='GdlDockLayout']/method[@name='GetLayouts']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GdlDockItemFlags']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GdlDockParamFlags']" name="hidden">1</attr>
Modified: branches/MonoDevelop-generate-what/gdldock/gdl/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/gdldock/gdl/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/gdldock/gdl/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -16,8 +16,7 @@
DockParamFlags.cs
CUSTOM_FILES = \
- DockLayout.custom \
- DockObject.custom
+ DockLayout.custom
build_sources = $(addprefix $(srcdir)/, $(FILES))
build_customs = $(addprefix $(srcdir)/, $(CUSTOM_FILES))
Modified: branches/MonoDevelop-generate-what/gdldock/sources/gdl/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/gdldock/sources/gdl/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/gdldock/sources/gdl/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -53,7 +53,6 @@
libgdlmarshal.c
libgdldock_la_LIBADD = $(GDLDOCK_LIBS)
-libgdldock_la_LDFLAGS = -avoid-version
BUILT_SOURCES = \
libgdltypebuiltins.h \
Modified: branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-dock-item.c
===================================================================
--- branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-dock-item.c 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-dock-item.c 2004-04-28 09:15:53 UTC (rev 1535)
@@ -283,14 +283,14 @@
g_object_class, PROP_PREFERRED_WIDTH,
g_param_spec_int ("preferred_width", _("Preferred width"),
_("Preferred width for the dock item"),
- -1, G_MAXINT, -1,
+ -2, G_MAXINT, -1,
G_PARAM_READWRITE));
g_object_class_install_property (
g_object_class, PROP_PREFERRED_HEIGHT,
g_param_spec_int ("preferred_height", _("Preferred height"),
_("Preferred height for the dock item"),
- -1, G_MAXINT, -1,
+ -2, G_MAXINT, -1,
G_PARAM_READWRITE));
/* signals */
Modified: branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-dock-paned.c
===================================================================
--- branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-dock-paned.c 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-dock-paned.c 2004-04-28 09:15:53 UTC (rev 1535)
@@ -536,12 +536,25 @@
{
GtkPaned *paned;
gboolean done = FALSE;
+ gboolean hresize = FALSE;
+ gboolean wresize = FALSE;
+ gint temp = 0;
g_return_if_fail (GDL_IS_DOCK_PANED (object));
g_return_if_fail (GDL_DOCK_ITEM (object)->child != NULL);
paned = GTK_PANED (GDL_DOCK_ITEM (object)->child);
+ if (GDL_IS_DOCK_ITEM (requestor)) {
+ g_object_get (G_OBJECT (requestor), "preferred_height", &temp, NULL);
+ if (temp == -2)
+ hresize = TRUE;
+ temp = 0;
+ g_object_get (G_OBJECT (requestor), "preferred_width", &temp, NULL);
+ if (temp == -2)
+ wresize = TRUE;
+ }
+
/* see if we can dock the item in our paned */
switch (GDL_DOCK_ITEM (object)->orientation) {
case GTK_ORIENTATION_HORIZONTAL:
@@ -555,10 +568,10 @@
break;
case GTK_ORIENTATION_VERTICAL:
if (!paned->child1 && position == GDL_DOCK_TOP) {
- gtk_paned_pack1 (paned, GTK_WIDGET (requestor), FALSE, FALSE);
+ gtk_paned_pack1 (paned, GTK_WIDGET (requestor), hresize, FALSE);
done = TRUE;
} else if (!paned->child2 && position == GDL_DOCK_BOTTOM) {
- gtk_paned_pack2 (paned, GTK_WIDGET (requestor), TRUE, FALSE);
+ gtk_paned_pack2 (paned, GTK_WIDGET (requestor), hresize, FALSE);
done = TRUE;
}
break;
Modified: branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-i18n.h
===================================================================
--- branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-i18n.h 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/gdldock/sources/gdl/gdl-i18n.h 2004-04-28 09:15:53 UTC (rev 1535)
@@ -30,11 +30,13 @@
#ifndef __GDL_18N_H__
#define __GDL_18N_H__ 1
-
+#undef ENABLE_NLS
#include <glib.h>
+#ifndef GETTEXT_PACKAGE
#define GETTEXT_PACKAGE ""
-#undef ENABLE_NLS
+#endif
+//#undef ENABLE_NLS
G_BEGIN_DECLS
Copied: branches/MonoDevelop-generate-what/libmonodevelop (from rev 1534, trunk/MonoDevelop/libmonodevelop)
Property changes on: branches/MonoDevelop-generate-what/libmonodevelop
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Makefile
.deps
.libs
Copied: branches/MonoDevelop-generate-what/mkinstalldirs (from rev 1534, trunk/MonoDevelop/mkinstalldirs)
Property changes on: branches/MonoDevelop-generate-what/mkinstalldirs
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/MonoDevelop-generate-what/monodevelop.applications
===================================================================
--- branches/MonoDevelop-generate-what/monodevelop.applications 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/monodevelop.applications 2004-04-28 09:15:53 UTC (rev 1535)
@@ -4,5 +4,5 @@
can_open_multiple_files=true
expects_uris=false
requires_terminal=false
- mime_types=text/x-csharp,application/x-monodevelop-combine,application/x-monodevelop-project
+ mime_types=text/x-csharp,text/x-java,text/x-msil,text/x-nemerle,text/x-vb,application/x-cmbx,application/x-prjx
uses_gnomevfs=false
Modified: branches/MonoDevelop-generate-what/monodevelop.in
===================================================================
--- branches/MonoDevelop-generate-what/monodevelop.in 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/monodevelop.in 2004-04-28 09:15:53 UTC (rev 1535)
@@ -13,12 +13,14 @@
MD_BIN_PATH=@prefix@/lib/monodevelop/bin
-LD_LIBRARY_PATH=$MOZILLA_HOME:$MD_BIN_PATH:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
-
-MOZILLA_FIVE_HOME=$MOZILLA_HOME
-export MOZILLA_FIVE_HOME
+if [ -n $LD_LIBRARY_PATH ]; then
+ export LD_LIBRARY_PATH=$MOZILLA_HOME:$MD_BIN_PATH:$LD_LIBRARY_PATH
+else
+ export LD_LIBRARY_PATH=$MOZILLA_HOME:$MD_BIN_PATH
+fi
+export MOZILLA_FIVE_HOME=$MOZILLA_HOME
+
cd $MD_BIN_PATH
case x$1 in
Modified: branches/MonoDevelop-generate-what/monodevelop.keys
===================================================================
--- branches/MonoDevelop-generate-what/monodevelop.keys 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/monodevelop.keys 2004-04-28 09:15:53 UTC (rev 1535)
@@ -3,9 +3,29 @@
edit=monodevelop %f
view=monodevelop %f
-application/x-monodevelop-project:
+text/x-java:
open=monodevelop %f
+ edit=monodevelop %f
+ view=monodevelop %f
-application/x-monodevelop-combine:
+text/x-msil:
open=monodevelop %f
+ edit=monodevelop %f
+ view=monodevelop %f
+text/x-nemerle:
+ open=monodevelop %f
+ edit=monodevelop %f
+ view=monodevelop %f
+
+text/x-vb:
+ open=monodevelop %f
+ edit=monodevelop %f
+ view=monodevelop %f
+
+application/x-prjx:
+ open=monodevelop %f
+
+application/x-cmbx:
+ open=monodevelop %f
+
Modified: branches/MonoDevelop-generate-what/monodevelop.mime
===================================================================
--- branches/MonoDevelop-generate-what/monodevelop.mime 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/monodevelop.mime 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,15 +1,15 @@
-application/x-monodevelop-combine
+application/x-cmbx
category=Software Development
default_action_type=monodevelop
- description=MonoDevelop Combine
+ description=MonoDevelop Solution
ext: cmbx
icon_filename=monodevelop.png
- short_list_application_ids_for_novice_user_level=monodevelop,anjuta,gedit
+ short_list_application_ids_for_novice_user_level=monodevelop
-application/x-monodevelop-project
+application/x-prjx
category=Software Development
default_action_type=monodevelop
description=MonoDevelop Project
ext: prjx
icon_filename=monodevelop.png
- short_list_application_ids_for_novice_user_level=monodevelop,anjuta,gedit
+ short_list_application_ids_for_novice_user_level=monodevelop
Modified: branches/MonoDevelop-generate-what/monodevelop.xml
===================================================================
--- branches/MonoDevelop-generate-what/monodevelop.xml 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/monodevelop.xml 2004-04-28 09:15:53 UTC (rev 1535)
@@ -8,6 +8,10 @@
<comment xml:lang="en">IL source</comment>
<glob pattern="*.il"/>
</mime-type>
+ <mime-type type="text/x-nemerle">
+ <comment xml:lang="en">Nemerle source</comment>
+ <glob pattern="*.n"/>
+ </mime-type>
<mime-type type="text/x-vb">
<comment xml:lang="en">VB source</comment>
<glob pattern="*.vb"/>
Copied: branches/MonoDevelop-generate-what/po (from rev 1534, trunk/MonoDevelop/po)
Property changes on: branches/MonoDevelop-generate-what/po
___________________________________________________________________
Name: svn:ignore
+ *.gmo
monodevelop.pot
POTFILES
Makefile.in.in
missing
Makefile.in
Makefile
Modified: branches/MonoDevelop-generate-what/samples/HtmlControl/Makefile
===================================================================
--- branches/MonoDevelop-generate-what/samples/HtmlControl/Makefile 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/samples/HtmlControl/Makefile 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,8 +1,13 @@
+CSC = mcs /debug
+EXE = ../../build/bin/HtmlTest.exe
+
+DLLS = -r gtk-sharp -r ../../build/bin/MonoDevelop.Base.dll
+
all:
- @ mcs -g Test.cs -r gtk-sharp -r ../../build/bin/SharpDevelop.Base.dll -o ../../build/bin/HtmlTest.exe
+ $(CSC) Test.cs $(DLLS) /out:$(EXE)
run:
- mono --debug ../../build/bin/HtmlTest.exe
+ mono --debug $(EXE)
clean:
- rm -f ../../build/bin/HtmlTest.exe
+ rm -f $(EXE)
Modified: branches/MonoDevelop-generate-what/samples/HtmlControl/Test.cs
===================================================================
--- branches/MonoDevelop-generate-what/samples/HtmlControl/Test.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/samples/HtmlControl/Test.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -69,8 +69,8 @@
html = new MozillaControl ();
html.NetStart += new EventHandler (OnNetStart);
html.NetStop += new EventHandler (OnNetStop);
- html.Title += new EventHandler (OnTitleChanged);
- html.LinkMessage += new EventHandler (OnLinkMessage);
+ html.TitleChange += new EventHandler (OnTitleChanged);
+ html.LinkMsg += new EventHandler (OnLinkMessage);
html.Html = "<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"test.css\" /></head><body>testing</body></html>";
html.ShowAll ();
@@ -91,7 +91,7 @@
void OnLinkMessage (object o, EventArgs args)
{
- status.Push (1, html.GeckoLinkMessage);
+ status.Push (1, html.LinkMessage);
}
void OnNetStart (object o, EventArgs args)
@@ -106,7 +106,7 @@
void OnTitleChanged (object o, EventArgs args)
{
- win.Title = html.GeckoTitle;
+ win.Title = html.Title;
}
void OnGoClicked (object o, EventArgs args)
@@ -121,7 +121,7 @@
void OnHtmlTitle (object o, EventArgs args)
{
- win.Title = html.GeckoTitle;
+ win.Title = html.Title;
}
void OnBackClicked (object o, EventArgs args)
Copied: branches/MonoDevelop-generate-what/samples/RecentFiles (from rev 1534, trunk/MonoDevelop/samples/RecentFiles)
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -17,6 +17,7 @@
using MonoDevelop.Internal.Project;
using MonoDevelop.Gui;
+using MonoDevelop.Gui.Components;
using MonoDevelop.Services;
namespace CSharpBinding
@@ -151,6 +152,7 @@
}
writer.WriteLine("/nologo");
+ writer.WriteLine("/codepage:utf8");
// writer.WriteLine("/utf8output");
// writer.WriteLine("/w:" + compilerparameters.WarningLevel);;
@@ -196,8 +198,8 @@
if (finfo.Subtype != Subtype.Directory) {
switch (finfo.BuildAction) {
case BuildAction.Compile:
- Console.Error.WriteLine(finfo.Name);
- writer.WriteLine('"' + finfo.Name + '"');
+ if (CanCompile (finfo.Name))
+ writer.WriteLine('"' + finfo.Name + '"');
break;
case BuildAction.EmbedAsResource:
// Workaround 50752
@@ -274,6 +276,89 @@
File.Delete(error);
return result;
}
+
+ public void GenerateMakefile (IProject project)
+ {
+ StreamWriter stream = new StreamWriter (Path.Combine (project.BaseDirectory, "Makefile." + project.Name));
+
+ CSharpProject p = (CSharpProject)project;
+ CSharpCompilerParameters compilerparameters = (CSharpCompilerParameters)p.ActiveConfiguration;
+
+ string outputName = compilerparameters.OutputAssembly + (compilerparameters.CompileTarget == CompileTarget.Library ? ".dll" : ".exe");
+
+ string target = "";
+
+ switch (compilerparameters.CompileTarget) {
+ case CompileTarget.Exe:
+ target = "exe";
+ break;
+ case CompileTarget.WinExe:
+ target = "winexe";
+ break;
+ case CompileTarget.Library:
+ target = "library";
+ break;
+ }
+
+ ArrayList compile_files = new ArrayList ();
+ ArrayList gac_references = new ArrayList ();
+
+ foreach (ProjectFile finfo in project.ProjectFiles) {
+ if (finfo.Subtype != Subtype.Directory) {
+ switch (finfo.BuildAction) {
+ case BuildAction.Compile:
+ string rel_path = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, Path.GetDirectoryName (finfo.Name));
+ compile_files.Add (Path.Combine (rel_path, Path.GetFileName (finfo.Name)));
+ break;
+
+ case BuildAction.EmbedAsResource:
+ //writer.WriteLine("--linkres " + finfo.Name);
+ break;
+ }
+ }
+ }
+
+ foreach (ProjectReference lib in project.ProjectReferences) {
+ switch (lib.ReferenceType) {
+ case ReferenceType.Gac:
+ string fileName = lib.GetReferencedFileName(project);
+ gac_references.Add (Path.GetFileNameWithoutExtension (fileName));
+ break;
+ }
+ }
+
+ stream.WriteLine ("SOURCES = \\");
+ for (int i = 0; i < compile_files.Count; i++) {
+ stream.Write (compile_files[i]);
+ if (i != compile_files.Count - 1)
+ stream.WriteLine (" \\");
+ else
+ stream.WriteLine ();
+ }
+
+ stream.WriteLine ();
+ stream.WriteLine ("GAC_REFERENCES = \\");
+ for (int i = 0; i < gac_references.Count; i++) {
+ stream.Write (gac_references[i]);
+ if (i != gac_references.Count - 1)
+ stream.WriteLine (" \\");
+ else
+ stream.WriteLine ();
+ }
+
+ stream.WriteLine ();
+ stream.WriteLine ("GAC_REFERENCES_BUILD = $(addprefix /r:, $(GAC_REFERENCES))");
+ stream.WriteLine ();
+
+ stream.WriteLine ("all: " + outputName);
+ stream.WriteLine ();
+
+ stream.WriteLine (outputName + ": $(SOURCES)");
+ stream.WriteLine ("\tmcs /target:{0} /out:{1} $(GAC_REFERENCES_BUILD) $(SOURCES)", target, outputName);
+
+ stream.Flush ();
+ stream.Close ();
+ }
string GetCompilerName()
{
@@ -335,8 +420,38 @@
Process p = new Process();
p.StartInfo = si;
p.Start();
- p.WaitForExit();
+ //FIXME: The glib.idle stuff is here because this *SHOULD* be
+ //a background thread calling back to the main thread.
+ //GLib.Idle.Add (new GLib.IdleHandler (setmsg));
+ setmsg ();
+ while (!p.HasExited) {
+ //GLib.Idle.Add (new GLib.IdleHandler (pulse));
+ pulse ();
+ System.Threading.Thread.Sleep (100);
+ }
+ //GLib.Idle.Add (new GLib.IdleHandler (done));
+ done ();
}
+
+ bool setmsg ()
+ {
+ ((IStatusBarService)ServiceManager.Services.GetService (typeof (IStatusBarService))).SetMessage ("Compiling...");
+ return false;
+ }
+
+ bool done ()
+ {
+ ((SdStatusBar)((IStatusBarService)ServiceManager.Services.GetService (typeof (IStatusBarService))).ProgressMonitor).Done ();
+ return false;
+ }
+
+ bool pulse ()
+ {
+ ((SdStatusBar)((IStatusBarService)ServiceManager.Services.GetService (typeof (IStatusBarService))).ProgressMonitor).Pulse ();
+ while (Gtk.Application.EventsPending ())
+ Gtk.Application.RunIteration ();
+ return false;
+ }
// Snatched from our codedom code :-).
static Regex regexError = new Regex (@"^(\s*(?<file>.*)\((?<line>\d*)(,(?<column>\d*))?\)\s+)*(?<level>\w+)\s*(?<number>.*):\s(?<message>.*)",
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -49,7 +49,7 @@
p.StartInfo = psi;
p.Start();
} catch (Exception) {
- throw new ApplicationException("Can't execute " + "\"" + exe + "\"\n(.NET bug? Try restaring SD or manual start)");
+ throw new ApplicationException("Can not execute " + "\"" + exe + "\"\n(Try restarting MonoDevelop or start your app manually)");
}
}
@@ -99,7 +99,7 @@
p.StartInfo = psi;
p.Start();
} catch (Exception) {
- throw new ApplicationException("Can't execute " + "\"" + directory + exe + "\"\n(.NET bug? Try restaring SD or manual start)");
+ throw new ApplicationException("Can not execute " + "\"" + directory + exe + "\"\n(Try restarting MonoDevelop or start your app manually)");
}
}
}
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpLanguageBinding.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpLanguageBinding.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpLanguageBinding.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -92,5 +92,10 @@
{
return new CSharpProject(info, projectOptions);
}
+
+ public void GenerateMakefile (IProject project)
+ {
+ compilerManager.GenerateMakefile (project);
+ }
}
}
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,3 +1,48 @@
+2004-04-28 Todd Berman <tberman at sevenl.net>
+
+ * CSharpLanguageBinding.cs: implemented GetMakefile passthru.
+ * CSharpBindingCompilerManager.cs: dirty dirty dirty first draft run
+ through of GenerateMakefile, I have tested this with exactly *one*
+ project, and that is all, just wanted to get something in svn.
+
+2004-04-24 Todd Berman <tberman at sevenl.net>
+
+ * Parser/Parser.cs: new IsAsResolver passthrough.
+ * Parser/Resolver.cs: new IsAsResolver to manage some (limited)
+ completion there.
+
+2004-04-23 John Luke <jluke at cfl.rr.com>
+
+ * CsharpBindingCompilerManager.cs: add /codepage:utf8
+
+2004-04-19 Todd Berman <tberman at sevenl.net>
+
+ * Parser/Resolver.cs: Turn local variables into a properly consumable
+ type for code completion.
+
+2004-04-09 Todd Berman <tberman at sevenl.net>
+
+ * CSharpBindingCompilerManager.cs: Show that something is going
+ on so people dont get too worried. (Speed might need some work)
+ * Makefile.am: add glib
+
+2004-04-04 John Luke <jluke at cfl.rr.com>
+
+ * CSharpBindingExecutionManager.cs: improve error message
+
+2004-04-03 Todd Berman <tberman at sevenl.net>
+
+ * Gui/OutputOptionsPanel.cs:
+ * Gui/CodeGenerationPanel.cs: gettextify
+
+2004-04-03 Todd Berman <tberman at sevenl.net>
+
+ * Project/CSharpCompilerParameters.cs: duh, refix library target bug
+
+2004-04-01 Todd Berman <tberman at sevenl.net>
+
+ * Gui/OutputOptionsPanel.cs: parse resource string, closes bug #56325
+
2004-03-31 Todd Berman <tberman at sevenl.net>
* CSharpBindingExecutionManager.cs: dont test CompileTarget, for now
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -18,6 +18,7 @@
using Gtk;
using MonoDevelop.Gui.Widgets;
+using MonoDevelop.Services;
namespace CSharpBinding
{
@@ -59,13 +60,9 @@
generateXmlOutputCheckButton.Sensitive = false;
Menu CompileTargetMenu = new Menu ();
- CompileTargetMenu.Append(new MenuItem(
- StringParserService.Parse(
- "${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.Exe}")));
+ CompileTargetMenu.Append(new MenuItem(GettextCatalog.GetString ("Executable")));
- CompileTargetMenu.Append(new MenuItem(
- StringParserService.Parse(
- "${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.Library}")));
+ CompileTargetMenu.Append(new MenuItem(GettextCatalog.GetString ("Library")));
// FIXME commented until the Module capability is ported
// CompileTargetMenu.Append(new MenuItem(
// StringParserService.Parse(
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Gui/OutputOptionsPanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -16,6 +16,8 @@
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.AddIns.Codons;
+using MonoDevelop.Services;
+
using Gtk;
using MonoDevelop.Gui.Widgets;
@@ -94,8 +96,8 @@
void SelectFolder(object sender, EventArgs e)
{
- using (FileSelection fdiag = new FileSelection (
- "${res:Dialog.Options.PrjOptions.Configuration.FolderBrowserDescription}")) {
+ ResourceService res = (ResourceService)ServiceManager.Services.GetService (typeof (ResourceService));
+ using (FileSelection fdiag = new FileSelection (GettextCatalog.GetString ("Select the directory in which the assembly will be created"))) {
if (fdiag.Run () == (int) ResponseType.Ok) {
outputDirectoryEntry.Text = fdiag.Filename;
}
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -7,8 +7,8 @@
/r:../../../../build/bin/MonoDevelop.Base.dll \
/r:../../../../build/bin/ICSharpCode.SharpRefactory.dll \
/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
- /r:gtk-sharp \
- /r:glade-sharp \
+ @GTKSHARP@ \
+ @GLADESHARP@ \
$(GTKSOURCEVIEW_SHARP)
FILES = \
@@ -44,7 +44,7 @@
all: $(ASSEMBLY)
$(ASSEMBLY): $(build_sources)
- @ $(CSC) /out:$(ASSEMBLY) /target:library $(DLLS) \
+ $(CSC) /out:$(ASSEMBLY) /target:library $(DLLS) \
/resource:$(srcdir)/../../../../data/resources/glade/CSharp.glade,CSharp.glade \
$(build_sources) \
&& cp $(ASSEMBLY) ../../../../build/AddIns/AddIns/BackendBindings/.
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/CSharpVisitor.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/CSharpVisitor.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/CSharpVisitor.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -138,7 +138,7 @@
{
DefaultRegion region = GetRegion(methodDeclaration.StartLocation, methodDeclaration.EndLocation);
DefaultRegion bodyRegion = GetRegion(methodDeclaration.EndLocation, methodDeclaration.Body != null ? methodDeclaration.Body.EndLocation : new Point(-1, -1));
-// Console.WriteLine(region + " --- " + bodyRegion);
+ // Console.WriteLine(region + " --- " + bodyRegion);
ReturnType type = new ReturnType(methodDeclaration.TypeReference);
Class c = (Class)currentClass.Peek();
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/Parser.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/Parser.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/Parser.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -84,6 +84,7 @@
visitor.Visit(p.compilationUnit, null);
visitor.Cu.ErrorsDuringCompile = p.Errors.count > 0;
visitor.Cu.Tag = p.compilationUnit;
+ visitor.Cu.ErrorOutput = p.Errors.ErrorOutput;
RetrieveRegions(visitor.Cu, lexer.SpecialTracker);
return visitor.Cu;
}
@@ -92,6 +93,11 @@
{
return new Resolver().CtrlSpace(parserService, caretLine, caretColumn, fileName);
}
+
+ public ArrayList IsAsResolve (IParserService parserService, string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent)
+ {
+ return new Resolver ().IsAsResolve (parserService, expression, caretLineNumber, caretColumn, fileName, fileContent);
+ }
public ResolveResult Resolve(IParserService parserService, string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent)
{
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -191,6 +191,8 @@
return new ResolveResult(namespaces, classes);
}
Console.WriteLine("Returning Result!");
+ if (returnClass.FullyQualifiedName == "System.Void")
+ return null;
return new ResolveResult(returnClass, ListMembers(new ArrayList(), returnClass));
}
@@ -795,6 +797,61 @@
}
}
}
+
+ public ArrayList IsAsResolve (IParserService parserService, string expression, int caretLine, int caretColumn, string fileName, string fileContent)
+ {
+ ArrayList result = new ArrayList ();
+ this.parserService = parserService;
+ this.caretLine = caretLine;
+ this.caretColumn = caretColumn;
+
+ IParseInformation parseInfo = parserService.GetParseInformation (fileName);
+ ICSharpCode.SharpRefactory.Parser.AST.CompilationUnit fcu = parseInfo.MostRecentCompilationUnit.Tag as ICSharpCode.SharpRefactory.Parser.AST.CompilationUnit;
+ if (fcu == null)
+ return null;
+ ICSharpCode.SharpRefactory.Parser.Parser p = new ICSharpCode.SharpRefactory.Parser.Parser ();
+ Lexer l = new Lexer (new StringReader (expression));
+ Expression expr = p.ParseExpression(l);
+ if (expr == null)
+ return null;
+
+ lookupTableVisitor = new LookupTableVisitor ();
+ lookupTableVisitor.Visit (fcu, null);
+
+ TypeVisitor typeVisitor = new TypeVisitor (this);
+
+ CSharpVisitor csharpVisitor = new CSharpVisitor ();
+ cu = (ICompilationUnit)csharpVisitor.Visit (fcu, null);
+ if (cu != null) {
+ callingClass = GetInnermostClass ();
+ }
+
+ IReturnType type = expr.AcceptVisitor (typeVisitor, null) as IReturnType;
+ if (type == null || type.PointerNestingLevel != 0) {
+ fcu = parserService.ParseFile (fileName, fileContent).MostRecentCompilationUnit.Tag as ICSharpCode.SharpRefactory.Parser.AST.CompilationUnit;
+ lookupTableVisitor.Visit (fcu, null);
+ cu = (ICompilationUnit)csharpVisitor.Visit (fcu, null);
+
+ if (cu != null) {
+ callingClass = GetInnermostClass ();
+ }
+ type = expr.AcceptVisitor (typeVisitor, null) as IReturnType;
+ if (type == null)
+ return null;
+ }
+ if (type.ArrayDimensions != null && type.ArrayDimensions.Length > 0)
+ type = new ReturnType ("System.Array");
+
+ IClass returnClass = SearchType (type.FullyQualifiedName, cu);
+ if (returnClass == null)
+ return null;
+
+ foreach (IClass iclass in returnClass.ClassInheritanceTree) {
+ if (!result.Contains (iclass))
+ result.Add (iclass);
+ }
+ return result;
+ }
public ArrayList CtrlSpace(IParserService parserService, int caretLine, int caretColumn, string fileName)
{
@@ -819,7 +876,7 @@
if (variables != null && variables.Count > 0) {
foreach (LocalLookupVariable v in variables) {
if (IsInside(new Point(caretColumn, caretLine), v.StartPos, v.EndPos)) {
- result.Add(v);
+ result.Add(new Parameter (name, new ReturnType (v.TypeRef.SystemType)));
break;
}
}
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/SharpDevelopTree/Constructor.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/SharpDevelopTree/Constructor.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Parser/SharpDevelopTree/Constructor.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -14,7 +14,7 @@
public Constructor(Modifier m, IRegion region, IRegion bodyRegion)
{
- FullyQualifiedName = "#ctor";
+ FullyQualifiedName = "ctor";
this.region = region;
this.bodyRegion = bodyRegion;
modifiers = (ModifierEnum)m;
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpCompilerParameters.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpCompilerParameters.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpCompilerParameters.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -15,9 +15,9 @@
namespace CSharpBinding
{
public enum CompileTarget {
- Exe,
+ Exe,
+ Library,
WinExe,
- Library,
Module
};
Copied: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/ILAsmBinding (from rev 1534, trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding)
Property changes on: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/ILAsmBinding
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
ILAsmBinding.dll
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/ChangeLog 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/ChangeLog 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,3 +1,32 @@
+2004-04-28 Todd Berman <tberman at sevenl.net>
+
+ * JavaLanguageBinding.cs: stubbing GenerateMakefile.
+
+2004-04-16 John Luke <jluke at cfl.rr.com>
+
+ * JavaBindingCompilerService.cs:
+ rework error parsing to work off of Streams instead of temp files
+ allows javac errors to work, gcj maybe not
+ set the column of the error
+ specify the output directory
+ * Project/JavaCompilerOptions: add runtime prop
+ * JavaBindingExecutionService.cs: add prelim support
+ for choosing runtime
+ * JavaCompiler.cs:
+ * JavaRuntime.cs: add enums for compiler and runtime
+
+2004-04-09 John Luke <jluke at cfl.rr.com>
+
+ * JavaBindingCompilerService.cs: account for classpath when compiling,
+ work with gcj or javac, cleanup old code
+ * Gui/ProjectConfigurationPropertyPanel.cs: rough port, needs major HIG love,
+ cleanup, add RadioButtons to select from gcj and javac
+ * JavaBindingExecutionService.cs: use ikvm instead of java runtime
+ * Parser/*: make a copy of the CSharpBinding/Parser in case I am crazy enough
+ to port the parser to work with Java (not built yet)
+ * Project/JavaCompilerParameters.cs: add javac/gcj .Compiler property,
+ fix CompilerPath from being hardcoded
+
2004-03-25 John Luke <jluke at cfl.rr.com>
import from SD and make it build with our
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -6,49 +6,51 @@
// </file>
using System;
-using System.Drawing;
+using Gtk;
using MonoDevelop.Internal.Project;
using MonoDevelop.Internal.ExternalTool;
using MonoDevelop.Gui.Dialogs;
+using MonoDevelop.Gui.Widgets;
+using MonoDevelop.Services;
using MonoDevelop.Core.Services;
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.AddIns.Codons;
namespace JavaBinding
{
- /// <summary>
- /// Summary description for Form5.
- /// </summary>
public class ProjectConfigurationPropertyPanel : AbstractOptionPanel
{
- /*private System.Windows.Forms.GroupBox groupBox1;
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.Label label4;
- private System.Windows.Forms.Label label5;
+ private Label runtimeLabel = new Label ();
+ private Label labelWarnings = new Label ();
+ private Label labelOutput = new Label ();
+ private Label titleLabel = new Label ();
+ private Label labelCompiler = new Label ();
+ private Label labelClasspath = new Label ();
+ private Label labelMainClass = new Label ();
- private System.Windows.Forms.TextBox textBox2;
- private System.Windows.Forms.TextBox textBox3;
- private System.Windows.Forms.Button button1;
+ private Button browseButton;
- private System.Windows.Forms.CheckBox checkBox3;
- private System.Windows.Forms.CheckBox checkBox5;
- private System.Windows.Forms.CheckBox checkBox6;
- private System.Windows.Forms.CheckBox checkBox7;
-
- private System.Windows.Forms.Label label6;
- private System.Windows.Forms.Label label7;
- private System.Windows.Forms.Label label8;
+ private CheckButton checkDebug = new CheckButton (GettextCatalog.GetString ("Enable debug"));
+ private CheckButton checkDeprecation = new CheckButton (GettextCatalog.GetString ("Deprecated"));
+ private CheckButton checkOptimize = new CheckButton (GettextCatalog.GetString ("Enable optimizations"));
+ private CheckButton checkWarnings = new CheckButton (GettextCatalog.GetString ("Generate Warnings"));
- private System.Windows.Forms.TextBox textBox5; //Compiler Path
- private System.Windows.Forms.TextBox textBox6; //Classpath
- private System.Windows.Forms.TextBox textBox7; //MainClass
+ // compiler chooser
+ private RadioButton javac = new RadioButton ("javac");
+ private RadioButton gcj;
+
+ // runtime chooser
+ private RadioButton ikvm = new RadioButton ("ikvm");
+ private RadioButton mono;
+ private RadioButton java;
+
+ private Entry outputAssembly = new Entry ();
+ private Entry outputDirectory = new Entry ();
+ private Entry compilerPath = new Entry ();
+ private Entry classPath = new Entry ();
+ private Entry mainClass = new Entry ();
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.Container components = null;
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
JavaCompilerParameters compilerParameters = null;
public override bool ReceiveDialogMessage(DialogMessage message)
@@ -56,16 +58,29 @@
if (message == DialogMessage.OK) {
if (compilerParameters == null)
return true;
- compilerParameters.GenWarnings = checkBox7.Checked;
- compilerParameters.Deprecation = checkBox6.Checked;
- compilerParameters.Debugmode = checkBox5.Checked;
- compilerParameters.Optimize = checkBox3.Checked;
- compilerParameters.OutputAssembly = textBox2.Text;
- compilerParameters.OutputDirectory = textBox3.Text;
+
+ if (javac.Active)
+ compilerParameters.Compiler = JavaCompiler.Javac;
+ else
+ compilerParameters.Compiler = JavaCompiler.Gcj;
+
+ if (ikvm.Active)
+ compilerParameters.Runtime = JavaRuntime.Ikvm;
+ else if (mono.Active)
+ compilerParameters.Runtime = JavaRuntime.Mono;
+ else
+ compilerParameters.Runtime = JavaRuntime.Java;
+
+ compilerParameters.GenWarnings = checkWarnings.Active;
+ compilerParameters.Deprecation = checkDeprecation.Active;
+ compilerParameters.Debugmode = checkDebug.Active;
+ compilerParameters.Optimize = checkOptimize.Active;
+ compilerParameters.OutputAssembly = outputAssembly.Text;
+ compilerParameters.OutputDirectory = outputDirectory.Text;
- compilerParameters.CompilerPath = textBox5.Text;
- compilerParameters.ClassPath = textBox6.Text;
- compilerParameters.MainClass = textBox7.Text;
+ compilerParameters.CompilerPath = compilerPath.Text;
+ compilerParameters.ClassPath = classPath.Text;
+ compilerParameters.MainClass = mainClass.Text;
}
return true;
}
@@ -74,265 +89,128 @@
{
this.compilerParameters = (JavaCompilerParameters)((IProperties)CustomizationObject).GetProperty("Config");
- checkBox3.Checked = compilerParameters.Optimize;
- checkBox5.Checked = compilerParameters.Debugmode;
- checkBox6.Checked = compilerParameters.Deprecation;
- checkBox7.Checked = compilerParameters.GenWarnings;
- textBox2.Text = compilerParameters.OutputAssembly;
- textBox3.Text = compilerParameters.OutputDirectory;
+ if (compilerParameters.Compiler == JavaCompiler.Javac)
+ javac.Active = true;
+ else
+ gcj.Active = true;
+
+ switch (compilerParameters.Runtime) {
+ case JavaRuntime.Ikvm:
+ ikvm.Active = true;
+ break;
+ case JavaRuntime.Mono:
+ mono.Active = true;
+ break;
+ case JavaRuntime.Java:
+ java.Active = true;
+ break;
+ default:
+ ikvm.Active = true;
+ break;
+ }
+
+ checkOptimize.Active = compilerParameters.Optimize;
+ checkDebug.Active = compilerParameters.Debugmode;
+ checkDeprecation.Active = compilerParameters.Deprecation;
+ checkWarnings.Active = compilerParameters.GenWarnings;
+ outputAssembly.Text = compilerParameters.OutputAssembly;
+ outputDirectory.Text = compilerParameters.OutputDirectory;
- textBox5.Text = compilerParameters.CompilerPath;
- textBox6.Text = compilerParameters.ClassPath;
- textBox7.Text = compilerParameters.MainClass;
+ compilerPath.Text = compilerParameters.CompilerPath;
+ classPath.Text = compilerParameters.ClassPath;
+ mainClass.Text = compilerParameters.MainClass;
}
void SelectFolder(object sender, EventArgs e)
{
- FolderDialog fdiag = new FolderDialog();
+ using (FolderDialog fdiag = new FolderDialog (GettextCatalog.GetString ("Browse"))) {
- if (fdiag.DisplayDialog(resourceService.GetString("Dialog.Options.PrjOptions.Configuration.FolderBrowserDescription")) == DialogResult.OK) {
- textBox3.Text = fdiag.Path;
+ if (fdiag.Run () == (int) ResponseType.Ok) {
+ //textBox3.Text = fdiag.Path;
+ }
+ fdiag.Hide ();
}
}
- public ProjectConfigurationPropertyPanel()
+ public ProjectConfigurationPropertyPanel ()
{
- InitializeComponent();
- CustomizationObjectChanged += new EventHandler(SetValues);
+ InitializeComponent ();
+ VBox vbox = new VBox ();
+ HBox hboxTitle = new HBox ();
+ hboxTitle.PackStart (titleLabel, false, false, 0);
+ vbox.PackStart (hboxTitle);
+ vbox.PackStart (outputAssembly);
+ HBox hboxCompiler = new HBox ();
+ hboxCompiler.PackStart (labelCompiler, false, false, 0);
+ vbox.PackStart (hboxCompiler);
+ HBox comps = new HBox ();
+ comps.PackStart (gcj);
+ comps.PackStart (javac);
+ vbox.PackStart (comps);
+ vbox.PackStart (compilerPath);
+ HBox hboxRuntime = new HBox ();
+ hboxRuntime.PackStart (runtimeLabel, false, false, 0);
+ vbox.PackStart (hboxRuntime);
+ HBox runtimes = new HBox ();
+ runtimes.PackStart (ikvm);
+ runtimes.PackStart (mono);
+ runtimes.PackStart (java);
+ vbox.PackStart (runtimes);
+ HBox hboxClasspath = new HBox ();
+ hboxClasspath.PackStart (labelClasspath, false, false, 0);
+ vbox.PackStart (hboxClasspath);
+ vbox.PackStart (classPath);
+ HBox hboxMainClass = new HBox ();
+ hboxMainClass.PackStart (labelMainClass, false, false, 0);
+ vbox.PackStart (hboxMainClass);
+ vbox.PackStart (mainClass);
+ HBox hboxWarnings = new HBox ();
+ hboxWarnings.PackStart (labelWarnings, false, false, 0);
+ vbox.PackStart (hboxWarnings);
+ HBox hbox = new HBox ();
+ hbox.PackStart (checkDeprecation);
+ hbox.PackStart (checkDebug);
+ hbox.PackStart (checkOptimize);
+ vbox.PackStart (hbox);
+ HBox hboxOutput = new HBox ();
+ hboxOutput.PackStart (labelOutput, false, false, 0);
+ vbox.PackStart (hboxOutput);
+ vbox.PackStart (outputDirectory);
+ this.Add (vbox);
+ CustomizationObjectChanged += new EventHandler (SetValues);
}
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- protected override void Dispose( bool disposing )
+
+ void OnCompilerToggled (object o, EventArgs args)
{
- if( disposing )
- {
- if(components != null)
- {
- components.Dispose();
- }
- }
- base.Dispose( disposing );
+ if (javac.Active)
+ compilerPath.Text = "javac";
+ else
+ compilerPath.Text = "gcj";
}
- #region Windows Form Designer generated code
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
private void InitializeComponent()
{
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.checkBox6 = new System.Windows.Forms.CheckBox();
- this.checkBox5 = new System.Windows.Forms.CheckBox();
+ gcj = new RadioButton (javac, "gcj");
+ gcj.Toggled += OnCompilerToggled;
+ javac.Toggled += OnCompilerToggled;
- this.checkBox3 = new System.Windows.Forms.CheckBox();
-
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.button1 = new System.Windows.Forms.Button();
- this.textBox3 = new System.Windows.Forms.TextBox();
- this.label5 = new System.Windows.Forms.Label();
- this.textBox2 = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
-
- this.checkBox7 = new System.Windows.Forms.CheckBox();
- this.textBox5 = new System.Windows.Forms.TextBox();
- this.textBox6 = new System.Windows.Forms.TextBox();
- this.textBox7 = new System.Windows.Forms.TextBox();
-
- this.label6 = new System.Windows.Forms.Label();
- this.label7 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
-
- this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.SuspendLayout();
- //
- // groupBox1
- //
- this.groupBox1.Controls.AddRange(new System.Windows.Forms.Control[] { this.textBox5,
- this.textBox6,
- this.textBox7,
- this.label6,
- this.label7,
- this.label8,
- this.checkBox5,
- this.checkBox6,
- this.checkBox7,
- this.checkBox3});
- this.groupBox1.Location = new System.Drawing.Point(8, 8);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(376, 232);
- this.groupBox1.TabIndex = 0;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = resourceService.GetString("Dialog.Options.PrjOptions.Configuration.CodeGenerationGroupBox");
-
- //
- // checkBox6
- //
- this.checkBox6.Location = new System.Drawing.Point(192, 128);
- this.checkBox6.Name = "checkBox6";
- this.checkBox6.Size = new System.Drawing.Size(176, 16);
- this.checkBox6.TabIndex = 8;
- this.checkBox6.Text = "Deprecation";
- //this.checkBox5.Text = resourceService.GetString("Dialog.Options.PrjOptions.Configuration.DebugInformationCheckBox");
-
- //
- // checkBox7
- //
- this.checkBox7.Location = new System.Drawing.Point(192, 146);
- this.checkBox7.Name = "checkBox7";
- this.checkBox7.Size = new System.Drawing.Size(176, 16);
- this.checkBox7.TabIndex = 8;
- this.checkBox7.Text = "Generate Warnings";
- //this.checkBox5.Text = resourceService.GetString("Dialog.Options.PrjOptions.Configuration.DebugInformationCheckBox");
-
- //
- // checkBox5
- //
- this.checkBox5.Location = new System.Drawing.Point(192, 112);
- this.checkBox5.Name = "checkBox5";
- this.checkBox5.Size = new System.Drawing.Size(176, 16);
- this.checkBox5.TabIndex = 8;
- this.checkBox5.Text = resourceService.GetString("Dialog.Options.PrjOptions.Configuration.DebugInformationCheckBox");
-
- //
- // checkBox3
- //
- this.checkBox3.Location = new System.Drawing.Point(192, 96);
- this.checkBox3.Name = "checkBox3";
- this.checkBox3.Size = new System.Drawing.Size(176, 16);
- this.checkBox3.TabIndex = 7;
- this.checkBox3.Text = resourceService.GetString("Dialog.Options.PrjOptions.Configuration.OptimizeCheckBox");
-
- //
- // label6
- //
- this.label6.Location = new System.Drawing.Point(18, 50);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(80, 23);
- this.label6.TabIndex = 99;
- this.label6.Text = "Compiler Path"; //resourceService.GetString("Dialog.Options.PrjOptions.Configuration.OutputPathLabel");
-
- //
- // textBox5
- //
- this.textBox5.Location = new System.Drawing.Point(186, 50);
- this.textBox5.Name = "textBox5";
- this.textBox5.Size = new System.Drawing.Size(182, 20);
- this.textBox5.TabIndex = 1;
- this.textBox5.Text = "";
-
- //
- // label7
- //
- this.label7.Location = new System.Drawing.Point(18, 70);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(80, 23);
- this.label7.TabIndex = 99;
- this.label7.Text = "Class Path"; //resourceService.GetString("Dialog.Options.PrjOptions.Configuration.OutputPathLabel");
-
- //
- // textBox6
- //
- this.textBox6.Location = new System.Drawing.Point(186, 70);
- this.textBox6.Name = "textBox6";
- this.textBox6.Size = new System.Drawing.Size(182, 20);
- this.textBox6.TabIndex = 1;
- this.textBox6.Text = "";
-
- //
- // label8
- //
- this.label8.Location = new System.Drawing.Point(18, 170);
- this.label8.Name = "label7";
- this.label8.Size = new System.Drawing.Size(80, 23);
- this.label8.TabIndex = 99;
- this.label8.Text = "Main Class"; //resourceService.GetString("Dialog.Options.PrjOptions.Configuration.OutputPathLabel");
-
-
- //
- // textBox7
- //
- this.textBox7.Location = new System.Drawing.Point(186, 170);
- this.textBox7.Name = "textBox7";
- this.textBox7.Size = new System.Drawing.Size(182, 20);
- this.textBox7.TabIndex = 1;
- this.textBox7.Text = "";
-
- //
- // groupBox2
- //
- this.groupBox2.Controls.AddRange(new System.Windows.Forms.Control[] { //this.checkBox4,
- this.button1,
- this.textBox3,
- this.label5,
- this.textBox2,
- this.label4});
- this.groupBox2.Location = new System.Drawing.Point(8, 240);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(376, 96);
- this.groupBox2.TabIndex = 2;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = resourceService.GetString("Dialog.Options.PrjOptions.Configuration.OutputGroupBox");
-
- //
- // button1
- //
- this.button1.Location = new System.Drawing.Point(344, 40);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(24, 24);
- this.button1.TabIndex = 3;
- this.button1.Text = "...";
- this.button1.Click += new EventHandler(SelectFolder);
- //
- // textBox3
- //
- this.textBox3.Location = new System.Drawing.Point(96, 40);
- this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(240, 20);
- this.textBox3.TabIndex = 2;
- this.textBox3.Text = "";
- //
- // label5
- //
- this.label5.Location = new System.Drawing.Point(8, 40);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(80, 23);
- this.label5.TabIndex = 99;
- this.label5.Text = resourceService.GetString("Dialog.Options.PrjOptions.Configuration.OutputPathLabel");
-
- //
- // textBox2
- //
- this.textBox2.Location = new System.Drawing.Point(96, 16);
- this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(272, 20);
- this.textBox2.TabIndex = 1;
- this.textBox2.Text = "";
- //
- // label4
- //
- this.label4.Location = new System.Drawing.Point(8, 16);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(88, 16);
- this.label4.TabIndex = 99;
- this.label4.Text = resourceService.GetString("Dialog.Options.PrjOptions.Configuration.WarningsAsErrorsCheckBox");
-
- //
- // Form5
- //
- this.ClientSize = new System.Drawing.Size(392, 341);
- this.Controls.AddRange(new System.Windows.Forms.Control[] { this.groupBox2,
- this.groupBox1});
- this.Name = "Form5";
- this.groupBox1.ResumeLayout(false);
- this.groupBox2.ResumeLayout(false);
- this.ResumeLayout(false);
+ mono = new RadioButton (ikvm, "mono");
+ mono.Sensitive = false;
+ java = new RadioButton (ikvm, "java");
+ java.Sensitive = false;
+ runtimeLabel.Markup = String.Format ("<b>{0}</b>", GettextCatalog.GetString ("Runtime"));
+
+ this.browseButton = new Button ("_Browse");
+ this.browseButton.Clicked += new EventHandler (SelectFolder);
+ labelOutput.Markup = String.Format ("<b>{0}</b>", GettextCatalog.GetString ("Output path"));
+ this.outputAssembly = new Entry ();
+ titleLabel.Markup = String.Format ("<b>{0}</b>", GettextCatalog.GetString ("Output Assembly"));
+ labelWarnings.Markup = String.Format ("<b>{0}</b>", GettextCatalog.GetString ("Warnings and Errors"));
+
+ labelCompiler.Markup = String.Format ("<b>{0}</b>", GettextCatalog.GetString ("Compiler"));
+ labelClasspath.Markup = String.Format ("<b>{0}</b>", GettextCatalog.GetString ("Classpath"));
+ labelMainClass.Markup = String.Format ("<b>{0}</b>", GettextCatalog.GetString ("Main Class"));
}
- #endregion
- */
}
}
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -10,6 +10,8 @@
using System.IO;
using System.CodeDom.Compiler;
+using MonoDevelop.Gui.Components;
+using MonoDevelop.Services;
using MonoDevelop.Core.Services;
using MonoDevelop.Internal.Project;
@@ -27,8 +29,6 @@
public ICompilerResult CompileFile(string filename)
{
- string output = "";
- string error = "";
string options = "";
JavaCompilerParameters cparam = new JavaCompilerParameters();
@@ -51,13 +51,11 @@
TempFileCollection tf = new TempFileCollection();
string outstr = "javac \"" + filename + "\" -classpath " + cparam.ClassPath + options;
- Executor.ExecWaitWithCapture(outstr, tf, ref error , ref output);
+ //Executor.ExecWaitWithCapture(outstr, tf, ref error , ref output);
+ StreamReader output, error;
+ DoCompilation (outstr, tf, out output, out error);
+ ICompilerResult cr = ParseOutput (tf, error);
- ICompilerResult cr = ParseOutput(tf, output);
-
- File.Delete(output);
- File.Delete(error);
-
return cr;
}
@@ -104,8 +102,8 @@
options += " -encoding utf8 ";
- string output = "";
- string error = "";
+ //string output = "";
+ //string error = "";
string files = "";
foreach (ProjectFile finfo in p.ProjectFiles) {
@@ -120,68 +118,91 @@
TempFileCollection tf = new TempFileCollection ();
- //string CurrentDir = Directory.GetCurrentDirectory();
- //Directory.SetCurrentDirectory(compilerparameters.OutputDirectory);
-
- //string outstr = compilerparameters.CompilerPath + "" + files + " -classpath " + compilerparameters.ClassPath + options;
- //string outstr = compilerparameters.CompilerPath + "" + files + " -classpath " + compilerparameters.ClassPath + options;
- string outstr = compilerparameters.CompilerPath + " " + files + options;
- DoCompilation (outstr, tf, ref output, ref error);
+ string outdir = " -d " + compilerparameters.OutputDirectory;
+ string compiler;
+
+ if (compilerparameters.Compiler == JavaCompiler.Gcj)
+ {
+ compiler = "gcj -C"; // compile to bytecode
+ }
+ else
+ {
+ compiler = "javac";
+ }
+
+ string outstr;
+ //FIXME re-enable options
+ //FIXME re-enable compilerPath
+ if (compilerparameters.ClassPath == "") {
+ outstr = compiler + files + outdir;
+ } else {
+ outstr = compiler + " -classpath " + compilerparameters.ClassPath + files + outdir;
+ }
+ Console.WriteLine (outstr);
+
+ StreamReader output;
+ StreamReader error;
+ DoCompilation (outstr, tf, out output, out error);
//Executor.ExecWaitWithCapture(outstr, tf, ref error , ref output);
- ICompilerResult cr = ParseOutput (tf, output);
- File.Delete(output);
- File.Delete(error);
+ ICompilerResult cr = ParseOutput (tf, error);
- //Directory.SetCurrentDirectory(CurrentDir);
-
-// TempFileCollection tf = new TempFileCollection ();
-// string output = "";
-// string error = "";
-// //string outstr = compilerparameters.CompilerPath + " " + compilerparameters.OutputDirectory+"untitled.java -classpath " + compilerparameters.ClassPath + options;
-// string outstr = compilerparameters.CompilerPath + " " + compilerparameters.OutputDirectory + finfo.Name;
-// Executor.ExecWaitWithCapture(outstr, tf, ref error , ref output);
-// CompilerResults cr = ParseOutput(tf, output);
-// File.Delete(output);
-// File.Delete(error);
-
return cr;
}
- private void DoCompilation (string outstr, TempFileCollection tf, ref string output, ref string error)
+ private void DoCompilation (string outstr, TempFileCollection tf, out StreamReader output, out StreamReader error)
{
- output = Path.GetTempFileName ();
- error = Path.GetTempFileName ();
-
- string arguments = outstr + " > " + output + " 2> " + error;
+ string arguments = outstr;
string command = arguments;
- ProcessStartInfo si = new ProcessStartInfo("/bin/sh -c \"" + command + "\"");
+ ProcessStartInfo si = new ProcessStartInfo (command);
si.RedirectStandardOutput = true;
si.RedirectStandardError = true;
si.UseShellExecute = false;
Process p = new Process ();
p.StartInfo = si;
p.Start ();
+
+ IStatusBarService sbs = (IStatusBarService)ServiceManager.Services.GetService (typeof (IStatusBarService));
+ sbs.SetMessage ("Compiling...");
+
+ while (!p.HasExited) {
+ ((SdStatusBar)sbs.ProgressMonitor).Pulse();
+ while (Gtk.Application.EventsPending ())
+ Gtk.Application.RunIteration ();
+ System.Threading.Thread.Sleep (100);
+ }
+ ((SdStatusBar) sbs.ProgressMonitor).Done ();
+
+ // FIXME: avoid having a full buffer
+ // perhaps read one line and append parsed output
+ // and then return cr at end
+ output = p.StandardOutput;
+ error = p.StandardError;
p.WaitForExit ();
}
- ICompilerResult ParseOutput(TempFileCollection tf, string file)
+ ICompilerResult ParseOutput(TempFileCollection tf, StreamReader errorStream)
{
string compilerOutput = "";
- StreamReader sr = new StreamReader(file, System.Text.Encoding.Default);
+ StreamReader sr = errorStream;
CompilerResults cr = new CompilerResults(tf);
while (true)
{
- string next = sr.ReadLine();
+ string next = sr.ReadLine ();
if (next == null)
break;
-
+
+ CompilerError error = new CompilerError ();
+
+ int errorCol = 0;
+ string col = next.Trim ();
+ if (col.Length ==1 && col == "^")
+ errorCol = next.IndexOf ("^");
+
compilerOutput += next + "\n";
-
- CompilerError error = new CompilerError();
-
+
int index1 = next.IndexOf(".java:");
if (index1 < 0)
continue;
@@ -190,21 +211,19 @@
string s2 = next.Substring(index1 + 6);
int index2 = s2.IndexOf(":");
int line = Int32.Parse(next.Substring(index1 + 6,index2));
-
-// error.Column = Int32.Parse(pos2[1]);
-// error.IsWarning = what[0] == "warning";
-// error.ErrorNumber = what[what.Length - 1];
+ //error.IsWarning = what[0] == "warning";
+ //error.ErrorNumber = what[what.Length - 1];
- error.Column = 25;
+ error.Column = errorCol;
error.Line = line;
- error.ErrorText = next.Substring(index1 + index2 + 7);
- error.FileName = Path.GetFullPath(next.Substring(0, index1) + ".java"); //Path.GetFileName(filename);
- cr.Errors.Add(error);
-
+ error.ErrorText = next.Substring (index1 + index2 + 7);
+ error.FileName = Path.GetFullPath (next.Substring (0, index1) + ".java"); //Path.GetFileName(filename);
+ cr.Errors.Add (error);
}
- sr.Close();
- return new DefaultCompilerResult(cr, compilerOutput);
+ sr.Close ();
+ return new DefaultCompilerResult (cr, compilerOutput);
}
}
}
+
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -8,15 +8,11 @@
using System;
using System.IO;
using System.Diagnostics;
-using System.Collections;
using System.Reflection;
-using System.Resources;
-using System.Xml;
-using System.CodeDom.Compiler;
-using System.Threading;
using MonoDevelop.Internal.Project;
using MonoDevelop.Gui;
+using MonoDevelop.Gui.Pads;
using MonoDevelop.Core.Services;
namespace JavaBinding
@@ -47,36 +43,70 @@
JavaCompilerParameters parameters = (JavaCompilerParameters)project.ActiveConfiguration;
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
string directory = fileUtilityService.GetDirectoryNameWithSeparator(((JavaCompilerParameters)project.ActiveConfiguration).OutputDirectory);
+ string mainClass = ((JavaCompilerParameters) project.ActiveConfiguration).MainClass;
string CurrentDir = Directory.GetCurrentDirectory();
- Directory.SetCurrentDirectory(parameters.OutputDirectory);
- ProcessStartInfo psi;
- if(((JavaCompilerParameters)project.ActiveConfiguration).MainClass==null) {
- //FIXME:
- psi = new ProcessStartInfo("xterm -e \"java " + ((JavaCompilerParameters)project.ActiveConfiguration).OutputAssembly + ";read -p 'press any key to continue...' -n1\"");
- } else {
- if (parameters.PauseConsoleOutput) {
- //FIXME:
- psi = new ProcessStartInfo("xterm -e \"java " + ((JavaCompilerParameters)project.ActiveConfiguration).MainClass + ";read -p 'press any key to continue...' -n1\"");
- } else {
- //FIXME:
- psi = new ProcessStartInfo("xterm -e \"java " + ((JavaCompilerParameters)project.ActiveConfiguration).MainClass + ";read -p 'press any key to continue...' -n1\"");
- }
+ Directory.SetCurrentDirectory (parameters.OutputDirectory);
+
+ string javaExec;
+ switch (parameters.Runtime) {
+ case JavaRuntime.Ikvm:
+ javaExec = "xterm -e \"ikvm -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
+ break;
+ // FIXME: need to both compile with ikvmc
+ // and then run with mono
+ case JavaRuntime.Mono:
+ javaExec = "xterm -e \"ikvm -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
+ break;
+ case JavaRuntime.Java:
+ javaExec = "xterm -e \"java -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
+ break;
+ default:
+ javaExec = "xterm -e \"ikvm -classpath " + parameters.ClassPath + " " + mainClass + ";read -p 'press any key to continue...' -n1\"";
+ break;
}
-
- try {
- psi.WorkingDirectory = parameters.OutputDirectory;
- psi.UseShellExecute = false;
-
- Process p = new Process();
- p.StartInfo = psi;
- p.Start();
- } catch (Exception) {
- throw new ApplicationException("Can not execute");
+
+ ProcessStartInfo psi = new ProcessStartInfo(javaExec);
+
+ try {
+ psi.WorkingDirectory = Path.GetDirectoryName (directory);
+ psi.UseShellExecute = false;
+
+ Process p = new Process ();
+ p.StartInfo = psi;
+ p.Start ();
+ } catch (Exception) {
+ throw new ApplicationException ("Can not execute " + "\"" + directory + mainClass + "\"\n(Try restarting MonoDevelop or start your app manually)");
+ }
+
+/*
+ //FIXME: find out how to set the working dir better
+ TerminalPad outputPad = (TerminalPad) WorkbenchSingleton.Workbench.GetPad (typeof (TerminalPad));
+ outputPad.RunCommand ("cd " + parameters.OutputDirectory);
+
+ string runtime = "ikvm"; // make it project.RuntimeOptions or so
+ switch (runtime) {
+ // is this even supposed to work with CLI binaries?
+ //case "java": // use an installed jre
+ // outputPad.RunCommand ("java -classpath " + parameters.ClassPath + " " + ((JavaCompilerParameters) project.ActiveConfiguration).MainClass);
+ // break;
+ case "ikvm": // JIT to Java then JIT to mono
+ outputPad.RunCommand ("ikvm -classpath " + parameters.ClassPath + " " + ((JavaCompilerParameters) project.ActiveConfiguration).MainClass);
+ break;
+ default: // run compiled to exe with mono
+ string command = "ikvmc -reference:/usr/lib/classpath.dll " + ((JavaCompilerParameters) project.ActiveConfiguration).MainClass + ".class ";
+ string[] allJars = parameters.ClassPath.Split (':');
+ foreach (string jar in allJars)
+ {
+ if (jar != ".")
+ command += jar + " ";
+ }
+ outputPad.RunCommand (command);
+ outputPad.RunCommand ("mono " + ((JavaCompilerParameters) project.ActiveConfiguration).MainClass + ".exe");
+ break;
}
-
- Directory.SetCurrentDirectory(CurrentDir);
+ outputPad.RunCommand ("cd -");
+*/
}
-
}
}
Copied: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaCompiler.cs (from rev 1534, trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaCompiler.cs)
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaLanguageBinding.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaLanguageBinding.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaLanguageBinding.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -91,5 +91,11 @@
{
//executionManager.Debug (project);
}
+
+ public void GenerateMakefile (IProject project)
+ {
+ throw new NotImplementedException ();
+ }
+
}
}
Copied: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/JavaRuntime.cs (from rev 1534, trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaRuntime.cs)
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -6,15 +6,16 @@
/r:../../../../build/bin/MonoDevelop.Core.dll \
/r:../../../../build/bin/MonoDevelop.SourceEditor.dll \
/r:../../../../build/bin/MonoDevelop.Base.dll \
- /r:../../../../build/bin/ICSharpCode.SharpRefactory.dll \
/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
- /r:gtk-sharp.dll
+ @GTKSHARP@
FILES = ./Gui/ProjectConfigurationPropertyPanel.cs \
./Project/JavaCompilerParameters.cs \
./Project/JavaProject.cs \
./JavaBindingCompilerServices.cs \
+./JavaCompiler.cs \
./JavaLanguageBinding.cs \
+./JavaRuntime.cs \
./FormatingStrategy/JavaFormattingStrategy.cs \
./JavaBindingExecutionServices.cs \
./ProjectTreeBuilder/JavaNodeBuilder.cs
@@ -27,7 +28,7 @@
$(CSC) $(DLLS) $(build_sources) /out:$(ASSEMBLY) /target:library \
&& cp $(ASSEMBLY) ../../../../build/AddIns/AddIns/BackendBindings/.
-assemblydir = $(libdir)/monodevelop/AddIns/AddIns/BackendBindings/
+assemblydir = $(libdir)/monodevelop/AddIns/AddIns/BackendBindings
assembly_DATA = $(ASSEMBLY)
CLEANFILES = $(ASSEMBLY)
Copied: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Parser (from rev 1534, trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Parser)
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -39,8 +39,14 @@
[XmlAttribute("classpath")]
public string classpath = String.Empty;
+ [XmlAttribute ("compiler")]
+ public JavaCompiler compiler = JavaCompiler.Gcj;
+
+ [XmlAttribute ("runtime")]
+ public JavaRuntime runtime = JavaRuntime.Ikvm;
+
[XmlAttribute("compilerpath")]
- public string compilerpath = "javac";
+ public string compilerpath = "javac";
[XmlAttribute("genwarnings")]
public bool genwarnings = false;
@@ -57,12 +63,6 @@
Execution execution = new Execution();
- public override string OutputDirectory {
- get {
- return base.OutputDirectory.Substring (0, base.OutputDirectory.Length - 4);
- }
- }
-
public bool GenWarnings {
get {
return codeGeneration.genwarnings;
@@ -80,12 +80,28 @@
codeGeneration.classpath = value;
}
}
+
+ public JavaRuntime Runtime {
+ get {
+ return codeGeneration.runtime;
+ }
+ set {
+ codeGeneration.runtime = value;
+ }
+ }
+
+ public JavaCompiler Compiler {
+ get {
+ return codeGeneration.compiler;
+ }
+ set {
+ codeGeneration.compiler = value;
+ }
+ }
public string CompilerPath {
get {
- //return codeGeneration.compilerpath;
- //FIXME
- return "javac";
+ return codeGeneration.compilerpath;
}
set {
codeGeneration.compilerpath = value;
Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1 +1,3 @@
-SUBDIRS = CSharpBinding JavaBinding
+
+SUBDIRS = CSharpBinding JavaBinding NemerleBinding ILAsmBinding
+
Copied: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/NemerleBinding (from rev 1534, trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding)
Property changes on: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/NemerleBinding
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
NemerleBinding.dll
NemerleBinding.cmbx
NemerleBinding.prjx
Modified: branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/ChangeLog 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/ChangeLog 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,3 +1,10 @@
+2004-04-04 Todd Berman <tberman at sevenl.net>
+
+ * Makefile.am: change to .addin.xml for i18n
+ * MonoDevelopDebugger.addin.xml: mv
+ * MonoDevelopDebugger.addin: rm
+
+
2004-03-29 Todd Berman <tberman at sevenl.net>
* Gui/DebuggerVariablePad.cs: use AmbienceService to convert from
Modified: branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,9 +1,9 @@
CSC = mcs /debug
ASSEMBLY = MonoDevelop.Debugger.dll
-ADDIN = $(srcdir)/MonoDevelopDebugger.addin
+ADDIN = $(srcdir)/MonoDevelopDebugger.addin.xml
-DLLS = /r:gtk-sharp /r:glib-sharp \
+DLLS = @GTKSHARP@ \
/r:$(debugger_prefix)/lib/Mono.Debugger.dll \
/r:../../../build/bin/MonoDevelop.Base.dll \
/r:../../../build/bin/MonoDevelop.Core.dll
Deleted: branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/MonoDevelopDebugger.addin
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/MonoDevelopDebugger.addin 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/MonoDevelopDebugger.addin 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,52 +0,0 @@
-<AddIn name = "MonoDevelop Debugger"
- author = "Todd Berman"
- copyright = "GPL"
- url = ""
- description = ""
- version = "0.2">
-
- <Runtime>
- <Import assembly="MonoDevelop.Debugger.dll"/>
- </Runtime>
-
- <Extension path="/Workspace/Services">
- <Class id = "DebuggingService"
- class = "MonoDevelop.Services.DebuggingService"/>
- </Extension>
-
- <Extension path="/SharpDevelop/Workbench/Views">
- <Class id = "DebuggerLocalsPad"
- class = "MonoDevelop.SourceEditor.Gui.DebuggerLocalsPad"/>
- </Extension>
-
- <Extension path="/SharpDevelop/Workbench/MainMenu">
- <MenuItem id = "DebugMenuThing" label = "Debug" insertafter = "View" insertbefore = "Tools">
- <MenuItem id = "DebugProject"
- label = "Debug Project"
- shortcut = "Control|F5"
- class = "MonoDevelop.Commands.DebugProject"/>
-
- <MenuItem id = "ToggleRunning"
- label = "Pause/Resume"
- shortcut = "Control|F8"
- class = "MonoDevelop.Commands.ToggleRunning"/>
-
- <MenuItem id = "DebugKillApplication"
- label = "Kill Application"
- class = "MonoDevelop.Commands.KillApplication"/>
-
- <MenuItem id = "DebugSep1" label = "-" />
-
- <MenuItem id = "DebugStepOver"
- label = "Step Over"
- shortcut = "F11"
- class = "MonoDevelop.Commands.StepOver"/>
-
- <MenuItem id = "DebugStepInto"
- label = "Step Into"
- shortcut = "Control|F11"
- class = "MonoDevelop.Commands.StepInto"/>
- </MenuItem>
- </Extension>
-</AddIn>
-
Copied: branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/MonoDevelopDebugger.addin.xml (from rev 1534, trunk/MonoDevelop/src/AddIns/DebuggerAddIn/MonoDevelopDebugger.addin.xml)
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,3 +1,132 @@
+2004-04-27 Todd Berman <tberman at sevenl.net>
+
+ * Gui/SourceEditorDisplayBinding.cs: workaround some to reduce the
+ amount of times the idle handler is called, and to reuse the delegate.
+
+2004-04-27 Todd Berman <tberman at sevenl.net>
+
+ * Gui/SourceEditorBuffer.cs:
+ * Gui/SourceEditorView.cs:
+ * Gui/SourceEditorDisplayBinding.cs: update to match gsv-sharp from
+ cvs.
+
+2004-04-26 John Luke <jluke at cfl.rr.com>
+
+ * Gui/SourceEditorDisplayBinding.cs: add python mimetype to
+ CanCreateContent, needs a more robust fix
+
+2004-04-26 Todd Berman <tberman at sevenl.net>
+
+ * Gui/SourceEditorDisplayBinding.cs: Make goto matching brace work
+ a bit better. now ctrl+b ctrl+b will bring you back to the same place.
+
+2004-04-24 Todd Berman <tberman at sevenl.net>
+
+ * CodeCompletion/CompletionWindow.cs: make sure to properly handle
+ people typing things other than whats in our window (that is legal
+ too... (for now ;) )).
+
+2004-04-24 Todd Berman <tberman at sevenl.net>
+
+ * CodeCompletion/CodeCompletionDataProvider.cs: hook into is/as resolve
+ method.
+
+2004-04-23 Todd Berman <tberman at sevenl.net>
+
+ * Gui/SourceEditorBuffer.cs: add a check for a 0 length iter.Char
+ value, closes bug #57549.
+
+2004-04-20 Todd Berman <tberman at sevenl.net>
+
+ * CodeCompletion/CompletionWindow.cs: Properly attach to the lost focus
+ event.
+ * CodeCompletion/CodeCompletionDataProvider.cs: add //'d dbg info
+ * Gui/SourceEditorView.cs: more of the same.
+
+2004-04-19 Todd Berman <tberman at sevenl.net>
+
+ * CodeCompletion/CodeCompletionDataProvider.cs: Wrap docs.
+
+2004-04-19 Todd Berman <tberman at sevenl.net>
+
+ * Gui/SourceEditorView.cs: call the right resolver method.
+ * CodeCompletion/CodeCompletionDataProvider.cs: Add IParameter results.
+ * CodeCompletion/CodeCompletionData.cs: Add IParameter ctor.
+
+2004-04-16 Todd Berman <tberman at sevenl.net>
+
+ * Gui/SourceEditorBuffer.cs: On load, place the cursor at the top
+ and grab focus.
+
+2004-04-12 Nick Drochak <ndrochak at gol.com>
+
+ * Gui/SourceEditorView.cs: Use white space already on the line to
+ indent the 2nd and following lines of an inserted template.
+
+2004-04-10 Todd Berman <tberman at sevenl.net>
+
+ * Gui/SourceEditorView.cs: fix logic bug.
+
+2004-04-10 Todd Berman <tberman at sevenl.net>
+
+ * CodeCompletion/CompletionWindow.cs: convert to RenderIcon and away
+ from stock-id, because of gtk+2.4 sizing issues.
+
+2004-04-10 Todd Berman <tberman at sevenl.net>
+
+ * Gui/SourceEditorView.cs: cleanup the delete line func.
+
+2004-04-09 Todd Berman <tberman at sevenl.net>
+
+ * Gui/SourceEditorBuffer.cs:
+ * CodeCompletion/CompletionWindow.cs:
+ add atomic undo on code completion, cause its scary now.
+
+2004-04-09 Todd Berman <tberman at sevenl.net>
+
+ * Gui/SourceEditorBuffer.cs:
+ * Gui/SourceEditorView.cs:
+ * CodeCompletion/ICompletionData.cs:
+ * CodeCompletion/CodeCompletionData.cs:
+ * CodeCompletion/CompletionWindow.cs:
+ * CodeCompletion/CommentCompletionDataProvider.cs:
+ * CodeCompletion/TemplateCompletionDataProvider.cs:
+ add support for xcode style type ahead completion. It looks cool, and
+ is actually pretty useful.
+
+
+2004-04-03 Todd Berman <tberman at sevenl.net>
+
+ * Gui/SourceEditorView.cs:
+ * Gui/SourceEditorDisplayBinding.cs: attempt to solve gtk+ threading
+ issues
+
+2004-04-03 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Dialogs/ReplaceInFilesDialog.cs:
+ * Gui/SourceEditorView.cs:
+ * Gui/Pads/CompilerMessageView.cs:
+ * Gui/OptionPanels/BehaviorTextEditorPanel.cs:
+ * Gui/OptionPanels/MarkersTextEditorPanel.cs:
+ * Gui/OptionPanels/CodeTemplatePanel.cs:
+ * Gui/OptionPanels/GeneralTextEditorPanel.cs:
+ * Gui/SourceEditorDisplayBinding.cs:
+ * Search/SearchReplaceManager.cs:
+ * Search/SearchReplaceInFilesManager.cs:
+ gettextify
+
+2004-04-03 Todd Berman <tberman at sevenl.net>
+
+ * Commands/ToolCommands.cs:
+ * Gui/Dialogs/ReplaceDialog.cs:
+ * Gui/Dialogs/EditTemplateGroupDialog.cs:
+ Gettextify
+
+2004-04-01 Todd Berman <tberman at sevenl.net>
+
+ * CodeCompletion/TextUtilities.cs: if we are already caching the string
+ might as well use it.
+
2004-03-29 Todd Berman <tberman at sevenl.net>
* Gui/SourceEditorDisplayBinding.cs: second half of the double clicking
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionData.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionData.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionData.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,7 +1,7 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
+// <owner name="Mike Kr�¼ger" email="mike at icsharpcode.net"/>
// <version value="$version"/>
// </file>
@@ -42,7 +42,16 @@
return asvc;
}
}
+
+ public string CompletionString
+ {
+ get
+ {
+ return completionString;
+ }
+ }
+
public int Overloads
{
get {
@@ -210,6 +219,16 @@
completionString = e.Name;
documentation = e.Documentation;
}
+
+ public CodeCompletionData (IParameter o)
+ {
+ image = MonoDevelop.Gui.Stock.Field;
+ text = o.Name;
+ description = "";
+ pango_description = "";
+ completionString = o.Name;
+ documentation = "";
+ }
public void InsertAction (SourceEditorView control)
{
@@ -257,8 +276,18 @@
}
} while (xml.Read ());
} catch {
+ Console.WriteLine ("DocBoom");
return doc;
}
+ int i = 45;
+ while (i < ret.Length) {
+ while (ret[i] != ' ') {
+ i++;
+ if (i >= ret.Length) return ret.ToString ();
+ }
+ ret.Insert (i, '\n');
+ i += 45;
+ }
return ret.ToString ();
}
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,7 +1,7 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
+// <owner name="Mike Kr�¼ger" email="mike at icsharpcode.net"/>
// <version value="$version"/>
// </file>
@@ -41,16 +41,27 @@
int caretLineNumber;
int caretColumn;
string fileName;
+ bool ctrlspace;
+
+ public CodeCompletionDataProvider() : this (false)
+ {
+ }
+
+ public CodeCompletionDataProvider (bool ctrl)
+ {
+ this.ctrlspace = ctrl;
+ }
+
ArrayList completionData = null;
-
+
public ICompletionData[] GenerateCompletionData(string fileName, SourceEditorView textArea, char charTyped, TextMark triggerMark)
{
completionData = new ArrayList();
this.fileName = fileName;
-
+
Gtk.TextIter insertIter = textArea.Buffer.GetIterAtMark (triggerMark);
-
+
// the parser works with 1 based coordinates
caretLineNumber = insertIter.Line + 1;
@@ -62,6 +73,17 @@
IExpressionFinder expressionFinder = parserService.GetExpressionFinder(fileName);
string expression = expressionFinder == null ? TextUtilities.GetExpressionBeforeOffset(textArea, insertIter.Offset) : expressionFinder.FindExpression(textArea.Buffer.GetText(textArea.Buffer.StartIter, insertIter, true), insertIter.Offset - 2);
if (expression == null) return null;
+ Console.WriteLine ("Expr: |{0}|", expression);
+ //FIXME: This chartyped check is a fucking *HACK*
+ if (expression == "is" || expression == "as") {
+ string expr = expressionFinder == null ? TextUtilities.GetExpressionBeforeOffset (textArea, insertIter.Offset - 3) : expressionFinder.FindExpression (textArea.Buffer.GetText (textArea.Buffer.StartIter, insertIter, true), insertIter.Offset - 5);
+ AddResolveResults (parserService.IsAsResolve (expr, caretLineNumber, caretColumn, fileName, textArea.Buffer.Text));
+ return (ICompletionData[])completionData.ToArray (typeof (ICompletionData));
+ }
+ if (ctrlspace && charTyped != '.') {
+ AddResolveResults (parserService.CtrlSpace (parserService, caretLineNumber, caretColumn, fileName));
+ return (ICompletionData[])completionData.ToArray (typeof (ICompletionData));
+ }
if (charTyped == ' ') {
if (expression == "using" || expression.EndsWith(" using") || expression.EndsWith("\tusing")|| expression.EndsWith("\nusing")|| expression.EndsWith("\rusing")) {
string[] namespaces = parserService.GetNamespaceList("");
@@ -71,17 +93,17 @@
//FIXME: I added the null check, #D doesnt need it, why do we?
if (fileName != null) {
results = parserService.Resolve(expression,
- caretLineNumber,
- caretColumn,
- fileName,
- textArea.Buffer.Text);
+ caretLineNumber,
+ caretColumn,
+ fileName,
+ textArea.Buffer.Text);
AddResolveResults(results);
}
}
return (ICompletionData[]) completionData.ToArray (typeof (ICompletionData));
}
-
+
void AddResolveResults(ICollection list)
{
if (list == null) {
@@ -120,6 +142,8 @@
completionData.Add(new CodeCompletionData(e));
insertedEventElements[e.Name] = e;
}
+ } else if (o is IParameter) {
+ completionData.Add (new CodeCompletionData((IParameter)o));
}
}
}
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -98,6 +98,14 @@
return new string[] { text };
}
}
+
+ public string CompletionString
+ {
+ get
+ {
+ return "";
+ }
+ }
public string Description
{
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -23,9 +23,10 @@
ICompletionDataProvider completionDataProvider;
SourceEditorView control;
TreeView listView;
- TreeStore store;
+ ListStore store;
TextMark triggeringMark;
int origOffset;
+ int num_in = 0;
DeclarationViewWindow declarationviewwindow = new DeclarationViewWindow ();
string GetTypedString ()
@@ -66,14 +67,20 @@
case ';':
case '(':
case '[':
+ case (char) Gdk.Key.Return:
+ case (char) Gdk.Key.ISO_Enter:
+ case (char) Gdk.Key.Key_3270_Enter:
+ case (char) Gdk.Key.KP_Enter:
control.SimulateKeyPress (ref e);
LostFocusListView (null, null);
return true;
case (char) Gdk.Key.BackSpace:
+ num_in--;
control.SimulateKeyPress (ref e);
if (insertLength <= -1) {
LostFocusListView (null, null);
}
+ RowActivated (null, null);
return true;
}
break;
@@ -111,7 +118,9 @@
default:
if (val != '_' && !Char.IsLetterOrDigit (val)) {
- if (listView.Selection.CountSelectedRows () > 0) {
+ TreeModel mdl;
+ TreeIter itr;
+ if (listView.Selection.GetSelected (out mdl, out itr)) {
ActivateItem (null, null);
} else {
LostFocusListView (null, null);
@@ -126,6 +135,8 @@
break;
}
+ num_in++;
+
ShuffleSelection (false);
ex.RetVal = true;
@@ -176,6 +187,10 @@
return true;
}
}
+ if (numOfHits == 0) {
+ control.buf.DropCompleteAhead ();
+ listView.Selection.UnselectAll ();
+ }
return false;
}
@@ -186,7 +201,7 @@
SkipTaskbarHint = true;
TypeHint = Gdk.WindowTypeHint.Dialog;
- store = new Gtk.TreeStore (typeof (string), typeof (string), typeof(ICompletionData));
+ store = new Gtk.ListStore (typeof (string), typeof (Gdk.Pixbuf), typeof(ICompletionData));
listView = new Gtk.TreeView (store);
listView.HeadersVisible = false;
@@ -194,9 +209,8 @@
complete_column.Title = "completion";
Gtk.CellRendererPixbuf pix_render = new Gtk.CellRendererPixbuf ();
- pix_render.StockSize = Gtk.IconSize.Button;
complete_column.PackStart (pix_render, false);
- complete_column.AddAttribute (pix_render, "stock-id", 1);
+ complete_column.AddAttribute (pix_render, "pixbuf", 1);
Gtk.CellRendererText text_render = new Gtk.CellRendererText ();
complete_column.PackStart (text_render, true);
@@ -216,7 +230,7 @@
//listView.KeyReleaseEvent += new KeyReleaseEventHandler(ListKeyreleaseEvent);
listView.FocusOutEvent += new FocusOutEventHandler (LostFocusListView);
listView.RowActivated += new RowActivatedHandler (ActivateItem);
- listView.AddEvents ((int) (Gdk.EventMask.KeyPressMask));
+ listView.AddEvents ((int) (Gdk.EventMask.KeyPressMask | Gdk.EventMask.LeaveNotifyMask));
}
/// <remarks>
@@ -224,6 +238,7 @@
/// </remarks>
public void ShowCompletionWindow (char firstChar, TextIter trigIter, bool magic)
{
+ control.buf.StartAtomicUndo ();
triggeringMark = control.Buffer.CreateMark (null, trigIter, true);
origOffset = trigIter.Offset;
FillList (true, firstChar);
@@ -247,7 +262,7 @@
int tx, ty;
control.GdkWindow.GetOrigin (out tx, out ty);
//Console.WriteLine ("Moving to: " + (tx + wx) + " . " + (ty + wy));
- System.Threading.Thread.Sleep (100);
+ //System.Threading.Thread.Sleep (50);
ShowAll ();
Move (tx + wx, ty + wy);
Present ();
@@ -293,11 +308,11 @@
void ActivateItem (object sender, RowActivatedArgs e)
{
- if (listView.Selection.CountSelectedRows () > 0) {
- TreeModel foo;
- TreeIter iter;
- listView.Selection.GetSelected (out foo, out iter);
+ TreeModel foo;
+ TreeIter iter;
+ if (listView.Selection.GetSelected (out foo, out iter)) {
ICompletionData data = (ICompletionData) store.GetValue (iter, 2);
+ control.buf.DropCompleteAhead ();
DeleteInsertion ();
data.InsertAction (control);
LostFocusListView (null, null);
@@ -306,6 +321,8 @@
void LostFocusListView (object sender, FocusOutEventArgs e)
{
+ control.buf.DropCompleteAhead ();
+ control.buf.EndAtomicUndo ();
control.HasFocus = true;
declarationviewwindow.HideAll ();
this.Hide ();
@@ -317,9 +334,9 @@
if (completionData == null || completionData.Length == 0) {
return;
}
-
+
foreach (ICompletionData data in completionData) {
- store.AppendValues (data.Text[0], data.Image, data);
+ store.AppendValues (data.Text[0], RenderIcon (data.Image, Gtk.IconSize.Menu, ""), data);
}
// sort here
store.SetSortColumnId (0, SortType.Ascending);
@@ -329,11 +346,28 @@
{
Gtk.TreeIter iter;
Gtk.TreeModel model;
-
+
if (listView.Selection.GetSelected (out model, out iter)){
ICompletionData data = (ICompletionData) store.GetValue (iter, 2);
if (data == null)
return;
+
+ int inst = insertLength;
+ if (inst == -1) {
+ LostFocusListView (null, null);
+ return;
+ }
+ if (inst >= 1) {
+ DeleteInsertion ();
+ int l = inst > data.CompletionString.Length ? data.CompletionString.Length : inst;
+ control.buf.InsertAtCursor (data.CompletionString.Substring (0, l));
+ }
+ control.buf.DropCompleteAhead ();
+ if (data.CompletionString.Length > inst) {
+ control.buf.DropCompleteAhead ();
+ control.buf.CompleteAhead (data.CompletionString.Substring(inst));
+ }
+
// This code is for sizing the treeview properly.
Gtk.TreePath path = store.GetPath (iter);
Gdk.Rectangle backRect = listView.GetBackgroundArea (path, (Gtk.TreeViewColumn)listView.Columns[0]);
@@ -342,7 +376,8 @@
// FIXME: This code is buggy, and generates a bad placement sometimes when you jump a lot.
// but it is better than 0,0
- // This code is for sizing the treeview properly.
+ // This code is for sizing the treeview properly.
+
Gdk.Rectangle rect = listView.GetCellArea (path, (Gtk.TreeViewColumn)listView.Columns[0]);
int listpos_x = 0, listpos_y = 0;
while (listpos_x == 0)
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ICompletionData.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ICompletionData.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ICompletionData.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -27,6 +27,11 @@
string Description {
get;
}
+
+ string CompletionString
+ {
+ get;
+ }
void InsertAction(SourceEditorView control);
}
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TemplateCompletionDataProvider.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TemplateCompletionDataProvider.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TemplateCompletionDataProvider.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -50,6 +50,14 @@
return Stock.Method;
}
}
+
+ public string CompletionString
+ {
+ get
+ {
+ return "";
+ }
+ }
public string[] Text
{
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TextUtilities.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TextUtilities.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TextUtilities.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -248,14 +248,14 @@
{
// FIXME: use iters
string text = document.Buffer.Text;
- while (offset > 0 && offset < document.Buffer.Text.Length) {
+ while (offset > 0 && offset < text.Length) {
char ch = text [offset];
switch (ch) {
case '\r':
case '\n':
return false;
case '/':
- if (document.Buffer.Text[offset + 1] == '/') {
+ if (text[offset + 1] == '/') {
return true;
}
break;
@@ -271,10 +271,10 @@
string text = document.Buffer.Text;
int brackets = -1;
bool inString = false;
- bool inChar = false;
+ bool inChar = false;
bool blockComment = false;
- while (offset >= 0 && offset < document.Buffer.Text.Length) {
+ while (offset >= 0 && offset < text.Length) {
char ch = text [offset];
switch (ch) {
case '/':
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Commands/ToolCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Commands/ToolCommands.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Commands/ToolCommands.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -18,6 +18,7 @@
using MonoDevelop.Gui.HtmlControl;
using MonoDevelop.Core.Services;
using MonoDevelop.SourceEditor.Gui;
+using MonoDevelop.Services;
using Gtk;
@@ -26,7 +27,7 @@
public class ColorDialog : ColorSelectionDialog
{
// FIXME: i18n
- public ColorDialog () : base ("Insert a color hex string")
+ public ColorDialog () : base (GettextCatalog.GetString ("Insert a color hex string"))
{
this.ColorSelection.HasPalette = true;
this.ColorSelection.HasOpacityControl = false;
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/EditTemplateGroupDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/EditTemplateGroupDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/EditTemplateGroupDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -11,6 +11,8 @@
using MonoDevelop.Internal.Templates;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
+
namespace MonoDevelop.EditorBindings.Gui.Dialogs
{
public class EditTemplateGroupDialog : Gtk.Dialog
@@ -56,7 +58,7 @@
// set up this actual dialog
this.Modal = true;
// FIXME: make this a resource in the resource file
- this.Title = titlePrefix + "Code Group";
+ this.Title = String.Format (GettextCatalog.GetString ("{0} Code Group"), titlePrefix);
// set up the dialog fields and add them
templateExtensionsTextBox = new Gtk.Entry();
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -64,17 +64,9 @@
void InitDialog ()
{
- label1.Text = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.FindWhat}");
- searchLocationLabel.Text = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.SearchIn}");
- //findButton.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.FindNextButton}");
- //closeButton.Label = stringParserService.Parse ("${res:Global.CloseButtonText}");
findButton.UseUnderline = true;
closeButton.UseUnderline = true;
- ignoreCaseCheckBox.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.CaseSensitive}");
- searchWholeWordOnlyCheckBox.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.WholeWord}");
- useSpecialSearchStrategyCheckBox.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.UseMethodLabel}");
-
//set up the size groups
SizeGroup labels = new SizeGroup(SizeGroupMode.Horizontal);
SizeGroup combos = new SizeGroup(SizeGroupMode.Horizontal);
@@ -99,9 +91,6 @@
{
ReplaceDialogPointer = this.ReplaceDialogWidget;
// set the label properties
- label2.Text = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.ReplaceWith}");
- //replaceButton.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.ReplaceButton}");
- replaceAllButton.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.ReplaceAllButton}");
replaceButton.UseUnderline = true;
replaceAllButton.UseUnderline = true;
@@ -116,7 +105,6 @@
{
ReplaceDialogPointer = this.FindDialogWidget;
markAllButton.UseUnderline = true;
- markAllButton.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.MarkAllButton}");
}
ReplaceDialogPointer.TransientFor = (Gtk.Window)WorkbenchSingleton.Workbench;
}
@@ -151,10 +139,10 @@
useSpecialSearchStrategyCheckBox.Active = SearchReplaceManager.SearchOptions.SearchStrategyType != SearchStrategyType.Normal;
useSpecialSearchStrategyCheckBox.Toggled += new EventHandler(SpecialSearchStrategyCheckBoxChangedEvent);
- Gtk.MenuItem tmpItem = new Gtk.MenuItem ("Wildcards");
+ Gtk.MenuItem tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Wildcards"));
Gtk.Menu stratMenu = new Gtk.Menu ();
stratMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (resourceService.GetString("Dialog.NewProject.SearchReplace.SearchStrategy.RegexSearch"));
+ tmpItem = new Gtk.MenuItem (GettextCatalog.GetString("Regular Expressions"));
stratMenu.Append (tmpItem);
specialSearchStrategyComboBox.Menu = stratMenu;
@@ -170,11 +158,11 @@
specialSearchStrategyComboBox.SetHistory (index);
Gtk.Menu locMenu = new Gtk.Menu ();
- tmpItem = new Gtk.MenuItem (resourceService.GetString("Global.Location.currentfile"));
+ tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Current File"));
locMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (resourceService.GetString("Global.Location.allopenfiles"));
+ tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("All Open Files"));
locMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (resourceService.GetString("Global.Location.wholeproject"));
+ tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Entire Project"));
locMenu.Append (tmpItem);
searchLocationComboBox.Menu = locMenu;
@@ -199,12 +187,12 @@
ReplaceDialogPointer.DeleteEvent += new DeleteEventHandler (OnDeleted);
if (replaceMode) {
- ReplaceDialogPointer.Title = resourceService.GetString("Dialog.NewProject.SearchReplace.ReplaceDialogName");
+ ReplaceDialogPointer.Title = GettextCatalog.GetString ("Replace");
replaceButton.Clicked += new EventHandler(ReplaceEvent);
replaceAllButton.Clicked += new EventHandler(ReplaceAllEvent);
replacePatternEntry.GtkEntry.Text = SearchReplaceManager.SearchOptions.ReplacePattern;
} else {
- ReplaceDialogPointer.Title = resourceService.GetString("Dialog.NewProject.SearchReplace.FindDialogName");
+ ReplaceDialogPointer.Title = GettextCatalog.GetString ("Find");
markAllButton.Clicked += new EventHandler(MarkAllEvent);
}
searchPatternEntry.GtkEntry.SelectRegion(0, searchPatternEntry.GtkEntry.Text.Length);
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -64,20 +64,9 @@
void InitDialog ()
{
- label1.Text = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.FindWhat}");
- searchLocationLabel.Text = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.SearchIn}");
- label6.Text = stringParserService.Parse ("${res:NewProject.SearchReplace.FileMask}");
- label7.Text = stringParserService.Parse ("${res:NewProject.SearchReplace.Directory}");
- //findButton.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.FindNextButton}");
- //closeButton.Label = stringParserService.Parse ("${res:Global.CloseButtonText}");
findButton.UseUnderline = true;
closeButton.UseUnderline = true;
- includeSubdirectoriesCheckBox.Label = stringParserService.Parse ("${res:NewProject.SearchReplace.IncludeSubdirectories}");
- ignoreCaseCheckBox.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.CaseSensitive}");
- searchWholeWordOnlyCheckBox.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.WholeWord}");
- useSpecialSearchStrategyCheckBox.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.UseMethodLabel}");
-
//set up the size groups
SizeGroup labels = new SizeGroup(SizeGroupMode.Horizontal);
SizeGroup combos = new SizeGroup(SizeGroupMode.Horizontal);
@@ -106,9 +95,8 @@
// set replace dialog properties
if(replaceMode)
{
- ReplaceDialogPointer = this.ReplaceInFilesDialogWidget;
// set the label properties
- label2.Text = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.ReplaceWith}");
+ label2.Text = GettextCatalog.GetString ("Replace in Files");
//replaceButton.Label = stringParserService.Parse ("${res:Dialog.NewProject.SearchReplace.ReplaceButton}");
//replaceButton.UseUnderline = true;
@@ -185,9 +173,9 @@
//CancelButton = (Button)ControlDictionary["closeButton"];
Gtk.MenuItem tmpItem;
Gtk.Menu stratMenu = new Gtk.Menu ();
- tmpItem = new Gtk.MenuItem (resourceService.GetString("Dialog.NewProject.SearchReplace.SearchStrategy.WildcardSearch"));
+ tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Wildcards"));
stratMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (resourceService.GetString("Dialog.NewProject.SearchReplace.SearchStrategy.RegexSearch"));
+ tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Regular Expressions"));
stratMenu.Append (tmpItem);
specialSearchStrategyComboBox.Menu = stratMenu;
@@ -203,11 +191,11 @@
specialSearchStrategyComboBox.SetHistory (index);
Gtk.Menu locMenu = new Gtk.Menu ();
- tmpItem = new Gtk.MenuItem (resourceService.GetString("Global.Location.directories"));
+ tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Directories"));
locMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (resourceService.GetString("Global.Location.allopenfiles"));
+ tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("All open files"));
locMenu.Append (tmpItem);
- tmpItem = new Gtk.MenuItem (resourceService.GetString("Global.Location.wholeproject"));
+ tmpItem = new Gtk.MenuItem (GettextCatalog.GetString ("Whole project"));
locMenu.Append (tmpItem);
searchLocationComboBox.Menu = locMenu;
@@ -265,7 +253,7 @@
void BrowseDirectoryEvent(object sender, EventArgs e)
{
- FolderDialog fd = new FolderDialog("Select directory");
+ FolderDialog fd = new FolderDialog(GettextCatalog.GetString ("Select directory"));
if (fd.Run() == (int)Gtk.ResponseType.Ok)
{
directoryTextBox.Text = fd.Filename;
@@ -303,17 +291,17 @@
if (SearchReplaceInFilesManager.SearchOptions.DocumentIteratorType == DocumentIteratorType.Directory) {
if (!fileUtilityService.IsValidFileName(directoryName)) {
- messageService.ShowErrorFormatted("${res:NewProject.SearchReplace.FindInFilesInvalidDirectoryMessage}", directoryName);
+ messageService.ShowErrorFormatted(GettextCatalog.GetString ("Invalid directory name: {0}"), directoryName);
return false;
}
if (!Directory.Exists(directoryName)) {
- messageService.ShowErrorFormatted("${res:NewProject.SearchReplace.FindInFilesDirectoryNotExistingMessage}", directoryName);
+ messageService.ShowErrorFormatted (GettextCatalog.GetString ("Invalid directory name: {0}"), directoryName);
return false;
}
if (!fileUtilityService.IsValidFileName(fileMask) || fileMask.IndexOf('\\') >= 0) {
- messageService.ShowErrorFormatted("${res:NewProject.SearchReplace.FindInFilesInvalidFilemaskMessage}", fileMask);
+ messageService.ShowErrorFormatted(GettextCatalog.GetString ("Invalid file mask: {0}"), fileMask);
return false;
}
}
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/BehaviorTextEditorPanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/BehaviorTextEditorPanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/BehaviorTextEditorPanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -69,34 +69,6 @@
{
// Set up Text
- //FIXME: i18n the following Labels
- noneIndentStyle.Label = "None";
- automaticIndentStyle.Label = "Automatic";
- // FIXME: renable this when smart indent is back
- //smartIndentStyle.Label = "Smart";
-
- tabsGroupBoxLabel.Markup = "<b>" + StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.TabsGroupBox}") + "</b>";
- tabSizeLabel.TextWithMnemonic = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.TabSizeLabel}");
- indentSizeLabel.TextWithMnemonic = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.IndentSizeLabel}");
- indentLabel.TextWithMnemonic = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.IndentLabel}");
-
- behaviourGroupBoxLabel.Markup = "<b>" + StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.BehaviourGroupBox}") + "</b>";
- autoinsertCurlyBraceCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.CurlyBracketCheckBox}");
- hideMouseCursorCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.HideMouseCheckBox}");
- caretBehindEOLCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.BehindEOLCheckBox}");
- autoInsertTemplatesCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.TemplateInsertCheckBox}");
- convertTabsToSpacesCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.ConvertTabsToSpacesCheckBox}");
-
// Set up Value
autoinsertCurlyBraceCheckBox.Active = ((IProperties)CustomizationObject).GetProperty(
"AutoInsertCurlyBracket", true);
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/CodeTemplatePanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -15,6 +15,7 @@
using MonoDevelop.Core.AddIns.Codons;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
using MonoDevelop.Gui.Dialogs;
using Gtk;
@@ -105,24 +106,15 @@
void SetLabels()
{
- extensionLabel.TextWithMnemonic = StringParserService.Parse("${res:Dialog.Options.CodeTemplate.ExtensionsLabel}");
- removeButton.Label = StringParserService.Parse("${res:Global.RemoveButtonText}");
- addButton.Label = StringParserService.Parse("${res:Global.AddButtonText}");
- editButton.Label = StringParserService.Parse("${res:Global.EditButtonText}");
- addGroupButton.Label = StringParserService.Parse("${res:Dialog.Options.CodeTemplate.AddGroupLabel}");
- // FIXME: make this use the resource file for the label
- editGroupButton.Label = "Ed_it Group";
- removeGroupButton.Label = StringParserService.Parse("${res:Dialog.Options.CodeTemplate.RemoveGroupLabel}");
-
CellRendererText textRenderer = new CellRendererText ();
// and listview columns
templateListView.AppendColumn (
- StringParserService.Parse("${res:Dialog.Options.CodeTemplate.Template}"),
+ GettextCatalog.GetString ("Template"),
textRenderer,
new TreeCellDataFunc(TemplateListViewCellDataFunc));
templateListView.AppendColumn (
- StringParserService.Parse("${res:Dialog.Options.CodeTemplate.Description}"),
+ GettextCatalog.GetString ("Description"),
textRenderer,
new TreeCellDataFunc(TemplateListViewCellDataFunc));
}
@@ -134,7 +126,7 @@
CodeTemplate codeTemplate = ((ListStore)model).GetValue(iter, 0) as CodeTemplate;
- if(column.Title == StringParserService.Parse("${res:Dialog.Options.CodeTemplate.Template}"))
+ if(column.Title == GettextCatalog.GetString ("Template"))
{
// first column
((CellRendererText)renderer).Text = codeTemplate.Shortcut;
@@ -166,7 +158,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;
}
@@ -186,7 +178,7 @@
void AddGroupEvent(object sender, EventArgs e)
{
CodeTemplateGroup templateGroup = new CodeTemplateGroup(".???");
- if(ShowEditTemplateGroupDialog(ref templateGroup, "New ")) {
+ if(ShowEditTemplateGroupDialog(ref templateGroup, GettextCatalog.GetString ("New "))) {
templateGroups.Add(templateGroup);
FillGroupOptionMenu();
groupOptionMenu.SetHistory((uint) templateGroups.Count - 1);
@@ -199,7 +191,7 @@
int index = groupOptionMenu.History;
CodeTemplateGroup templateGroup = (CodeTemplateGroup) templateGroups[index];
- if(ShowEditTemplateGroupDialog(ref templateGroup, "Edit ")) {
+ if(ShowEditTemplateGroupDialog(ref templateGroup, GettextCatalog.GetString ("Edit "))) {
templateGroups[index] = templateGroup;
FillGroupOptionMenu();
groupOptionMenu.SetHistory((uint)index);
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/GeneralTextEditorPanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -61,24 +61,11 @@
public GeneralTextEditorPanelWidget (IProperties CustomizationObject) : base ("EditorBindings.glade", "GeneralTextEditorPanel")
{
encodingBox.Destroy(); // this is a really dirty way of hiding encodingBox, but Hide() doesn't work
- genOptions.Markup = "<b> " + StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.General.GeneralOptionsGroupBox}" ) + "</b>";
- fontOptions.Markup = "<b> " + StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.General.FontGroupBox}" ) + "</b>";
-// encOptions.Markup = "<b> " + StringParserService.Parse(
-// "${res:Dialog.Options.IDEOptions.TextEditor.General.FontGroupBox.FileEncodingGroupBox}" ) + "</b>";
-
- enableCodeCompletionCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.General.CodeCompletionCheckBox}");
enableCodeCompletionCheckBox.Active = ((IProperties) CustomizationObject).GetProperty(
"EnableCodeCompletion", true);
- enableFoldingCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.General.FoldingCheckBox}");
enableFoldingCheckBox.Active = ((IProperties) CustomizationObject).GetProperty("EnableFolding", true);
- enableDoublebufferingCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.General.DoubleBufferCheckBox}");
enableDoublebufferingCheckBox.Active = ((IProperties) CustomizationObject).GetProperty(
"DoubleBuffer", true);
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/MarkersTextEditorPanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -73,31 +73,7 @@
// Load Text
// FIXME i8n the following labels:
- markersLabel.Markup = "<b>Markers</b> ";
- rulersLabel.Markup = "<b>Rulers</b> ";
- characterMarkersLabel.TextWithMnemonic = "Character Markers";
- atColumnLabel.TextWithMnemonic = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Markers.AtRowLabel}") + ", ";
- showLineNumberCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Markers.LineNumberCheckBox}");
- showInvalidLinesCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Markers.InvalidLinesCheckBox}");
- showBracketHighlighterCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox}");
- showErrorsCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Markers.UnderLineErrorsCheckBox}");
- showHRulerCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox}");
- showEOLMarkersCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Markers.EOLMarkersCheckBox}");
- showVRulerCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Markers.VerticalRulerCheckBox}");
- showTabCharsCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Markers.TabsCheckBox}");
- showSpaceCharsCheckBox.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.TextEditor.Markers.SpacesCheckBox}");
-
// Load Values
showLineNumberCheckBox.Active = ((IProperties)CustomizationObject).GetProperty(
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/Pads/CompilerMessageView.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -42,7 +42,7 @@
public string Title {
get {
- return resourceService.GetString("MainWindow.Windows.OutputWindow");
+ return GettextCatalog.GetString ("Output");
}
}
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -8,10 +8,14 @@
using MonoDevelop.Core.Services;
using MonoDevelop.Services;
using MonoDevelop.Core.AddIns.Codons;
+using MonoDevelop.Internal.Parser;
using System;
using System.IO;
+using System.Collections;
using System.Runtime.InteropServices;
+
+using GtkSourceView;
namespace MonoDevelop.SourceEditor.Gui
{
@@ -62,13 +66,85 @@
{
SourceLanguagesManager slm = new SourceLanguagesManager ();
TextTag markup;
+ TextTag complete_ahead;
+ TextTag compilation_error;
+ TextMark complete_end;
+ AtomicUndo atomic_undo;
+ SourceEditorView view;
+
+ public SourceEditorView View
+ {
+ get {
+ return view;
+ }
+ set {
+ view = value;
+ }
+ }
+
+ IParserService ps = (IParserService)ServiceManager.Services.GetService (typeof (IParserService));
+
+ public SourceEditorBuffer (SourceEditorView view) : this ()
+ {
+ this.view = view;
+ }
+
public SourceEditorBuffer () : base (new SourceTagTable ())
{
markup = new TextTag ("breakpoint");
markup.Background = "yellow";
TagTable.Add (markup);
+ complete_ahead = new TextTag ("complete_ahead");
+ complete_ahead.Foreground = "grey";
+ TagTable.Add (complete_ahead);
+ compilation_error = new TextTag ("compilation_error");
+ compilation_error.Underline = Pango.Underline.Single;
+ TagTable.Add (compilation_error);
+ complete_end = CreateMark (null, StartIter, true);
+ //ps.ParseInformationChanged += new ParseInformationEventHandler (parseChanged);
}
+
+ ArrayList points = new ArrayList ();
+ public void parseChanged (object o, ParseInformationEventArgs e)
+ {
+ if (view != null) {
+ if (view.ParentEditor.DisplayBinding.ContentName == e.FileName){
+ if (e.ParseInformation.MostRecentCompilationUnit.ErrorsDuringCompile) {
+ string[] errors = e.ParseInformation.MostRecentCompilationUnit.ErrorOutput.Split ('\n');
+ foreach (string error in errors) {
+ string[] pieces = error.Split (' ');
+ if (pieces.Length == 1) continue;
+ Console.WriteLine ("line: {0} col: {1}", pieces[2], pieces[4]);
+ int[] point = new int[2];
+ point[0] = Convert.ToInt32 (pieces[2]) - 1;
+ point[1] = Convert.ToInt32 (pieces[4]);
+ points.Add (point);
+ }
+ GLib.Idle.Add (new GLib.IdleHandler (addMarkup));
+ }
+ else {
+ //Clear errors
+ }
+ }
+ }
+ }
+
+ bool addMarkup ()
+ {
+ foreach (int[] point in points) {
+ Console.WriteLine ("line: {0} col: {1}", point[0], point[1]);
+ TextIter start = GetIterAtLine (point[0]);
+ Console.WriteLine (start.Line);
+ //start.LineOffset = point[1] - 1;
+ Console.WriteLine (start.Line);
+ TextIter end = start;
+ end.ForwardToLineEnd ();
+ ApplyTag (compilation_error, start, end);
+ }
+ points.Clear ();
+ return false;
+ }
public void MarkupLine (int linenumber)
{
@@ -78,13 +154,43 @@
end_line.ForwardToLineEnd ();
ApplyTag (markup, begin_line, end_line);
}
-
+
public void UnMarkupLine (int line)
{
ClearMarks (SourceMarkerType.ExecutionMark);
RemoveTag (markup, StartIter, EndIter);
}
+
+ public void DropCompleteAhead ()
+ {
+ if (GetIterAtMark (complete_end).Offset == 0)
+ return;
+ RemoveTag (complete_ahead, GetIterAtMark (InsertMark), GetIterAtMark (complete_end));
+ Delete (GetIterAtMark (InsertMark), GetIterAtMark (complete_end));
+ MoveMark (complete_end, GetIterAtOffset (0));
+ }
+ public void CompleteAhead (string what)
+ {
+ DropCompleteAhead ();
+ InsertWithTags (GetIterAtMark (InsertMark), what, new TextTag[]
+ { complete_ahead });
+ TextIter it = GetIterAtMark (InsertMark);
+ MoveMark (complete_end, it);
+ it.BackwardChars (what.Length);
+ PlaceCursor (it);
+ }
+
+ public void StartAtomicUndo ()
+ {
+ atomic_undo = new AtomicUndo (this);
+ }
+
+ public void EndAtomicUndo ()
+ {
+ atomic_undo.Dispose ();
+ }
+
public void LoadFile (string file, string mime)
{
LoadText (File.OpenText (file).ReadToEnd (), mime);
@@ -97,6 +203,7 @@
Text = File.OpenText (file).ReadToEnd ();
Modified = false;
+ ScrollToTop ();
}
public void LoadText (string text, string mime)
@@ -109,6 +216,7 @@
Text = text;
Modified = false;
+ ScrollToTop ();
}
public void LoadText (string text)
@@ -117,7 +225,23 @@
Text = text;
Modified = false;
+ ScrollToTop ();
}
+
+ void ScrollToTop ()
+ {
+ PlaceCursor (StartIter);
+ if (View != null) {
+ View.ScrollMarkOnscreen (InsertMark);
+ Gtk.Timeout.Add (20, new Gtk.Function (changeFocus));
+ }
+ }
+
+ bool changeFocus ()
+ {
+ View.GrabFocus ();
+ return false;
+ }
public void Save (string fileName)
{
@@ -479,15 +603,23 @@
public char GetCharAt (int offset)
{
+ /*if (offset < 0)
+ offset = 0;
+ TextIter begin_iter = GetIterAtOffset (offset);
+ TextIter next_iter = begin_iter;
+ next_iter.ForwardChar ();
+ string text = GetText (begin_iter, next_iter, true);
+ if (text != null && text.Length >= 1)
+ return text[0];*/
+ //New test implementation
if (offset < 0)
offset = 0;
- TextIter begin_iter = GetIterAtOffset (offset);
- TextIter next_iter = begin_iter;
- next_iter.ForwardChar ();
- string text = GetText (begin_iter, next_iter, true);
- if (text != null && text.Length >= 1)
- return text[0];
- return ' ';
+ TextIter iter = GetIterAtOffset (offset);
+ if (iter.Equals (TextIter.Zero))
+ return ' ';
+ if (iter.Char == null || iter.Char.Length == 0)
+ return ' ';
+ return iter.Char[0];
}
public string GetText (int start, int length)
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -14,6 +14,7 @@
using MonoDevelop.Services;
using Gtk;
+using GtkSourceView;
namespace MonoDevelop.SourceEditor.Gui
{
@@ -23,7 +24,7 @@
static SourceEditorDisplayBinding ()
{
- GtkSourceView.Init ();
+ GtkSourceViewManager.Init ();
}
public virtual bool CanCreateContentForFile (string fileName)
@@ -37,6 +38,8 @@
return false;
if (mimetype.StartsWith ("text"))
return true;
+ if (mimetype == "application/x-python")
+ return true;
return false;
}
@@ -105,7 +108,7 @@
public override string TabPageLabel {
get {
- return "Source Editor";
+ return GettextCatalog.GetString ("Source Editor");
}
}
@@ -151,6 +154,7 @@
{
TextIter iter = se.Buffer.GetIterAtMark (se.Buffer.InsertMark);
if (Source.IterFindMatchingBracket (ref iter)) {
+ iter.ForwardChar ();
se.Buffer.PlaceCursor (iter);
se.View.ScrollMarkOnscreen (se.Buffer.InsertMark);
}
@@ -221,10 +225,30 @@
get { return se.Buffer; }
}
+ string cachedText;
+ GLib.IdleHandler bouncingDelegate;
+
public string Text {
- get { return se.Buffer.Text; }
+ get {
+ if (bouncingDelegate == null)
+ bouncingDelegate = new GLib.IdleHandler (BounceAndGrab);
+ if (needsUpdate) {
+ GLib.Idle.Add (bouncingDelegate);
+ }
+ return cachedText;
+ }
set { se.Buffer.Text = value; }
}
+
+ bool needsUpdate;
+ bool BounceAndGrab ()
+ {
+ if (needsUpdate) {
+ cachedText = se.Buffer.Text;
+ needsUpdate = false;
+ }
+ return false;
+ }
public void Undo ()
{
@@ -251,6 +275,7 @@
// gedit also hooks this event, but do we need it?
UpdateLineCol ();
OnContentChanged (null);
+ needsUpdate = true;
}
// WORKAROUND until we get this method returning char in gtk#
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,5 +1,6 @@
using Gtk;
using Gdk;
+using Global = Gtk.Global;
using System;
using System.IO;
@@ -16,6 +17,8 @@
using MonoDevelop.Gui.Utils;
using MonoDevelop.Services;
+using GtkSourceView;
+
namespace MonoDevelop.SourceEditor.Gui
{
public class SourceEditorView : SourceView, IFormattableDocument
@@ -23,7 +26,7 @@
private static GLib.GType gtype;
public readonly SourceEditor ParentEditor;
internal IFormattingStrategy fmtr;
- SourceEditorBuffer buf;
+ public SourceEditorBuffer buf;
int lineToMark = -1;
CompletionWindow completionWnd;
bool codeCompleteEnabled;
@@ -86,8 +89,8 @@
buf.ToggleBookmark (line.Line);
} else if (e.Event.Button == 3) {
Gtk.Menu popup = new Gtk.Menu ();
- Gtk.CheckMenuItem bookmarkItem = Gtk.CheckMenuItem.NewWithLabel ("Bookmark");
- Gtk.CheckMenuItem breakpointItem = Gtk.CheckMenuItem.NewWithLabel ("Breakpoint");
+ Gtk.CheckMenuItem bookmarkItem = Gtk.CheckMenuItem.NewWithLabel (GettextCatalog.GetString ("Bookmark"));
+ Gtk.CheckMenuItem breakpointItem = Gtk.CheckMenuItem.NewWithLabel (GettextCatalog.GetString ("Breakpoint"));
bookmarkItem.Active = buf.IsBookmarked (line.Line);
breakpointItem.Active = buf.IsBreakpoint (line.Line);
@@ -136,36 +139,35 @@
public void SimulateKeyPress (ref Gdk.EventKey evnt)
{
- Gtk.Global.PropagateEvent (this, evnt);
+ Global.PropagateEvent (this, evnt);
}
void DeleteLine ()
{
//remove the current line
TextIter iter = buf.GetIterAtMark (buf.InsertMark);
- TextIter start_iter = buf.GetIterAtLine (iter.Line);
+ iter.LineOffset = 0;
TextIter end_iter = buf.GetIterAtLine (iter.Line);
- end_iter.ForwardToLineEnd ();
- buf.Delete (start_iter, end_iter);
+ end_iter.LineOffset = end_iter.CharsInLine;
+ buf.Delete (iter, end_iter);
}
void TriggerCodeComplete ()
{
+
TextIter iter = buf.GetIterAtMark (buf.InsertMark);
- char triggerChar = '.';
+ char triggerChar = '\0';
TextIter triggerIter = TextIter.Zero;
do {
- //FIXME: This code is placeholder until you can
- //just switch on iter.Char
- string s = buf.GetText (iter, buf.GetIterAtOffset (iter.Offset + 1), true);
- switch (s) {
- case " ":
+ switch (iter.Char[0]) {
+ case ' ':
+ case '\t':
+ case '.':
+ case '(':
+ case '[':
triggerIter = iter;
- triggerChar = ' ';
+ triggerChar = iter.Char[0];
break;
- case ".":
- triggerIter = iter;
- break;
}
if (!triggerIter.Equals (TextIter.Zero))
break;
@@ -174,8 +176,8 @@
if (triggerIter.Equals (TextIter.Zero)) return;
triggerIter.ForwardChar ();
- completionWindow = new CompletionWindow (this, ParentEditor.DisplayBinding.ContentName, new CodeCompletionDataProvider ());
-
+ completionWindow = new CompletionWindow (this, ParentEditor.DisplayBinding.ContentName, new CodeCompletionDataProvider (true));
+
completionWindow.ShowCompletionWindow (triggerChar, triggerIter, true);
}
@@ -219,56 +221,60 @@
}
switch ((char)key) {
- case ' ':
- if (1 == 1) {
- string word = GetWordBeforeCaret ();
- if (word != null) {
- CodeTemplateGroup templateGroup = CodeTemplateLoader.GetTemplateGroupPerFilename(ParentEditor.DisplayBinding.ContentName);
-
- if (templateGroup != null) {
- foreach (CodeTemplate template in templateGroup.Templates) {
- if (template.Shortcut == word) {
- InsertTemplate(template);
- return false;
- }
- }
+ case ' ':
+ string word = GetWordBeforeCaret ();
+ if (word != null) {
+ /*if (word.ToLower () == "new") {
+ if (EnableCodeCompletion) {
+ completionWindow = new CompletionWindow (this, ParentEditor.DisplayBinding.ContentName, new CodeCompletionDataProvider (true));
+ completionWindow.ShowCompletionWindow ((char)key, buf.GetIterAtMark (buf.InsertMark), true);
+ }
+ }*/
+ CodeTemplateGroup templateGroup = CodeTemplateLoader.GetTemplateGroupPerFilename(ParentEditor.DisplayBinding.ContentName);
+
+ if (templateGroup != null) {
+ foreach (CodeTemplate template in templateGroup.Templates) {
+ if (template.Shortcut == word) {
+ InsertTemplate(template);
+ return false;
}
}
}
- goto case '.';
-
- case '.':
- bool retval = base.OnKeyPressEvent (evnt);
- if (EnableCodeCompletion) {
- completionWindow = new CompletionWindow (this, ParentEditor.DisplayBinding.ContentName, new CodeCompletionDataProvider ());
- completionWindow.ShowCompletionWindow ((char)key, buf.GetIterAtMark (buf.InsertMark), false);
- }
- return retval;
+ }
+ goto case '.';
+
+ case '.':
+ bool retval = base.OnKeyPressEvent (evnt);
+ if (EnableCodeCompletion) {
+ completionWindow = new CompletionWindow (this, ParentEditor.DisplayBinding.ContentName, new CodeCompletionDataProvider ());
+ completionWindow.ShowCompletionWindow ((char)key, buf.GetIterAtMark (buf.InsertMark), false);
+ }
+ return retval;
/*case '(':
- try {
- InsightWindow insightWindow = new InsightWindow(this, ParentEditor.DisplayBinding.ContentName);
-
- insightWindow.AddInsightDataProvider(new MethodInsightDataProvider());
- insightWindow.ShowInsightWindow();
- } catch (Exception e) {
- Console.WriteLine("EXCEPTION: " + e);
- }
- break;
- case '[':
- try {
- InsightWindow insightWindow = new InsightWindow(this, ParentEditor.DisplayBinding.ContentName);
-
- insightWindow.AddInsightDataProvider(new IndexerInsightDataProvider());
- insightWindow.ShowInsightWindow();
- } catch (Exception e) {
- Console.WriteLine("EXCEPTION: " + e);
- }
- break;*/
+ try {
+ InsightWindow insightWindow = new InsightWindow(this, ParentEditor.DisplayBinding.ContentName);
+
+ insightWindow.AddInsightDataProvider(new MethodInsightDataProvider());
+ insightWindow.ShowInsightWindow();
+ } catch (Exception e) {
+ Console.WriteLine("EXCEPTION: " + e);
+ }
+ break;
+ case '[':
+ try {
+ InsightWindow insightWindow = new InsightWindow(this, ParentEditor.DisplayBinding.ContentName);
+
+ insightWindow.AddInsightDataProvider(new IndexerInsightDataProvider());
+ insightWindow.ShowInsightWindow();
+ } catch (Exception e) {
+ Console.WriteLine("EXCEPTION: " + e);
+ }
+ break;*/
}
-
+
return base.OnKeyPressEvent (evnt);
}
-
+
public int FindPrevWordStart (string doc, int offset)
{
for ( offset-- ; offset >= 0 ; offset--)
@@ -293,15 +299,27 @@
return start;
}
-
+ public string GetLeadingWhiteSpace (int line) {
+ string lineText = ((IFormattableDocument)this).GetLineAsString (line);
+ int index = 0;
+ while (index < lineText.Length && Char.IsWhiteSpace (lineText[index])) {
+ index++;
+ }
+ return index > 0 ? lineText.Substring (0, index) : "";
+ }
+
public void InsertTemplate (CodeTemplate template)
{
- int newCaretOffset = buf.GetIterAtMark (buf.InsertMark).Offset;
+ TextIter iter = buf.GetIterAtMark (buf.InsertMark);
+ int newCaretOffset = iter.Offset;
string word = GetWordBeforeCaret ().Trim ();
-
+ int beginLine = iter.Line;
+ int endLine = beginLine;
if (word.Length > 0)
newCaretOffset = DeleteWordBeforeCaret ();
+ string leadingWhiteSpace = GetLeadingWhiteSpace (beginLine);
+
int finalCaretOffset = newCaretOffset;
for (int i =0; i < template.Text.Length; ++i) {
@@ -318,6 +336,7 @@
case '\n':
buf.InsertAtCursor ('\n'.ToString ());
newCaretOffset++;
+ endLine++;
break;
default:
buf.InsertAtCursor (template.Text[i].ToString ());
@@ -326,6 +345,10 @@
}
}
+ if (endLine > beginLine) {
+ IndentLines (beginLine+1, endLine, leadingWhiteSpace);
+ }
+
buf.PlaceCursor (buf.GetIterAtOffset (finalCaretOffset));
}
@@ -369,8 +392,11 @@
void IndentLines (int y0, int y1)
{
- string indent = InsertSpacesInsteadOfTabs ? "\t" : new string (' ', (int) TabsWidth);
-
+ IndentLines (y0, y1, InsertSpacesInsteadOfTabs ? new string (' ', (int) TabsWidth) : "\t");
+ }
+
+ void IndentLines (int y0, int y1, string indent)
+ {
for (int l = y0; l <= y1; l ++)
Buffer.Insert (Buffer.GetIterAtLine (l), indent);
}
@@ -462,7 +488,7 @@
}
string IFormattableDocument.TextContent
- { get { return Buffer.Text; } }
+ { get { return ParentEditor.DisplayBinding.Text; } }
int IFormattableDocument.TextLength
{ get { return Buffer.EndIter.Offset; } }
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -29,6 +29,7 @@
Buffer = new SourceEditorBuffer ();
View = new SourceEditorView (Buffer, this);
Buffer.Highlight = true;
+ Buffer.View = View;
View.SetMarkerPixbuf ("SourceEditorBookmark", new Gdk.Pixbuf (drag_icon_xpm));
View.SetMarkerPixbuf ("ExecutionMark", new Gdk.Pixbuf ("../data/resources/icons/ExecutionMarker.png"));
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -78,13 +78,15 @@
mcs $(build_sources) /debug /out:$(DLL) /t:library \
/resource:$(srcdir)/../../../../data/resources/glade/EditorBindings.glade,EditorBindings.glade \
/resource:$(srcdir)/../../../../data/resources/glade/texteditoraddin.glade,texteditoraddin.glade \
- /r:gtk-sharp /r:gdk-sharp $(GTKSOURCEVIEW_SHARP) /r:glib-sharp \
/r:../../../../build/bin/MonoDevelop.Core.dll \
/r:../../../../build/bin/MonoDevelop.Base.dll \
/r:../../../../build/bin/MonoDevelop.Gui.Utils.dll \
/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
- /r:pango-sharp /r:gnome-sharp /r:glade-sharp \
- /r:gconf-sharp \
+ @GTKSHARP@ \
+ @GLADESHARP@ \
+ @GNOMESHARP@ \
+ @GCONFSHARP@ \
+ $(GTKSOURCEVIEW_SHARP) \
/r:System.Drawing \
&& cp $(DLL) ../../../../build/bin/.
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceInFilesManager.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceInFilesManager.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceInFilesManager.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -114,7 +114,7 @@
// tell the user search is done.
MessageService MessageService = (MessageService)ServiceManager.Services.GetService (typeof (MessageService));
- MessageService.ShowMessage ("Search completed");
+ MessageService.ShowMessage (GettextCatalog.GetString ("Search completed"));
}
public static void ReplaceAll()
Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -102,7 +102,7 @@
if (result == null) {
//MessageBox.Show((Form)WorkbenchSingleton.Workbench, "Mark all done", "Finished");
- MessageService.ShowMessage ("Mark all completed");
+ MessageService.ShowMessage (GettextCatalog.GetString ("Mark all completed"));
find.Reset();
return;
} else {
@@ -135,7 +135,7 @@
if (result == null) {
//MessageBox.Show((Form)WorkbenchSingleton.Workbench, "Replace all done", "Finished");
- MessageService.ShowMessage ("Replace all finished");
+ MessageService.ShowMessage (GettextCatalog.GetString ("Replace all finished"));
find.Reset();
return;
} else {
@@ -163,14 +163,8 @@
ISearchResult result = find.FindNext(searchOptions);
if (result == null) {
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- //FIXME: This needs to be a msg or whatever
- /*MessageBox.Show((Form)WorkbenchSingleton.Workbench,
- resourceService.GetString("Dialog.NewProject.SearchReplace.SearchStringNotFound"),
- "Not Found",
- MessageBoxButtons.OK,
- MessageBoxIcon.Information);*/
- MessageService.ShowMessage ("Not Found");
+ ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ MessageService.ShowMessage (GettextCatalog.GetString ("Not Found"));
find.Reset();
} else {
SourceEditor textArea = OpenTextArea(result.FileName);
@@ -180,7 +174,7 @@
}
int startPos = Math.Min(textArea.Buffer.Text.Length, Math.Max(0, result.Offset));
int endPos = Math.Min(textArea.Buffer.Text.Length, startPos + result.Length);
- textArea.Buffer.MoveMark ("insert", textArea.Buffer.GetIterAtOffset (endPos));
+ textArea.Buffer.MoveMark ("insert", textArea.Buffer.GetIterAtOffset (endPos));
textArea.Buffer.MoveMark ("selection_bound", textArea.Buffer.GetIterAtOffset (startPos));
textArea.View.ScrollMarkOnscreen (textArea.Buffer.InsertMark);
}
Modified: branches/MonoDevelop-generate-what/src/AddIns/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1 +1 @@
-SUBDIRS = DisplayBindings BackendBindings Misc DebuggerAddIn Nunit
+SUBDIRS = DisplayBindings BackendBindings Misc DebuggerAddIn Nunit prj2make-sharp-lib
Modified: branches/MonoDevelop-generate-what/src/AddIns/Misc/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/Misc/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/Misc/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1 +1,3 @@
-SUBDIRS=StartPage
+
+SUBDIRS = StartPage
+
Modified: branches/MonoDevelop-generate-what/src/AddIns/Misc/StartPage/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/Misc/StartPage/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/Misc/StartPage/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -11,11 +11,11 @@
all: $(DLL)
$(DLL): $(build_sources)
- @ mcs /debug /out:$(DLL) /target:library /r:System.Drawing \
+ mcs /debug /out:$(DLL) /target:library /r:System.Drawing \
/r:../../../../build/bin/MonoDevelop.Core.dll \
/r:../../../../build/bin/MonoDevelop.Base.dll \
@GECKO_SHARP@ \
- /r:gtk-sharp \
+ @GTKSHARP@ \
$(build_sources) \
&& cp $(DLL) ../../../../build/AddIns/AddIns/Misc/StartPage/.
Modified: branches/MonoDevelop-generate-what/src/AddIns/Misc/StartPage/StartPage.addin
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/Misc/StartPage/StartPage.addin 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/Misc/StartPage/StartPage.addin 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,4 +1,4 @@
-<AddIn name = "#develop Start Page"
+<AddIn name = "MonoDevelop Start Page"
author = "Georg Brandl"
copyright = "GPL"
url = "http://www.icsharpcode.net"
Modified: branches/MonoDevelop-generate-what/src/AddIns/Nunit/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/Nunit/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/Nunit/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,10 +1,10 @@
CSC = mcs /debug
ASSEMBLY = MonoDevelop.Nunit.dll
-ADDIN = $(srcdir)/MonoDevelopNunit.addin
+ADDIN = $(srcdir)/MonoDevelopNunit.addin.xml
DLLS = /r:NUnit.Framework.dll \
- /r:gtk-sharp.dll /r:glib-sharp.dll /r:gdk-sharp.dll \
+ @GTKSHARP@ \
/r:../../../build/bin/MonoDevelop.Core.dll \
/r:../../../build/bin/MonoDevelop.Base.dll
Deleted: branches/MonoDevelop-generate-what/src/AddIns/Nunit/MonoDevelopNunit.addin
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/Nunit/MonoDevelopNunit.addin 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/AddIns/Nunit/MonoDevelopNunit.addin 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,40 +0,0 @@
-<AddIn name = "MonoDevelop Nunit"
- author = "John Luke"
- copyright = "GPL"
- url = "http://monodevelop.com"
- description = "NUnit testing tool"
- version = "0.2">
-
- <Runtime>
- <Import assembly="MonoDevelop.Nunit.dll"/>
- </Runtime>
-
- <Extension path="/Workspace/Services">
- <Class id = "NunitService"
- class = "MonoDevelop.Services.NunitService"/>
- </Extension>
-
- <Extension path="/SharpDevelop/Workbench/Views">
- <Class id = "NunitTestTree"
- class = "MonoDevelop.Nunit.Gui.TestTree"/>
- </Extension>
-
- <Extension path="/SharpDevelop/Workbench/DisplayBinding">
- <Class id = "NunitResultTree"
- class = "MonoDevelop.Nunit.Gui.ResultTree"/>
- </Extension>
-
- <Extension path="/SharpDevelop/Workbench/MainMenu/Tools">
- <MenuItem id = "NunitMenu" label = "NUnit" insertafter = "ExternalTools" insertbefore = "Options">
- <MenuItem id = "LoadTestAssembly"
- label = "Load Assembly"
- shortcut = ""
- class = "MonoDevelop.Commands.NunitLoadAssembly" />
- <MenuItem id = "NunitRunTests"
- label = "Run Tests"
- shortcut = ""
- class = "MonoDevelop.Commands.NunitRunTests" />
- </MenuItem>
- </Extension>
-
-</AddIn>
Copied: branches/MonoDevelop-generate-what/src/AddIns/Nunit/MonoDevelopNunit.addin.xml (from rev 1534, trunk/MonoDevelop/src/AddIns/Nunit/MonoDevelopNunit.addin.xml)
Copied: branches/MonoDevelop-generate-what/src/AddIns/prj2make-sharp-lib (from rev 1534, trunk/MonoDevelop/src/AddIns/prj2make-sharp-lib)
Property changes on: branches/MonoDevelop-generate-what/src/AddIns/prj2make-sharp-lib
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
AssemblyInfo.cs
*.dll
Copied: branches/MonoDevelop-generate-what/src/Libraries/ChangeLog (from rev 1534, trunk/MonoDevelop/src/Libraries/ChangeLog)
Modified: branches/MonoDevelop-generate-what/src/Libraries/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1 +1 @@
-SUBDIRS=SharpAssembly CsVbRefactory SharpRefactory MonoDevelop.Core MonoDevelop.Gui.Utils MonoDevelop.Gui.Widgets
+SUBDIRS = SharpAssembly SharpRefactory MonoDevelop.Core MonoDevelop.Gui.Utils MonoDevelop.Gui.Widgets
Modified: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/AddIns/AddInTreeSingleton.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/AddIns/AddInTreeSingleton.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/AddIns/AddInTreeSingleton.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -85,7 +85,7 @@
StringCollection retryList = null;
if (ignoreDefaultCoreDirectory == false) {
- addInFiles = fileUtilityService.SearchDirectory(defaultCoreDirectory, "*.addin");
+ addInFiles = fileUtilityService.SearchDirectory(defaultCoreDirectory, "*.addin.xml");
retryList = InsertAddIns(addInFiles);
}
else
@@ -93,7 +93,7 @@
if (addInDirectories != null) {
foreach(string path in addInDirectories) {
- addInFiles = fileUtilityService.SearchDirectory(path, "*.addin");
+ addInFiles = fileUtilityService.SearchDirectory(path, "*.addin.xml");
StringCollection partialRetryList = InsertAddIns(addInFiles);
if (partialRetryList.Count != 0) {
string [] retryListArray = new string[partialRetryList.Count];
Copied: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/ChangeLog (from rev 1534, trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/ChangeLog)
Modified: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -56,7 +56,8 @@
./AddIns/TypeNotFoundException.cs \
./AddIns/AddInInitializeException.cs \
./AddIns/AddInCollection.cs \
-./AddIns/AddInSignatureException.cs
+./AddIns/AddInSignatureException.cs \
+./Services/GettextCatalog.cs
build_sources = $(addprefix $(srcdir)/, $(FILES))
@@ -65,7 +66,7 @@
all: $(DLL)
$(DLL): $(build_sources)
- @ mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll /define:LINUX /resource:$(srcdir)/../../../data/resources/AddIn.xsd,AddIn.xsd \
+ mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll /define:LINUX /resource:$(srcdir)/../../../data/resources/AddIn.xsd,AddIn.xsd \
$(build_sources) && cp $(DLL) ../../../build/bin/.
assemblydir = $(libdir)/monodevelop/bin
Copied: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Core/Services/GettextCatalog.cs (from rev 1534, trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/GettextCatalog.cs)
Modified: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/ChangeLog 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/ChangeLog 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,3 +1,9 @@
+2004-04-12 Kristian Rietveld <kris at gtk.org>
+
+ * FileIcons/FileIconLoader.cs: if LookupIcon returns an empty string,
+ but doesn't throw an exception, also return a pixbuf of
+ gnome-fs-regular.
+
2004-03-29 Todd Berman <tberman at sevenl.net>
* FileIcons/FileIconLoader.cs: fix from richard torkar to workaround a
Modified: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -48,6 +48,9 @@
string p_filename = "gnome-fs-regular";
try {
p_filename = iconTheme.LookupIcon (type, 24, new Gnome.IconData (), out i);
+ if (p_filename == "") {
+ return new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
+ }
} catch {
return new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
}
Modified: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -17,12 +17,12 @@
all: $(DLL)
$(DLL): $(build_sources)
- @ mcs /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \
+ mcs /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \
&& cp $(DLL) ../../../build/bin/.
assemblydir = $(libdir)/monodevelop/bin
assembly_DATA = $(DLL)
-
+
CLEANFILES=$(DLL)
EXTRA_DIST = $(FILES)
Modified: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,8 +1,25 @@
+2004-04-13 John Luke <jluke at cfl.rr.com>
+
+ * Navbar/Navbar.cs: switch the address entry to Gnome.Entry
+ so we get a little history
+
+2004-04-13 John Luke <jluke at cfl.rr.com>
+
+ * Navbar/Navbar.cs: add a navbar control for the web browser
+ removes the clutter in that area
+
+2004-04-03 Todd Berman <tberman at sevenl.net>
+
+ * Tree/TreeNodeCollection.cs:
+ * FileBrowser/FileBrowser.cs:
+ * FolderDialog/BaseFileEntry.cs:
+ gettextify
+
2004-03-31 Todd Berman <tberman at sevenl.net>
* Tree/TreeNode.cs:
- * Tree/TreeView.cs: Fixing gtk+ 2.4 regression with the change from enum to
- integer. Using RenderIcon to workaround.
+ * Tree/TreeView.cs: Fixing gtk+ 2.4 regression with the change from
+ enum to integer. Using RenderIcon to workaround.
2004-03-27 Todd Berman <tberman at sevenl.net>
Modified: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -15,6 +15,7 @@
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
using MonoDevelop.Gui.Utils;
+using MonoDevelop.Services;
namespace MonoDevelop.Gui.Widgets
{
@@ -249,19 +250,19 @@
private void ShowPopup ()
{
Menu menu = new Menu ();
- MenuItem openfilebrowser = new MenuItem ("Open with file browser");
+ MenuItem openfilebrowser = new MenuItem (GettextCatalog.GetString ("Open with file browser"));
openfilebrowser.Activated += new EventHandler (OpenFileBrowser);
- MenuItem openterminal = new MenuItem ("Open with terminal");
+ MenuItem openterminal = new MenuItem (GettextCatalog.GetString ("Open with terminal"));
openterminal.Activated += new EventHandler (OpenTerminal);
- MenuItem rename = new MenuItem ("Rename");
+ MenuItem rename = new MenuItem (GettextCatalog.GetString ("Rename"));
rename.Activated += new EventHandler (OnDirRename);
- MenuItem delete = new MenuItem ("Delete");
+ MenuItem delete = new MenuItem (GettextCatalog.GetString ("Delete"));
delete.Activated += new EventHandler (OnDirDelete);
- MenuItem newfolder = new MenuItem ("Create new folder");
+ MenuItem newfolder = new MenuItem (GettextCatalog.GetString ("Create new folder"));
newfolder.Activated += new EventHandler (OnNewDir);
menu.Append (newfolder);
@@ -324,7 +325,7 @@
CurrentDir = entry.Text;
else
{
- messageService.ShowError (null, "Cannot enter '" + entry.Text + "' folder");
+ messageService.ShowError (null, String.Format (GettextCatalog.GetString ("Cannot enter '{0}' folder"), entry.Text));
}
}
@@ -360,7 +361,7 @@
}
catch (Exception ex)
{
- messageService.ShowError (ex, "Could not rename folder '" + oldpath + "' to '" + args.NewText + "'");
+ messageService.ShowError (ex, String.Format (GettextCatalog.GetString ("Could not rename folder '{0}' to '{1}'"), oldpath, args.NewText));
}
finally
{
@@ -378,7 +379,7 @@
}
catch (Exception ex)
{
- messageService.ShowError (ex, "Could not create new folder '" + args.NewText + "'");
+ messageService.ShowError (ex, String.Format (GettextCatalog.GetString ("Could not create new folder '{0}'"), args.NewText));
}
finally
{
@@ -400,7 +401,7 @@
TreeIter iter;
TreeModel model;
- if (messageService.AskQuestion ("Are you sure you want to delete this folder?", "Delete folder"))
+ if (messageService.AskQuestion (GettextCatalog.GetString ("Are you sure you want to delete this folder?"), GettextCatalog.GetString ("Delete folder")))
{
if (tv.Selection.GetSelected (out model, out iter))
{
@@ -410,7 +411,7 @@
}
catch (Exception ex)
{
- messageService.ShowError (ex, "Could not delete folder '" + System.IO.Path.Combine (CurrentDir, (string) store.GetValue (iter, 1)) + "'");
+ messageService.ShowError (ex, String.Format (GettextCatalog.GetString ("Could not delete folder '{0}'"), System.IO.Path.Combine (CurrentDir, (string) store.GetValue (iter, 1))));
}
finally
{
Modified: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/FolderDialog/BaseFileEntry.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/FolderDialog/BaseFileEntry.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/FolderDialog/BaseFileEntry.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -5,6 +5,8 @@
using GtkSharp;
using GdkSharp;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Gui.Widgets {
public abstract class BaseFileEntry : Gtk.HBox {
@@ -19,7 +21,7 @@
{
this.name = name;
text = new Entry ();
- browse = Button.NewWithMnemonic ("_Browse...");
+ browse = Button.NewWithMnemonic (GettextCatalog.GetString ("_Browse..."));
text.Changed += new EventHandler (OnTextChanged);
browse.Clicked += new EventHandler (OnButtonClicked);
Modified: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -3,7 +3,7 @@
DLL = MonoDevelop.Gui.Widgets.dll
-REFERENCES = /r:System.Drawing /r:gtk-sharp /r:gdk-sharp /r:pango-sharp /r:gnome-sharp /r:glib-sharp /r:glade-sharp /r:../../../build/bin/MonoDevelop.Core.dll /r:../../../build/bin/MonoDevelop.Gui.Utils.dll
+REFERENCES = /r:System.Drawing @GTKSHARP@ @GNOMESHARP@ @GLADESHARP@ /r:../../../build/bin/MonoDevelop.Core.dll /r:../../../build/bin/MonoDevelop.Gui.Utils.dll
FILES = ./Tree/TreeView.cs \
./Tree/TreeNodeCollection.cs \
@@ -17,6 +17,7 @@
./FolderDialog/BaseFileEntry.cs \
./FolderDialog/FolderEntry.cs \
./FolderDialog/FileEntry.cs \
+./Navbar/Navbar.cs \
./TabLabel/TabLabel.cs \
./GladeWidgetExtract/GladeWidgetExtract.cs
@@ -25,7 +26,7 @@
all: $(DLL)
$(DLL): $(build_sources)
- @ $(MCS) /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \
+ $(MCS) /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \
&& cp $(DLL) ../../../build/bin/.
assemblydir = $(libdir)/monodevelop/bin
Copied: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/Navbar (from rev 1534, trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Navbar)
Modified: branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeNodeCollection.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeNodeCollection.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeNodeCollection.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,6 +1,8 @@
using System;
using System.Collections;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Gui.Widgets {
public class TreeNodeCollection: IList {
private ArrayList list;
@@ -166,7 +168,7 @@
void IList.Remove(object value){
if (value is TreeNode == false) {
- throw new Exception ("Attempt to remove a non node from the tree");
+ throw new Exception (GettextCatalog.GetString ("Attempt to remove a non node from the tree"));
}
Remove((TreeNode)value);
}
Modified: branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,5 +1,6 @@
+CSC = mcs /debug
+
FILES = \
-./src/Lexer/Tokens.cs \
./src/Lexer/Reader/IReader.cs \
./src/Lexer/Reader/FileReader.cs \
./src/Lexer/Reader/StringReader.cs \
@@ -112,14 +113,16 @@
DLL = ICSharpCode.SharpRefactory.dll
+REFS = /r:System.Drawing.dll
+
all: $(DLL)
$(DLL): $(FILES)
- @ mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll $(build_sources) \
+ @ $(CSC) /out:$(DLL) /target:library $(REFS) $(build_sources) \
&& cp $(DLL) ../../../build/bin/.
test-parser.exe : $(DLL) src/Main.cs
- @ mcs /debug /out:$@ /r:$(DLL) src/Main.cs
+ @ $(CSC) /out:$@ /r:$(DLL) src/Main.cs
run : test-parser.exe
@ MONO_PATH=`dirname $(DLL)` mono --debug test-parser.exe $(TEST_SOURCE)
Modified: branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Lexer/Tokens.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Lexer/Tokens.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Lexer/Tokens.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -7,7 +7,7 @@
using System;
-namespace MonoDevelop.SharpRefactory.Parser
+namespace ICSharpCode.SharpRefactory.Parser
{
public sealed class Tokens
{
Modified: branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Parser/AST/AbstractASTVisitor.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Parser/AST/AbstractASTVisitor.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Parser/AST/AbstractASTVisitor.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -543,6 +543,7 @@
}
public virtual object Visit(AssignmentExpression assignmentExpression, object data)
{
+ if (assignmentExpression.Left == null || assignmentExpression.Right == null) return null;
assignmentExpression.Left.AcceptVisitor(this, data);
return assignmentExpression.Right.AcceptVisitor(this, data);
}
Modified: branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Parser/generated/Error.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Parser/generated/Error.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Libraries/SharpRefactory/src/Parser/generated/Error.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -34,13 +34,13 @@
void DefaultCodeError (int line, int col, int n)
{
- errorText.Append(String.Format("-- line {0} col {1}: error {2}", line, col, n));
+ errorText.Append(String.Format("-- line {0} col {1} : error {2}", line, col, n));
errorText.Append("\n");
count++;
}
void DefaultMsgError (int line, int col, string s) {
- errorText.Append(String.Format("-- line {0} col {1}: {2}", line, col, s));
+ errorText.Append(String.Format("-- line {0} col {1} : {2}", line, col, s));
errorText.Append("\n");
count++;
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,5 +1,413 @@
+2004-04-28 Todd Berman <tberman at sevenl.net>
+
+ * Internal/Project/Project/AbstractProject.cs: For now, dont ask
+ to add new Makefiles.
+
+2004-04-28 Todd Berman <tberman at sevenl.net>
+
+ * Commands/RunCommands.c:
+ * Services/Project/DefaultProjectService.cs:
+ * Services/Project/IProjectService.cs:
+ * Internal/Codons/LanguageBinding/ILanguageBinding.cs:
+ * Internal/Project/Project/IncludeFilesDialog.cs:
+ * Internal/Project/Combine/Combine.cs:
+ * Internal/Project/Combine/CombineEntry.cs:
+
+ Commit basically sets up the skeleton for the GenerateMakefiles stuff.
+ Right now all the real code is in the LanguageBinding, where it
+ should be (I think). Anyone looking to add this functionality to their
+ LanguageBinding is welcome too, however the api and setup may change
+ while the C# implementation is being written, so there are no
+ promises at all.
+
+
+2004-04-27 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Pads/HelpBrowser/MonodocTreePad.cs: Select the content window
+ when you render new docs.
+
+2004-04-27 John Luke <jluke at cfl.rr.com>
+
+ * Gui/Pads/FileScout.cs: kill
+ * Gui/Pads/FileScout/FileScout.cs
+ * Gui/Pads/FileScout/FileList.cs
+ * Gui/Pads/FileScout/FileListItem.cs: split these up, remove
+ unneeded/used code, implement File.Delete popup
+ * Makefile.am: account for new files
+
+2004-04-25 John Luke <jluke at cfl.rr.com>
+
+ * Gui/Dialogs/WordCountDialog.cs: use ShadowType.in
+ * Gui/Pads/ClassScout/ClassScout.cs:
+ * Gui/Pads/ProjectBrowser/ProjectBrowserView.cs:
+ implement PopupMenu to show ContextMenus
+
+2004-04-25 Pawel Rozanski <tokugawa at afn.no-ip.org>
+
+ * Gui/Dialogs/CommonAboutDialog.cs: fixed my very Polish name.
+
+2004-04-25 John Luke <jluke at cfl.rr.com>
+
+ * Gui/Dialogs/CommonAboutDialog.cs:
+ update contributors and adjust the scroll slightly
+
+2004-04-24 Todd Berman <tberman at sevenl.net>
+
+ * Services/ParserService/DefaultParserService.cs:
+ * Services/ParserService/IParserService.cs:
+ * Internal/Parser/IParser.cs: add stubbing for IsAsResolver
+
+2004-04-22 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Components/SdMenu.cs: check for children, if none, hide menu.
+ * Gui/Components/SdMenuCheckBox.cs: small change for gtk-sharp from
+ future cvs, should work with current cvs though.
+
+2004-04-20 Todd Berman <tberman at sevenl.net>
+
+ * Commands/AutostartCommands.cs: Move stuff around so workbench memento
+ works.
+ * Gui/Workbench/DefaultWorkbench.cs: Same as above.
+
+2004-04-19 Todd Berman <tberman at sevenl.net>
+
+ * Commands/AutostartCommands.cs: Match new ReflectionLayer api.
+ * Services/MonodocService.cs: uncomment GetHelpXml
+ * Services/AmbienceService/AmbienceReflectionDecorator.cs: match api.
+ * Services/ParserService/AssemblyInformation.cs: match api.
+ * Internal/Parser/ReflectionLayer/Reflection*.cs:
+ Add the start of documentation integration into the actual IDE.
+ Now the docs show up on code completion tooltips, just the summary.
+ Potentially we should enable the entire doc for the class/method,
+ but I havnt seen how it looks yet, as it will most likely be large
+ for some methods/classes.
+
+ **NOTE: To get this documentation integration, you have to rebuild
+ your code completion database.
+
+2004-04-17 Todd Berman <tberman at sevenl.net>
+
+ * Services/Toolbar/ToolbarService.cs:
+ * Gui/Workbench/Layouts/SdiWorkspaceLayout.cs:
+ * Gui/Workbench/DefaultWorkbench.cs:
+ * Gui/Components/SdToolbarCommand.cs:
+ Fixup the entire toolbar scheme to actually *work* properly.
+ This is only temporary, as the entire toolbar setup is going to be
+ rewritten again to support arbitrary widgetry, proper saving/loading of
+ toolbars tied to layouts, etc, etc.
+
+2004-04-17 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Components/SdMenu.cs:
+ * Commands/MenuItemBuilders.cs:
+ Fix the menu system so we dont rebuild the menu's from scratch every
+ time you use them. This should speed using the menu's up a lot.
+ The only trick is new SubmenuItemBuilders need to create menu types
+ with the ISubmenuItem interface so we can tell that they are built
+ and not static.
+
+2004-04-16 John Luke <jluke at cfl.rr.com>
+
+ * Gui/Dialogs/SharpDevelopAboutPanels.cs: align the labels to
+ the left and space them a little better
+
+2004-04-14 John Luke <jluke at cfl.rr.com>
+
+ * Gui/Dialogs/CommonAboutDialog.cs: chain to base (GType)
+ so Gtk# cvs is happy
+
+2004-04-14 Nick Drochak <ndrochak at gol.com>
+
+ * Gui/Pads/ProjectBrowser/ProjectBrowserView.cs: When file is added,
+ put it under the correct folder.
+
+2004-04-14 Pawel Rozanski <tokugawa at afn.no-ip.org>
+
+ * Commands/RunCommands.cs:
+ * Internal/Project/Combine/Combine.cs:
+ fix bug #56864.
+
+2004-04-13 John Luke <jluke at cfl.rr.com>
+
+ * Gui/BrowserDisplayBinding/HtmlViewPane.cs: use Navbar control,
+ use StatusBarService for messages and a Progress monitor
+
+2004-04-11 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Workbench/WorkbenchMemento.cs: ugh, check for valid data too.
+
+2004-04-11 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Workbench/WorkbenchMemento.cs: fix potential nullrefs.
+
+2004-04-11 Todd Berman <tberman at sevenl.net>
+
+ * Commands/AutostartCommands.cs: reorganize the SetMemento so it works
+ better.
+ * Gui/Workbench/WorkbenchMemento.cs: readd windowstate.
+ * Gui/Workbench/DefaultWorkbench.cs: now we restore from maximized
+ properly.
+
+2004-04-10 Todd Berman <tberman at sevenl.net>
+
+ * Internal/Project/Project/AbstractProject.cs: fix potentiall nullref
+
+2004-04-10 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Workbench/Layouts/SdiWorkspaceLayout.cs:
+ * Gui/Workbench/Layouts/SdiWorkspaceWindow.cs:
+ * Gui/IWorkbenchLayout.cs:
+ fix bug #56769.
+
+2004-04-09 John Luke <jluke at cfl.rr.com>
+
+ * Commands/AutostartCommands: remove dead code
+ * Gui/Pads/TerminalPad.cs: update and rename from 'Output' to 'Terminal'
+ * Gui/HtmlControl/MozillaControl.cs: remove CWL
+
+2004-04-09 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Dialogs/SharpDevelopAboutPanels.cs: closing per bug #55955.
+
+2004-04-09 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Components/SdStatusBar.cs: Add pulsing.
+
+2004-04-09 Pawel Rozanski <tokugawa at afn.no-ip.org>
+
+ * Services/Tasks/Task.cs: don't show "()" when error.ErrorNumber is
+ empty
+
+2004-04-07 John Luke <jluke at cfl.rr.com>
+
+ * Gui/Dialogs/CommonAboutDialog.cs:
+ * Gui/Dialogs/SharpDevelopAboutPanels.cs: rearrange the copyright,
+ license, sponsorship, and version information. Add back info about
+ SharpDevelop and AlphaSierraPapa
+ * Gui/Dialogs/TipOfTheDay.cs: remove IDisposable and call Hide and
+ Dispose instead of Destroy on the window, remove some unneccesary
+ public things
+ * Commands/HelpCommand.cs: revert addition of using () {} to
+ tipoftheday
+ * Gui/Workbench/DefaultWorkbench.cs: uncomment memento restoring code
+
+2004-04-07 Todd Berman <tberman at sevenl.net>
+
+ * Commands/ProjectBrowserCommands/FolderNodeCommands: Incorporate bug
+ fix for bug #56275 based on a patch from eddie tejeda
+ <eddie AT nailchipper DOT com>. Also fix an exception that could
+ occur when the file already exists in the target directory.
+
+2004-04-07 Nick Drochak <ndrochak at gol.com>
+
+ * Gui/Pads/ProjectBrowser/ProjectBrowserView.cs: Before the actual edit
+ have node un-munge the text it wraps around the combine name.
+ * Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs: Re-munge
+ name with number of entries after the combine name changes.
+
+2004-04-06 Todd Berman <tberman at sevenl.net>
+
+ * Commands/FileCommands.cs: Combine the open solution/file into one
+ open... command
+ * Gui/Pads/FileScout.cs: add .ToUpper () to catch .pRjx, etc.
+
+2004-04-06 Todd Berman <tberman at sevenl.net>
+
+ * Commands/MenuItemBuilders.cs: change to use alt instead of control
+ for a more 'gnomey' feel.
+
+2004-04-06 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Workbench/Layouts/SdiWorkspaceLayout.cs: update the menu
+ after a context switch.
+ * Gui/Components/SdMenu.cs: remove some junk.
+ * Internal/Conditions/WorkbenchContextCondition.cs: new condition
+ to allow conditionals on current context state.
+ * Makefile.am: add above file to build
+
+2004-04-06 Todd Berman <tberman at sevenl.net>
+
+ * Commands/ProjectBrowserCommands/CombineNodeCommands.cs: fix bug
+ #56429.
+
+2004-04-06 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Workbench/DefaultWorkbench.cs: register gtype. add message about
+ using proper ctor.
+ * Gui/BrowserDisplayBinding/HtmlViewPane.cs: remove useless event
+ box.
+
+2004-04-04 John Luke <jluke at cfl.rr.com>
+
+ * Gui/BrowserDisplayBinding/HtmlViewPane.cs:
+ * Gui/BrowserDisplayBinding/BrowserDisplayBinding.cs: small cleanups
+ * Commands/HelpCommands.cs: make sure dispose is called on the
+ tip of the day, about and viewgpl dialogs
+ * Commands/ToolsCommands.cs: make sure dispose is called for the
+ NewLayoutDialog
+ * Gui/Dialogs/NewLayoutDialog.cs: implement IDisposable
+ * Gui/Dialogs/ViewGplDialog.cs: implement IDisposable
+ * Gui/Dialogs/TipOfTheDayDialog.cs: implement IDisposable
+
+2004-04-04 Todd Berman <tberman at sevenl.net>
+
+ * Services/ParserService/AssemblyInformation.cs: workaround mono bug
+ with Assembly.Load (byte[]). (this fixes radek's bug)
+ * Gui/Dialogs/NewProjectDialog.cs: proper string
+
+2004-04-04 Todd Berman <tberman at sevenl.net>
+
+ * Services/ParserService/DefaultParserService.cs: fix nullref
+
+2004-04-04 John Luke <jluke at cfl.rr.com>
+
+ * Gui/Pads/FileScout.cs: use Gtk.Stock.Open for the icon
+ * Gui/Dialogs/SharpDevelopAboutPanels.cs: call Path.GetFullPath
+ on assembly location to get rid of '../AddIn/..' stuff
+ send the text to the X clipboard also
+ * Gui/BrowserDisplayBinding/HtmlViewPane.cs: register the GType
+ to fix weirdness
+
+2004-04-04 Todd Berman <tberman at sevenl.net>
+
+ * Internal/Codons/MenuItems/MenuItemCodon.cs:
+ * Internal/Codons/DialogPanelCodon.cs: change label to _label and
+ gettext it
+
+2004-04-04 Nick Drochak <ndrochak at gol.com>
+
+ * Gui/Dialogs/NewProjectDialog.cs: On double click of icon when there
+ is an illegal or empty solution name, do not hide dialog.
+
+2004-04-03 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Workbench/Layous/SdiWorkspaceLayout.cs: set pref height and width
+ on the Documents dockitem to -2 to make gdl-dock attempt to give it
+ greedy resizing as much as possible.
+
+2004-04-03 Todd Berman <tberman at sevenl.net>
+
+ * Services/GettextCatalog.cs: moved to .Core.
+ * Makefile.am: reflect above change.
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * Services/File/DefaultFileService.cs:
+ * Services/ResourceNotFoundException.cs:
+ * Services/DisplayBinding/DisplayBindingService.cs:
+ * Services/Project/DefaultProjectService.cs:
+ * Services/StatusBar/DefaultStatusBarService.cs:
+ * Services/MessageService.cs:
+ * Services/ParserService/DefaultParserService.cs:
+ Finished gettextifyin the base dll.
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs:
+ * Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs:
+ phantom commit, no one saw this
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * Commands/RunCommands.cs:
+ * Commands/FileCommands.cs:
+ * Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs:
+ * Internal/ExternalTool/ExternalTool.cs:
+ * Internal/ExternalTool/ToolLoader.cs:
+ * Internal/Project/Project/Deployment/FileDeploy.cs:
+ * Internal/Project/Project/Deployment/AssemblyDeploy.cs:
+ * Internal/Project/Project/Deployment/ScriptDeploy.cs:
+ * Internal/Project/Project/IncludeFilesDialog.cs:
+ * Internal/Project/Project/AbstractProject.cs:
+ * Internal/Project/Combine/Combine.cs:
+ * Internal/Project/Combine/CombineEntry.cs:
+ * Internal/Templates/FileTemplate.cs:
+ * Internal/Templates/CodeTemplateLoader.cs:
+ * Internal/Templates/ProjectTemplates/CombineDescriptor.cs:
+ * Internal/Templates/ProjectTemplates/ProjectDescriptor.cs:
+ gettextify, and actually COMPILE it before checking in this time...
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * Commands/MenuItemBuilders.cs:
+ * Commands/RunCommands.cs:
+ * Commands/ClassBrowserCommands/ClassBrowserCommands.cs:
+ * Commands/ProjectCommands.cs:
+ * Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs:
+ * Commands/ProjectBrowserCommands/FolderNodeCommands.cs:
+ * Commands/ProjectBrowserCommands/CombineNodeCommands.cs:
+ * Commands/FileCommands.cs:
+ * Commands/HelpCommands.cs:
+ gettextify all of the in-use Commands/
+
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Dialogs/SharpDevelopAboutPanels.cs:
+ * Gui/Dialogs/ProjectOptionsDialog.cs:
+ * Gui/Dialogs/WordCountDialog.cs:
+ * Gui/Dialogs/TreeViewOptions.cs:
+ * Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs:
+ * Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs:
+ * Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs:
+ * Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs:
+ * Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs:
+ * Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs:
+ * Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs:
+ gettextify, this finishes Gui/Dialogs/* that we use currently i think.
+
+
+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:
+ * Gui/Dialogs/CommonAboutDialog.cs:
+ * Gui/Dialogs/OptionPanels/EditTemplateDialog.cs:
+ * Gui/Dialogs/NewFileDialog.cs: gettextified
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * Services/GettextCatalog.cs: changed to use static methods.
+ * Gui/Dialogs/CommonAboutDialog.cs: reflecting above change.
+
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * Makefile.am: Added GettextCatalog.cs
+ * Services/GettextCatalog.cs: imported from muine, modified a bit.
+ * Gui/Dialogs/CommonAboutDialog.cs: added gettext translatable title
+ to test .cs translations.
+ * Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs: modified to
+ test .glade translations
+
+2004-04-01 John Luke <jluke at cfl.rr.com>
+
+ * Internal/ExternalTool/ExternalTool.cs:
+ store UseOutputPad in xml file
+
+2004-04-01 Todd Berman <tberman at sevenl.net>
+
+ * Gui/Dialogs/TipOfTheDay.cs: make same change here.
+
+2004-04-01 Todd Berman <tberman at sevenl.net>
+
+ * Commands/AutostartCommands.cs: default to false for ShowToTD
+
2004-03-31 Todd Berman <tberman at sevenl.net>
+ * Gui/Dialogs/CommonAboutDialog.cs: fixing the string stuff.
+ * Makefile.am: adding -codepage:utf8
+
+2004-03-31 Todd Berman <tberman at sevenl.net>
+
* Gui/Dialogs/CommonAboutDialog.cs: adding miguel :)
2004-03-31 Todd Berman <tberman at sevenl.net>
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/AutostartCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/AutostartCommands.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/AutostartCommands.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,7 +1,7 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
+// <owner name="Mike Kr�¼ger" email="mike at icsharpcode.net"/>
// <version value="$version"/>
// </file>
@@ -32,20 +32,16 @@
{
public class InitializeWorkbenchCommand : AbstractCommand
{
- const string workbenchMemento = "SharpDevelop.Workbench.WorkbenchMemento";
-
+
public override void Run()
{
DefaultWorkbench w = new DefaultWorkbench();
WorkbenchSingleton.Workbench = w;
-
w.InitializeWorkspace();
PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- w.SetMemento((IXmlConvertable)propertyService.GetProperty(workbenchMemento, new WorkbenchMemento()));
w.UpdateViews(null, null);
WorkbenchSingleton.CreateWorkspace();
((Gtk.Window)w).Visible = false;
-
}
}
@@ -137,7 +133,7 @@
isCalled = true;
// show tip of the day
PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- if (propertyService.GetProperty("MonoDevelop.Gui.Dialog.TipOfTheDayView.ShowTipsAtStartup", true)) {
+ if (propertyService.GetProperty("MonoDevelop.Gui.Dialog.TipOfTheDayView.ShowTipsAtStartup", false)) {
ViewTipOfTheDay dview = new ViewTipOfTheDay();
dview.Run();
}
@@ -151,7 +147,7 @@
return;
}
- ReflectionClass reflectionClass = new ReflectionClass(typeof(object), null);
+ ReflectionClass reflectionClass = new ReflectionClass(typeof(object));
// register string tag provider (TODO: move to add-in tree :)
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
@@ -200,6 +196,7 @@
}
((Gtk.Window)WorkbenchSingleton.Workbench).ShowAll ();
+ WorkbenchSingleton.Workbench.SetMemento ((IXmlConvertable)propertyService.GetProperty (workbenchMemento, new WorkbenchMemento ()));
((Gtk.Window)WorkbenchSingleton.Workbench).Visible = true;
WorkbenchSingleton.Workbench.RedrawAllComponents ();
@@ -210,10 +207,7 @@
ShowTipOfTheDay (null, null);
// finally run the workbench window ...
- Gtk.Application.Run();
-
- // save the workbench memento in the ide properties
- //propertyService.SetProperty(workbenchMemento, WorkbenchSingleton.Workbench.CreateMemento());
+ Gtk.Application.Run ();
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -41,7 +41,7 @@
if (node != null) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowWarning("Not implemented");
+ messageService.ShowWarning(GettextCatalog.GetString ("Not implemented"));
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/FileCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/FileCommands.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/FileCommands.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -101,7 +101,7 @@
if (window != null && window.ViewContent.ContentName != null && !window.ViewContent.IsViewOnly) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (messageService.AskQuestion("${res:ICSharpCode.SharpDevelop.Commands.ReloadFile.ReloadFileQuestion}")) {
+ if (messageService.AskQuestion(GettextCatalog.GetString ("Are you sure that you want to reload the file?"))) {
IXmlConvertable memento = null;
if (window.ViewContent is IMementoCapable) {
memento = ((IMementoCapable)window.ViewContent).CreateMemento();
@@ -146,7 +146,7 @@
}
}*/
- using (Gtk.FileSelection fdiag = new Gtk.FileSelection ("Save as...")) {
+ using (Gtk.FileSelection fdiag = new Gtk.FileSelection (GettextCatalog.GetString ("Save as..."))) {
fdiag.Filename = window.ViewContent.ContentName;
int response = fdiag.Run ();
string filename = fdiag.Filename;
@@ -158,7 +158,7 @@
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
if (!fileUtilityService.IsValidFileName(filename)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowMessage("File name " + filename +" is invalid");
+ messageService.ShowMessage(String.Format (GettextCatalog.GetString ("File name {0} is invalid"), filename));
return;
}
@@ -190,7 +190,7 @@
if (content.ContentName == null)
{
- using (Gtk.FileSelection fdiag = new Gtk.FileSelection ("Save File As..."))
+ using (Gtk.FileSelection fdiag = new Gtk.FileSelection (GettextCatalog.GetString ("Save File As...")))
{
fdiag.Filename = System.Environment.GetEnvironmentVariable ("HOME");
if (fdiag.Run () == (int) Gtk.ResponseType.Ok)
@@ -206,7 +206,7 @@
if (fileUtilityService.ObservedSave(new NamedFileOperationDelegate(content.Save), fileName) == FileOperationResult.OK)
{
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowMessage(fileName, "File saved");
+ messageService.ShowMessage(fileName, GettextCatalog.GetString ("File saved"));
}
}
@@ -227,7 +227,7 @@
public override void Run()
{
- using (Gtk.FileSelection fs = new Gtk.FileSelection ("File to Open")) {
+ using (Gtk.FileSelection fs = new Gtk.FileSelection (GettextCatalog.GetString ("File to Open"))) {
string defaultFolder = PropertyService.GetProperty(
"MonoDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath",
System.IO.Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal),
@@ -242,16 +242,18 @@
case ".CMBX": // Don't forget the 'recent' projects if you chance something here
case ".PRJX":
IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
-
+
try {
- projectService.OpenCombine(name);
+ //projectService.OpenCombine(name);
+ IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ fileService.OpenFile(name);
} catch (Exception ex) {
CombineLoadError.HandleError(ex, name);
}
break;
default:
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("Can't open file " + name + "as project");
+ messageService.ShowError(String.Format (GettextCatalog.GetString ("Can't open file {0} as project"), name));
break;
}
}
@@ -297,7 +299,7 @@
}
}
- using (Gtk.FileSelection fs = new Gtk.FileSelection ("File to Open")) {
+ using (Gtk.FileSelection fs = new Gtk.FileSelection (GettextCatalog.GetString ("File to Open"))) {
string defaultFolder = PropertyService.GetProperty(
"MonoDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath",
System.IO.Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal),
@@ -309,7 +311,16 @@
if (response == (int)Gtk.ResponseType.Ok) {
IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
+ IProjectService proj = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+ switch (System.IO.Path.GetExtension (name).ToUpper()) {
+ case ".PRJX":
+ case ".CMBX":
+ proj.OpenCombine (name);
+ break;
+ default:
fileService.OpenFile(name);
+ break;
+ }
}
}
}
@@ -400,7 +411,7 @@
IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
IMessageService messageService = (IMessageService) MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IMessageService));
- if (fileService.RecentOpen.RecentFile != null && fileService.RecentOpen.RecentFile.Count > 0 && messageService.AskQuestion("Are you sure you want to clear recent files list?", "Clear recent files"))
+ if (fileService.RecentOpen.RecentFile != null && fileService.RecentOpen.RecentFile.Count > 0 && messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent files list?"), GettextCatalog.GetString ("Clear recent files")))
{
fileService.RecentOpen.ClearRecentFiles();
}
@@ -416,7 +427,7 @@
IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
IMessageService messageService = (IMessageService) MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IMessageService));
- if (fileService.RecentOpen.RecentProject != null && fileService.RecentOpen.RecentProject.Count > 0 && messageService.AskQuestion("Are you sure you want to clear recent projects list?", "Clear recent projects"))
+ if (fileService.RecentOpen.RecentProject != null && fileService.RecentOpen.RecentProject.Count > 0 && messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent projects list?"), GettextCatalog.GetString ("Clear recent projects")))
{
fileService.RecentOpen.ClearRecentProjects();
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/HelpCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/HelpCommands.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/HelpCommands.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -10,7 +10,6 @@
using System.IO;
using System.Collections;
using Gtk;
-using GtkSharp;
using MonoDevelop.Core.AddIns.Codons;
using MonoDevelop.Core.Properties;
@@ -40,7 +39,7 @@
{
public override void Run()
{
- ViewGPLDialog vgd = new ViewGPLDialog();
+ using (ViewGPLDialog vgd = new ViewGPLDialog ());
}
}
@@ -78,7 +77,7 @@
Process.Start(file);
} catch (Exception) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("Can't execute/view " + file + "\n Please check that the file exists and that you can open this file.");
+ messageService.ShowError(String.Format (GettextCatalog.GetString ("Can not execute or view {0}\n Please check that the file exists and that you can open this file."), file));
}
}
}
@@ -96,9 +95,10 @@
{
public override void Run()
{
- CommonAboutDialog ad = new CommonAboutDialog ();
- ad.Run ();
- ad.Hide ();
+ using (CommonAboutDialog ad = new CommonAboutDialog ()) {
+ ad.Run ();
+ ad.Hide ();
+ }
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/MenuItemBuilders.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/MenuItemBuilders.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/MenuItemBuilders.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -29,8 +29,22 @@
namespace MonoDevelop.Commands
{
+
+ public interface ISubmenuItem
+ {
+ }
+
public class RecentFilesMenuBuilder : ISubmenuBuilder
{
+
+ class RFMItem : SdMenuCommand, ISubmenuItem {
+ public RFMItem (ConditionCollection a, object b, string c) : base (a, b, c) {
+ }
+ public RFMItem (ConditionCollection a, object b, string c, EventHandler d) : base (a, b, c, d) {
+ }
+ }
+
+
public Gtk.MenuItem[] BuildSubmenu(ConditionCollection conditionCollection, object owner)
{
IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
@@ -40,11 +54,11 @@
RecentOpen recentOpen = fileService.RecentOpen;
if (recentOpen.RecentFile.Count > 0) {
- SdMenuCommand[] items = new SdMenuCommand[recentOpen.RecentFile.Count];
+ RFMItem[] items = new RFMItem[recentOpen.RecentFile.Count];
for (int i = 0; i < recentOpen.RecentFile.Count; ++i) {
string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : "";
- items[i] = new SdMenuCommand(null, null, accelaratorKeyPrefix + recentOpen.RecentFile[i].ToString(), new EventHandler(LoadRecentFile));
+ items[i] = new RFMItem(null, null, accelaratorKeyPrefix + recentOpen.RecentFile[i].ToString(), new EventHandler(LoadRecentFile));
items[i].Tag = recentOpen.RecentFile[i].ToString();
items[i].Description = stringParserService.Parse(resourceService.GetString("Dialog.Componnents.RichMenuItem.LoadFileDescription"),
new string[,] { {"FILE", recentOpen.RecentFile[i].ToString()} });
@@ -52,10 +66,10 @@
return items;
}
- SdMenuCommand defaultMenu = new SdMenuCommand(null, null, resourceService.GetString("Dialog.Componnents.RichMenuItem.NoRecentFilesString"));
+ RFMItem defaultMenu = new RFMItem(null, null, GettextCatalog.GetString("recent files"));
defaultMenu.Sensitive = false;
- return new SdMenuCommand[] { defaultMenu };
+ return new RFMItem[] { defaultMenu };
}
void LoadRecentFile(object sender, EventArgs e)
@@ -68,6 +82,13 @@
public class RecentProjectsMenuBuilder : ISubmenuBuilder
{
+ class RPMItem : SdMenuCommand, ISubmenuItem {
+ public RPMItem (ConditionCollection a, object b, string c) : base (a, b, c) {
+ }
+ public RPMItem (ConditionCollection a, object b, string c, EventHandler d) : base (a, b, c, d) {
+ }
+ }
+
public Gtk.MenuItem[] BuildSubmenu(ConditionCollection conditionCollection, object owner)
{
IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
@@ -77,21 +98,20 @@
RecentOpen recentOpen = fileService.RecentOpen;
if (recentOpen.RecentProject.Count > 0) {
- SdMenuCommand[] items = new SdMenuCommand[recentOpen.RecentProject.Count];
+ RPMItem[] items = new RPMItem[recentOpen.RecentProject.Count];
for (int i = 0; i < recentOpen.RecentProject.Count; ++i) {
string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : "";
- items[i] = new SdMenuCommand(null, null, accelaratorKeyPrefix + recentOpen.RecentProject[i].ToString(), new EventHandler(LoadRecentProject));
+ items[i] = new RPMItem(null, null, accelaratorKeyPrefix + recentOpen.RecentProject[i].ToString(), new EventHandler(LoadRecentProject));
items[i].Tag = recentOpen.RecentProject[i].ToString();
- items[i].Description = stringParserService.Parse(resourceService.GetString("Dialog.Componnents.RichMenuItem.LoadProjectDescription"),
- new string[,] { {"PROJECT", recentOpen.RecentProject[i].ToString()} });
+ items[i].Description = String.Format (GettextCatalog.GetString ("load solution {0}"), recentOpen.RecentProject[i].ToString ());
}
return items;
}
- SdMenuCommand defaultMenu = new SdMenuCommand(null, null, resourceService.GetString("Dialog.Componnents.RichMenuItem.NoRecentProjectsString"));
+ RPMItem defaultMenu = new RPMItem(null, null, GettextCatalog.GetString ("recent solutions"));
defaultMenu.Sensitive = false;
- return new SdMenuCommand[] { defaultMenu };
+ return new RPMItem[] { defaultMenu };
}
void LoadRecentProject(object sender, EventArgs e)
{
@@ -112,13 +132,18 @@
public class ToolMenuBuilder : ISubmenuBuilder
{
+ class TMItem : SdMenuCommand, ISubmenuItem {
+ public TMItem (ConditionCollection a, object b, string c, EventHandler d) : base (a, b, c, d) {
+ }
+ }
+
public Gtk.MenuItem[] BuildSubmenu(ConditionCollection conditionCollection, object owner)
{
// IconMenuStyle iconMenuStyle = (IconMenuStyle)propertyService.GetProperty("IconMenuItem.IconMenuStyle", IconMenuStyle.VSNet);
- SdMenuCommand[] items = new SdMenuCommand[ToolLoader.Tool.Count];
+ TMItem[] items = new TMItem[ToolLoader.Tool.Count];
for (int i = 0; i < ToolLoader.Tool.Count; ++i) {
- SdMenuCommand item = new SdMenuCommand(null, null, ToolLoader.Tool[i].ToString(), new EventHandler(ToolEvt));
- item.Description = "Start tool " + String.Join(String.Empty, ToolLoader.Tool[i].ToString().Split('&'));
+ TMItem item = new TMItem(null, null, ToolLoader.Tool[i].ToString(), new EventHandler(ToolEvt));
+ item.Description = GettextCatalog.GetString ("Start tool") + " " + String.Join(String.Empty, ToolLoader.Tool[i].ToString().Split('&'));
items[i] = item;
}
return items;
@@ -142,10 +167,7 @@
string args = stringParserService.Parse(tool.Arguments);
// prompt for args if needed
if (tool.PromptForArguments) {
- args = messageService.GetTextResponse(
- "Enter any arguments you want to use while launching tool, " + tool.MenuCommand + ":",
- "Command Arguments for " + tool.MenuCommand,
- args);
+ args = messageService.GetTextResponse(String.Format (GettextCatalog.GetString ("Enter any arguments you want to use while launching tool, {0}:"), tool.MenuCommand), String.Format (GettextCatalog.GetString ("Command Arguments for {0}"), tool.MenuCommand), args);
// if user selected cancel string will be null
if (args == null) {
@@ -172,19 +194,18 @@
// FIXME: need to find a way to wire the console output into the output window if specified
Process.Start(startinfo);
- } catch (Exception ex) {
- messageService.ShowError(ex, "External program execution failed.\nError while starting:\n '" + command + " " + args + "'");
+ } catch (Exception ex) { messageService.ShowError(ex, String.Format (GettextCatalog.GetString ("External program execution failed.\nError while starting:\n '{0} {1}'"), command, args));
}
- break;
- }
+ break;
}
}
}
-
+ }
+
public class OpenContentsMenuBuilder : ISubmenuBuilder
{
- class MyMenuItem : SdMenuCheckBox
+ class MyMenuItem : SdMenuCheckBox, ISubmenuItem
{
public MyMenuItem(string name) : base(null, null, name)
{
@@ -204,30 +225,29 @@
if (contentCount == 0) {
return new Gtk.MenuItem[] {};
}
- Gtk.MenuItem[] items = new Gtk.MenuItem[contentCount + 1];
- items[0] = new SdMenuSeparator(null, null);
+ Gtk.MenuItem[] items = new Gtk.MenuItem[contentCount];
for (int i = 0; i < contentCount; ++i) {
IViewContent content = (IViewContent)WorkbenchSingleton.Workbench.ViewContentCollection[i];
- SdMenuCheckBox item = new MyMenuItem(content.WorkbenchWindow.Title);
+ MyMenuItem item = new MyMenuItem(content.WorkbenchWindow.Title);
item.Tag = content.WorkbenchWindow;
if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow == content.WorkbenchWindow) {
item.Active = true;
} else {
item.Active = false;
}
- item.Description = "Activate this window ";
+ item.Description = GettextCatalog.GetString ("Activate this window");
if (i + 1 <= 9) {
string accel_path = "<MonoDevelop>/MainWindow/" + content.WorkbenchWindow.Title + (i + 1).ToString ();
if (!Gtk.Accel.MapLookupEntry (accel_path, new Gtk.AccelKey ())) {
- Gtk.Accel.MapAddEntry (accel_path, Gdk.Keyval.FromName ((i + 1).ToString ()), Gdk.ModifierType.ControlMask);
+ Gtk.Accel.MapAddEntry (accel_path, Gdk.Keyval.FromName ((i + 1).ToString ()), Gdk.ModifierType.Mod1Mask);
item.AccelPath = accel_path;
} else {
- Gtk.Accel.MapChangeEntry (accel_path, Gdk.Keyval.FromName ((i + 1).ToString()), Gdk.ModifierType.ControlMask, true);
+ Gtk.Accel.MapChangeEntry (accel_path, Gdk.Keyval.FromName ((i + 1).ToString()), Gdk.ModifierType.Mod1Mask, true);
item.AccelPath = accel_path;
}
}
- items[i + 1] = item;
+ items[i] = item;
}
return items;
}
@@ -240,7 +260,7 @@
MyMenuItem includeInCompileItem;
MyMenuItem includeInDeployItem;
- class MyMenuItem : SdMenuCheckBox
+ class MyMenuItem : SdMenuCheckBox, ISubmenuItem
{
IncludeFilesBuilder builder;
@@ -278,8 +298,8 @@
public Gtk.MenuItem[] BuildSubmenu(ConditionCollection conditionCollection, object owner)
{
browser = (ProjectBrowserView)owner;
- includeInCompileItem = new MyMenuItem(this, "${res:ProjectComponent.ContextMenu.IncludeMenu.InCompile}", new EventHandler(ChangeCompileInclude));
- includeInDeployItem = new MyMenuItem(this, "${res:ProjectComponent.ContextMenu.IncludeMenu.InDeploy}", new EventHandler(ChangeDeployInclude));
+ includeInCompileItem = new MyMenuItem(this, GettextCatalog.GetString ("Compile"), new EventHandler(ChangeCompileInclude));
+ includeInDeployItem = new MyMenuItem(this, GettextCatalog.GetString ("Deploy"), new EventHandler(ChangeDeployInclude));
return new Gtk.MenuItem[] {
includeInCompileItem,
@@ -331,7 +351,7 @@
public class ViewMenuBuilder : ISubmenuBuilder
{
- class MyMenuItem : SdMenuCheckBox
+ class MyMenuItem : SdMenuCheckBox, ISubmenuItem
{
IPadContent padContent;
@@ -357,6 +377,7 @@
}
Active = IsPadVisible;
}
+
public override void UpdateStatus()
{
base.UpdateStatus();
@@ -375,13 +396,13 @@
}
}
- return (Gtk.MenuItem[])items.ToArray(typeof(Gtk.MenuItem));
+ return (MyMenuItem[])items.ToArray(typeof(MyMenuItem));
}
}
public class LayoutsMenuBuilder : ISubmenuBuilder
{
- class MyMenuItem : SdMenuCheckBox
+ class MyMenuItem : SdMenuCheckBox, ISubmenuItem
{
string layoutName;
@@ -402,6 +423,7 @@
{
WorkbenchSingleton.Workbench.WorkbenchLayout.CurrentLayout = layoutName;
}
+
public override void UpdateStatus()
{
base.UpdateStatus();
@@ -421,7 +443,7 @@
}
}
- return (Gtk.MenuItem[]) items.ToArray (typeof (Gtk.MenuItem));
+ return (MyMenuItem[]) items.ToArray (typeof (MyMenuItem));
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -31,18 +31,26 @@
{
public override void Run()
{
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- ProjectBrowserView browser = (ProjectBrowserView)Owner;
- CombineBrowserNode node = browser.SelectedNode as CombineBrowserNode;
+ IProjectService projectService = (IProjectService)ServiceManager.Services.GetService(typeof(IProjectService));
+ ProjectBrowserView browser = (ProjectBrowserView)Owner;
+ CombineBrowserNode node = browser.SelectedNode as CombineBrowserNode;
+ MessageService msg = (MessageService)ServiceManager.Services.GetService (typeof (MessageService));
if (node != null) {
NewProjectDialog npdlg = new NewProjectDialog(false);
if (npdlg.Run() == (int)Gtk.ResponseType.Ok) {
//System.Console.WriteLine("inside if");
- int newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildProjectTreeNode((IProject)node.Combine.AddEntry(npdlg.NewProjectLocation)));
- projectService.SaveCombine();
- // expand to the new node
- node.Nodes[newNodeIndex].Expand();
+ try
+ {
+ int newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildProjectTreeNode((IProject)node.Combine.AddEntry(npdlg.NewProjectLocation)));
+ projectService.SaveCombine();
+ // expand to the new node
+ node.Nodes[newNodeIndex].Expand();
+ }
+ catch
+ {
+ msg.ShowError (GettextCatalog.GetString ("Invalid Project File"));
+ }
}
}
//System.Console.WriteLine("end");
@@ -56,15 +64,23 @@
IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
ProjectBrowserView browser = (ProjectBrowserView)Owner;
CombineBrowserNode node = browser.SelectedNode as CombineBrowserNode;
+ MessageService msg = (MessageService)ServiceManager.Services.GetService (typeof (MessageService));
if (node != null) {
NewProjectDialog npdlg = new NewProjectDialog(false);
if (npdlg.Run() == (int)Gtk.ResponseType.Ok) {
- int newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildCombineTreeNode((Combine)node.Combine.AddEntry(npdlg.NewCombineLocation)));
- projectService.SaveCombine();
-
- // expand to the new node
- node.Nodes[newNodeIndex].Expand();
+ try
+ {
+ int newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildCombineTreeNode((Combine)node.Combine.AddEntry(npdlg.NewCombineLocation)));
+ projectService.SaveCombine();
+
+ // expand to the new node
+ node.Nodes[newNodeIndex].Expand();
+ }
+ catch
+ {
+ msg.ShowError (GettextCatalog.GetString ("Invalid Solution File"));
+ }
}
}
}
@@ -80,7 +96,7 @@
PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
if (node != null) {
- using (Gtk.FileSelection fdiag = new Gtk.FileSelection ("Add a Project")) {
+ using (Gtk.FileSelection fdiag = new Gtk.FileSelection (GettextCatalog.GetString ("Add a Project"))) {
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
string defaultFolder = propertyService.GetProperty(
"MonoDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath",
@@ -90,19 +106,25 @@
fdiag.Complete (defaultFolder);
fdiag.SelectMultiple = false;
if (fdiag.Run () == (int) Gtk.ResponseType.Ok) {
- object obj = node.Combine.AddEntry(fdiag.Filename);
- int newNodeIndex = -1;
- if (obj is IProject) {
- newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildProjectTreeNode((IProject)obj));
- } else {
- newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildCombineTreeNode((Combine)obj));
- }
- projectService.SaveCombine();
+ try {
+ object obj = node.Combine.AddEntry(fdiag.Filename);
+ int newNodeIndex = -1;
+ if (obj is IProject) {
+ newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildProjectTreeNode((IProject)obj));
+ } else {
+ newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildCombineTreeNode((Combine)obj));
+ }
+ projectService.SaveCombine();
- if (newNodeIndex > -1) {
- // expand to the new node
- node.Nodes[newNodeIndex].Expand();
+ if (newNodeIndex > -1) {
+ // expand to the new node
+ node.Nodes[newNodeIndex].Expand();
+ }
}
+ catch
+ {
+ ((MessageService)ServiceManager.Services.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("Invalid Project File"));
+ }
}
fdiag.Hide ();
@@ -121,7 +143,7 @@
PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
if (node != null) {
- using (Gtk.FileSelection fdiag = new Gtk.FileSelection ("Add a Combine")) {
+ using (Gtk.FileSelection fdiag = new Gtk.FileSelection (GettextCatalog.GetString ("Add a Combine"))) {
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
string defaultFolder = propertyService.GetProperty(
@@ -132,18 +154,24 @@
fdiag.Complete (defaultFolder);
fdiag.SelectMultiple = false;
if (fdiag.Run () == (int) Gtk.ResponseType.Ok) {
- object obj = node.Combine.AddEntry(fdiag.Filename);
- int newNodeIndex = -1;
- if (obj is IProject) {
- newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildProjectTreeNode((IProject)obj));
- } else {
- newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildCombineTreeNode((Combine)obj));
+ try {
+ object obj = node.Combine.AddEntry(fdiag.Filename);
+ int newNodeIndex = -1;
+ if (obj is IProject) {
+ newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildProjectTreeNode((IProject)obj));
+ } else {
+ newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildCombineTreeNode((Combine)obj));
+ }
+ projectService.SaveCombine();
+
+ if (newNodeIndex > -1) {
+ // expand to the new node
+ node.Nodes[newNodeIndex].Expand();
+ }
}
- projectService.SaveCombine();
-
- if (newNodeIndex > -1) {
- // expand to the new node
- node.Nodes[newNodeIndex].Expand();
+ catch
+ {
+ ((MessageService)ServiceManager.Services.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("Invalid Solution File"));
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -30,6 +30,7 @@
{
public class AddFilesToProject : AbstractMenuCommand
{
+
public override void Run()
{
ProjectBrowserView browser = (ProjectBrowserView)Owner;
@@ -39,44 +40,55 @@
}
AbstractBrowserNode node = (AbstractBrowserNode)browser.SelectedNode;
+ PropertyService props = (PropertyService)ServiceManager.Services.GetService (typeof (PropertyService));
- using (FileSelection fdiag = new FileSelection ("Add a file")) {
- fdiag.SelectMultiple = true;
- string defaultPath = Path.Combine (Environment.GetEnvironmentVariable ("HOME"), "MonoDevelopProjects");
- fdiag.Complete (defaultPath);
-
- int result = fdiag.Run ();
- try {
- if (result != (int) ResponseType.Ok)
- return;
+ using (FileSelection fdiag = new FileSelection (GettextCatalog.GetString ("Add a file"))) {
+ fdiag.SelectMultiple = true;
- foreach (string file in fdiag.Selections) {
- if (file.StartsWith(node.Project.BaseDirectory)) {
- ProjectBrowserView.MoveCopyFile (file, node, true, true);
- } else {
- using (MessageDialog md = new MessageDialog (
- (Window) WorkbenchSingleton.Workbench,
- DialogFlags.Modal | DialogFlags.DestroyWithParent,
- MessageType.Question, ButtonsType.None,
- "The file is outside the project directory, what should I do?")) {
- md.AddButton (Gtk.Stock.Copy, 1);
- md.AddButton ("_Move", 2);
- md.AddButton (Gtk.Stock.Cancel, ResponseType.Cancel);
-
- int ret = md.Run ();
- md.Hide ();
-
- if (ret < 0)
- return;
-
- ProjectBrowserView.MoveCopyFile (file, node, ret == 2, false);
+ string defaultPath = props.GetProperty ("MonoDevelop.Project.AddFilePath", node.Project.BaseDirectory);
+
+ fdiag.Complete(defaultPath);
+
+ int result = fdiag.Run ();
+ try {
+ if (result != (int) ResponseType.Ok)
+ return;
+
+ foreach (string file in fdiag.Selections) {
+ if (file.StartsWith(node.Project.BaseDirectory)) {
+ ProjectBrowserView.MoveCopyFile (file, node, true, true);
+ } else {
+ using (MessageDialog md = new MessageDialog (
+ (Window) WorkbenchSingleton.Workbench,
+ DialogFlags.Modal | DialogFlags.DestroyWithParent,
+ MessageType.Question, ButtonsType.None,
+ GettextCatalog.GetString ("The file is outside the project directory, what should I do?"))) {
+ md.AddButton (Gtk.Stock.Copy, 1);
+ md.AddButton (GettextCatalog.GetString ("_Move"), 2);
+ md.AddButton (Gtk.Stock.Cancel, ResponseType.Cancel);
+
+ int ret = md.Run ();
+ md.Hide ();
+
+ if (ret < 0)
+ return;
+
+ try
+ {
+ ProjectBrowserView.MoveCopyFile (file, node, ret == 2, false);
+ }
+ catch
+ {
+ ((MessageService)ServiceManager.Services.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("An error occurred while attempt to move/copy that file. Please check your permissions."));
+ }
+ }
}
+ props.SetProperty ("MonoDevelop.Project.AddFilePath", System.IO.Path.GetDirectoryName (file));
}
+ } finally {
+ fdiag.Hide ();
}
- } finally {
- fdiag.Hide ();
}
- }
}
}
@@ -175,7 +187,7 @@
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- string directoryName = fileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + resourceService.GetString("ProjectComponent.NewFolderString");
+ string directoryName = fileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + GettextCatalog.GetString("New Folder");
int index = -1;
if (Directory.Exists(directoryName)) {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -44,7 +44,7 @@
show_dialog:
- using (Gtk.FileSelection fs = new Gtk.FileSelection ("File to Open")) {
+ using (Gtk.FileSelection fs = new Gtk.FileSelection (GettextCatalog.GetString ("File to Open"))) {
fs.SelectMultiple = true;
fs.Filename = project.BaseDirectory;
int response = fs.Run ();
@@ -57,7 +57,7 @@
foreach (string file in files) {
if (! File.Exists (file)) {
IMessageService messageService = (IMessageService) ServiceManager.Services.GetService (typeof (IMessageService));
- messageService.ShowError (String.Format ("Resource file `{0}' does not exist", file));
+ messageService.ShowError (String.Format (GettextCatalog.GetString ("Resource file '{0}' does not exist"), file));
goto show_dialog;
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectCommands.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/ProjectCommands.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -34,7 +34,7 @@
if (!File.Exists(assembly)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("Assembly not Found (Compile the project first)");
+ messageService.ShowError(GettextCatalog.GetString ("Assembly not Found (Compile the project first)"));
} else {
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
string command = fileUtilityService.SharpDevelopRootPath +
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/RunCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/RunCommands.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/RunCommands.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -43,12 +43,10 @@
TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
if (!taskService.SomethingWentWrong) {
- statusBarService.SetMessage("${res:MainWindow.StatusBar.SuccessfulMessage}");
+ statusBarService.SetMessage(GettextCatalog.GetString ("Successful"));
} else {
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- stringParserService.Properties["Errors"] = taskService.Errors.ToString();
- stringParserService.Properties["Warnings"] = taskService.Warnings.ToString();
- statusBarService.SetMessage("${res:MainWindow.StatusBar.ErrorWarningsMessage}");
+ statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("{0} errors, {1} warnings"), taskService.Errors.ToString (), taskService.Warnings.ToString ()));
}
}
@@ -74,7 +72,7 @@
if (binding != null) {
if (binding == null || !binding.CanCompile(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("Language binding " + binding.Language + " can't compile " + WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
+ messageService.ShowError(String.Format (GettextCatalog.GetString ("Language binding {0} can't compile {1}"), binding.Language, WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName));
} else {
new SaveFile().Run();
ICompilerResult res = binding.CompileFile(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
@@ -88,15 +86,15 @@
}
} else {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("No source file for compilation found. Please save unsaved files");
+ messageService.ShowError(GettextCatalog.GetString ("No source file for compilation found. Please save unsaved files"));
}
}
}
- taskService.CompilerOutput += resourceService.GetString("MainWindow.CompilerMessages.DoneLabel") + "\n\n" +
- stringParserService.Parse("${res:MainWindow.CompilerMessages.StatsOutput}", new string[,] { {"SUCCEEDED", CombineEntry.BuildProjects.ToString()}, {"FAILED", CombineEntry.BuildErrors.ToString()} }) + "\n";
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString (), CombineEntry.BuildErrors.ToString ());
} catch (Exception e) {
+ Console.WriteLine (e);
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Error while compiling");
+ messageService.ShowError(e, GettextCatalog.GetString ("Error while compiling"));
}
projectService.OnEndBuild();
//}
@@ -149,7 +147,7 @@
if (binding != null) {
if (binding == null || !binding.CanCompile(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("Language binding " + binding.Language + " can't compile " + WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
+ messageService.ShowError(String.Format (GettextCatalog.GetString ("Language binding {0} can't compile {1}"), binding.Language, WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName));
} else {
new SaveFile().Run();
ICompilerResult res = binding.CompileFile(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
@@ -163,15 +161,15 @@
}
} else {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("No source file for compilation found. Please save unsaved files");
+ messageService.ShowError(GettextCatalog.GetString ("No source file for compilation found. Please save unsaved files"));
}
}
}
- taskService.CompilerOutput += resourceService.GetString("MainWindow.CompilerMessages.DoneLabel") + "\n\n" +
- stringParserService.Parse("${res:MainWindow.CompilerMessages.StatsOutput}", new string[,] { {"SUCCEEDED", CombineEntry.BuildProjects.ToString()}, {"FAILED", CombineEntry.BuildErrors.ToString()} }) + "\n";
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
} catch (Exception e) {
+ Console.WriteLine (e);
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Error while compiling");
+ messageService.ShowError(e, GettextCatalog.GetString ("Error while compiling"));
}
projectService.OnEndBuild();
}
@@ -206,25 +204,25 @@
IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
try {
- statusBarService.SetMessage("${res:MainWindow.StatusBar.ExecutingMessage}");
+ statusBarService.SetMessage(GettextCatalog.GetString ("Executing"));
if (projectService.CurrentOpenCombine != null) {
try {
if (projectService.NeedsCompiling) {
projectService.CompileCombine();
}
- if (taskService.Tasks.Count == 0) {
+ if (taskService.Errors == 0) {
projectService.OnBeforeStartProject();
projectService.CurrentOpenCombine.Execute();
}
} catch (NoStartupCombineDefinedException) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("Cannot execute Run command, cannot find startup project.\nPlease define a startup project for the combine in the combine properties.");
+ messageService.ShowError(GettextCatalog.GetString ("Cannot execute Run command, cannot find startup project.\nPlease define a startup project for the combine in the combine properties."));
}
} else {
if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
new Compile().RunWithWait();
- if (!taskService.SomethingWentWrong) {
+ if (taskService.Errors == 0) {
LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
ILanguageBinding binding = languageBindingService.GetBindingPerFileName(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
if (binding != null) {
@@ -232,16 +230,16 @@
binding.Execute(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
} else {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("No runnable executable found.");
+ messageService.ShowError(GettextCatalog.GetString ("No runnable executable found."));
}
}
}
}
} catch (Exception e) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Error while running");
+ messageService.ShowError(e, GettextCatalog.GetString ("Error while running"));
}
- statusBarService.SetMessage("${res:MainWindow.StatusBar.ReadyMessage}");
+ statusBarService.SetMessage(GettextCatalog.GetString ("Ready"));
return false;
}
}
@@ -281,11 +279,10 @@
projectService.OnStartBuild();
projectService.CompileProject(projectService.CurrentSelectedProject);
- taskService.CompilerOutput += resourceService.GetString("MainWindow.CompilerMessages.DoneLabel") + "\n\n" +
- stringParserService.Parse("${res:MainWindow.CompilerMessages.StatsOutput}", new string[,] { {"SUCCEEDED", CombineEntry.BuildProjects.ToString()}, {"FAILED", CombineEntry.BuildErrors.ToString()} }) + "\n";
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
} catch (Exception e) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Error while compiling project " + projectService.CurrentSelectedProject.Name);
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error while compiling project {0}"), projectService.CurrentSelectedProject.Name));
}
projectService.OnEndBuild();
}
@@ -316,11 +313,10 @@
projectService.OnStartBuild();
projectService.RecompileProject(projectService.CurrentSelectedProject);
- taskService.CompilerOutput += resourceService.GetString("MainWindow.CompilerMessages.DoneLabel") + "\n\n" +
- stringParserService.Parse("${res:MainWindow.CompilerMessages.StatsOutput}", new string[,] { {"SUCCEEDED", CombineEntry.BuildProjects.ToString()}, {"FAILED", CombineEntry.BuildErrors.ToString()} }) + "\n";
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
} catch (Exception e) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Error while compiling project " + projectService.CurrentSelectedProject.Name);
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error while compiling project {0}"), projectService.CurrentSelectedProject.Name));
}
projectService.OnEndBuild();
}
@@ -328,4 +324,15 @@
}
}
}
+
+ public class GenerateMakefiles : AbstractMenuCommand {
+
+ public override void Run ()
+ {
+ IProjectService projectservice = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+ if (projectservice.CurrentOpenCombine != null) {
+ projectservice.GenerateMakefiles ();
+ }
+ }
+ }
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Commands/ToolsCommands.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Commands/ToolsCommands.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Commands/ToolsCommands.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -47,8 +47,9 @@
{
public override void Run()
{
- NewLayoutDialog dlg = new NewLayoutDialog ();
- dlg.Run ();
+ using (NewLayoutDialog dlg = new NewLayoutDialog ()) {
+ dlg.Run ();
+ }
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractBaseViewContent.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractBaseViewContent.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractBaseViewContent.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -8,6 +8,8 @@
using System;
//using System.Windows.Forms;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Gui
{
public abstract class AbstractBaseViewContent : IBaseViewContent
@@ -30,7 +32,7 @@
public virtual string TabPageLabel {
get {
- return "Abstract Content";
+ return GettextCatalog.GetString ("Abstract Content");
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractPadContent.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractPadContent.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractPadContent.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -23,8 +23,7 @@
public virtual string Title {
get {
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- return stringParserService.Parse(title);
+ return title;
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractViewContent.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractViewContent.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/AbstractViewContent.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -7,6 +7,8 @@
using System;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Gui
{
public abstract class AbstractViewContent : AbstractBaseViewContent, IViewContent
@@ -21,7 +23,7 @@
bool hasproject = false;
public override string TabPageLabel {
- get { return "Change me"; }
+ get { return GettextCatalog.GetString ("Change me"); }
}
public virtual string UntitledName {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/BrowserDisplayBinding/BrowserDisplayBinding.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/BrowserDisplayBinding/BrowserDisplayBinding.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/BrowserDisplayBinding/BrowserDisplayBinding.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -10,12 +10,9 @@
using Gtk;
using MonoDevelop.Internal.Undo;
-using System.Drawing.Printing;
using MonoDevelop.Core.Properties;
-
using MonoDevelop.Core.AddIns.Codons;
using MonoDevelop.Gui;
-
using MonoDevelop.Gui.Utils;
namespace MonoDevelop.BrowserDisplayBinding
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -7,17 +7,17 @@
using System;
using Gtk;
-using GtkSharp;
using Gecko;
using MonoDevelop.Internal.Undo;
-using System.Drawing.Printing;
using MonoDevelop.Core.Properties;
-
using MonoDevelop.Core.Services;
using MonoDevelop.Core.AddIns.Codons;
using MonoDevelop.Gui;
+using MonoDevelop.Gui.Components;
+using MonoDevelop.Gui.Widgets;
using MonoDevelop.Gui.HtmlControl;
+using MonoDevelop.Services;
namespace MonoDevelop.BrowserDisplayBinding
{
@@ -42,7 +42,7 @@
public override string TabPageLabel
{
get {
- return "Web Browser";
+ return GettextCatalog.GetString ("Web Browser");
}
}
@@ -58,7 +58,7 @@
Gtk.Timeout.Add (50, new Gtk.Function (checkFocus));
} catch {
- Console.WriteLine ("gtkmozembed tossed an exception");
+ Console.WriteLine ("Gecko# tossed an exception");
}
}
}
@@ -99,16 +99,15 @@
void onFocused (object o, EventArgs e)
{
- Console.WriteLine ("aa");
}
- public BrowserPane(bool showNavigation) //: base (type)
+ public BrowserPane (bool showNavigation)
{
htmlViewPane = new HtmlViewPane(showNavigation);
htmlViewPane.MozillaControl.TitleChange += new EventHandler (OnTitleChanged);
}
- public BrowserPane() : this(true)
+ public BrowserPane () : this (true)
{
}
@@ -136,16 +135,14 @@
public class HtmlViewPane : Gtk.Frame
{
MozillaControl htmlControl = null;
- public Gtk.EventBox catcher = null;
+ IStatusBarService statusbarService = (IStatusBarService) ServiceManager.Services.GetService (typeof (IStatusBarService));
+ SdStatusBar status;
- VBox topPanel = new VBox (false, 2);
- Toolbar toolBar = new Toolbar ();
- Entry urlTextBox = new Entry ();
- Statusbar status;
+ VBox topPanel = new VBox (false, 2);
+ Navbar nav = new Navbar ();
- bool isHandleCreated = false;
- string lastUrl = null;
- static GLib.GType type;
+ bool loading = false;
+ static GLib.GType gtype;
public MozillaControl MozillaControl {
get {
@@ -153,111 +150,89 @@
}
}
- static HtmlViewPane ()
+ public static new GLib.GType GType
{
- type = RegisterGType (typeof (HtmlViewPane));
+ get
+ {
+ if (gtype == GLib.GType.Invalid)
+ gtype = RegisterGType (typeof (HtmlViewPane));
+ return gtype;
+ }
}
- public HtmlViewPane(bool showNavigation) : base ()
+ public HtmlViewPane(bool showNavigation) : base (GType)
{
- //RequestSize = new Size (500, 500);
-
Shadow = Gtk.ShadowType.In;
VBox mainbox = new VBox (false, 2);
+ status = (SdStatusBar) statusbarService.ProgressMonitor;
if (showNavigation) {
- //topPanel.RequestSize = new Size (Width, 25);
- //topPanel.Dock = DockStyle.Top;
+ nav.Back += OnBackClicked;
+ nav.Forward += OnForwardClicked;
+ nav.Stop += OnStopClicked;
+ nav.Reload += OnRefreshClicked;
+ nav.Go += OnEntryActivated;
- //toolBar.Dock = DockStyle.None;
-
- Button toolBarBack = new Button ();
- toolBarBack.Child = new Image (Gtk.Stock.GoBack, IconSize.SmallToolbar);
- toolBarBack.Relief = ReliefStyle.None;
- toolBarBack.Clicked += new EventHandler (OnBackClicked);
-
- Button toolBarForward = new Button ();
- toolBarForward.Child = new Image (Gtk.Stock.GoForward, IconSize.SmallToolbar);
- toolBarForward.Relief = ReliefStyle.None;
- toolBarForward.Clicked += new EventHandler (OnForwardClicked);
-
- Button toolBarStop = new Button ();
- toolBarStop.Child = new Image (Gtk.Stock.Stop, IconSize.SmallToolbar);
- toolBarStop.Relief = ReliefStyle.None;
- toolBarStop.Clicked += new EventHandler (OnStopClicked);
-
- Button toolBarRefresh = new Button ();
- toolBarRefresh.Child = new Image (Gtk.Stock.Refresh, IconSize.SmallToolbar);
- toolBarRefresh.Relief = ReliefStyle.None;
- toolBarRefresh.Clicked += new EventHandler (OnRefreshClicked);
-
- urlTextBox.WidthChars = 50;
- urlTextBox.Activated += new EventHandler (OnEntryActivated);
-
- toolBar.ToolbarStyle = ToolbarStyle.Icons;
- toolBar.IconSize = IconSize.SmallToolbar;
- toolBar.AppendWidget (toolBarBack, "Go Back", "");
- toolBar.AppendWidget (toolBarForward, "Go Forward", "");
- toolBar.AppendWidget (toolBarStop, "Stop Loading", "");
- toolBar.AppendWidget (toolBarRefresh, "Reload page", "");
- toolBar.AppendWidget (urlTextBox, "Location", "");
-
- topPanel.PackStart (toolBar);
+ topPanel.PackStart (nav);
mainbox.PackStart (topPanel, false, false, 2);
}
htmlControl = new MozillaControl ();
- htmlControl.NetStart += new EventHandler (OnNetStart);
- htmlControl.NetStop += new EventHandler (OnNetStop);
+ htmlControl.NetStart += OnNetStart;
+ htmlControl.NetStop += OnNetStop;
+ htmlControl.LocChange += OnLocationChanged;
htmlControl.ShowAll ();
-
- catcher = new Gtk.EventBox ();
- catcher.Add (htmlControl);
- mainbox.PackStart (catcher);
-
- status = new Statusbar ();
- status.HasResizeGrip = false;
- mainbox.PackStart (status, false, true, 0);
+ mainbox.PackStart (htmlControl);
this.Add (mainbox);
this.ShowAll ();
}
- //void TitleChange(object sender, DWebBrowserEvents2_TitleChangeEvent e)
- //{
- // urlTextBox.Text = axWebBrowser.LocationURL;
- //}
-
void OnEntryActivated (object o, EventArgs args)
{
- htmlControl.LoadUrl (urlTextBox.Text);
+ htmlControl.LoadUrl (nav.Url);
}
public void CreatedWebBrowserHandle(object sender, EventArgs evArgs)
{
- isHandleCreated = true;
- if (lastUrl != null) {
- Navigate(lastUrl);
- }
}
public void Navigate(string name)
{
- urlTextBox.Text = name;
+ nav.Url = name;
htmlControl.LoadUrl (name);
}
private void OnNetStart (object o, EventArgs args)
{
- status.Push (1, "Loading...");
+ statusbarService.SetMessage (GettextCatalog.GetString ("Loading..."));
+ loading = true;
+ GLib.Idle.Add (new GLib.IdleHandler (Pulse));
}
+ bool Pulse ()
+ {
+ if (loading) {
+ status.Pulse ();
+ System.Threading.Thread.Sleep (100);
+ return true;
+ }
+ status.Done ();
+ statusbarService.SetMessage (GettextCatalog.GetString ("Done."));
+ return false;
+ }
+
private void OnNetStop (object o, EventArgs args)
{
- status.Push (1, "Done.");
+ loading = false;
}
+ void OnLocationChanged (object o, EventArgs args)
+ {
+ nav.Url = htmlControl.Location;
+ }
+
private void OnBackClicked (object o, EventArgs args)
{
htmlControl.GoBack ();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/DownloadGenerator.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -24,7 +24,7 @@
{
ProgressHolder holder = (ProgressHolder)arg;
holder.currentProgress = holder.startProgress + holder.s.Position;
- holder.progressBar.Worked ((int)((double)holder.currentProgress/holder.maxAmount * int.MaxValue), "Extracted more of the archive");
+ holder.progressBar.Worked ((int)((double)holder.currentProgress/holder.maxAmount * int.MaxValue), GettextCatalog.GetString ("Extracted more of the archive"));
while (Gtk.Application.EventsPending ())
Gtk.Application.RunIteration ();
@@ -56,7 +56,7 @@
maxAmount = dataResp.ContentLength * 2;
- progress.BeginTask("Downloading database", int.MaxValue);
+ progress.BeginTask(GettextCatalog.GetString ("Downloading database"), int.MaxValue);
DownloadFile (dataResp.GetResponseStream (),
compressedFile,
maxAmount, progress);
@@ -96,7 +96,7 @@
amountRead = s.Read(buffer, 0, buffer.Length);
amountDownloaded += amountRead;
outstream.Write(buffer, 0, amountRead);
- progress.Worked ((int)((float)amountDownloaded/maxAmount * int.MaxValue), "Downloaded more of " + fileName);
+ progress.Worked ((int)((float)amountDownloaded/maxAmount * int.MaxValue), String.Format (GettextCatalog.GetString ("Downloaded more of {0}"), fileName));
// make sure we let the GTK events happen at least every second
long nowticks = DateTime.Now.Ticks;
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/GenerateDatabase.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/GenerateDatabase.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/GenerateDatabase.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -41,7 +41,7 @@
IDatabaseGenerator generator;
ProgressMonitorBar progress;
- public GeneratorProgress (IDatabaseGenerator generator) : base("Code completion database generator")
+ public GeneratorProgress (IDatabaseGenerator generator) : base(GettextCatalog.GetString ("Code completion database generator"))
{
try {
this.generator = generator;
@@ -49,18 +49,18 @@
Gtk.VBox vb = new Gtk.VBox(false, 6);
this.Add(vb);
- vb.Add(new Gtk.Label("Creating database..."));
+ vb.Add(new Gtk.Label(GettextCatalog.GetString ("Creating database...")));
progress = new ProgressMonitorBar();
vb.Add(progress);
- cancel = new Gtk.Button("Cancel");
+ cancel = new Gtk.Button(GettextCatalog.GetString ("Cancel"));
cancel.Clicked += new EventHandler(DoCancel);
if (!generator.Cancelable) {
cancel.Sensitive = false;
Tooltips t = new Tooltips();
- t.SetTip(cancel, "Cancelling not available",
- "This type of code completion database generator can not be canceled");
+ t.SetTip(cancel, GettextCatalog.GetString ("Cancelling not available"),
+ GettextCatalog.GetString ("This type of code completion database generator can not be canceled"));
}
vb.Add(cancel);
this.ShowAll();
@@ -86,7 +86,7 @@
public void Start()
{
CodeCompletionDruid druid = new CodeCompletionDruid();
- druidHost = new Gtk.Window("Code completion database druid");
+ druidHost = new Gtk.Window(GettextCatalog.GetString ("Code completion database druid"));
druidHost.Add(druid);
druid.Finished += new DruidFinished(GotDruidData);
druid.Canceled += new DruidCanceled(DruidCanceled);
@@ -115,9 +115,8 @@
// restart & exit
ServiceManager.Services.UnloadAllServices();
// FIXME: handle this elegantly
- // is it really necessary to restart here?
Console.WriteLine ("******************************************************************************");
- Console.WriteLine ("Attempting to restart MonoDevelop, if you get any exceptions, restart manually");
+ Console.WriteLine (GettextCatalog.GetString ("Attempting to restart MonoDevelop, if you get any exceptions, restart manually"));
Console.WriteLine ("******************************************************************************");
// not everyone can run .exe's directly
System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo ("mono", "MonoDevelop.exe");
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingGenerator.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -18,7 +18,7 @@
// changed to work during GLib.Idle
public void Generate(IProgressMonitor progress)
{
- progress.BeginTask("Referencing existing database", 2);
+ progress.BeginTask(GettextCatalog.GetString ("Referencing existing database"), 2);
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
if (!fileUtilityService.IsValidFileName(Path))
@@ -31,7 +31,7 @@
PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
propertyService.SetProperty ("SharpDevelop.CodeCompletion.DataDirectory", Path);
propertyService.SaveProperties ();
- progress.Worked(2, "Referenced existing database");
+ progress.Worked(2, GettextCatalog.GetString ("Referenced existing database"));
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/CompletionDatabaseWizard/druid.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -4,6 +4,7 @@
using MonoDevelop.Gui.Widgets;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
namespace MonoDevelop.Gui.Dialogs.OptionPanels.CompletionDatabaseWizard {
class MethodSelectionPage : DruidPageStandard {
@@ -12,10 +13,10 @@
internal RadioButton download;
internal MethodSelectionPage(CodeCompletionDruid druid) : base() {
- Title = "Generation Method";
- generateDatabase = new RadioButton("Generate a code completion database");
- useExisting = new RadioButton(generateDatabase, "Use a code completion database already on this computer");
- download = new RadioButton(generateDatabase, "Download a code completion database");
+ Title = GettextCatalog.GetString ("Generation Method");
+ generateDatabase = new RadioButton(GettextCatalog.GetString ("Generate a code completion database"));
+ useExisting = new RadioButton(generateDatabase, GettextCatalog.GetString ("Use a code completion database already on this computer"));
+ download = new RadioButton(generateDatabase, GettextCatalog.GetString ("Download a code completion database"));
this.NextClicked += new NextClickedHandler(druid.GoToMethodPage);
AppendItem("", generateDatabase, "");
AppendItem("", useExisting, "");
@@ -29,12 +30,12 @@
internal RadioButton light;
internal GenerateDatabasePage(CodeCompletionDruid druid) : base(druid) {
- Title = "Select Generation Style";
- heavy = new RadioButton("Heavy process");
- light = new RadioButton(heavy, "Light process");
+ Title = GettextCatalog.GetString ("Select Generation Style");
+ heavy = new RadioButton(GettextCatalog.GetString ("Heavy process"));
+ light = new RadioButton(heavy, GettextCatalog.GetString ("Light process"));
- AppendItem("", heavy, "This process is slower and more memory-intensive than the light process, but will enable faster code completion");
- AppendItem("", light, "This process will take less time and memory to produce the code completion database, but code completion will be slower");
+ AppendItem("", heavy, GettextCatalog.GetString ("This process is slower and more memory-intensive than the light process, but will enable faster code completion"));
+ AppendItem("", light, GettextCatalog.GetString ("This process will take less time and memory to produce the code completion database, but code completion will be slower"));
}
}
@@ -42,10 +43,10 @@
internal MonoDevelop.Gui.Widgets.FolderEntry filename;
internal UseExistingPage(CodeCompletionDruid druid) : base(druid) {
- Title = "Existing Database Location";
- filename = new FolderEntry("Select code completion database");
+ Title = GettextCatalog.GetString ("Existing Database Location");
+ filename = new FolderEntry(GettextCatalog.GetString ("Select code completion database"));
filename.DefaultPath = System.IO.Directory.GetCurrentDirectory();
- AppendItem("Where is the code completion database you would like to copy", filename, "");
+ AppendItem(GettextCatalog.GetString ("Where is the code completion database you would like to copy"), filename, "");
}
}
@@ -54,9 +55,9 @@
internal DownloadPage(CodeCompletionDruid druid) : base(druid)
{
- Title = "Download Database";
+ Title = GettextCatalog.GetString ("Download Database");
uri = new Gtk.Entry();
- AppendItem("Where would you like to download the code completion database from?", uri, "");
+ AppendItem(GettextCatalog.GetString ("Where would you like to download the code completion database from?"), uri, "");
}
protected override string GetError (object sender)
@@ -64,13 +65,13 @@
try {
Uri u = new Uri(this.uri.Text);
} catch (UriFormatException ex) {
- return "That Uri is invalid: " + ex.Message;
+ return String.Format (GettextCatalog.GetString ("That Uri is invalid: {0}"), ex.Message);
}
int compressionType = (int)MonoDevelop.Gui.Utils.DirectoryArchive.Decompressor.GetTypeFromString(this.uri.Text, false);
if (compressionType == -1){
- return "That Uri appears not to refer to a file with a known compression type";
+ return GettextCatalog.GetString ("That Uri appears not to refer to a file with a known compression type");
}
return null;
@@ -158,14 +159,14 @@
internal static DruidPageEdge GetStartPage()
{
DruidPageEdge page = new DruidPageEdge(EdgePosition.Start);
- page.Text = "This druid will guide you through the process of creating a code completion database";
+ page.Text = GettextCatalog.GetString ("This druid will guide you through the process of creating a code completion database");
return page;
}
internal DruidPageEdge GetEndPage()
{
DruidPageEdge page = new DruidPageEdge(EdgePosition.Finish);
- page.Text = "Click Apply to start the database creation process";
+ page.Text = GettextCatalog.GetString("Click Apply to start the database creation process");
page.BackClicked += new BackClickedHandler(GoToPrev);
page.FinishClicked += new FinishClickedHandler(EndOfWizard);
return page;
@@ -220,7 +221,7 @@
internal void HandleCancel(object sender, EventArgs args)
{
MessageService messageService = (MessageService)ServiceManager.Services.GetService(typeof(MessageService));
- bool really = messageService.AskQuestion("Are you sure you want to skip database creation? You will not have code completion functionality.", "Are you sure?");
+ bool really = messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to skip database creation? You will not have code completion functionality."), GettextCatalog.GetString ("Are you sure?"));
if (really) {
this.Destroy();
this.Canceled(this);
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdMenu.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdMenu.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdMenu.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -16,6 +16,8 @@
using MonoDevelop.Core.AddIns.Conditions;
using MonoDevelop.Core.AddIns.Codons;
+using MonoDevelop.Commands;
+
namespace MonoDevelop.Gui.Components
{
public interface IStatusUpdate
@@ -29,7 +31,7 @@
ConditionCollection conditionCollection;
object caller;
- string localizedText = String.Empty;
+ public string localizedText = String.Empty;
public ArrayList SubItems = new ArrayList();
private Gtk.Menu subMenu = null;
@@ -66,12 +68,12 @@
public void OnDropDown(object ob, System.EventArgs e)
{
- foreach (object o in ((Gtk.Menu)Submenu).Children) {
-
- if (o is IStatusUpdate) {
- ((IStatusUpdate)o).UpdateStatus();
- }
- }
+ //foreach (object o in ((Gtk.Menu)Submenu).Children) {
+ //
+ // if (o is IStatusUpdate) {
+ // ((IStatusUpdate)o).UpdateStatus();
+ // }
+ //}
UpdateStatus ();
}
@@ -85,7 +87,10 @@
if (Visible) {
foreach (Gtk.Widget widg in ((Gtk.Menu)Submenu).Children) {
- ((Gtk.Menu)Submenu).Remove (widg);
+ if (widg is ISubmenuItem) {
+ ((Gtk.Menu)Submenu).Remove (widg);
+ widg.Destroy ();
+ }
}
foreach (object item in SubItems) {
if (item is Gtk.MenuItem) {
@@ -94,18 +99,22 @@
}
Append((Gtk.MenuItem)item);
} else {
+ int location = SubItems.IndexOf (item);
ISubmenuBuilder submenuBuilder = (ISubmenuBuilder)item;
Gtk.MenuItem[] items = submenuBuilder.BuildSubmenu(conditionCollection, caller);
foreach (Gtk.MenuItem menuItem in items) {
- Append (menuItem);
+ subMenu.Insert (menuItem, location);
+ location++;
}
-
}
}
ShowAll ();
+ if (((Gtk.Menu)Submenu).Children.Length == 0) {
+ Visible = false;
+ }
}
}
-
+
public void Append (Gtk.Widget item)
{
if (item.Parent == null) {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdMenuCheckBox.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdMenuCheckBox.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdMenuCheckBox.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -42,9 +42,14 @@
}
}
- public SdMenuCheckBox (string label) : base (label)
+ public SdMenuCheckBox (string label) : base ()
{
Toggled += new EventHandler (OnClick);
+ Gtk.AccelLabel child = new Gtk.AccelLabel (label);
+ child.Xalign = 0;
+ child.UseUnderline = true;
+ Child = child;
+ child.AccelWidget = this;
}
public SdMenuCheckBox(ConditionCollection conditionCollection, object caller, string label) : this(stringParserService.Parse(label))
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdToolbarCommand.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdToolbarCommand.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/SdToolbarCommand.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -18,7 +18,7 @@
namespace MonoDevelop.Gui.Components
{
- public class SdToolbarCommand : Gtk.Image, IStatusUpdate
+ public class SdToolbarCommand : Gtk.Button, IStatusUpdate
{
static StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
@@ -56,7 +56,7 @@
public SdToolbarCommand (string text) : base ()
{
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService (typeof(IResourceService));
-
+
if (text.StartsWith ("${")) {
localizedText = resourceService.GetString (text);
} else {
@@ -64,8 +64,9 @@
}
localizedText = localizedText.Replace ('&', '_');
+ Clicked += new EventHandler (ToolbarClicked);
}
-
+
public SdToolbarCommand(ConditionCollection conditionCollection, object caller, string label) : this(stringParserService.Parse(label))
{
this.caller = caller;
@@ -95,12 +96,12 @@
}
// To be called from ToolbarService
- public void ToolbarClicked() {
+ public void ToolbarClicked(object o, EventArgs e) {
if (menuCommand != null) {
menuCommand.Run();
}
}
-
+
public virtual void UpdateStatus()
{
if (conditionCollection != null) {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/StatusBar/SdStatusBar.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/StatusBar/SdStatusBar.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Components/StatusBar/SdStatusBar.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -65,24 +65,25 @@
modeStatusBarPanel.HasResizeGrip = false;
this.PackStart (modeStatusBarPanel, true, true, 0);
+ Progress.Visible = false;
+ Progress.PulseStep = 0.3;
+
this.ShowAll ();
}
public void ShowErrorMessage(string message)
{
- txtStatusBarPanel.Push (ctx, "Error : " + message);
+ txtStatusBarPanel.Push (ctx, String.Format (GettextCatalog.GetString ("Error : {0}"), message));
}
public void ShowErrorMessage(Image image, string message)
{
- txtStatusBarPanel.Push (ctx, "Error : " + message);
+ txtStatusBarPanel.Push (ctx, String.Format (GettextCatalog.GetString ("Error : {0}"), message));
}
public void SetCursorPosition (int ln, int col, int ch)
{
- // FIXME: I18N
- // FIXME: Properly space, perhaps 3 seperate Labels
- cursorStatusBarPanel.Push (ctx, String.Format ("ln {0} col {1} ch {2}", ln, col, ch));
+ cursorStatusBarPanel.Push (ctx, String.Format (GettextCatalog.GetString ("ln {0} col {1} ch {2}"), ln, col, ch));
}
public void SetMessage (string message)
@@ -101,7 +102,7 @@
SetMessage (name);
this.Progress.Visible = true;
}
-
+
public void Worked (double work, string status)
{
this.Progress.Fraction = work;
@@ -111,9 +112,17 @@
public void Done ()
{
txtStatusBarPanel.Pop (ctx);
+ this.Progress.Fraction = 0.0;
this.Progress.Visible = false;
}
+
+ public void Pulse ()
+ {
+ this.Progress.Visible = true;
+ this.Progress.Pulse ();
+ }
+
public bool Canceled
{
get {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -10,6 +10,7 @@
using MonoDevelop.Gui;
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
//using MonoDevelop.Gui.HtmlControl;
using Gdk;
@@ -53,7 +54,7 @@
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
image = resourceService.GetBitmap ("Icons.AboutImage");
- text = "<b>Ported and developed by:</b>\nTodd Berman\nPedro Abelleira Seco\nJohn Luke\nDaniel Kornhauser\norph\nnricciar\nJohn Bou Antoun\nBen Maurer\nJeroen Zwartepoorte\nGustavo Giráldez\nMiguel de Icaza";
+ text = "<b>Ported and developed by:</b>\nTodd Berman\nPedro Abelleira Seco\nJohn Luke\nDaniel Kornhauser\nAlex Graveley\nnricciar\nJohn Bou Antoun\nBen Maurer\nJeroen Zwartepoorte\nGustavo Giráldez\nMiguel de Icaza\nInigo Illan\nIain McCoy\nNick Drochak\nPaweł Różański\nRichard Torkar\nErik Dasque ";
//text = "\"The most successful method of programming is to begin a program as simply as possible, test it, and then add to the program until it performs the required job.\"\n -- PDP8 handbook, Pg 9-64\n\n\n";
//text = "\"The primary purpose of the DATA statement is to give names to constants; instead of referring to pi as 3.141592653589793 at every\n appearance, the variable PI can be given that value with a DATA statement and used instead of the longer form of the constant. This also simplifies modifying the program, should the value of pi change.\"\n -- FORTRAN manual for Xerox computers\n\n\n";
@@ -85,7 +86,7 @@
{
this.GdkWindow.DrawLayout (this.Style.TextGC (StateType.Normal), 200, 0 - scroll, layout);
- if (scroll > 220 ) {
+ if (scroll > 275 ) {
scroll = -scroll;
}
}
@@ -110,29 +111,32 @@
public class CommonAboutDialog : Dialog
{
- static GLib.GType type;
+ static GLib.GType gtype;
static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
AuthorAboutTabPage aatp;
//ChangeLogTabPage changelog;
ScrollBox aboutPictureScrollBox;
- static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ //static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- static CommonAboutDialog ()
+ public static new GLib.GType GType
{
- type = RegisterGType (typeof (CommonAboutDialog));
+ get {
+ if (gtype == GLib.GType.Invalid)
+ gtype = RegisterGType (typeof (CommonAboutDialog));
+ return gtype;
+ }
}
- public CommonAboutDialog() : base ("About MonoDevelop", (Gtk.Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent)
+ public CommonAboutDialog () : base (GType)
{
- ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService(typeof (IResourceService));
+ this.Title = GettextCatalog.GetString ("About MonoDevelop");
+ this.TransientFor = (Gtk.Window) WorkbenchSingleton.Workbench;
+ //ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService(typeof (IResourceService));
aboutPictureScrollBox = new ScrollBox ();
this.VBox.PackStart (aboutPictureScrollBox);
- Label copyright = new Label ("(c) 2000-2003 by icsharpcode.net");
- copyright.Justify = Justification.Left;
- this.VBox.PackStart (copyright, false, true, 0);
Notebook nb = new Notebook ();
nb.SetSizeRequest (400, 280);
@@ -141,10 +145,11 @@
//changelog = new ChangeLogTabPage ();
VersionInformationTabPage vinfo = new VersionInformationTabPage ();
- nb.AppendPage (new AboutMonoDevelopTabPage (), new Label ("About MonoDevelop"));
+ nb.AppendPage (new AboutMonoDevelopTabPage (), new Label (GettextCatalog.GetString ("About MonoDevelop")));
//nb.AppendPage (aatp, new Label ("Authors"));
//nb.AppendPage (changelog, new Label ("ChangeLog"));
- nb.AppendPage (vinfo, new Label ("Version Info"));
+
+ nb.AppendPage (vinfo, new Label (GettextCatalog.GetString ("Version Info")));
this.VBox.PackStart (nb);
this.AddButton (Gtk.Stock.Close, (int) ResponseType.Close);
this.ShowAll ();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewFileDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewFileDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -48,7 +48,6 @@
public NewFileDialog () : base ()
{
- this.Title = "New file";
this.TransientFor = (Window) WorkbenchSingleton.Workbench;
this.BorderWidth = 6;
this.HasSeparator = false;
@@ -82,7 +81,7 @@
imglist.Add(bitmap);
tmp[entry.Key] = ++i;
} else {
- Console.WriteLine("can't load bitmap " + entry.Key.ToString() + " using default");
+ Console.WriteLine(GettextCatalog.GetString ("Can't load bitmap {0} using default"), entry.Key.ToString ());
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewLayoutDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewLayoutDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewLayoutDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -10,7 +10,7 @@
namespace MonoDevelop.Gui.Dialogs
{
- public class NewLayoutDialog
+ public class NewLayoutDialog : IDisposable
{
IWorkbenchLayout wbLayout = WorkbenchSingleton.Workbench.WorkbenchLayout;
string[] existentLayouts;
@@ -35,6 +35,11 @@
existentLayouts = wbLayout.Layouts;
}
+ public void Dispose ()
+ {
+ newLayoutDialog.Dispose ();
+ }
+
void OnNameChanged (object obj, EventArgs args)
{
newButton.Sensitive = (layoutName.Text != "" &&
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -158,7 +158,7 @@
void PathChanged (object sender, EventArgs e)
{
ActivateIfReady ();
- lbl_will_save_in.Text = resourceService.GetString("Dialog.NewProject.ProjectAtDescription") + " " + ProjectSolution;
+ lbl_will_save_in.Text = GettextCatalog.GetString("Project will be saved at") + " " + ProjectSolution;
}
public bool IsFilenameAvailable(string fileName)
@@ -203,7 +203,7 @@
//The one below seemed to be failing sometimes.
if(solution.IndexOfAny("$#@!%^&*/?\\|'\";:}{".ToCharArray()) > -1) {
- messageService.ShowError("Illegal project name. \nOnly use letters, digits, space, '.' or '_'.");
+ messageService.ShowError(GettextCatalog.GetString ("Illegal project name. \nOnly use letters, digits, space, '.' or '_'."));
dialog.Respond(Gtk.ResponseType.Reject);
dialog.Hide();
return;
@@ -213,14 +213,12 @@
&& (!fileUtilityService.IsValidFileName (solution) || solution.IndexOf(System.IO.Path.DirectorySeparatorChar) >= 0)) ||
!fileUtilityService.IsValidFileName(name) || name.IndexOf(System.IO.Path.DirectorySeparatorChar) >= 0 ||
!fileUtilityService.IsValidFileName(location)) {
- messageService.ShowError("Illegal project name.\nOnly use letters, digits, space, '.' or '_'.");
- dialog.Respond(Gtk.ResponseType.Reject);
- dialog.Hide();
+ messageService.ShowError(GettextCatalog.GetString ("Illegal project name.\nOnly use letters, digits, space, '.' or '_'."));
return;
}
if(projService.ExistsEntryWithName(name)) {
- messageService.ShowError("A Project with that name is already in your Project Space");
+ messageService.ShowError(GettextCatalog.GetString ("A Project with that name is already in your Project Space"));
dialog.Respond(Gtk.ResponseType.Reject);
dialog.Hide();
return;
@@ -277,7 +275,7 @@
NewCombineLocation = fileUtilityService.GetDirectoryNameWithSeparator(ProjectLocation) + ((TextBox)ControlDictionary["nameTextBox"]).Text + ".cmbx";
if (File.Exists(NewCombineLocation)) {
- DialogResult result = MessageBox.Show("Combine file " + NewCombineLocation + " already exists, do you want to overwrite\nthe existing file ?", "File already exists", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
+ DialogResult result = MessageBox.Show(String.Format (Gettext.GetString ("Combine file {0} already exists, do you want to overwrite\nthe existing file ?"), NewCombineLocation), Gettext.GetString ("File already exists"), MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
switch(result) {
case DialogResult.Yes:
cmb.SaveCombine(NewCombineLocation);
@@ -289,7 +287,7 @@
cmb.SaveCombine(NewCombineLocation);
}
} else {
- MessageBox.Show(resourceService.GetString("Dialog.NewProject.EmptyProjectFieldWarning"), "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ MessageBox.Show(GettextCatalog.GetString ("The project or source entry is empty, can't create project."), GettextCatalog.GetString ("Warning"), MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
#endif
}
@@ -347,12 +345,7 @@
TemplateView = new IconView ();
hbox_template.PackStart (TemplateView, true, true, 0);
- //string label = stringParserService.Parse ("${res:Dialog.NewProject.NewSolutionLabelText}");
- //label = stringParserService.Parse ("${res:Dialog.NewProject.LocationLabelText}");
- //label = stringParserService.Parse ("${res:Dialog.NewProject.NameLabelText}");
- //label = stringParserService.Parse ("${res:Dialog.NewProject.checkBox1Text}");
- //label = stringParserService.Parse ("${res:Dialog.NewProject.autoCreateSubDirCheckBox}");
- entry_location = new FolderEntry ("Combine Location");
+ entry_location = new FolderEntry (GettextCatalog.GetString ("Combine Location"));
hbox_for_browser.PackStart (entry_location, true, true, 0);
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -10,6 +10,7 @@
using MonoDevelop.Internal.Templates;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
namespace MonoDevelop.Gui.Dialogs
{
@@ -55,14 +56,13 @@
{
// set up this actual dialog
this.Modal = true;
- this.Title = StringParserService.Parse("${res:Dialog.Options.CodeTemplate.EditTemplateDialog.DialogName}");
// set up the dialog fields and add them
templateTextBox = new Gtk.Entry();
descriptionTextBox = new Gtk.Entry();
descriptionTextBox.ActivatesDefault = true;
- Gtk.Label label1 = new Gtk.Label(StringParserService.Parse("${res:Dialog.Options.CodeTemplate.EditTemplateDialog.DescriptionLabel}"));
- Gtk.Label label2 = new Gtk.Label(StringParserService.Parse("${res:Dialog.Options.CodeTemplate.EditTemplateDialog.TemplateLabel}"));
+ Gtk.Label label1 = new Gtk.Label(GettextCatalog.GetString ("_Description"));
+ Gtk.Label label2 = new Gtk.Label(GettextCatalog.GetString ("_Template"));
label1.Xalign = 0;
label2.Xalign = 0;
templateTextBox.Text = codeTemplate.Shortcut;
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -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: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -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: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -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: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -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: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -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
//
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -17,6 +17,7 @@
using MonoDevelop.Core.Services;
using MonoDevelop.Core.Properties;
using MonoDevelop.Gui.Components;
+using MonoDevelop.Services;
using Gtk;
using MonoDevelop.Gui.Widgets;
@@ -49,8 +50,6 @@
{
this.project = (IProject)((IProperties)CustomizationObject).GetProperty("Project");
- includeLabel.Text = StringParserService.Parse(
- "${res:Dialog.Options.PrjOptions.CompileFile.IncludeGroupBox}");
includeLabel.UseUnderline = true;
store = new ListStore (typeof(bool), typeof(string));
includeTreeView.Selection.Mode = SelectionMode.None;
@@ -100,12 +99,11 @@
if (j < project.ProjectFiles.Count) {
project.ProjectFiles[j].BuildAction = (bool) store.GetValue(current, 0) ? BuildAction.Compile : BuildAction.Nothing;
} else {
- string message = "File " + name + " not found in " + project.Name;
MessageDialog dialog = new MessageDialog ((Window) WorkbenchSingleton.Workbench,
DialogFlags.DestroyWithParent,
MessageType.Error,
ButtonsType.Close,
- message);
+ String.Format (GettextCatalog.GetString ("File {0} not found in {1}."), name, project.Name));
dialog.Run ();
dialog.Hide ();
dialog.Dispose ();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -17,6 +17,8 @@
using MonoDevelop.Core.AddIns.Codons;
using MonoDevelop.Gui.Components;
+using MonoDevelop.Services;
+
using Gtk;
using MonoDevelop.Gui.Widgets;
@@ -94,7 +96,7 @@
//FIXME : Finish details in this dialog.
void SelectScriptFileEvent(object sender, EventArgs e)
{
- using (FileSelection fs = new FileSelection ("Select your File")) { // Put correct title
+ using (FileSelection fs = new FileSelection (GettextCatalog.GetString ("Select your File"))) { // Put correct title
fs.Complete("*.txt");
if ( fs.Run () == (int) ResponseType.Ok) {
deployScriptEntry.Text = fs.SelectionEntry.Text;
@@ -105,7 +107,7 @@
void SelectTargetFolderEvent(object sender, EventArgs e)
{
- using (FileSelection fs = new FileSelection ("${res:Dialog.Options.PrjOptions.DeployFile.FolderDialogDescription}")) {
+ using (FileSelection fs = new FileSelection (GettextCatalog.GetString ("Select the target directory"))) {
if ( fs.Run () == (int) ResponseType.Ok) {
deployTargetEntry.Text = fs.SelectionEntry.Text;
}
@@ -139,7 +141,7 @@
DialogFlags.DestroyWithParent,
MessageType.Error,
ButtonsType.Close,
- "Invalid deploy target specified");
+ GettextCatalog.GetString ("Invalid deploy target specified"));
dialog.Run ();
dialog.Hide ();
dialog.Dispose ();
@@ -153,7 +155,7 @@
DialogFlags.DestroyWithParent,
MessageType.Error,
ButtonsType.Close,
- "Invalid deploy script specified");
+ GettextCatalog.GetString ("Invalid deploy script specified"));
dialog.Run ();
dialog.Hide ();
dialog.Dispose ();
@@ -166,7 +168,7 @@
DialogFlags.DestroyWithParent,
MessageType.Error,
ButtonsType.Close,
- "Deploy script doesn't exists");
+ GettextCatalog.GetString ("Deploy script doesn't exists"));
dialog.Run ();
dialog.Hide ();
dialog.Dispose ();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -54,26 +54,10 @@
{
this.project = (IProject)((IProperties)CustomizationObject).GetProperty("Project");
- nameLabel.Text = StringParserService.Parse(
- "${res:Dialog.Options.PrjOptions.General.ProjectNameLabel}");
nameLabel.UseUnderline = true;
- descriptionLabel.Text = StringParserService.Parse(
- "${res:Dialog.Options.PrjOptions.General.ProjectDescriptionLabel}");
descriptionLabel.UseUnderline = true;
- // FIXME: il8n this
- informationHeaderLabel.Markup = "<b>" + "Project Information" + "</b>";
- // FIXME: il8n this
- onProjectLoadHeaderLabel.Markup = "<b>" + "On Project Load" + "</b>";
-
- newFilesOnLoadCheckButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.PrjOptions.General.SearchNewFileOnLoadCheckBox}");
- autoInsertNewFilesCheckButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.PrjOptions.General.AutoIncludeFilesCheckBox}");
- enableViewStateCheckButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.PrjOptions.General.ViewStateCheckBox}" );
-
projectNameEntry.Text = project.Name;
projectDescriptionTextView.Buffer.Text = project.Description;
enableViewStateCheckButton.Active = project.EnableViewState;
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -37,7 +37,7 @@
{
this.project = project;
this.configurationNode = configurationNode;
- this.Title = StringParserService.Parse("${res:Dialog.Options.ProjectOptions.DialogName}");
+ this.Title = GettextCatalog.GetString ("Project Options");
properties = new DefaultProperties();
properties.SetProperty("Project", project);
@@ -56,13 +56,13 @@
void AddConfigurationNodes()
{
- configurationTreeNode = treeStore.AppendValues (StringParserService.Parse("${res:Dialog.Options.ProjectOptions.ConfigurationsNodeName}"), null);
+ configurationTreeNode = treeStore.AppendValues (GettextCatalog.GetString ("Configurations"), null);
foreach (IConfiguration config in project.Configurations) {
Gtk.TreeIter newNode ;
if (config == project.ActiveConfiguration) {
- newNode = treeStore.AppendValues (configurationTreeNode, config.Name + " (Active)", config);
+ newNode = treeStore.AppendValues (configurationTreeNode, config.Name + " " + GettextCatalog.GetString ("(Active)"), config);
//newNode.NodeFont = boldFont;
} else {
newNode = treeStore.AppendValues (configurationTreeNode, config.Name, config);
@@ -173,7 +173,7 @@
// determine if this is the active config
IConfiguration config = (IConfiguration) treeStore.GetValue(node, 1);
if (project.ActiveConfiguration == config) {
- treeStore.SetValue(node, 0, config.Name + " (Active)");
+ treeStore.SetValue(node, 0, config.Name + " " + GettextCatalog.GetString ("(Active)"));
} else {
treeStore.SetValue(node, 0, config.Name);
}
@@ -206,7 +206,7 @@
// see if it's the active columne (if so remove the active text on the end) before editing
if (project.ActiveConfiguration == config) {
string name = (string) mdl.GetValue(iter, 0);
- name = name.Replace(" (Active)", string.Empty);
+ name = name.Replace(" " + GettextCatalog.GetString ("(Active)"), string.Empty);
mdl.SetValue(iter, 0, name);
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -10,6 +10,7 @@
using System.Text;
using MonoDevelop.Internal.Project;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
using Gtk;
@@ -23,7 +24,7 @@
{
this.selectDialog = selectDialog;
// FIXME: il8n this
- Gtk.Button browseButton = new Gtk.Button("Browse");
+ Gtk.Button browseButton = new Gtk.Button(GettextCatalog.GetString ("Browse"));
browseButton.Clicked += new EventHandler(SelectReferenceDialog);
PackStart(browseButton, false, false, 6);
ShowAll();
@@ -33,7 +34,7 @@
{
// FIXME: il8n the dialog name
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- using (FileSelection fdiag = new FileSelection("Find .Net Assembly")) {
+ using (FileSelection fdiag = new FileSelection(GettextCatalog.GetString ("Find .Net Assembly"))) {
// FIXME: this should only allow dll's and exe's
// fdiag.Complete("*");
fdiag.SelectMultiple = true;
@@ -58,7 +59,7 @@
} else {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
// FIXME: il8n this
- messageService.ShowError("File " + file + "is not a valid .Net Assembly");
+ messageService.ShowError(String.Format (GettextCatalog.GetString ("File {0} is not a valid .Net Assembly"), file));
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -14,6 +14,7 @@
using MonoDevelop.Internal.Project;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
using Gtk;
@@ -35,7 +36,7 @@
treeView = new TreeView (store);
TreeViewColumn firstColumn = new TreeViewColumn ();
- firstColumn.Title = resourceService.GetString ("Dialog.SelectReferenceDialog.GacReferencePanel.ReferenceHeader");
+ firstColumn.Title = GettextCatalog.GetString ("Reference Name");
CellRendererToggle tog_render = new CellRendererToggle ();
tog_render.Toggled += new Gtk.ToggledHandler (AddReference);
firstColumn.PackStart (tog_render, false);
@@ -46,8 +47,8 @@
firstColumn.AddAttribute (text_render, "text", 0);
treeView.AppendColumn (firstColumn);
- treeView.AppendColumn (resourceService.GetString ("Dialog.SelectReferenceDialog.GacReferencePanel.VersionHeader"), new CellRendererText (), "text", 1);
- treeView.AppendColumn (resourceService.GetString ("Dialog.SelectReferenceDialog.GacReferencePanel.PathHeader"), new CellRendererText (), "text", 2);
+ treeView.AppendColumn (GettextCatalog.GetString ("Version"), new CellRendererText (), "text", 1);
+ treeView.AppendColumn (GettextCatalog.GetString ("Path"), new CellRendererText (), "text", 2);
PrintCache();
@@ -122,7 +123,7 @@
//FIXME: gac.
System.Reflection.MethodInfo gac = typeof (System.Environment).GetMethod ("internalGetGacPath", System.Reflection.BindingFlags.Static|System.Reflection.BindingFlags.NonPublic);
if (gac == null) {
- Console.WriteLine ("ERROR: non-mono runtime detected, please use the mono runtime for this piece of MonoDevelop for the time being");
+ Console.WriteLine (GettextCatalog.GetString ("ERROR: non-mono runtime detected, please use the mono runtime for this piece of MonoDevelop for the time being"));
Environment.Exit (1);
}
string gac_path = System.IO.Path.Combine ((string)gac.Invoke (null, null), "");
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -30,8 +30,8 @@
store = new TreeStore (typeof (string), typeof (string), typeof(IProject));
treeView = new TreeView (store);
- treeView.AppendColumn (resourceService.GetString ("Dialog.SelectReferenceDialog.ProjectReferencePanel.NameHeader"), new CellRendererText (), "text", 0);
- treeView.AppendColumn (resourceService.GetString ("Dialog.SelectReferenceDialog.ProjectReferencePanel.DirectoryHeader"), new CellRendererText (), "text", 1);
+ treeView.AppendColumn (GettextCatalog.GetString ("Project Name"), new CellRendererText (), "text", 0);
+ treeView.AppendColumn (GettextCatalog.GetString ("Project Directory"), new CellRendererText (), "text", 1);
PopulateListView ();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -13,6 +13,7 @@
using MonoDevelop.Internal.Project;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
using Gtk;
@@ -69,14 +70,12 @@
Glade.XML refXML = new Glade.XML (null, "Base.glade", "AddReferenceDialog", null);
refXML.Autoconnect (this);
- AddReferenceDialog.Title = resourceService.GetString("Dialog.SelectReferenceDialog.DialogName");
-
refTreeStore = new Gtk.TreeStore (typeof (string), typeof(string), typeof(string), typeof(ProjectReference));
ReferencesTreeView.Model = refTreeStore;
- ReferencesTreeView.AppendColumn (resourceService.GetString("Dialog.SelectReferenceDialog.ReferenceHeader"), new CellRendererText (), "text", 0);
- ReferencesTreeView.AppendColumn (resourceService.GetString ("Dialog.SelectReferenceDialog.TypeHeader"), new CellRendererText (), "text", 1);
- ReferencesTreeView.AppendColumn (resourceService.GetString ("Dialog.SelectReferenceDialog.LocationHeader"), new CellRendererText (), "text", 2);
+ ReferencesTreeView.AppendColumn (GettextCatalog.GetString("Reference Name"), new CellRendererText (), "text", 0);
+ ReferencesTreeView.AppendColumn (GettextCatalog.GetString ("Type"), new CellRendererText (), "text", 1);
+ ReferencesTreeView.AppendColumn (GettextCatalog.GetString ("Location"), new CellRendererText (), "text", 2);
gacRefPanel = new GacReferencePanel (this);
@@ -92,10 +91,10 @@
}
}
mainBook.RemovePage (mainBook.CurrentPage);
- mainBook.AppendPage (gacRefPanel, new Gtk.Label ("System Assemblies"));
- mainBook.AppendPage (new ProjectReferencePanel (this), new Gtk.Label (resourceService.GetString("Dialog.SelectReferenceDialog.ProjectTabPage")));
+ mainBook.AppendPage (gacRefPanel, new Gtk.Label (GettextCatalog.GetString ("System Assemblies")));
+ mainBook.AppendPage (new ProjectReferencePanel (this), new Gtk.Label (GettextCatalog.GetString ("Projects")));
// FIXME il8n the assembly tab name
- mainBook.AppendPage (new AssemblyReferencePanel (this), new Gtk.Label (".Net Assembly"));
+ mainBook.AppendPage (new AssemblyReferencePanel (this), new Gtk.Label (GettextCatalog.GetString (".Net Assembly")));
//comTabPage.Controls.Add(new COMReferencePanel(this));
AddReferenceDialog.ShowAll ();
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -6,13 +6,11 @@
// </file>
using System;
-using System.Drawing;
-using Gtk;
-
using System.IO;
using System.Text;
using System.Reflection;
+using Gtk;
using MonoDevelop.Gui;
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
@@ -25,11 +23,10 @@
public class AboutMonoDevelopTabPage : VBox
{
static GLib.GType gtype;
- Label buildLabel = new Label ();
- Label buildTextBox = new Label ();
- Label versionLabel = new Label ();
- Label versionTextBox = new Label ();
- Label sponsorLabel = new Label ();
+ Label versionLabel = new Label ();
+ Label sponsorLabel = new Label ();
+ Label licenseLabel = new Label ();
+ Label copyrightLabel = new Label ();
public static new GLib.GType GType
{
@@ -43,33 +40,29 @@
public AboutMonoDevelopTabPage() : base (GType)
{
- HBox hbox = new HBox (false, 0);
Version v = Assembly.GetEntryAssembly().GetName().Version;
- versionTextBox.Text = v.Major + "." + v.Minor;
- buildTextBox.Text = v.Revision + "." + v.Build;
+ versionLabel.Markup = String.Format ("<b>{0}</b>\n {1}", GettextCatalog.GetString("Version"), v.Major + "." + v.Minor);
+ HBox hboxVersion = new HBox ();
+ hboxVersion.PackStart (versionLabel, false, false, 5);
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- versionLabel.Text = resourceService.GetString("Dialog.About.label1Text");
-
- //versionLabel.TabIndex = 1;
- hbox.PackStart (versionLabel, false, false, 10);
-
- //versionTextBox.TabIndex = 4;
- hbox.PackStart (versionTextBox, false, false, 10);
-
- buildLabel.Text = resourceService.GetString("Dialog.About.label2Text");
- //buildLabel.TabIndex = 2;
- hbox.PackStart (buildLabel, false, false, 10);
-
- //buildTextBox.TabIndex = 3;
- hbox.PackStart (buildTextBox, false, false, 10);
- this.PackStart (hbox, false, false, 5);
-
- sponsorLabel.Text = "Released under the GNU General Public license.";
- // "Sponsored by AlphaSierraPapa\n" +
- // " http://www.AlphaSierraPapa.com";
- //sponsorLabel.TabIndex = 8;
- this.PackStart (sponsorLabel, false, false, 5);
+ //FIXME why do they align in the center always
+ HBox hboxLicense = new HBox ();
+ licenseLabel.Markup = String.Format ("<b>License</b>\n {0}", GettextCatalog.GetString ("Released under the GNU General Public license."));
+ hboxLicense.PackStart (licenseLabel, false, false, 5);
+
+ // FIXME should this be translated
+ HBox hboxSponsor = new HBox ();
+ sponsorLabel.Markup = "<b>Sponsors</b>\n SharpDevelop is sponsored by AlphaSierraPapa\n <span foreground=\"blue\">http://www.AlphaSierraPapa.com</span>\n <span foreground=\"blue\">http://icsharpcode.net/opensource/sd</span>";
+ hboxSponsor.PackStart (sponsorLabel, false, false, 5);
+
+ HBox hboxCopyright = new HBox ();
+ copyrightLabel.Markup = "<b>Copyright</b>\n (c) 2000-2003 by icsharpcode.net\n (c) 2004 by MonoDevelop contributors";
+ hboxCopyright.PackStart (copyrightLabel, false, false, 5);
+
+ this.PackStart (hboxVersion, false, true, 0);
+ this.PackStart (hboxLicense, false, true, 5);
+ this.PackStart (hboxCopyright, false, true, 5);
+ this.PackStart (hboxSponsor, false, true, 5);
this.ShowAll ();
}
}
@@ -172,9 +165,9 @@
TreeView listView = new TreeView ();
listView.RulesHint = true;
- listView.AppendColumn (resourceService.GetString("Dialog.About.VersionInfoTabName.NameColumn"), new CellRendererText (), "text", 0);
- listView.AppendColumn (resourceService.GetString("Dialog.About.VersionInfoTabName.VersionColumn"), new CellRendererText (), "text", 1);
- listView.AppendColumn (resourceService.GetString("Dialog.About.VersionInfoTabName.PathColumn"), new CellRendererText (), "text", 2);
+ listView.AppendColumn (GettextCatalog.GetString ("Name"), new CellRendererText (), "text", 0);
+ listView.AppendColumn (GettextCatalog.GetString ("Version"), new CellRendererText (), "text", 1);
+ listView.AppendColumn (GettextCatalog.GetString ("Path"), new CellRendererText (), "text", 2);
FillListView ();
ScrolledWindow sw = new ScrolledWindow ();
@@ -182,10 +175,10 @@
this.PackStart (sw);
HBox hbox = new HBox (false, 0);
- button = new Button (Gtk.Stock.Copy);
- button.Clicked += new EventHandler(CopyButtonClick);
+ //button = new Button (Gtk.Stock.Copy);
+ //button.Clicked += new EventHandler(CopyButtonClick);
hbox.PackStart (new Label (), false, true, 3);
- hbox.PackStart (button, false, false, 3);
+ //hbox.PackStart (button, false, false, 3);
hbox.PackStart (new Label (), false, true, 3);
this.PackStart (hbox, false, false, 6);
@@ -202,9 +195,9 @@
string loc;
try {
- loc = asm.Location;
+ loc = System.IO.Path.GetFullPath (asm.Location);
} catch (Exception) {
- loc = "dynamic";
+ loc = GettextCatalog.GetString ("dynamic");
}
store.AppendValues (name.Name, name.Version.ToString(), loc);
@@ -215,8 +208,6 @@
void CopyButtonClick(object o, EventArgs args)
{
- clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
-
StringBuilder versionInfo = new StringBuilder();
foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies()) {
AssemblyName name = asm.GetName();
@@ -225,15 +216,19 @@
versionInfo.Append(name.Version.ToString());
versionInfo.Append(",");
try {
- versionInfo.Append(asm.Location);
+ versionInfo.Append(System.IO.Path.GetFullPath (asm.Location));
} catch (Exception) {
- versionInfo.Append("dynamic");
+ versionInfo.Append(GettextCatalog.GetString ("dynamic"));
}
versionInfo.Append(Environment.NewLine);
}
+ // set to both the X and normal clipboards
+ clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
clipboard.SetText (versionInfo.ToString ());
+ clipboard = Clipboard.Get (Gdk.Atom.Intern ("PRIMARY", false));
+ clipboard.SetText (versionInfo.ToString ());
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -10,8 +10,6 @@
using System.Xml;
using Gtk;
-using GtkSharp;
-
using MonoDevelop.Gui;
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
@@ -42,7 +40,7 @@
tipOfTheDayWindow.TypeHint = Gdk.WindowTypeHint.Dialog;
- noshowCheckbutton.Active = propertyService.GetProperty ("MonoDevelop.Gui.Dialog.TipOfTheDayView.ShowTipsAtStartup", true);
+ noshowCheckbutton.Active = propertyService.GetProperty ("MonoDevelop.Gui.Dialog.TipOfTheDayView.ShowTipsAtStartup", false);
noshowCheckbutton.Toggled += new EventHandler (OnNoshow);
nextButton.Clicked += new EventHandler (OnNext);
closeButton.Clicked += new EventHandler (OnClose);
@@ -71,27 +69,29 @@
currentTip = (new Random ().Next ()) % nodes.Count;
}
- public void OnNoshow (object obj, EventArgs args)
+ void OnNoshow (object obj, EventArgs args)
{
propertyService.SetProperty ("MonoDevelop.Gui.Dialog.TipOfTheDayView.ShowTipsAtStartup",
noshowCheckbutton.Active);
}
- public void OnNext (object obj, EventArgs args)
+ void OnNext (object obj, EventArgs args)
{
tipTextview.Buffer.Clear ();
currentTip = ++currentTip % tips.Length;
tipTextview.Buffer.InsertAtCursor (tips[currentTip]);
}
- public void OnClose (object obj, EventArgs args)
+ void OnClose (object obj, EventArgs args)
{
- tipOfTheDayWindow.Destroy ();
+ tipOfTheDayWindow.Hide ();
+ tipOfTheDayWindow.Dispose ();
}
- public void OnDelete (object obj, DeleteEventArgs args)
+ void OnDelete (object obj, DeleteEventArgs args)
{
- tipOfTheDayWindow.Destroy ();
+ tipOfTheDayWindow.Hide ();
+ tipOfTheDayWindow.Dispose ();
}
public void Show ()
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -150,7 +150,7 @@
TreeViewOptionDialog.TransientFor = (Gtk.Window)WorkbenchSingleton.Workbench;
TreeViewOptionDialog.WindowPosition = Gtk.WindowPosition.CenterOnParent;
- TreeViewOptionDialog.Title = StringParserService.Parse("${res:Dialog.Options.TreeViewOptions.DialogName}");
+ TreeViewOptionDialog.Title = GettextCatalog.GetString ("MonoDevelop options");
this.InitializeComponent();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ViewGPLDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ViewGPLDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/ViewGPLDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -14,7 +14,7 @@
namespace MonoDevelop.Gui.Dialogs
{
- public class ViewGPLDialog
+ public class ViewGPLDialog : IDisposable
{
[Glade.Widget] Gtk.TextView view;
[Glade.Widget] Gtk.Dialog GPLDialog;
@@ -36,6 +36,11 @@
}
}
+ public void Dispose ()
+ {
+ GPLDialog.Dispose ();
+ }
+
protected void OnCloseButtonClicked(object sender, EventArgs e)
{
GPLDialog.Hide();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/WordCountDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/WordCountDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Dialogs/WordCountDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -55,7 +55,7 @@
public static Report operator+(Report r, Report s)
{
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- Report tmpReport = new Report (resourceService.GetString ("Dialog.WordCountDialog.TotalText"), s.chars, s.words, s.lines);
+ Report tmpReport = new Report (GettextCatalog.GetString("total"), s.chars, s.words, s.lines);
tmpReport.chars += r.chars;
tmpReport.words += r.words;
@@ -97,7 +97,7 @@
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if (window != null) {
if (window.ViewContent.ContentName == null) {
- messageService.ShowWarning ("${res:Dialog.WordCountDialog.SaveTheFileWarning}");
+ messageService.ShowWarning (GettextCatalog.GetString ("You must save the file"));
} else {
Report r = GetReport(window.ViewContent.ContentName);
if (r != null) items.Add(r);
@@ -111,10 +111,10 @@
if (WorkbenchSingleton.Workbench.ViewContentCollection.Count > 0) {
bool dirty = false;
- total = new Report (stringParserService.Parse ("${res:Dialog.WordCountDialog.TotalText}"), 0, 0, 0);
+ total = new Report (GettextCatalog.GetString ("total"), 0, 0, 0);
foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
if (content.ContentName == null) {
- messageService.ShowWarning ("${res:Dialog.WordCountDialog.SaveAllFileWarning}");
+ messageService.ShowWarning (GettextCatalog.GetString ("You must save the file"));
continue;
} else {
Report r = GetReport(content.ContentName);
@@ -129,7 +129,7 @@
}
if (dirty) {
- messageService.ShowWarning ("${res:Dialog.WordCountDialog.DirtyWarning}");
+ messageService.ShowWarning (GettextCatalog.GetString ("Unsaved changed to open files were not included in counting"));
}
store.AppendValues ("", "", "", "");
@@ -142,10 +142,10 @@
IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
if (projectService.CurrentOpenCombine == null) {
- messageService.ShowError ("${res:Dialog.WordCountDialog.MustBeInProtectedModeWarning}");
+ messageService.ShowError (GettextCatalog.GetString ("You must be in project mode"));
break;
}
- total = new Report (stringParserService.Parse ("${res:Dialog.WordCountDialog.TotalText}"), 0, 0, 0);
+ total = new Report (GettextCatalog.GetString ("total"), 0, 0, 0);
CountCombine(projectService.CurrentOpenCombine, ref total);
store.AppendValues ("", "", "", "");
//string[] allItems = all.ToListItem ();
@@ -250,23 +250,19 @@
void SortEvt (object sender, EventArgs e)
{
TreeViewColumn col = (TreeViewColumn) sender;
+ string file = GettextCatalog.GetString ("File");
+ string chars = GettextCatalog.GetString ("Chars");
+ string words = GettextCatalog.GetString ("Words");
+ string lines = GettextCatalog.GetString ("Lines");
- switch (col.Title) {
- case "file":
+ if (file == col.Title)
store.SetSortColumnId (0, ReverseSort (col.SortOrder));
- break;
- case "Chars":
+ else if (chars == col.Title)
store.SetSortColumnId (1, ReverseSort (col.SortOrder));
- break;
- case "Words":
+ else if (words == col.Title)
store.SetSortColumnId (2, ReverseSort (col.SortOrder));
- break;
- case "Lines":
+ else if (lines == col.Title)
store.SetSortColumnId (3, ReverseSort (col.SortOrder));
- break;
- default:
- break;
- }
//UpdateList ((TreeViewColumn)e.Column);
}
@@ -293,7 +289,7 @@
void InitializeComponents()
{
this.SetDefaultSize (300, 300);
- this.Title = "Word Count";
+ this.Title = GettextCatalog.GetString ("Word Count");
Button startButton = new Button (Gtk.Stock.Execute);
startButton.Clicked += new EventHandler (startEvent);
@@ -305,23 +301,24 @@
scrolledwindow = new ScrolledWindow();
scrolledwindow.VscrollbarPolicy = PolicyType.Automatic;
scrolledwindow.HscrollbarPolicy = PolicyType.Never;
+ scrolledwindow.ShadowType = ShadowType.In;
resultListView = new TreeView ();
resultListView.RulesHint = true;
- TreeViewColumn fileColumn = new TreeViewColumn ("file", new CellRendererText (), "text", 0);
+ TreeViewColumn fileColumn = new TreeViewColumn (GettextCatalog.GetString ("File"), new CellRendererText (), "text", 0);
fileColumn.Clicked += new EventHandler (SortEvt);
resultListView.AppendColumn (fileColumn);
- TreeViewColumn charsColumn = new TreeViewColumn ("Chars", new CellRendererText (), "text", 1);
+ TreeViewColumn charsColumn = new TreeViewColumn (GettextCatalog.GetString ("Chars"), new CellRendererText (), "text", 1);
charsColumn.Clicked += new EventHandler (SortEvt);
resultListView.AppendColumn (charsColumn);
- TreeViewColumn wordsColumn = new TreeViewColumn ("Words", new CellRendererText (), "text", 2);
+ TreeViewColumn wordsColumn = new TreeViewColumn (GettextCatalog.GetString ("Words"), new CellRendererText (), "text", 2);
wordsColumn.Clicked += new EventHandler (SortEvt);
resultListView.AppendColumn (wordsColumn);
- TreeViewColumn linesColumn = new TreeViewColumn ("Lines", new CellRendererText (), "text", 3);
+ TreeViewColumn linesColumn = new TreeViewColumn (GettextCatalog.GetString ("Lines"), new CellRendererText (), "text", 3);
linesColumn.Clicked += new EventHandler (SortEvt);
resultListView.AppendColumn (linesColumn);
@@ -334,15 +331,15 @@
this.TransientFor = (Window) WorkbenchSingleton.Workbench;
HBox hbox = new HBox (false, 0);
- Label l = new Label ("_Count where");
+ Label l = new Label (GettextCatalog.GetString ("_Count where"));
hbox.PackStart (l);
OptionMenu locationComboBox = new OptionMenu ();
locationComboBox.Changed += new EventHandler (OnOptionChanged);
Menu m = new Menu ();
- m.Append (new MenuItem (stringParserService.Parse ("${res:Global.Location.currentfile}")));
- m.Append (new MenuItem (stringParserService.Parse ("${res:Global.Location.allopenfiles}")));
- m.Append (new MenuItem (stringParserService.Parse ("${res:Global.Location.wholeproject}")));
+ m.Append (new MenuItem (GettextCatalog.GetString ("Current file")));
+ m.Append (new MenuItem (GettextCatalog.GetString ("All open files")));
+ m.Append (new MenuItem (GettextCatalog.GetString ("Whole solution")));
locationComboBox.Menu = m;
hbox.PackStart (locationComboBox);
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/ErrorHandlers/CombineLoadError.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/ErrorHandlers/CombineLoadError.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/ErrorHandlers/CombineLoadError.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -8,6 +8,8 @@
using System;
using System.IO;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Gui.ErrorHandlers
{
public class CombineLoadError
@@ -23,9 +25,9 @@
bool isProject = filename.ToLower().EndsWith(".prjx");
string errorMessage = string.Format
- ("Could not load the {0} '{1}'.\n\n{2}",
+ (String.Format (GettextCatalog.GetString ("Could not load the {0} '{1}'.\n\n{2}"),
isProject ? "project" : "combine",
- filename, e.Message);
+ filename, e.Message));
GenericError.DisplayError(errorMessage);
} else {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/HtmlControl/MozillaControl.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/HtmlControl/MozillaControl.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/HtmlControl/MozillaControl.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,5 +1,5 @@
//
-// MozillaControl - An Html widget that uses GtkMozEmbed#
+// MozillaControl - An Html widget that uses Gecko#
//
// Author: John Luke <jluke at cfl.rr.com>
//
@@ -94,7 +94,7 @@
public void InitializeWithBase (string base_uri)
{
- Console.WriteLine (base_uri);
+ //Console.WriteLine (base_uri);
if (html.Length > 0)
{
this.RenderData (html, base_uri, "text/html");
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/IWorkbenchLayout.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/IWorkbenchLayout.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/IWorkbenchLayout.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -99,5 +99,7 @@
PadContentCollection PadContentCollection {
get;
}
+
+ void ActiveMdiChanged(object sender, Gtk.SwitchPageArgs e);
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -19,9 +19,7 @@
using MonoDevelop.Core.AddIns;
using MonoDevelop.Core.Properties;
-
using MonoDevelop.Internal.Project;
-
using MonoDevelop.Core.Services;
using MonoDevelop.Services;
using MonoDevelop.Gui.Widgets;
@@ -79,7 +77,7 @@
public string Title {
get {
- return resourceService.GetString("MainWindow.Windows.ClassScoutLabel");
+ return GettextCatalog.GetString("Classes");
}
}
@@ -122,6 +120,7 @@
ambienceService.AmbienceChanged += new EventHandler(AmbienceChangedEvent);
RowActivated += new Gtk.RowActivatedHandler(OnNodeActivated);
+ PopupMenu += OnPopupMenu;
contentPanel.ButtonReleaseEvent += new Gtk.ButtonReleaseEventHandler(OnButtonRelease);
}
@@ -134,12 +133,13 @@
public void RedrawContent()
{
+ Console.WriteLine ("redraw");
}
void OnCombineOpen(object sender, CombineEventArgs e)
{
Nodes.Clear();
- Nodes.Add(new TreeNode("Loading..."));
+ Nodes.Add(new TreeNode(GettextCatalog.GetString ("Loading...")));
StartCombineparse(e.Combine);
}
@@ -215,18 +215,27 @@
*/
private void OnButtonRelease(object sender, Gtk.ButtonReleaseEventArgs args)
{
- //if (e.Button == MouseButtons.Right && SelectedNode != null && SelectedNode is AbstractClassScoutNode) {
if (args.Event.Button == 3 && SelectedNode != null && SelectedNode is AbstractClassScoutNode) {
- AbstractClassScoutNode selectedBrowserNode = (AbstractClassScoutNode)SelectedNode;
- if (selectedBrowserNode.ContextmenuAddinTreePath != null && selectedBrowserNode.ContextmenuAddinTreePath.Length > 0) {
- MenuService menuService = (MenuService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(MenuService));
- menuService.ShowContextMenu(this, selectedBrowserNode.ContextmenuAddinTreePath, this);
- }
+ ShowPopup ();
}
+ }
- //base.OnMouseUp(e);
+ void OnPopupMenu (object o, Gtk.PopupMenuArgs args)
+ {
+ if (SelectedNode != null && SelectedNode is AbstractClassScoutNode) {
+ ShowPopup ();
+ }
}
+ void ShowPopup ()
+ {
+ AbstractClassScoutNode selectedBrowserNode = (AbstractClassScoutNode) SelectedNode;
+ if (selectedBrowserNode.ContextmenuAddinTreePath != null && selectedBrowserNode.ContextmenuAddinTreePath.Length > 0) {
+ MenuService menuService = (MenuService) MonoDevelop.Core.Services.ServiceManager.Services.GetService (typeof (MenuService));
+ menuService.ShowContextMenu(this, selectedBrowserNode.ContextmenuAddinTreePath, this);
+ }
+ }
+
protected virtual void OnTitleChanged(EventArgs e)
{
if (TitleChanged != null) {
@@ -341,7 +350,7 @@
IconService iconService = (IconService)ServiceManager.Services.GetService(typeof(IconService));
//prjNode.SelectedImageIndex = prjNode.ImageIndex = imageIndexOffset + iconService.GetImageIndexForProjectType(p.ProjectType);
prjNode.Image = iconService.GetImageForProjectType(p.ProjectType);
- prjNode.Nodes.Add(new TreeNode("No class builder found"));
+ prjNode.Nodes.Add(new TreeNode(GettextCatalog.GetString ("No class builder found")));
prjNode.Tag = p;
nodes.Add(prjNode);
}
@@ -386,3 +395,4 @@
}
}
}
+
Copied: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/FileScout (from rev 1534, trunk/MonoDevelop/src/Main/Base/Gui/Pads/FileScout)
Deleted: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/FileScout.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/FileScout.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/FileScout.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,446 +0,0 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Resources;
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.Services;
-
-using MonoDevelop.Services;
-using MonoDevelop.Gui.Widgets;
-using MonoDevelop.Gui.Utils;
-
-namespace MonoDevelop.Gui.Pads
-{
- public class FileList : Gtk.TreeView
- {
- private static GLib.GType gtype;
- private FileSystemWatcher watcher;
- private ItemCollection Items;
- private Gtk.ListStore store;
- private Gtk.Menu popmenu = null;
-
- public static new GLib.GType GType
- {
- get
- {
- if (gtype == GLib.GType.Invalid)
- gtype = RegisterGType (typeof (FileList));
- return gtype;
- }
- }
-
- public FileList() : base (GType)
- {
- Items = new ItemCollection(this);
- ResourceManager resources = new ResourceManager("ProjectComponentResources", this.GetType().Module.Assembly);
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
-
- store = new Gtk.ListStore (typeof (string), typeof (string), typeof(string), typeof(FileListItem), typeof (Gdk.Pixbuf));
- Model = store;
-
- HeadersVisible = true;
- HeadersClickable = true;
- Reorderable = true;
- RulesHint = true;
-
- Gtk.TreeViewColumn name_column = new Gtk.TreeViewColumn ();
- name_column.Title = "Files";
-
- Gtk.TreeViewColumn size_column = new Gtk.TreeViewColumn ();
- size_column.Title = "Size";
-
- Gtk.TreeViewColumn modi_column = new Gtk.TreeViewColumn ();
- modi_column.Title = "Last modified";
-
- Gtk.CellRendererPixbuf pix_render = new Gtk.CellRendererPixbuf ();
- name_column.PackStart (pix_render, false);
- name_column.AddAttribute (pix_render, "pixbuf", 4);
-
- Gtk.CellRendererText render1 = new Gtk.CellRendererText ();
- name_column.PackStart (render1, false);
- name_column.AddAttribute (render1, "text", 0);
-
- Gtk.CellRendererText render2 = new Gtk.CellRendererText ();
- size_column.PackStart (render2, false);
- size_column.AddAttribute (render2, "text", 1);
-
- Gtk.CellRendererText render3 = new Gtk.CellRendererText ();
- modi_column.PackStart (render3, false);
- modi_column.AddAttribute (render3, "text", 2);
-
- AppendColumn(name_column);
- AppendColumn(size_column);
- AppendColumn(modi_column);
-
- this.PopupMenu += new Gtk.PopupMenuHandler (OnPopupMenu);
- this.ButtonReleaseEvent += new Gtk.ButtonReleaseEventHandler (OnButtonReleased);
-
- watcher = new FileSystemWatcher ();
-
- if(watcher != null) {
- watcher.NotifyFilter = NotifyFilters.FileName;
- watcher.EnableRaisingEvents = false;
-
- watcher.Renamed += new RenamedEventHandler(fileRenamed);
- watcher.Deleted += new FileSystemEventHandler(fileDeleted);
- watcher.Created += new FileSystemEventHandler(fileCreated);
- watcher.Changed += new FileSystemEventHandler(fileChanged);
- }
- }
-
- internal void ItemAdded(FileListItem item) {
- store.AppendValues(item.Text, item.Size, item.LastModified, item, item.Icon);
- }
-
- void ItemRemoved(FileListItem item) {
- // TODO
- }
-
- internal void Clear() {
- store.Clear();
- }
-
- void fileDeleted(object sender, FileSystemEventArgs e)
- {
- foreach(FileListItem fileItem in Items)
- {
- if(fileItem.FullName.ToLower() == e.FullPath.ToLower()) {
- Items.Remove(fileItem);
- break;
- }
- }
- }
-
- void fileChanged(object sender, FileSystemEventArgs e)
- {
- foreach(FileListItem fileItem in Items)
- {
- if(fileItem.FullName.ToLower() == e.FullPath.ToLower()) {
-
- FileInfo info = new FileInfo(e.FullPath);
-
- fileItem.Size = Math.Round((double)info.Length / 1024).ToString() + " KB";
- fileItem.LastModified = info.LastWriteTime.ToString();
- break;
- }
- }
- }
-
- void fileCreated(object sender, FileSystemEventArgs e)
- {
- FileInfo info = new FileInfo(e.FullPath);
-
- FileListItem fileItem = Items.Add(new FileListItem(e.FullPath,
- Math.Round((double)info.Length / 1024).ToString() + " KB",
- info.LastWriteTime.ToString())
- );
-
- Items.Add(fileItem);
- }
-
- void fileRenamed(object sender, RenamedEventArgs e)
- {
- foreach(FileListItem fileItem in Items)
- {
- if(fileItem.FullName.ToLower() == e.OldFullPath.ToLower()) {
- fileItem.FullName = e.FullPath;
- //fileItem.Text = e.Name;
- break;
- }
- }
- }
-
- private void OnRenameFile (object sender, EventArgs e)
- {
- /*
- if(SelectedItems.Count == 1) {
- //SelectedItems[0].BeginEdit();
- }
- */
- }
-
- private void OnDeleteFiles (object sender, EventArgs e)
- {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
-
- if (messageService.AskQuestion("Are you sure you want to delete this file?", "Delete files"))
- {
- /* try
- {
- File.Delete (fileItem.FullName);
- }
- catch (Exception ex)
- {
- messageService.ShowError (ex, "Could not delete file '" + Path.GetFileName (fileItem.FullName) + "'");
- } */
- }
- }
-
- private void OnPopupMenu (object o, Gtk.PopupMenuArgs args)
- {
- ShowPopup ();
- }
-
- private void OnButtonReleased (object o, Gtk.ButtonReleaseEventArgs args)
- {
- if (args.Event.Button == 3)
- ShowPopup ();
- }
-
- private void ShowPopup ()
- {
- Gtk.Menu menu = new Gtk.Menu ();
-
- Gtk.MenuItem deleteFile = new Gtk.MenuItem ("Delete file");
- deleteFile.Activated += new EventHandler (OnDeleteFiles);
- deleteFile.Sensitive = false;
-
- Gtk.MenuItem renameFile = new Gtk.MenuItem ("Rename file");
- renameFile.Activated += new EventHandler (OnRenameFile);
- renameFile.Sensitive = false;
-
- menu.Append (deleteFile);
- menu.Append (renameFile);
-
- menu.Popup (null, null, null, IntPtr.Zero, 3, Gtk.Global.CurrentEventTime);
- menu.ShowAll ();
- }
-
- public class FileListItem
- {
- string fullname;
- string text;
- string size;
- string lastModified;
- Gdk.Pixbuf icon;
-
- public string FullName {
- get {
- return fullname;
- }
- set {
- fullname = System.IO.Path.GetFullPath(value);
- text = System.IO.Path.GetFileName(fullname);
- }
- }
-
- public String Text {
- get {
- return text;
- }
- }
-
- public string Size {
- get {
- return size;
- }
- set {
- size = value;
- }
- }
-
- public string LastModified {
- get {
- return lastModified;
- }
- set {
- lastModified = value;
- }
- }
-
- public Gdk.Pixbuf Icon {
- get {
- return icon;
- }
- set {
- icon = value;
- }
- }
-
- public FileListItem(string fullname, string size, string lastModified)
- {
- this.size = size;
- this.lastModified = lastModified;
- //FIXME: This is because //home/blah is not the same as /home/blah according to Icon.LookupSync, if we get weird behaviours, lets look at this again, see if we still need it.
- FullName = fullname.Substring (1);
- icon = FileIconLoader.GetPixbufForFile (FullName, 24, 24);
- }
-
- public FileListItem (string name)
- {
- FileInfo fi = new FileInfo (name);
- this.size = Math.Round ((double) fi.Length / 1024).ToString () + " KB";
- this.lastModified = fi.LastWriteTime.ToString ();
- FullName = System.IO.Path.GetFullPath (name);
- icon = FileIconLoader.GetPixbufForFile (FullName, 24, 24);
- }
- }
-
- class ItemCollection {
- FileList parent;
- ArrayList list = new ArrayList();
-
- public ItemCollection(FileList parent) {
- this.parent = parent;
- }
-
- public FileListItem Add(FileListItem item) {
- list.Add(item);
- parent.ItemAdded(item);
- return item;
- }
-
- public void Remove(FileListItem item) {
- parent.ItemRemoved(item);
- list.Remove(item);
- }
-
- public void Clear() {
- list.Clear();
- parent.Clear();
- }
-
- public IEnumerator GetEnumerator() {
- ArrayList copy = (ArrayList)list.Clone();
- return copy.GetEnumerator();
- }
- }
- }
-
- public class FileScout : Gtk.VPaned, IPadContent
- {
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(ResourceService));
- public Gtk.Widget Control {
- get {
- return this;
- }
- }
-
- public void BringToFront() {
- // TODO
- }
-
- public string Title {
- get {
- return resourceService.GetString ("MainWindow.Windows.FileScoutLabel");
- }
- }
-
- public string Icon {
- get {
- return MonoDevelop.Gui.Stock.OpenFolderBitmap;
- }
- }
-
- public void RedrawContent()
- {
- //OnTitleChanged(null);
- //OnIconChanged(null);
- }
-
- FileList filelister = new FileList ();
- FileBrowser fb = new FileBrowser ();
- PropertyService PropertyService = (PropertyService) ServiceManager.Services.GetService (typeof (PropertyService));
-
- public FileScout()
- {
- fb.DirectoryChangedEvent += new DirectoryChangedEventHandler (OnDirChanged);
- filelister.RowActivated += new Gtk.RowActivatedHandler (FileSelected);
-
- Gtk.Frame treef = new Gtk.Frame ();
- treef.Add (fb);
-
- Gtk.ScrolledWindow listsw = new Gtk.ScrolledWindow ();
- listsw.Add (filelister);
-
- this.Pack1 (treef, true, true);
- this.Pack2 (listsw, true, true);
-
- fb.SelectFirst ();
-
- OnDirChanged (fb.CurrentDir);
- this.ShowAll ();
- }
-
- void OnDirChanged (string path)
- {
- filelister.Clear ();
-
- PropertyService p = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
- bool ignoreHidden = !p.GetProperty ("MonoDevelop.Gui.FileScout.ShowHidden", false);
- fb.IgnoreHidden = ignoreHidden;
-
- foreach (string f in fb.Files)
- {
- if (!(System.IO.Path.GetFileName (f)).StartsWith ("."))
- {
- FileList.FileListItem it = new FileList.FileListItem (f);
- filelister.ItemAdded (it);
- }
- else
- {
- if (!ignoreHidden)
- {
- FileList.FileListItem it = new FileList.FileListItem (f);
- filelister.ItemAdded (it);
-
- }
- }
- }
- }
-
- void FileSelected (object sender, Gtk.RowActivatedArgs e)
- {
- IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
- IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
-
- Gtk.TreeIter iter;
- Gtk.TreeModel model;
-
- // we are not using SelectMultiple
- // nor can more than one be activated here
- if (filelister.Selection.GetSelected (out model, out iter))
- {
- FileList.FileListItem item = (FileList.FileListItem) filelister.Model.GetValue (iter, 3);
-
- //FIXME: use mimetypes not extensions
- // also change to Project tab when its a project
- switch (System.IO.Path.GetExtension (item.FullName)) {
- case ".cmbx":
- case ".prjx":
- projectService.OpenCombine (item.FullName);
- break;
- default:
- //Console.WriteLine (item.FullName);
- fileService.OpenFile (item.FullName);
- break;
- }
- }
- }
-
-/*
- protected virtual void OnTitleChanged(EventArgs e)
- {
- if (TitleChanged != null) {
- TitleChanged(this, e);
- }
- }
- protected virtual void OnIconChanged(EventArgs e)
- {
- if (IconChanged != null) {
- IconChanged(this, e);
- }
- }
- */
- public event EventHandler TitleChanged;
- public event EventHandler IconChanged;
- }
-}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -27,7 +27,7 @@
}
public override string ContentName {
- get { return "Documentation"; }
+ get { return GettextCatalog.GetString ("Documentation"); }
}
public HelpViewer ()
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -27,7 +27,7 @@
ScrolledWindow scroller;
TreeIter root_iter;
- public HelpTree () : base ("Help", Gtk.Stock.Help)
+ public HelpTree () : base (GettextCatalog.GetString ("Help"), Gtk.Stock.Help)
{
mds = (MonodocService)ServiceManager.Services.GetService (typeof (MonodocService));
tree_view = new TreeView ();
@@ -37,7 +37,7 @@
tree_view.Selection.Changed += new EventHandler (RowActivated);
store = new TreeStore (typeof (string), typeof (Node));
- root_iter = store.AppendValues ("Mono Documentation", mds.HelpTree);
+ root_iter = store.AppendValues (GettextCatalog.GetString ("Mono Documentation"), mds.HelpTree);
PopulateNode (root_iter);
@@ -105,8 +105,9 @@
void ShowDocs (string text, Node matched_node, string url)
{
foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
- if (content.ContentName == "Documentation") {
+ if (content.ContentName == GettextCatalog.GetString ("Documentation")) {
((HelpViewer)content).Render (text, matched_node, url);
+ content.WorkbenchWindow.SelectWindow ();
return;
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/OpenTaskView.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/OpenTaskView.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/OpenTaskView.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -35,7 +35,7 @@
public string Title {
get {
- return resourceService.GetString ("MainWindow.Windows.TaskList");
+ return GettextCatalog.GetString ("Task List");
}
}
@@ -86,11 +86,6 @@
view.RowActivated += new RowActivatedHandler (OnRowActivated);
}
- string res (string s)
- {
- return resourceService.GetString (s);
- }
-
void MarkupCol (Gtk.TreeViewColumn col)
{
}
@@ -108,10 +103,10 @@
view.AppendColumn ("!" , iconRender , "stock-id", COL_TYPE);
view.AppendColumn ("" , toggleRender , "active" , COL_MARKED, "activatable", COL_READ);
- view.AppendColumn (res ("CompilerResultView.LineText") , line , "text" , COL_LINE, "weight", COL_READ_WEIGHT);
- view.AppendColumn (res ("CompilerResultView.DescriptionText") , desc , "text" , COL_DESC, "weight", COL_READ_WEIGHT, "strikethrough", COL_MARKED);
- view.AppendColumn (res ("CompilerResultView.PathText") , path , "text" , COL_PATH, "weight", COL_READ_WEIGHT);
- view.AppendColumn (res ("CompilerResultView.FileText") , file , "text" , COL_FILE, "weight", COL_READ_WEIGHT);
+ view.AppendColumn (GettextCatalog.GetString ("Line") , line , "text" , COL_LINE, "weight", COL_READ_WEIGHT);
+ view.AppendColumn (GettextCatalog.GetString ("Description") , desc , "text" , COL_DESC, "weight", COL_READ_WEIGHT, "strikethrough", COL_MARKED);
+ view.AppendColumn (GettextCatalog.GetString ("Path") , path , "text" , COL_PATH, "weight", COL_READ_WEIGHT);
+ view.AppendColumn (GettextCatalog.GetString ("File") , file , "text" , COL_FILE, "weight", COL_READ_WEIGHT);
}
void OnCombineOpen(object sender, CombineEventArgs e)
@@ -166,11 +161,21 @@
foreach (Task t in taskService.Tasks) {
string stock;
switch (t.TaskType) {
- case TaskType.Warning : stock = Gtk.Stock.DialogWarning ; break;
- case TaskType.Error : stock = Gtk.Stock.DialogError ; break;
- case TaskType.Comment : stock = Gtk.Stock.DialogInfo ; break;
- case TaskType.SearchResult : stock = Gtk.Stock.DialogQuestion ; break;
- default : stock = null ; break;
+ case TaskType.Warning:
+ stock = Gtk.Stock.DialogWarning;
+ break;
+ case TaskType.Error:
+ stock = Gtk.Stock.DialogError;
+ break;
+ case TaskType.Comment:
+ stock = Gtk.Stock.DialogInfo;
+ break;
+ case TaskType.SearchResult:
+ stock = Gtk.Stock.DialogQuestion;
+ break;
+ default:
+ stock = null;
+ break;
}
string tmpPath = t.FileName;
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -15,6 +15,7 @@
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
using MonoDevelop.Internal.Project;
using MonoDevelop.Gui.Components;
using Stock = MonoDevelop.Gui.Stock;
@@ -57,6 +58,7 @@
if (newName != null && newName.Trim().Length > 0) {
combine.Name = newName;
}
+ UpdateCombineName (null, EventArgs.Empty);
}
public override void UpdateNaming()
@@ -70,13 +72,13 @@
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
switch (combine.Entries.Count) {
case 0:
- Text = stringParserService.Parse(resourceService.GetString("ProjectComponent.CombineNameStringNoEntry"), new string[,] { {"Combinename", combine.Name}, {"Entries", combine.Entries.Count.ToString()}});
+ Text = String.Format (GettextCatalog.GetString ("Solution {0}"), combine.Name);
break;
case 1:
- Text = stringParserService.Parse(resourceService.GetString("ProjectComponent.CombineNameStringSingleEntry"), new string[,] { {"Combinename", combine.Name}, {"Entries", combine.Entries.Count.ToString()}});
+ Text = String.Format (GettextCatalog.GetString ("Solution {0} (1 entry)"), combine.Name);
break;
default:
- Text = stringParserService.Parse(resourceService.GetString("ProjectComponent.CombineNameString"), new string[,] { {"Combinename", combine.Name}, {"Entries", combine.Entries.Count.ToString()}});
+ Text = String.Format (GettextCatalog.GetString ("Solution {0} ({1} entries)"), combine.Name, combine.Entries.Count.ToString ());
break;
}
}
@@ -95,7 +97,7 @@
CombineBrowserNode cmbNode = (CombineBrowserNode)Parent;
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, stringParserService.Parse(resourceService.GetString("ProjectComponent.RemoveCombine.Question"), new string[,] { {"COMBINE", combine.Name}, {"PARENTCOMBINE", cmbNode.Combine.Name}}));
+ Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, String.Format (GettextCatalog.GetString ("Do you really want to remove solution {0} from solution {1}?"), combine.Name, cmbNode.Combine.Name));
if (dialog.Run() != (int)Gtk.ResponseType.Ok) {
dialog.Destroy ();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -107,10 +107,10 @@
}
} catch (System.IO.IOException) { // assume duplicate file
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("${res:Gui.ProjectBrowser.FileInUseError}");
+ messageService.ShowError(GettextCatalog.GetString ("File or directory name is already in use, choose a different one."));
} catch (System.ArgumentException) { // new file name with wildcard (*, ?) characters in it
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("${res:Gui.ProjectBrowser.IllegalCharactersInFileNameError}");
+ messageService.ShowError(GettextCatalog.GetString ("The file name you have chosen contains illegal characters. Please choose a different file name."));
}
}
}
@@ -128,8 +128,8 @@
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, stringParserService.Parse(resourceService.GetString("ProjectComponent.RemoveFolder.Question"), new string[,] { {"FOLDER", Text}, {"PROJECT", Project.Name}}));
-
+ Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, String.Format (GettextCatalog.GetString ("Do you want to remove folder {0} from project {1}?"), Text, Project.Name));
+
if (dialog.Run() != (int)Gtk.ResponseType.Ok) {
dialog.Destroy ();
return false;
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -124,10 +124,10 @@
}
} catch (System.IO.IOException) { // assume duplicate file
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("${res:Gui.ProjectBrowser.FileInUseError}");
+ messageService.ShowError(GettextCatalog.GetString ("File or directory name is already in use, choose a different one."));
} catch (System.ArgumentException) { // new file name with wildcard (*, ?) characters in it
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("${res:Gui.ProjectBrowser.IllegalCharactersInFileNameError}");
+ messageService.ShowError(GettextCatalog.GetString ("The file name you have chosen contains illegal characters. Please choose a different file name."));
}
}
}
@@ -142,9 +142,7 @@
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- //FIXME: bug #55185
- //Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, stringParserService.Parse(resourceService.GetString("ProjectComponent.RemoveFile.Question"), new string[,] { {"FILE", Path.GetFileName (((ProjectFile)userData).Name)}, {"PROJECT", Project.Name}}));
- using (MessageDialog dialog = new Gtk.MessageDialog ((Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent, MessageType.Question, ButtonsType.YesNo, String.Format ("Are you sure you want to remove {0} from the {1}?", Path.GetFileName (((ProjectFile)userData).Name), Project.Name))) {
+ using (MessageDialog dialog = new Gtk.MessageDialog ((Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent, MessageType.Question, ButtonsType.YesNo, String.Format (GettextCatalog.GetString ("Are you sure you want to remove file {0} from project {1}?"), Path.GetFileName (((ProjectFile)userData).Name), Project.Name))) {
if (dialog.Run() != (int)Gtk.ResponseType.Yes) {
dialog.Hide ();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -35,7 +35,7 @@
}
- public NamedFolderNode(string resourceReference, int sortPriority) : base(((ResourceService)ServiceManager.Services.GetService(typeof(ResourceService))).GetString(resourceReference))
+ public NamedFolderNode(string resourceReference, int sortPriority) : base(resourceReference)
{
this.resourceReference = resourceReference;
this.sortPriority = sortPriority;
@@ -43,9 +43,8 @@
public override void UpdateNaming()
{
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- Text = resourceService.GetString(resourceReference);
+ Text = resourceReference;
base.UpdateNaming();
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -107,7 +107,7 @@
CombineEntry removeEntry = null;
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, stringParserService.Parse(resourceService.GetString("ProjectComponent.RemoveProject.Question"), new string[,] { {"COMBINE", cmb.Name}, {"PROJECT", project.Name}}));
+ Gtk.MessageDialog dialog = new Gtk.MessageDialog ((Gtk.Window)WorkbenchSingleton.Workbench, Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.OkCancel, String.Format (GettextCatalog.GetString ("Do you really want to remove project {0} from solution {1}"), project.Name, cmb.Name));
if (dialog.Run() != (int)Gtk.ResponseType.Ok) {
dialog.Destroy ();
return false;
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -22,6 +22,8 @@
using MonoDevelop.Gui.Widgets;
using Stock = MonoDevelop.Gui.Stock;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Gui.Pads.ProjectBrowser
{
public class DefaultDotNetNodeBuilder : IProjectNodeBuilder
@@ -38,7 +40,7 @@
if (node != null) {
if (node is ProjectBrowserNode)
return false;
- if (node.Text == "Web References")
+ if (node.Text == GettextCatalog.GetString ("Web References"))
return true;
return IsWebReference((AbstractBrowserNode)node.Parent);
}
@@ -54,13 +56,13 @@
projectNode.Image = iconService.GetImageForProjectType (project.ProjectType);
- FolderNode resourceNode = new NamedFolderNode("ProjectComponent.ResourceFilesString", 0);
+ FolderNode resourceNode = new NamedFolderNode(GettextCatalog.GetString ("Resource Files"), 0);
resourceNode.ContextmenuAddinTreePath = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ResourceFolderNode";
resourceNode.OpenedImage = Stock.OpenResourceFolder;
resourceNode.ClosedImage = Stock.ClosedResourceFolder;
projectNode.Nodes.Add (resourceNode);
- FolderNode referenceNode = new NamedFolderNode("ProjectComponent.ReferencesString", 1);
+ FolderNode referenceNode = new NamedFolderNode(GettextCatalog.GetString ("References"), 1);
referenceNode.ContextmenuAddinTreePath = "/SharpDevelop/Views/ProjectBrowser/ContextMenu/ReferenceFolderNode";
referenceNode.OpenedImage = Stock.OpenReferenceFolder;
referenceNode.ClosedImage = Stock.ClosedReferenceFolder;
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -56,7 +56,7 @@
public string Title {
get {
- return "Combine";
+ return GettextCatalog.GetString ("Solution");
}
}
@@ -81,6 +81,7 @@
//projectBrowserImageList = new ImageList();
//projectBrowserImageList.ColorDepth = ColorDepth.Depth32Bit;
}
+
public ProjectBrowserView() : base (true, TreeNodeComparer.GtkProjectNode)
{
//LabelEdit = true;
@@ -110,6 +111,7 @@
contentPanel.Add(sw);
RowActivated += new Gtk.RowActivatedHandler(OnNodeActivated);
contentPanel.ButtonReleaseEvent += new Gtk.ButtonReleaseEventHandler(OnButtonRelease);
+ contentPanel.PopupMenu += OnPopupMenu;
}
void TrackPropertyChange (object o, MonoDevelop.Core.Properties.PropertyEventArgs e)
@@ -260,6 +262,9 @@
public void StartLabelEdit()
{
AbstractBrowserNode selectedNode = (AbstractBrowserNode)SelectedNode;
+ CombineBrowserNode cbn = SelectedNode as CombineBrowserNode;
+ if (null != cbn)
+ cbn.BeforeLabelEdit ();
if (selectedNode != null && selectedNode.CanLabelEdited) {
//LabelEdit = true;
selectedNode.BeginEdit ();
@@ -333,22 +338,29 @@
return true;
}
*/
- private void OnButtonRelease(object sender, Gtk.ButtonReleaseEventArgs args)
+ void ShowPopup ()
{
- if (args.Event.Button != 3 || SelectedNode == null) {
- return;
- }
AbstractBrowserNode node = (AbstractBrowserNode) SelectedNode;
-
IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
-
projectService.CurrentSelectedProject = node.Project;
projectService.CurrentSelectedCombine = node.Combine;
- //PropertyPad.SetDesignableObject(node.UserData);
-
MenuService menuService = (MenuService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(MenuService));
menuService.ShowContextMenu(this, node.ContextmenuAddinTreePath, this);
+
}
+
+ void OnPopupMenu (object o, Gtk.PopupMenuArgs args)
+ {
+ if (SelectedNode != null)
+ ShowPopup ();
+ }
+
+ private void OnButtonRelease(object sender, Gtk.ButtonReleaseEventArgs args)
+ {
+ if (args.Event.Button == 3 && SelectedNode != null) {
+ ShowPopup ();
+ }
+ }
/*
protected override void OnAfterSelect(TreeViewEventArgs e)
{ // set current project & current combine
@@ -532,8 +544,7 @@
string newrelativename = fileUtilityService.AbsoluteToRelativePath(baseDirectory, newfilename);
AbstractBrowserNode oldparent = DefaultDotNetNodeBuilder.GetPath(oldrelativename, GetRootProjectNode(node), false); // TODO : change this for more projects
- AbstractBrowserNode newparent = DefaultDotNetNodeBuilder.GetPath(newrelativename, GetRootProjectNode(node), alreadyInPlace);
-
+ AbstractBrowserNode newparent = node;
AbstractBrowserNode oldnode = null; // if oldnode is == null the old file doesn't exist in current tree
if (oldparent != null) {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/TerminalPad.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/TerminalPad.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Pads/TerminalPad.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -13,7 +13,6 @@
public class TerminalPad : IPadContent
{
Frame frame = new Frame ();
- VScrollbar vscroll;
Terminal term;
ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService(typeof(IResourceService));
@@ -29,7 +28,8 @@
public string Title {
get {
- return resourceService.GetString ("MainWindow.Windows.OutputWindow");
+ //FIXME: check the string
+ return GettextCatalog.GetString ("Terminal");
}
}
@@ -56,8 +56,8 @@
term.ScrollOnKeystroke = true;
term.CursorBlinks = true;
term.MouseAutohide = true;
- term.FontFromString = "monospace 12";
- term.Encoding = "UTF8";
+ term.FontFromString = "monospace 10";
+ term.Encoding = "UTF-8";
term.BackspaceBinding = TerminalEraseBinding.Auto;
term.DeleteBinding = TerminalEraseBinding.Auto;
term.Emulation = "xterm";
@@ -67,21 +67,26 @@
Gdk.Colormap colormap = Gdk.Colormap.System;
colormap.AllocColor (ref fgcolor, true, true);
colormap.AllocColor (ref bgcolor, true, true);
- term.ColorBackground = bgcolor;
- term.ColorForeground = fgcolor;
+ term.SetColors (fgcolor, bgcolor, fgcolor, 16);
- term.Commit += new Vte.CommitHandler (OnTermCommit);
- term.RestoreWindow += new EventHandler (OnRestoreWindow);
-// term.TextModified += new EventHandler (OnTermTextModified);
+ //FIXME: whats a good default here
+ //term.SetSize (80, 5);
- vscroll = new VScrollbar (term.Adjustment);
+ // FIXME: pass the environment along
+ term.ForkCommand (Environment.GetEnvironmentVariable ("SHELL"), Environment.GetCommandLineArgs (), new string[] {""}, Environment.GetEnvironmentVariable ("HOME"), false, true, true);
+ term.ChildExited += new EventHandler (OnChildExited);
+
+ VScrollbar vscroll = new VScrollbar (term.Adjustment);
+
HBox hbox = new HBox ();
hbox.PackStart (term, true, true, 0);
hbox.PackStart (vscroll, false, true, 0);
frame.ShadowType = Gtk.ShadowType.In;
- frame.Add (hbox);
+ ScrolledWindow sw = new ScrolledWindow ();
+ sw.Add (hbox);
+ frame.Add (sw);
taskService.CompilerOutputChanged += new EventHandler (SetOutput);
projectService.StartBuild += new EventHandler (SelectMessageView);
@@ -89,38 +94,20 @@
projectService.CombineOpened += new CombineEventHandler (OnCombineOpen);
}
-/*
- void OnTermTextModified (object o, EventArgs args)
+ void OnChildExited (object o, EventArgs args)
{
+ // full reset
+ term.Reset (true, true);
}
-*/
- void OnRestoreWindow (object o, EventArgs args)
- {
-
- }
-
- void OnTermCommit (object o, Vte.CommitArgs args)
- {
- Terminal t = (Terminal) o;
- if (args.P0 == "\r")
- {
- //FIXME: maybe a setting somewhere
- t.Feed ("\r\n");
- return;
- }
-
- t.Feed (args.P0);
- }
-
void OnCombineOpen (object sender, CombineEventArgs e)
{
- term.Reset (true, true);
+ term.Reset (false, false);
}
void OnCombineClosed (object sender, CombineEventArgs e)
{
- term.Reset (true, false);
+ term.Reset (false, true);
}
void SelectMessageView (object sender, EventArgs e)
@@ -135,7 +122,12 @@
}
}
}
-
+
+ public void RunCommand (string command)
+ {
+ term.FeedChild (command + "\n");
+ }
+
void SetOutput2 ()
{
term.Feed (taskService.CompilerOutput.Replace ("\n", "\r\n"));
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,7 +1,7 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
+// <owner name="Mike Kr�¼ger" email="mike at icsharpcode.net"/>
// <version value="$version"/>
// </file>
@@ -23,6 +23,8 @@
using MonoDevelop.Services;
+using GLib;
+
namespace MonoDevelop.Gui
{
/// <summary>
@@ -45,6 +47,8 @@
Rectangle normalBounds = new Rectangle(0, 0, 640, 480);
private IWorkbenchLayout layout = null;
+
+ static GType gtype;
protected static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
@@ -118,9 +122,22 @@
return layout.ActiveWorkbenchwindow;
}
}
-
- public DefaultWorkbench() : base ("MonoDevelop")
+
+ public static new GLib.GType GType
{
+ get
+ {
+ if (gtype == GLib.GType.Invalid)
+ gtype = RegisterGType (typeof (DefaultWorkbench));
+ return gtype;
+ }
+ }
+
+ //FIXME: When it becomes possible, set this ctor to change ctor
+ //to the windowtype ctor with WindowType.TopLevel
+ public DefaultWorkbench() : base (GType)
+ {
+ Title = "MonoDevelop";
Console.WriteLine ("Creating DefaultWorkbench");
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
// FIXME: edit the name in the resource
@@ -133,7 +150,7 @@
DeleteEvent += new Gtk.DeleteEventHandler (OnClosing);
this.Icon = resourceService.GetBitmap ("Icons.SharpDevelopIcon");
- this.WindowPosition = Gtk.WindowPosition.None;
+ //this.WindowPosition = Gtk.WindowPosition.None;
IDebuggingService dbgr = (IDebuggingService)ServiceManager.Services.GetService (typeof (IDebuggingService));
if (dbgr != null) {
@@ -380,13 +397,14 @@
{
WorkbenchMemento memento = new WorkbenchMemento();
int x, y, width, height;
- GdkWindow.GetSize (out width, out height);
- GdkWindow.GetRootOrigin (out x, out y);
- if (GdkWindow.State != Gdk.WindowState.Fullscreen && GdkWindow.State != Gdk.WindowState.Maximized) {
+ GetPosition (out x, out y);
+ GetSize (out width, out height);
+ if (GdkWindow.State == 0) {
memento.Bounds = new Rectangle (x, y, width, height);
} else {
memento.Bounds = normalBounds;
}
+ memento.WindowState = GdkWindow.State;
memento.FullScreen = fullscreen;
return memento;
@@ -400,8 +418,15 @@
normalBounds = memento.Bounds;
Move (normalBounds.X, normalBounds.Y);
Resize (normalBounds.Width, normalBounds.Height);
- FullScreen = memento.FullScreen;
+ if (memento.WindowState == Gdk.WindowState.Maximized) {
+ Maximize ();
+ } else if (memento.WindowState == Gdk.WindowState.Iconified) {
+ Iconify ();
+ }
+ //GdkWindow.State = memento.WindowState;
+ FullScreen = memento.FullScreen;
}
+ Decorated = true;
}
protected /*override*/ void OnResize(EventArgs e)
@@ -468,7 +493,7 @@
protected /*override*/ void OnClosing(object o, Gtk.DeleteEventArgs e)
{
if (Close()) {
- propertyService.SetProperty("SharpDevelop.Workbench.WorkbenchMemento", WorkbenchSingleton.Workbench.CreateMemento());
+ // propertyService.SetProperty("SharpDevelop.Workbench.WorkbenchMemento", WorkbenchSingleton.Workbench.CreateMemento());
Gtk.Application.Quit ();
} else {
e.RetVal = true;
@@ -504,12 +529,13 @@
// TODO : Dirty Files Dialog
// foreach (IViewContent content in ViewContentCollection) {
- // if (content.IsDirty) {
- // MonoDevelop.Gui.Dialogs.DirtyFilesDialog dfd = new MonoDevelop.Gui.Dialogs.DirtyFilesDialog();
+ // if (content.IsDirty) {
+ // MonoDevelop.Gui.Dialogs.DirtyFilesDialog dfd = new MonoDevelop.Gui.Dialogs.DirtyFilesDialog();
// e.Cancel = dfd.ShowDialog() == DialogResult.Cancel;
// return;
// }
// }
+ propertyService.SetProperty("SharpDevelop.Workbench.WorkbenchMemento", WorkbenchSingleton.Workbench.CreateMemento());
OnClosed (null);
return true;
}
@@ -533,7 +559,7 @@
void SetStandardStatusBar(object sender, EventArgs e)
{
IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
- statusBarService.SetMessage("${res:MainWindow.StatusBar.ReadyMessage}");
+ statusBarService.SetMessage(GettextCatalog.GetString ("Ready"));
}
void OnActiveWindowChanged(object sender, EventArgs e)
@@ -595,11 +621,6 @@
}
}
- // this method simply copies over the enabled state of the toolbar,
- // this assumes that no item is inserted or removed.
- // TODO : make this method more add-in tree like, currently with Windows.Forms
- // toolbars this is not possible. (drawing fragments, slow etc.)
-
void CreateToolBars()
{
if (ToolBars == null) {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -42,7 +42,7 @@
Window wbWindow;
Container rootWidget;
- Container toolbarContainer;
+ VBox toolbarContainer;
Dock dock;
DockLayout dockLayout;
Notebook tabControl;
@@ -75,12 +75,14 @@
vbox.PackStart (workbench.TopMenu, false, false, 0);
if (workbench.ToolBars != null) {
- VBox toolvbox = new VBox (false, 0);
- toolbarContainer = toolvbox;
+ toolbarContainer = new VBox (false, 0);
for (int i = 0; i < workbench.ToolBars.Length; i++) {
- toolvbox.PackStart (workbench.ToolBars[i], false, false, 0);
+ Gtk.HandleBox toolHandleBox = new Gtk.HandleBox ();
+ toolHandleBox.Shadow = Gtk.ShadowType.None;
+ toolHandleBox.Add (workbench.ToolBars[i]);
+ vbox.PackStart (toolHandleBox, false, false, 0);
}
- vbox.PackStart(toolvbox, false, false, 0);
+ //vbox.PackStart(toolbarContainer, false, false, 0);
}
// Create the docking widget and add it to the window.
@@ -98,6 +100,8 @@
tabControl.SwitchPage += new SwitchPageHandler (ActiveMdiChanged);
DockItem item = new DockItem ("Documents", "Documents",
DockItemBehavior.Locked);
+ item.PreferredWidth = -2;
+ item.PreferredHeight = -2;
item.Add (tabControl);
item.ShowAll ();
dock.AddItem (item, DockPlacement.Center);
@@ -139,6 +143,7 @@
void onContextChanged (object o, EventArgs e)
{
SwitchContext (workbench.Context);
+ workbench.UpdateMenu (null, null);
}
void SwitchContext (WorkbenchContext ctxt)
@@ -266,6 +271,7 @@
"MonoDevelop.Gui.Pads.OpenTaskView",
"MonoDevelop.Gui.Pads.HelpTree",
"MonoDevelop.EditorBindings.Gui.Pads.CompilerMessageView",
+ //"MonoDevelop.Gui.Pads.TerminalPad",
"MonoDevelop.Gui.Pads.HelpBrowser"
};
@@ -440,19 +446,23 @@
tabControl.ShowTabs = false;
}
- void ActiveMdiChanged(object sender, SwitchPageArgs e)
+ public void ActiveMdiChanged(object sender, SwitchPageArgs e)
{
try {
if (ActiveWorkbenchwindow.ViewContent.IsUntitled) {
((Gtk.Window)WorkbenchSingleton.Workbench).Title = "MonoDevelop";
} else {
+ string post = String.Empty;
+ if (ActiveWorkbenchwindow.ViewContent.IsDirty) {
+ post = "*";
+ }
if (ActiveWorkbenchwindow.ViewContent.HasProject)
{
- ((Gtk.Window)WorkbenchSingleton.Workbench).Title = ActiveWorkbenchwindow.ViewContent.ProjectName + " - " + ActiveWorkbenchwindow.ViewContent.PathRelativeToProject + " - MonoDevelop";
+ ((Gtk.Window)WorkbenchSingleton.Workbench).Title = ActiveWorkbenchwindow.ViewContent.ProjectName + " - " + ActiveWorkbenchwindow.ViewContent.PathRelativeToProject + post + " - MonoDevelop";
}
else
{
- ((Gtk.Window)WorkbenchSingleton.Workbench).Title = ActiveWorkbenchwindow.ViewContent.ContentName + " - MonoDevelop";
+ ((Gtk.Window)WorkbenchSingleton.Workbench).Title = ActiveWorkbenchwindow.ViewContent.ContentName + post + " - MonoDevelop";
}
}
} catch {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -192,6 +192,7 @@
if (newTitle != Title) {
Title = newTitle;
}
+ WorkbenchSingleton.Workbench.WorkbenchLayout.ActiveMdiChanged (null, null);
}
public void DetachContent()
@@ -217,7 +218,7 @@
if (!force && ViewContent != null && ViewContent.IsDirty) {
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- bool response = messageService.AskQuestion (resourceService.GetString ("MainWindow.SaveChangesMessage"));
+ bool response = messageService.AskQuestion (GettextCatalog.GetString ("Do you want to save the current changes"));
switch (response) {
case true:
@@ -225,7 +226,7 @@
while (true) {
new MonoDevelop.Commands.SaveFileAs().Run();
if (ViewContent.IsDirty) {
- if (messageService.AskQuestion("Do you really want to discard your changes ?")) {
+ if (messageService.AskQuestion(GettextCatalog.GetString ("Do you really want to discard your changes ?"))) {
break;
}
} else {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/WorkbenchMemento.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/WorkbenchMemento.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Gui/Workbench/WorkbenchMemento.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -19,7 +19,7 @@
/// </summary>
public class WorkbenchMemento : IXmlConvertable
{
- //FormWindowState windowstate = FormWindowState.Normal;
+ Gdk.WindowState windowstate = 0;
//FormWindowState defaultwindowstate = FormWindowState.Normal;
Rectangle bounds = new Rectangle(0, 0, 640, 480);
bool fullscreen = false;
@@ -33,14 +33,14 @@
}
}*/
- /*public FormWindowState WindowState {
+ public Gdk.WindowState WindowState {
get {
return windowstate;
}
set {
windowstate = value;
}
- }*/
+ }
public Rectangle Bounds {
get {
@@ -65,25 +65,34 @@
/// </summary>
public WorkbenchMemento()
{
- //windowstate = FormWindowState.Maximized;
+ windowstate = 0;
bounds = new Rectangle(0, 0, 640, 480);
fullscreen = false;
}
- WorkbenchMemento(XmlElement element)
+ WorkbenchMemento(XmlElement element) : base ()
{
- string[] boundstr = element.Attributes["bounds"].InnerText.Split(new char [] { ',' });
+ try {
+ string[] boundstr = element.Attributes["bounds"].InnerText.Split(new char [] { ',' });
+
+ bounds = new Rectangle(Int32.Parse(boundstr[0]), Int32.Parse(boundstr[1]),
+ Int32.Parse(boundstr[2]), Int32.Parse(boundstr[3]));
+ } catch {
+ }
- bounds = new Rectangle(Int32.Parse(boundstr[0]), Int32.Parse(boundstr[1]),
- Int32.Parse(boundstr[2]), Int32.Parse(boundstr[3]));
+ try {
+ windowstate = (Gdk.WindowState)Enum.Parse(typeof(Gdk.WindowState), element.Attributes["formwindowstate"].InnerText);
+ } catch {
+ }
- //windowstate = (FormWindowState)Enum.Parse(typeof(FormWindowState), element.Attributes["formwindowstate"].InnerText);
-
/*if (element.Attributes["defaultformwindowstate"] != null) {
defaultwindowstate = (FormWindowState)Enum.Parse(typeof(FormWindowState), element.Attributes["defaultformwindowstate"].InnerText);
}*/
-
- fullscreen = Boolean.Parse(element.Attributes["fullscreen"].InnerText);
+
+ try {
+ fullscreen = Boolean.Parse(element.Attributes["fullscreen"].InnerText);
+ } catch {
+ }
}
public object FromXmlElement(XmlElement element)
@@ -100,11 +109,11 @@
attr.InnerText = bounds.X + "," + bounds.Y + "," + bounds.Width + "," + bounds.Height;
element.Attributes.Append(attr);
- /*attr = doc.CreateAttribute("formwindowstate");
+ attr = doc.CreateAttribute ("formwindowstate");
attr.InnerText = windowstate.ToString();
element.Attributes.Append(attr);
- attr = doc.CreateAttribute("defaultformwindowstate");
+ /*attr = doc.CreateAttribute("defaultformwindowstate");
attr.InnerText = defaultwindowstate.ToString();
element.Attributes.Append(attr);*/
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/DialogPanelCodon.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/DialogPanelCodon.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/DialogPanelCodon.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -11,12 +11,14 @@
using MonoDevelop.Core.AddIns.Conditions;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Core.AddIns.Codons
{
[CodonNameAttribute("DialogPanel")]
public class DialogPanelCodon : AbstractCodon
{
- [XmlMemberAttribute("label", IsRequired=true)]
+ [XmlMemberAttribute("_label", IsRequired=true)]
string label = null;
public string Label {
@@ -39,12 +41,12 @@
if (subItems == null || subItems.Count == 0) {
if (Class != null) {
- newItem = new DefaultDialogPanelDescriptor(ID, stringParserService.Parse(Label), (IDialogPanel)AddIn.CreateObject(Class));
+ newItem = new DefaultDialogPanelDescriptor(ID, GettextCatalog.GetString (Label), (IDialogPanel)AddIn.CreateObject(Class));
} else {
- newItem = new DefaultDialogPanelDescriptor(ID, stringParserService.Parse(Label));
+ newItem = new DefaultDialogPanelDescriptor(ID, GettextCatalog.GetString (Label));
}
} else {
- newItem = new DefaultDialogPanelDescriptor(ID, stringParserService.Parse(Label), subItems);
+ newItem = new DefaultDialogPanelDescriptor(ID, GettextCatalog.GetString (Label), subItems);
}
return newItem;
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/LanguageBinding/ILanguageBinding.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/LanguageBinding/ILanguageBinding.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/LanguageBinding/ILanguageBinding.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -55,6 +55,8 @@
ICompilerResult CompileProject(IProject project);
ICompilerResult RecompileProject(IProject project);
+
+ void GenerateMakefile (IProject project);
/// <summary>
/// Creates a IProject out of the given ProjetCreateInformation object.
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -26,7 +26,7 @@
[CodonName("MenuItem")]
public class MenuItemCodon : AbstractCodon
{
- [XmlMemberAttribute("label", IsRequired=true)]
+ [XmlMemberAttribute("_label", IsRequired=true)]
string label = null;
[XmlMemberAttribute("description")]
@@ -102,14 +102,15 @@
if (Label == "-") {
newItem = new SdMenuSeparator(conditions, owner);
} else if (Link != null) {
- newItem = new SdMenuCommand(conditions, null, Label, Link.StartsWith("http") ? (IMenuCommand)new GotoWebSite(Link) : (IMenuCommand)new GotoLink(Link));
+ newItem = new SdMenuCommand(conditions, null, GettextCatalog.GetString (Label), Link.StartsWith("http") ? (IMenuCommand)new GotoWebSite(Link) : (IMenuCommand)new GotoLink(Link));
} else {
object o = null;
if (Class != null) {
o = AddIn.CreateObject(Class);
}
if (o != null) {
- if (o is IMenuCommand) {
+ Label = GettextCatalog.GetString (Label);
+ if (o is IMenuCommand) {
IMenuCommand menuCommand = (IMenuCommand)o;
menuCommand.Owner = owner;
if (o is ICheckableMenuCommand) {
Copied: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Conditions/WorkbenchContextCondition.cs (from rev 1534, trunk/MonoDevelop/src/Main/Base/Internal/Conditions/WorkbenchContextCondition.cs)
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/ExternalTool/ExternalTool.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/ExternalTool/ExternalTool.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/ExternalTool/ExternalTool.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -9,6 +9,8 @@
using System.Diagnostics;
using System.Xml;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Internal.ExternalTool
{
/// <summary>
@@ -17,7 +19,7 @@
/// </summary>
public class ExternalTool
{
- string menuCommand = "New Tool";
+ string menuCommand = GettextCatalog.GetString ("New Tool");
string command = "";
string arguments = "";
string initialDirectory = "";
@@ -117,7 +119,7 @@
public XmlElement ToXmlElement(XmlDocument doc)
{
if (doc == null) {
- throw new ArgumentNullException("ExternalTool.ToXmlElement(XmlDocument doc) : doc can't be null");
+ throw new ArgumentNullException("ExternalTool.ToXmlElement(XmlDocument doc) : doc can not be null");
}
XmlElement el = doc.CreateElement("TOOL");
@@ -141,6 +143,10 @@
x = doc.CreateElement("PROMPTFORARGUMENTS");
x.InnerText = PromptForArguments.ToString();
el.AppendChild(x);
+
+ x = doc.CreateElement("USEOUTPUTPAD");
+ x.InnerText = UseOutputPad.ToString();
+ el.AppendChild(x);
return el;
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/ExternalTool/ToolLoader.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/ExternalTool/ToolLoader.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/ExternalTool/ToolLoader.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -14,6 +14,8 @@
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Internal.ExternalTool
{
/// <summary>
@@ -79,13 +81,13 @@
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
if (!LoadToolsFromStream(propertyService.ConfigDirectory + TOOLFILE)) {
- Console.WriteLine("Tools: can't load user defaults, reading system defaults");
+ //Console.WriteLine("Tools: can't load user defaults, reading system defaults");
if (!LoadToolsFromStream(propertyService.DataDirectory +
Path.DirectorySeparatorChar + "options" +
Path.DirectorySeparatorChar + TOOLFILE)) {
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowWarning(resourceService.GetString("Internal.ExternalTool.CantLoadToolConfigWarining"));
+ messageService.ShowWarning(GettextCatalog.GetString ("Can't load external tools configuration file"));
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ICompilationUnitBase.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ICompilationUnitBase.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ICompilationUnitBase.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -16,6 +16,11 @@
get;
set;
}
+
+ string ErrorOutput {
+ get;
+ set;
+ }
object Tag {
get;
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/IParser.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/IParser.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/IParser.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -136,8 +136,9 @@
int caretColumn,
string fileName,
string fileContent);
+
+ ArrayList IsAsResolve (IParserService parserService, string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent);
-
ArrayList CtrlSpace(IParserService parserService, int caretLine, int caretColumn, string fileName);
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/Implementations/AbstractCompilationUnit.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/Implementations/AbstractCompilationUnit.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/Implementations/AbstractCompilationUnit.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -43,6 +43,7 @@
protected bool errorsDuringCompile = false;
protected object tag = null;
protected ArrayList foldingRegions = new ArrayList();
+ protected string erroroutput = String.Empty;
public bool ErrorsDuringCompile {
get {
@@ -52,6 +53,15 @@
errorsDuringCompile = value;
}
}
+
+ public string ErrorOutput {
+ get {
+ return erroroutput;
+ }
+ set {
+ erroroutput = value;
+ }
+ }
public object Tag {
get {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/Implementations/AbstractMethod.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/Implementations/AbstractMethod.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/Implementations/AbstractMethod.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -34,7 +34,7 @@
public virtual bool IsConstructor {
get {
- return returnType == null || Name == "#ctor";
+ return returnType == null || Name == "ctor";
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionClass.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionClass.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionClass.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -5,6 +5,9 @@
// <version value="$version"/>
// </file>
+using MonoDevelop.Services;
+using MonoDevelop.Core.Services;
+
using System;
using System.Collections;
using System.Xml;
@@ -37,11 +40,17 @@
return type.IsSubclassOf(typeof(Delegate)) && type != typeof(MulticastDelegate);
}
- public ReflectionClass(Type type, Hashtable xmlComments)
+ public ReflectionClass(Type type)
{
+
+ //FIXME: remove after doc changes are complete.
+ Hashtable xmlComments = null;
+
FullyQualifiedName = type.FullName;
- if (xmlComments != null) {
- XmlNode node = xmlComments["T:" + FullyQualifiedName] as XmlNode;
+
+ XmlDocument docs = ((MonodocService)ServiceManager.Services.GetService (typeof (MonodocService))).GetHelpXml (FullyQualifiedName);
+ if (docs != null) {
+ XmlNode node = docs.SelectSingleNode ("/Type/Docs/summary");
if (node != null) {
Documentation = node.InnerXml;
}
@@ -105,12 +114,12 @@
}
foreach (Type nestedType in type.GetNestedTypes(flags)) {
- innerClasses.Add(new ReflectionClass(nestedType, xmlComments));
+ innerClasses.Add(new ReflectionClass(nestedType));
}
foreach (FieldInfo field in type.GetFields(flags)) {
// if (!field.IsSpecialName) {
- IField newField = new ReflectionField(field, xmlComments);
+ IField newField = new ReflectionField(field, docs);
if (!newField.IsInternal) {
fields.Add(newField);
}
@@ -126,12 +135,12 @@
p = propertyInfo.GetIndexParameters();
} catch (Exception) {}
if (p == null || p.Length == 0) {
- IProperty newProperty = new ReflectionProperty(propertyInfo, xmlComments);
+ IProperty newProperty = new ReflectionProperty(propertyInfo, docs);
if (!newProperty.IsInternal) {
properties.Add(newProperty);
}
} else {
- IIndexer newIndexer = new ReflectionIndexer(propertyInfo, xmlComments);
+ IIndexer newIndexer = new ReflectionIndexer(propertyInfo, docs);
if (!newIndexer.IsInternal) {
indexer.Add(newIndexer);
}
@@ -141,7 +150,7 @@
foreach (MethodInfo methodInfo in type.GetMethods(flags)) {
if (!methodInfo.IsSpecialName) {
- IMethod newMethod = new ReflectionMethod(methodInfo, xmlComments);
+ IMethod newMethod = new ReflectionMethod(methodInfo, docs);
if (!newMethod.IsInternal) {
methods.Add(newMethod);
@@ -150,7 +159,7 @@
}
foreach (ConstructorInfo constructorInfo in type.GetConstructors(flags)) {
- IMethod newMethod = new ReflectionMethod(constructorInfo, xmlComments);
+ IMethod newMethod = new ReflectionMethod(constructorInfo, docs);
if (!newMethod.IsInternal) {
methods.Add(newMethod);
}
@@ -158,7 +167,7 @@
foreach (EventInfo eventInfo in type.GetEvents(flags)) {
// if (!eventInfo.IsSpecialName) {
- IEvent newEvent = new ReflectionEvent(eventInfo, xmlComments);
+ IEvent newEvent = new ReflectionEvent(eventInfo, docs);
if (!newEvent.IsInternal) {
events.Add(newEvent);
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionEvent.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionEvent.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionEvent.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -14,17 +14,17 @@
[Serializable]
public class ReflectionEvent : AbstractEvent
{
- public ReflectionEvent(EventInfo eventInfo, Hashtable xmlComments)
+ public ReflectionEvent(EventInfo eventInfo, XmlDocument docs)
{
FullyQualifiedName = String.Concat(eventInfo.DeclaringType.FullName, ".", eventInfo.Name);
-
- if (xmlComments != null) {
- XmlNode node = xmlComments["E:" + FullyQualifiedName] as XmlNode;
+
+ if (docs != null) {
+ XmlNode node = docs.SelectSingleNode ("/Type/Members/Member[@MemberName='" + eventInfo.Name + "']/Docs/summary");
if (node != null) {
Documentation = node.InnerXml;
}
}
-
+
// get modifiers
MethodInfo methodBase = null;
try {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionField.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionField.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionField.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -15,17 +15,18 @@
[Serializable]
public class ReflectionField : AbstractField
{
- public ReflectionField(FieldInfo fieldInfo, Hashtable xmlComments)
+ public ReflectionField(FieldInfo fieldInfo, XmlDocument docs)
{
System.Diagnostics.Debug.Assert(fieldInfo != null);
FullyQualifiedName = String.Concat(fieldInfo.DeclaringType.FullName, ".", fieldInfo.Name);
-
- if (xmlComments != null) {
- XmlNode node = xmlComments["F:" + FullyQualifiedName] as XmlNode;
+
+ if (docs != null) {
+ XmlNode node = docs.SelectSingleNode ("/Type/Members/Member[@MemberName='" + fieldInfo.Name + "']/Docs/summary");
if (node != null) {
Documentation = node.InnerXml;
}
}
+
if (fieldInfo.IsInitOnly) {
modifiers |= ModifierEnum.Readonly;
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionIndexer.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionIndexer.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionIndexer.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -29,7 +29,7 @@
return propertyName.ToString();
}
- public ReflectionIndexer(PropertyInfo propertyInfo, Hashtable xmlComments)
+ public ReflectionIndexer(PropertyInfo propertyInfo, XmlDocument docs)
{
// indexers does have the same name as the object that declare the indexers
FullyQualifiedName = propertyInfo.DeclaringType.FullName;
@@ -46,12 +46,15 @@
} else {
setterRegion = null;
}
-
+
XmlNode node = null;
- if (xmlComments != null) {
- node = xmlComments["P:" + FullyQualifiedName] as XmlNode;
+ if (docs != null) {
+ node = docs.SelectSingleNode ("/Type/Members/Member[@MemberName='" + propertyInfo.Name + "']");
if (node != null) {
- Documentation = node.InnerXml;
+ XmlNode docNode = node.SelectSingleNode ("Docs/summary");
+ if (docNode != null) {
+ Documentation = node.InnerXml;
+ }
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionMethod.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionMethod.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionMethod.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -31,24 +31,55 @@
propertyName.Append(')');
return propertyName.ToString();
}
+
+ XmlNode FindMatch (XmlNodeList nodes, MethodBase methodBase)
+ {
+ ParameterInfo[] p = methodBase.GetParameters ();
+ string s = "";
+ foreach (XmlNode node in nodes) {
+ XmlNodeList paramList = node.SelectNodes ("Parameters/*");
+ s += paramList.Count + " - " + p.Length + "\n";
+ if (p.Length == 0 && paramList.Count == 0) return node;
+ if (p.Length != paramList.Count) continue;
+ bool matched = true;
+ for (int i = 0; i < p.Length; i++) {
+ if (p[i].ParameterType.ToString () != paramList[i].Attributes["Type"].Value) {
+ matched = false;
+ }
+ }
+ if (matched)
+ return node;
+ }
+ return null;
+ }
- public ReflectionMethod(MethodBase methodBase, Hashtable xmlComments)
+ public ReflectionMethod(MethodBase methodBase, XmlDocument docs)
{
string name = methodBase.Name;
if (methodBase is ConstructorInfo) {
- name = "#ctor";
+ name = ".ctor";
}
FullyQualifiedName = String.Concat(methodBase.DeclaringType.FullName, ".", name);
XmlNode node = null;
-
- if (xmlComments != null) {
- node = xmlComments["M:" + FullyQualifiedName + GetParamList(methodBase)] as XmlNode;
- if (node != null) {
- Documentation = node.InnerXml;
+
+ if (docs != null) {
+ XmlNodeList nodes = docs.SelectNodes ("/Type/Members/Member[@MemberName='" + name + "']");
+ if (nodes != null && nodes.Count > 0) {
+ if (nodes.Count == 1) {
+ node = nodes[0];
+ } else {
+ node = FindMatch (nodes, methodBase);
+ }
+ if (node != null) {
+ XmlNode docNode = node.SelectSingleNode ("Docs/summary");
+ if (docNode != null) {
+ Documentation = docNode.InnerXml;
+ }
+ }
}
- }
+ }
modifiers = ModifierEnum.None;
if (methodBase.IsStatic) {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionParameter.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionParameter.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionParameter.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -33,7 +33,7 @@
}
if (methodNode != null) {
- XmlNode paramDocu = methodNode.SelectSingleNode("member[@name='" + parameterInfo.Name + "']");
+ XmlNode paramDocu = methodNode.SelectSingleNode("Docs/param[@name='" + parameterInfo.Name + "']");
if (paramDocu != null) {
documentation = paramDocu.InnerXml;
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionProperty.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionProperty.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Parser/ReflectionLayer/ReflectionProperty.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -14,7 +14,7 @@
[Serializable]
public class ReflectionProperty : AbstractProperty
{
- public ReflectionProperty(PropertyInfo propertyInfo, Hashtable xmlComments)
+ public ReflectionProperty(PropertyInfo propertyInfo, XmlDocument docs)
{
FullyQualifiedName = String.Concat(propertyInfo.DeclaringType.FullName, ".", propertyInfo.Name);
@@ -30,14 +30,14 @@
} else {
setterRegion = null;
}
-
- if (xmlComments != null) {
- XmlNode node = xmlComments["P:" + FullyQualifiedName] as XmlNode;
+
+ if (docs != null) {
+ XmlNode node = docs.SelectSingleNode ("/Type/Members/Member[@MemberName='" + propertyInfo.Name + "']/Docs/summary");
if (node != null) {
Documentation = node.InnerXml;
}
}
-
+
returnType = new ReflectionReturnType(propertyInfo.PropertyType);
MethodInfo methodBase = null;
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Combine/Combine.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Combine/Combine.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Combine/Combine.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -165,7 +165,7 @@
ILanguageBinding binding = languageBindingService.GetBindingPerProjectFile(filename);
if (binding == null) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(stringParserService.Parse("Can't find language binding for ${FILENAME} ", new string[,] {{"FILENAME", filename}}));
+ messageService.ShowError(String.Format (GettextCatalog.GetString ("Can't find language binding for {0}"), filename));
return null;
}
@@ -298,19 +298,19 @@
fileUtilityService.ObservedSave(new NamedFileOperationDelegate(doc.Save),
filename,
- resourceService.GetString("Internal.Project.Combine.CantSaveCombineErrorText"),
- FileErrorPolicy.ProvideAlternative);
+ GettextCatalog.GetString ("Can't save solution\nPlease check your file and directory permissions."),
+ FileErrorPolicy.ProvideAlternative);
}
public void SaveCombineAs()
{
- using (Gtk.FileSelection fdiag = new Gtk.FileSelection ("Save Combine As...")) {
+ using (Gtk.FileSelection fdiag = new Gtk.FileSelection (GettextCatalog.GetString ("Save Combine As..."))) {
fdiag.Filename = System.Environment.GetEnvironmentVariable ("HOME");
if (fdiag.Run() == (int)Gtk.ResponseType.Ok) {
string filename = fdiag.Filename;
SaveCombine(filename);
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowMessage(filename, resourceService.GetString("Internal.Project.Combine.CombineSavedMessage"));
+ messageService.ShowMessage(filename, GettextCatalog.GetString ("Combine saved"));
}
fdiag.Hide ();
@@ -513,17 +513,27 @@
allProjects = TopologicalSort(allProjects);
} catch (CyclicBuildOrderException) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("Cyclic dependencies can not be build with this version.\nBut we are working on it.");
+ messageService.ShowError(GettextCatalog.GetString ("Cyclic dependencies can not be built with this version.\nBut we are working on it."));
return;
}
TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
foreach (ProjectCombineEntry entry in allProjects) {
entry.Build(doBuildAll);
- if (taskService.SomethingWentWrong) {
+ if (taskService.Errors > 0) {
break;
}
}
}
+
+ public void GenerateMakefiles ()
+ {
+ foreach (CombineEntry entry in entries) {
+ if (entry is ProjectCombineEntry)
+ entry.GenerateMakefiles ();
+ else
+ Console.WriteLine ("Dont know how to generate makefiles for " + entry);
+ }
+ }
protected virtual void OnStartupPropertyChanged(EventArgs e)
{
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Combine/CombineEntry.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Combine/CombineEntry.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Combine/CombineEntry.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -67,6 +67,7 @@
public abstract void Execute();
public abstract void Save();
public abstract void Debug ();
+ public abstract void GenerateMakefiles ();
}
public class ProjectCombineEntry : CombineEntry
@@ -111,7 +112,7 @@
TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(TaskService));
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- statusBarService.SetMessage("${res:MainWindow.StatusBar.CompilingMessage}");
+ statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("Compiling: {0}"), Project.Name));
LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(LanguageBindingService));
// create output directory, if not exists
@@ -128,11 +129,11 @@
ILanguageBinding csc = languageBindingService.GetBindingPerLanguageName(project.ProjectType);
AbstractProjectConfiguration conf = project.ActiveConfiguration as AbstractProjectConfiguration;
- taskService.CompilerOutput += stringParserService.Parse("${res:MainWindow.CompilerMessages.BuildStartedOutput}", new string[,] { {"PROJECT", Project.Name}, {"CONFIG", Project.ActiveConfiguration.Name} }) + "\n";
- taskService.CompilerOutput += resourceService.GetString("MainWindow.CompilerMessages.PerformingMainCompilationOutput") + "\n";
+
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("------ Build started: Project: {0} Configuration: {1} ------\n\nPerforming main compilation...\n"), Project.Name, Project.ActiveConfiguration.Name);
if (conf != null && File.Exists(conf.ExecuteBeforeBuild)) {
- taskService.CompilerOutput += "Execute : " + conf.ExecuteBeforeBuild;
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Execute : {0}"), conf.ExecuteBeforeBuild);
ProcessStartInfo ps = new ProcessStartInfo(conf.ExecuteBeforeBuild);
ps.UseShellExecute = false;
ps.RedirectStandardOutput = true;
@@ -146,7 +147,7 @@
ICompilerResult res = csc.CompileProject(project);
if (conf != null && File.Exists(conf.ExecuteAfterBuild)) {
- taskService.CompilerOutput += "Execute : " + conf.ExecuteAfterBuild;
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Execute : {0}"), conf.ExecuteAfterBuild);
ProcessStartInfo ps = new ProcessStartInfo(conf.ExecuteAfterBuild);
ps.UseShellExecute = false;
ps.RedirectStandardOutput = true;
@@ -171,7 +172,7 @@
++BuildProjects;
}
- taskService.CompilerOutput += res.CompilerOutput + stringParserService.Parse("${res:MainWindow.CompilerMessages.ProjectStatsOutput}", new string[,] { {"ERRORS", taskService.Errors.ToString()}, {"WARNINGS", taskService.Warnings.ToString()} }) + "\n\n";
+ taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("Build complete -- {0} errors, {1} warnings\n\n"), taskService.Errors.ToString (), taskService.Warnings.ToString ());
}
}
@@ -210,6 +211,14 @@
{
project.SaveProject(Filename);
}
+
+ public override void GenerateMakefiles ()
+ {
+ Console.WriteLine ("Generating makefiles for " + Name);
+ LanguageBindingService languageBindingService = (LanguageBindingService)ServiceManager.Services.GetService(typeof(LanguageBindingService));
+ ILanguageBinding langBinding = languageBindingService.GetBindingPerLanguageName(project.ProjectType);
+ langBinding.GenerateMakefile (project);
+ }
}
public class CombineCombineEntry : CombineEntry
@@ -252,5 +261,9 @@
{
combine.Debug ();
}
+
+ public override void GenerateMakefiles ()
+ {
+ }
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/AbstractProject.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/AbstractProject.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/AbstractProject.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -176,6 +176,7 @@
public bool IsFileInProject(string filename)
{
+ if (filename == null) return false;
foreach (ProjectFile file in projectFiles) {
// WINDOWS DEPENDENCY:
if (file.Name.ToUpper() == filename.ToUpper()) {
@@ -215,6 +216,7 @@
!file.StartsWith (".") &&
!Path.GetDirectoryName(file).EndsWith("CVS") &&
!Path.GetDirectoryName(file).EndsWith(".svn") &&
+ !file.StartsWith ("Makefile") &&
!Path.GetDirectoryName(file).EndsWith("ProjectDocumentation")) {
newFiles.Add(file);
@@ -255,8 +257,7 @@
if (version == "1.0") {
string tempFile = Path.GetTempFileName();
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowMessage("Old project file format found.\n It will be automatically converted to " + currentProjectFileVersion,
- "Information");
+ messageService.ShowMessage(String.Format (GettextCatalog.GetString ("Old project file format found.\n It will be automatically converted to {0} information"), currentProjectFileVersion));
PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
ConvertXml.Convert(fileName,
@@ -271,7 +272,7 @@
File.Delete(tempFile);
return;
} catch (Exception) {
- messageService.ShowError("Error writing the old project file.\nCheck if you have write permission on the project file (.prjx).\n A non persistent proxy project will be created but no changes will be saved.\nIt is better if you close SharpDevelop and correct the problem.");
+ messageService.ShowError(GettextCatalog.GetString ("Error writing the old project file.\nCheck if you have write permission on the project file (.prjx).\n A non persistent proxy project will be created but no changes will be saved.\nIt is better if you close SharpDevelop and correct the problem."));
if (File.Exists(tempFile)) {
doc.Load(tempFile);
File.Delete(tempFile);
@@ -495,8 +496,8 @@
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
fileUtilityService.ObservedSave(new NamedFileOperationDelegate(doc.Save),
fileName,
- resourceService.GetString("Internal.Project.Project.CantSaveProjectErrorText"),
- FileErrorPolicy.ProvideAlternative);
+ GettextCatalog.GetString ("Can't save solution\nPlease check your file and directory permissions."),
+ FileErrorPolicy.ProvideAlternative);
}
public virtual string GetParseableFileContent(string fileName)
@@ -510,7 +511,7 @@
public void SaveProjectAs()
{
- using (Gtk.FileSelection fdiag = new Gtk.FileSelection ("Save Project As...")) {
+ using (Gtk.FileSelection fdiag = new Gtk.FileSelection (GettextCatalog.GetString ("Save Project As..."))) {
fdiag.Filename = System.Environment.GetEnvironmentVariable ("HOME");
if (fdiag.Run() == (int)Gtk.ResponseType.Ok) {
@@ -518,7 +519,7 @@
SaveProject(filename);
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowMessage(filename, resourceService.GetString("Internal.Project.DefaultProject.ProjectSavedMessage"));
+ messageService.ShowMessage(filename, GettextCatalog.GetString ("Project saved"));
}
fdiag.Hide ();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/AssemblyDeploy.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -9,6 +9,7 @@
using System.IO;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
namespace MonoDevelop.Internal.Project
{
@@ -25,7 +26,7 @@
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
if (project.DeployInformation.DeployTarget.Length == 0) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(resourceService.GetString("Internal.Project.Deploy.AssemblyDeploy.DeployTargetNotSet"));
+ messageService.ShowError(GettextCatalog.GetString ("Can't deploy: no deployment target set"));
return;
}
try {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/FileDeploy.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -10,6 +10,7 @@
using System.CodeDom.Compiler;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
namespace MonoDevelop.Internal.Project
{
@@ -20,7 +21,7 @@
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
if (project.DeployInformation.DeployTarget.Length == 0) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(resourceService.GetString("Internal.Project.Deploy.ScriptDeploy.DeployWithoutScriptError"));
+ messageService.ShowError(GettextCatalog.GetString ("Can't deploy: you forgot to specify a deployment script"));
return;
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/Deployment/ScriptDeploy.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -10,6 +10,7 @@
using System.Diagnostics;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
namespace MonoDevelop.Internal.Project
{
@@ -20,7 +21,7 @@
IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
if (project.DeployInformation.DeployScript.Length == 0) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(resourceService.GetString("Internal.Project.Deploy.ScriptDeploy.DeployWithoutScriptError"));
+ messageService.ShowError(GettextCatalog.GetString ("Can't deply: you forgot to specify a deployment script"));
return;
}
try {
@@ -32,7 +33,7 @@
}
} catch (Exception e) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, resourceService.GetString("Internal.Project.Deploy.ScriptDeploy.ErrorWhileExecuteScript"));
+ messageService.ShowError(e, GettextCatalog.GetString ("Error while executing deploy script"));
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/IncludeFilesDialog.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -12,6 +12,7 @@
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
using MonoDevelop.Gui;
using MonoDevelop.Internal.Project;
@@ -49,13 +50,10 @@
// we must do it from *here* otherwise, we get this assembly, not the caller
Glade.XML glade = new Glade.XML (null, "Base.glade", "IncludeFilesDialogWidget", null);
glade.Autoconnect (this);
- InitDialog ();
// set up dialog title
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- this.IncludeFilesDialogWidget.Title =
- stringParserService.Parse(resourceService.GetString("Dialog.IncludeFilesDialog.DialogName"),
- new string[,] {{ "PROJECT", project.Name}});
+ this.IncludeFilesDialogWidget.Title = String.Format (GettextCatalog.GetString ("Found new files in {0}"), project.Name);
newFilesOnlyRadioButton.Active = true;
this.newFiles = newFiles;
@@ -164,17 +162,6 @@
}
}
- private void InitDialog()
- {
- // setup all the strings
- this.deselectAllButton.Label = resourceService.GetString("Dialog.IncludeFilesDialog.DeselectAllButton");
- this.newFilesOnlyRadioButton.Label = resourceService.GetString("Dialog.IncludeFilesDialog.NewFilesRadioButton");
- this.allFilesRadioButton.Label = resourceService.GetString("Dialog.IncludeFilesDialog.AllFilesRadioButton");
- this.newFilesInProjectLabel.Text = resourceService.GetString("Dialog.IncludeFilesDialog.IncludeFilesLabel");
- this.selectAllButton.Label = resourceService.GetString("Dialog.IncludeFilesDialog.SelectAllButton");
- this.viewLabel.Markup = "<b>" + resourceService.GetString("Dialog.IncludeFilesDialog.ViewGroupBoxText") + "</b>";
- }
-
public void ShowDialog()
{
this.IncludeFilesDialogWidget.Run();
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/CodeTemplateLoader.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -15,6 +15,8 @@
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Internal.Templates
{
/// <summary>
@@ -103,7 +105,7 @@
Path.DirectorySeparatorChar + "options" +
Path.DirectorySeparatorChar + TemplateFileName)) {
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowWarning("${res:Internal.Templates.CodeTemplateLoader.CantLoadTemplatesWarning}");
+ messageService.ShowWarning(GettextCatalog.GetString ("Can't load templates configuration file"));
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/FileTemplate.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/FileTemplate.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/FileTemplate.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -162,7 +162,7 @@
try {
LoadFileTemplate(file);
} catch(Exception e) {
- messageService.ShowError(e, "Error loading template file " + file + ".");
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error loading template file {0}"), file));
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/ProjectTemplates/CombineDescriptor.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -16,6 +16,8 @@
using MonoDevelop.Core.Services;
using MonoDevelop.Internal.Project;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Internal.Templates
{
public class CombineDescriptor
@@ -94,7 +96,7 @@
string combineLocation = fileUtilityService.GetDirectoryNameWithSeparator(projectCreateInformation.CombinePath) + newCombineName + ".cmbx";
if (File.Exists(combineLocation)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (messageService.AskQuestion("Combine file " + combineLocation + " already exists, do you want to overwrite\nthe existing file ?")) {
+ if (messageService.AskQuestion(String.Format (GettextCatalog.GetString ("Solution file {0} already exists, do you want to overwrite\nthe existing file ?"), combineLocation))) {
newCombine.SaveCombine(combineLocation);
}
} else {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Templates/ProjectTemplates/ProjectDescriptor.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -84,7 +84,7 @@
if (languageinfo == null) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError("Can't create project with type :" + language);
+ messageService.ShowError(String.Format (GettextCatalog.GetString ("Can't create project with type : {0}"), language));
return String.Empty;
}
@@ -110,7 +110,7 @@
if (File.Exists(fileName)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (!messageService.AskQuestion("File " + fileName + " already exists, do you want to overwrite\nthe existing file ?", "File already exists")) {
+ if (!messageService.AskQuestion(String.Format (GettextCatalog.GetString ("File {0} already exists, do you want to overwrite\nthe existing file ?"), fileName), GettextCatalog.GetString ("File already exists"))) {
continue;
}
}
@@ -124,7 +124,7 @@
sr.Close();
} catch (Exception ex) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(ex, "File " + fileName + " could not be written.");
+ messageService.ShowError(ex, String.Format (GettextCatalog.GetString ("File {0} could not be written."), fileName));
}
}
@@ -136,7 +136,7 @@
if (File.Exists(fileName)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (!messageService.AskQuestion("File " + fileName + " already exists, do you want to overwrite\nthe existing file ?", "File already exists")) {
+ if (!messageService.AskQuestion(String.Format (GettextCatalog.GetString ("File {0} already exists, do you want to overwrite\nthe existing file ?"), fileName), GettextCatalog.GetString ("File already exists"))) {
continue;
}
}
@@ -150,7 +150,7 @@
sr.Close();
} catch (Exception ex) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(ex, "File " + fileName + " could not be written.");
+ messageService.ShowError(ex, String.Format (GettextCatalog.GetString ("File {0} could not be written."), fileName));
}
}
@@ -159,7 +159,7 @@
if (File.Exists(projectLocation)) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (messageService.AskQuestion("Project file " + projectLocation + " already exists, do you want to overwrite\nthe existing file ?", "File already exists")) {
+ if (messageService.AskQuestion(String.Format (GettextCatalog.GetString ("Project file {0} already exists, do you want to overwrite\nthe existing file ?"), projectLocation), GettextCatalog.GetString ("File already exists"))) {
project.SaveProject(projectLocation);
}
} else {
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -8,10 +8,12 @@
/r:../../../build/bin/MonoDevelop.Gui.Utils.dll \
/r:../../../build/bin/MonoDevelop.Gui.Widgets.dll \
/r:System.Data /r:System.Web.Services \
- /r:gtk-sharp /r:gdk-sharp /r:glib-sharp /r:pango-sharp \
+ @GTKSHARP@ \
/r:../../../build/bin/gdl-sharp.dll \
- /r:glade-sharp /r:gnome-sharp /r:gtkhtml-sharp \
- $(GECKO_SHARP)
+ @GLADESHARP@ \
+ @GNOMESHARP@ \
+ @GTKHTMLSHARP@ \
+ $(GECKO_SHARP) $(MONODOC)
FILES= \
./Gui/Pads/ProjectBrowser/ProjectBrowserView.cs \
@@ -28,7 +30,9 @@
./Gui/Pads/ProjectBrowser/BrowserNode/NamedFolderNode.cs \
./Gui/Pads/OpenTaskView.cs \
./Gui/Pads/TreeViewMemento.cs \
-./Gui/Pads/FileScout.cs \
+./Gui/Pads/FileScout/FileList.cs \
+./Gui/Pads/FileScout/FileListItem.cs \
+./Gui/Pads/FileScout/FileScout.cs \
./Gui/Pads/PropertyPad/PropertyPadCommands.cs \
./Gui/Pads/PropertyPad/PropertyPad.cs \
./Gui/Pads/ClassScout/ClassScout.cs \
@@ -224,6 +228,7 @@
./Internal/Conditions/WindowOpenCondition.cs \
./Internal/Conditions/CombineOpenCondition.cs \
./Internal/Conditions/ProjectOpenCondition.cs \
+./Internal/Conditions/WorkbenchContextCondition.cs \
./Internal/Codons/DisplayBinding/IDisplayBinding.cs \
./Internal/Codons/DisplayBinding/ISubDisplayBinding.cs \
./Internal/Codons/DisplayBinding/DisplayBindingCodon.cs \
@@ -374,7 +379,7 @@
all: $(ASSEMBLY)
$(ASSEMBLY): $(build_sources) ../../../data/resources/glade/Base.glade
- @ $(CSC) /out:$(ASSEMBLY) /target:library $(DLLS) \
+ $(CSC) -codepage:utf8 /out:$(ASSEMBLY) /target:library $(DLLS) \
/resource:$(srcdir)/../../../data/resources/glade/Base.glade,Base.glade \
$(monodoc_libflags) \
$(build_sources) \
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/AmbienceService/AmbienceReflectionDecorator.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/AmbienceService/AmbienceReflectionDecorator.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/AmbienceService/AmbienceReflectionDecorator.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -93,7 +93,7 @@
public string Convert(Type type)
{
- return conv.Convert(new ReflectionClass(type, null));
+ return conv.Convert(new ReflectionClass(type));
}
public string Convert(FieldInfo field)
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/DisplayBinding/DisplayBindingService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/DisplayBinding/DisplayBindingService.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/DisplayBinding/DisplayBindingService.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -58,7 +58,7 @@
}
}
}
- Console.WriteLine ("Didnt match on mimetype: " + mimetype + ", trying filename");
+ Console.WriteLine (String.Format (GettextCatalog.GetString ("Didnt match on mimetype: {0}, trying filename"), mimetype));
foreach (DisplayBindingCodon binding in bindings) {
if (binding.DisplayBinding != null && binding.DisplayBinding.CanCreateContentForFile(filename)) {
return binding;
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/File/DefaultFileService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/File/DefaultFileService.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/File/DefaultFileService.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -243,7 +243,7 @@
Directory.Delete(fileName);
} catch (Exception e) {
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Can't remove directory " + fileName);
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't remove directory {0}"), fileName));
return;
}
OnFileRemoved(new FileEventArgs(fileName, true));
@@ -252,7 +252,7 @@
File.Delete(fileName);
} catch (Exception e) {
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Can't remove file " + fileName);
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't remove file {0}"), fileName));
return;
}
OnFileRemoved(new FileEventArgs(fileName, false));
@@ -267,7 +267,7 @@
Directory.Move(oldName, newName);
} catch (Exception e) {
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Can't rename directory " + oldName);
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't rename directory {0}"), oldName));
return;
}
OnFileRenamed(new FileEventArgs(oldName, newName, true));
@@ -276,7 +276,7 @@
File.Move(oldName, newName);
} catch (Exception e) {
IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e, "Can't rename file " + oldName);
+ messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Can't rename file {0}"), oldName));
return;
}
OnFileRenamed(new FileEventArgs(oldName, newName, false));
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/File/FdoRecentFiles.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/File/FdoRecentFiles.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/File/FdoRecentFiles.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -17,32 +17,26 @@
{
public class FdoRecentFiles
{
- // The document should be stored in "~/.recently-used",
-
- // and it should contain no more than 500 items.
- int totalMaxLength = 500;
-
// MD only wants to save last 10 in its group
- int maxLength = 10;
- ArrayList lastfile = new ArrayList();
- ArrayList lastproject = new ArrayList();
+ ArrayList lastFiles = new ArrayList (10); // max 10
+ ArrayList lastProjects = new ArrayList (10); // max 10
+ ArrayList allRecents = new ArrayList (10); // max 500
- XmlDocument doc;
+ XPathDocument doc;
public event EventHandler RecentFileChanged;
public event EventHandler RecentProjectChanged;
public FdoRecentFiles ()
{
- string recentFile = Environment.GetEnvironmentVariable ("HOME");
- recentFile = Path.Combine (recentFile, ".recently_used");
- Console.WriteLine (recentFile);
+ // The document should be stored in "~/.recently-used",
+ string recentFile = Path.Combine (Environment.GetEnvironmentVariable ("HOME"), ".recently_used");
+ //Console.WriteLine (recentFile);
if (File.Exists (recentFile))
{
// use POSIX lockf ()
- doc = new XmlDocument ();
- doc.Load (recentFile);
+ doc = new XPathDocument (recentFile);
XPathNavigator nav = doc.CreateNavigator ();
XPathNodeIterator xni = nav.Select ("/RecentFiles/RecentItem");
@@ -55,8 +49,8 @@
// create it
}
- FileSystemWatcher watcher = new FileSystemWatcher (recentFile);
- watcher.Changed += new FileSystemEventHandler (OnWatcherChanged);
+ //FileSystemWatcher watcher = new FileSystemWatcher (recentFile);
+ //watcher.Changed += new FileSystemEventHandler (OnWatcherChanged);
}
void OnWatcherChanged (object o, FileSystemEventArgs args)
@@ -86,7 +80,7 @@
{
get
{
- return lastfile;
+ return lastFiles;
}
}
@@ -94,7 +88,7 @@
{
get
{
- return lastproject;
+ return lastProjects;
}
}
@@ -104,24 +98,54 @@
{
// uri must be unique
// or just update timestamp and group
+ foreach (RecentItem recentItem in allRecents)
+ {
+ if (recentItem.Uri == file_uri)
+ {
+ recentItem.Update (false);
+ lastFiles.Add (recentItem);
+ return;
+ }
+ }
+
RecentItem ri = new RecentItem (file_uri);
+ ri.Group = "MonoDevelop Files";
+ lastFiles.Add (ri);
}
public void AddProject (string file_uri)
{
// uri must be unique
// or just update timestamp and group
+ foreach (RecentItem recentItem in allRecents)
+ {
+ if (recentItem.Uri == file_uri)
+ {
+ recentItem.Update (true);
+ lastProjects.Add (recentItem);
+ return;
+ }
+ }
+
RecentItem ri = new RecentItem (file_uri);
+ ri.Group = "MonoDevelop Projects";
+ lastProjects.Add (ri);
}
// spec doesn't mention removal
public void ClearFiles ()
{
+ lastFiles.Clear ();
+ // remove from allRecents
+ // write the file
}
// spec doesn't mention removal
public void ClearProjects ()
{
+ lastProjects.Clear ();
+ // remove from allRecents
+ // write the file
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/File/RecentItem.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/File/RecentItem.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/File/RecentItem.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -33,6 +33,17 @@
this.timestamp = ((int) (now - epoch).TotalSeconds).ToString ();
}
+ // update the group and timestamp
+ public void Update (bool project)
+ {
+ DateTime now = DateTime.UtcNow;
+ this.timestamp = ((int) (now - epoch).TotalSeconds).ToString ();
+ if (project)
+ this.group = "MonoDevelop Projects";
+ else
+ this.group = "MonoDevelop Files";
+ }
+
public string Mime
{
get { return mime; }
@@ -51,6 +62,7 @@
public string Group
{
get { return group; }
+ set { group = value; }
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/MessageService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/MessageService.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/MessageService.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -11,6 +11,7 @@
using MonoDevelop.Gui;
using MonoDevelop.Core.AddIns;
using MonoDevelop.Core.Properties;
+using MonoDevelop.Services;
namespace MonoDevelop.Core.Services
{
@@ -52,7 +53,7 @@
msg += "Exception occurred: " + ex.ToString();
}
- using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Error, Gtk.ButtonsType.Ok, stringParserService.Parse(msg))) {
+ using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Error, Gtk.ButtonsType.Ok, message)) {
md.Run ();
md.Hide ();
}
@@ -60,7 +61,7 @@
public void ShowWarning(string message)
{
- using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Warning, Gtk.ButtonsType.Ok, stringParserService.Parse(message))) {
+ using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Warning, Gtk.ButtonsType.Ok, message)) {
md.Run ();
md.Hide ();
}
@@ -73,7 +74,7 @@
public bool AskQuestion(string question, string caption)
{
- using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.YesNo, stringParserService.Parse(question))) {
+ using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.YesNo, question)) {
int response = md.Run ();
md.Hide ();
@@ -96,7 +97,7 @@
public bool AskQuestion(string question)
{
- return AskQuestion(stringParserService.Parse(question), stringParserService.Parse("${res:Global.QuestionText}"));
+ return AskQuestion(stringParserService.Parse(question), GettextCatalog.GetString ("Question"));
}
public int ShowCustomDialog(string caption, string dialogText, params string[] buttontexts)
@@ -122,7 +123,7 @@
public void ShowMessage(string message, string caption)
{
- using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Info, Gtk.ButtonsType.Ok, stringParserService.Parse(message))) {
+ using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Info, Gtk.ButtonsType.Ok, message)) {
md.Run ();
md.Hide ();
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/MonodocService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/MonodocService.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/MonodocService.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -22,8 +22,8 @@
get { return helpTree; }
}
- //public XmlDocument GetHelpXml (string type) {
- // return helpTree.GetHelpXml ("T:" + type);
- //}
+ public XmlDocument GetHelpXml (string type) {
+ return helpTree.GetHelpXml ("T:" + type);
+ }
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/AssemblyInformation.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/AssemblyInformation.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/AssemblyInformation.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -44,6 +44,7 @@
byte[] GetBytes(string fileName)
{
+ Console.WriteLine (fileName);
FileStream fs = System.IO.File.OpenRead(fileName);
long size = fs.Length;
byte[] outArray = new byte[size];
@@ -65,7 +66,7 @@
// }
// read xml documentation for the assembly
- XmlDocument doc = null;
+ /*XmlDocument doc = null;
Hashtable docuNodes = new Hashtable();
string xmlDocFile = System.IO.Path.ChangeExtension(fileName, ".xml");
@@ -88,12 +89,15 @@
}
}
}
- }
-
- System.Reflection.Assembly asm = nonLocking ? Assembly.Load(GetBytes(fileName)) : Assembly.LoadFrom(fileName);
+ }*/
+
+ //FIXME: Re-enable this code when the mono bug goes away, 0.32
+ //hopefully
+ //System.Reflection.Assembly asm = nonLocking ? Assembly.Load(GetBytes(fileName)) : Assembly.LoadFrom(fileName);
+ System.Reflection.Assembly asm = Assembly.LoadFrom (fileName);
foreach (Type type in asm.GetTypes()) {
if (!type.FullName.StartsWith("<") && !type.IsSpecialName && type.IsPublic) {
- classes.Add(new ReflectionClass(type, docuNodes));
+ classes.Add(new ReflectionClass(type));
}
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/DefaultParserService.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -161,7 +161,7 @@
BinaryWriter classWriter = new BinaryWriter(new BufferedStream(new FileStream(codeCompletionMainFile, FileMode.Create, FileAccess.Write, FileShare.None)));
BinaryWriter proxyWriter = new BinaryWriter(new BufferedStream(new FileStream(codeCompletionProxyFile, FileMode.Create, FileAccess.Write, FileShare.None)));
if (progressMonitor != null) {
- progressMonitor.BeginTask("generate code completion database", assemblyList.Length);
+ progressMonitor.BeginTask(GettextCatalog.GetString ("Generate code completion database"), assemblyList.Length);
}
// convert all assemblies
@@ -185,7 +185,7 @@
}
if (progressMonitor != null) {
- progressMonitor.Worked(i, "Writing class");
+ progressMonitor.Worked(i, GettextCatalog.GetString ("Writing class"));
}
if (!ContinueWithProcess(progressMonitor))
return;
@@ -375,11 +375,13 @@
bool updated = false;
lock (parsings) {
string text = editable.Text;
+ if (text != null) {
- if (lastUpdateSize[fileName] == null || (int)lastUpdateSize[fileName] != text.GetHashCode()) {
- parseInformation = ParseFile(fileName, text);
- lastUpdateSize[fileName] = text.GetHashCode();
- updated = true;
+ if (lastUpdateSize[fileName] == null || (int)lastUpdateSize[fileName] != text.GetHashCode()) {
+ parseInformation = ParseFile(fileName, text);
+ lastUpdateSize[fileName] = text.GetHashCode();
+ updated = true;
+ }
}
}
if (updated) {
@@ -743,6 +745,19 @@
}
return null;
}
+
+ public ArrayList IsAsResolve (string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent)
+ {
+ try {
+ IParser parser = GetParser (fileName);
+ if (parser != null) {
+ return parser.IsAsResolve (this, expression, caretLineNumber, caretColumn, fileName, fileContent);
+ }
+ return null;
+ } catch {
+ return null;
+ }
+ }
public ResolveResult Resolve(string expression,
int caretLineNumber,
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/IParserService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/IParserService.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/ParserService/IParserService.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -68,6 +68,7 @@
int caretColumn,
string fileName,
string fileContent);
+ ArrayList IsAsResolve (string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent);
ArrayList CtrlSpace(IParserService parserService, int caretLine, int caretColumn, string fileName);
void AddReferenceToCompletionLookup(IProject project, ProjectReference reference);
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/DefaultProjectService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/DefaultProjectService.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/DefaultProjectService.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -133,7 +133,7 @@
return;
}
IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
- statusBarService.SetMessage("${res:MainWindow.StatusBar.OpeningCombineMessage}");
+ statusBarService.SetMessage(GettextCatalog.GetString ("Opening Combine..."));
if (Path.GetExtension(filename).ToUpper() == ".PRJX") {
string validcombine = Path.ChangeExtension(filename, ".cmbx");
@@ -152,7 +152,7 @@
} else {
LoadCombine(filename);
}
- statusBarService.SetMessage("${res:MainWindow.StatusBar.ReadyMessage}");
+ statusBarService.SetMessage(GettextCatalog.GetString ("Ready"));
}
void LoadCombine(string filename)
@@ -274,7 +274,7 @@
// cut&pasted from CombineEntry.cs
stringParserService.Properties["Project"] = project.Name;
IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IStatusBarService));
- statusBarService.SetMessage("${res:MainWindow.StatusBar.CompilingMessage}");
+ statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("Compiling {0}"), project.Name));
string outputDir = ((AbstractProjectConfiguration)project.ActiveConfiguration).OutputDirectory;
try {
@@ -332,7 +332,7 @@
if (content.ContentName != null && content.IsDirty) {
if (!save) {
IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- if (messageService.AskQuestion("Save changed files?")) {
+ if (messageService.AskQuestion(GettextCatalog.GetString ("Save changed files?"))) {
save = true;
} else {
break;
@@ -725,6 +725,11 @@
return String.Empty;
}
+
+ public void GenerateMakefiles ()
+ {
+ openCombine.GenerateMakefiles ();
+ }
public event FileEventHandler FileRemovedFromProject;
public event EventHandler StartBuild;
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/IProjectService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/IProjectService.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/Project/IProjectService.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -181,6 +181,8 @@
/// Removes a file from it's project(s)
/// </remarks>
void RemoveFileFromProject(string fileName);
+
+ void GenerateMakefiles ();
/// <remarks>
/// Is called, when a file is removed from a project.
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/ResourceNotFoundException.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/ResourceNotFoundException.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/ResourceNotFoundException.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -7,6 +7,8 @@
using System;
+using MonoDevelop.Services;
+
namespace MonoDevelop.Core.Services
{
/// <summary>
@@ -15,7 +17,7 @@
/// </summary>
public class ResourceNotFoundException : Exception
{
- public ResourceNotFoundException(string resource) : base("Resource not found : " + resource)
+ public ResourceNotFoundException(string resource) : base(String.Format (GettextCatalog.GetString("Resource not found: {0}"), resource))
{
}
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/StatusBar/DefaultStatusBarService.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -11,6 +11,7 @@
using MonoDevelop.Core.Services;
using MonoDevelop.Gui.Components;
using MonoDevelop.Gui;
+using MonoDevelop.Services;
namespace MonoDevelop.Services
{
@@ -64,7 +65,7 @@
public void SetInsertMode (bool insertMode)
{
StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- statusBar.ModeStatusBarPanel.Push (1, insertMode ? stringParserService.Parse("${res:StatusBarService.CaretModes.Insert}") : stringParserService.Parse("${res:StatusBarService.CaretModes.Overwrite}"));
+ statusBar.ModeStatusBarPanel.Push (1, insertMode ? GettextCatalog.GetString ("INS") : GettextCatalog.GetString ("OVR"));
}
public void ShowErrorMessage (string message)
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/Tasks/Task.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/Tasks/Task.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/Tasks/Task.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -94,7 +94,9 @@
type = error.IsWarning ? TaskType.Warning : TaskType.Error;
column = error.Column - 1;
line = error.Line - 1;
- description = error.ErrorText + "(" + error.ErrorNumber + ")";
+ description = error.ErrorText;
+ if (error.ErrorNumber != String.Empty)
+ description += "(" + error.ErrorNumber + ")";
fileName = error.FileName;
}
Modified: branches/MonoDevelop-generate-what/src/Main/Base/Services/Toolbar/ToolbarService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Services/Toolbar/ToolbarService.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Services/Toolbar/ToolbarService.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -61,13 +61,16 @@
continue;
} else {
item = new SdToolbarCommand(childCodon.Conditions, owner, childCodon.ToolTip);
- Gtk.Image img = resourceService.GetImage(childCodon.Icon, Gtk.IconSize.Menu);
- if (img.StorageType == Gtk.ImageType.Stock) {
- item.Stock = img.Stock;
- item.IconSize = (int)Gtk.IconSize.Menu;
- } else {
- item.Pixbuf = img.Pixbuf;
- }
+ Gtk.Image img = resourceService.GetImage(childCodon.Icon, Gtk.IconSize.LargeToolbar);
+ item.Add (img);
+ item.Relief = ReliefStyle.None;
+
+ //if (img.StorageType == Gtk.ImageType.Stock) {
+ // item.Stock = img.Stock;
+ // item.IconSize = (int)Gtk.IconSize.SmallToolbar;
+ //} else {
+ // item.Pixbuf = img.Pixbuf;
+ //}
item.ShowAll();
}
} else {
@@ -76,7 +79,8 @@
if (childCodon.Class != null) {
((SdToolbarCommand)item).Command = (ICommand)childCodon.AddIn.CreateObject(childCodon.Class);
}
- bar.AppendItem(item.Text, item.Text, item.Text, item, new Gtk.SignalFunc(item.ToolbarClicked));
+ //bar.AppendItem(item.Text, item.Text, item.Text, item, new Gtk.SignalFunc(item.ToolbarClicked));
+ bar.AppendWidget (item, item.Text, item.Text);
}
return bar;
}
Copied: branches/MonoDevelop-generate-what/src/Main/StartUp/ChangeLog (from rev 1534, trunk/MonoDevelop/src/Main/StartUp/ChangeLog)
Modified: branches/MonoDevelop-generate-what/src/Main/StartUp/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/StartUp/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/StartUp/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,7 +1,7 @@
BASEDIR=$(srcdir)/../../..
FILES= \
-./SharpDevelopMain.cs \
+./MonoDevelopMain.cs \
./Dialogs/AddInTreeSettingsHandler.cs \
./Dialogs/ExceptionBox.cs \
./AssemblyInfo.cs
@@ -13,34 +13,14 @@
all: $(DLL)
$(DLL): $(build_sources)
- @ mcs /debug /out:$(DLL) /r:System.Drawing \
+ mcs /debug /out:$(DLL) /r:System.Drawing \
/r:../../../build/bin/MonoDevelop.Core.dll \
/r:../../../build/bin/MonoDevelop.Base.dll \
- /r:glib-sharp \
- /define:GTK /r:gtk-sharp /r:gdk-sharp \
- /r:gnome-sharp \
+ /define:GTK \
+ @GTKSHARP@ \
+ @GNOMESHARP@ \
$(build_sources) \
- /resource:$(BASEDIR)/data/resources/StringResources.fr.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.cn-gb.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.jp.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.nl.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.pl.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.ro.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.pt.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.ru.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.goisern.resources \
- /resource:$(BASEDIR)/data/resources/BitmapResources.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.se.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.es.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.cz.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.kr.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.it.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.bg.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.de.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.cn-big.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.dk.resources \
/resource:$(BASEDIR)/data/resources/StringResources.resources,StringResources.resources \
- /resource:$(BASEDIR)/data/resources/StringResources.br.resources \
/resource:$(BASEDIR)/data/resources/SplashScreen.png,SplashScreen.png \
&& cp $(DLL) ../../../build/bin/.
Copied: branches/MonoDevelop-generate-what/src/Main/StartUp/MonoDevelopMain.cs (from rev 1534, trunk/MonoDevelop/src/Main/StartUp/MonoDevelopMain.cs)
Deleted: branches/MonoDevelop-generate-what/src/Main/StartUp/SharpDevelopMain.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/StartUp/SharpDevelopMain.cs 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Main/StartUp/SharpDevelopMain.cs 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1,117 +0,0 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Xml;
-using System.Threading;
-
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.AddIns.Codons;
-using MonoDevelop.Core.AddIns;
-using MonoDevelop.Core.Services;
-using MonoDevelop.Gui.Dialogs;
-
-namespace MonoDevelop
-{
- /// <summary>
- /// This Class is the Core main class, it starts the program.
- /// </summary>
- public class SharpDevelopMain
- {
- static string[] commandLineArgs = null;
-
- public static string[] CommandLineArgs {
- get {
- return commandLineArgs;
- }
- }
-
- static void ShowErrorBox(object sender, ThreadExceptionEventArgs eargs)
- {
- ExceptionDialog ed;
-
- ed = new ExceptionDialog(eargs.Exception);
- ed.AddButtonHandler(new ButtonHandler(DialogResultHandler));
- ed.ShowAll();
- }
-
- static void DialogResultHandler(ExceptionDialog ed, DialogResult dr) {
- ed.Destroy();
- }
-
- /// <summary>
- /// Starts the core of SharpDevelop.
- /// </summary>
- [STAThread()]
- public static void Main(string[] args)
- {
- Gnome.Program program = new Gnome.Program ("MonoDevelop", "0.1", Gnome.Modules.UI, args);
- Gdk.Threads.Init();
- commandLineArgs = args;
- bool noLogo = false;
-
- SplashScreenForm.SetCommandLineArgs(args);
-
- foreach (string parameter in SplashScreenForm.GetParameterList()) {
- switch (parameter.ToUpper()) {
- case "NOLOGO":
- noLogo = true;
- break;
- }
- }
-
- if (!noLogo) {
- SplashScreenForm.SplashScreen.ShowAll ();
- while (Gtk.Application.EventsPending()) {
- Gtk.Application.RunIteration (false);
- }
- }
-
- bool ignoreDefaultPath = false;
- string [] addInDirs = MonoDevelop.AddInSettingsHandler.GetAddInDirectories(out ignoreDefaultPath);
- AddInTreeSingleton.SetAddInDirectories(addInDirs, ignoreDefaultPath);
-
- ArrayList commands = null;
- try {
- ServiceManager.Services.AddService(new IconService());
- ServiceManager.Services.AddService(new MessageService());
- ServiceManager.Services.AddService(new ResourceService());
- ServiceManager.Services.InitializeServicesSubsystem("/Workspace/Services");
-
- commands = AddInTreeSingleton.AddInTree.GetTreeNode("/Workspace/Autostart").BuildChildItems(null);
- for (int i = 0; i < commands.Count - 1; ++i) {
- ((ICommand)commands[i]).Run();
- }
-
- // We don't have yet an alternative for Application.ThreadException
- // How can we handle this?
- // Application.ThreadException += new ThreadExceptionEventHandler(ShowErrorBox);
-
- } catch (XmlException e) {
- Console.WriteLine("Could not load XML :\n" + e.Message);
- return;
- } catch (Exception e) {
- Console.WriteLine("Loading error, please reinstall :\n" + e.ToString());
- return;
- } finally {
- if (SplashScreenForm.SplashScreen != null) {
- SplashScreenForm.SplashScreen.Hide();
- }
- }
-
- // run the last autostart command, this must be the workbench starting command
- if (commands.Count > 0) {
- ((ICommand)commands[commands.Count - 1]).Run();
- }
-
- // unloading services
- ServiceManager.Services.UnloadAllServices();
- }
- }
-}
Modified: branches/MonoDevelop-generate-what/src/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/Makefile.am 2004-04-28 07:45:40 UTC (rev 1534)
+++ branches/MonoDevelop-generate-what/src/Makefile.am 2004-04-28 09:15:53 UTC (rev 1535)
@@ -1 +1,3 @@
-SUBDIRS=Libraries Main AddIns
+
+SUBDIRS = Tools Libraries Main AddIns
+
Copied: branches/MonoDevelop-generate-what/src/Tools (from rev 1534, trunk/MonoDevelop/src/Tools)
Property changes on: branches/MonoDevelop-generate-what/src/Tools
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
More information about the Monodevelop-patches-list
mailing list